Updated to v3

auser · auser · commit 247eb5e6edc6 · 2016-11-18T13:07:24.000-05:00
diff --git a/app/views/Authentication/Demos/Email.js b/app/views/Authentication/Demos/Email.js
@@ -28,9 +28,12 @@ export class Email extends React.Component {
   componentWillMount() {
     const {firestack} = this.props;
 
-    firestack.auth.listenForAuth((u) => {
-      console.log('listenForAuth ->', u);
+    this.unsubscribe = firebase.auth().onAuthStateChanged(function(user) {
+      console.log('auth state changed', user);
     });
+    // firestack.auth.listenForAuth((u) => {
+    //   console.log('listenForAuth ->', u);
+    // });
   }
 
   fillInFields() {
@@ -44,7 +47,7 @@ export class Email extends React.Component {
     const {firestack} = this.props;
     const { email, password } = this.state;
 
-    firestack.auth.signInWithEmail(email, password)
+    firestack.auth().signInWithEmailAndPassword(email, password)
       .then(u => {
         console.log('Signed in!', u);
         this.setState({
@@ -69,7 +72,9 @@ export class Email extends React.Component {
 
   componentWillUnmount() {
     const {firestack} = this.props;
-    firestack.auth.unlistenForAuth();
+    if (this.unsubscribe) {
+      this.unsubscribe();
+    }
   }
 
   render() {
diff --git a/app/views/Authentication/Demos/ErrorHandling.js b/app/views/Authentication/Demos/ErrorHandling.js
@@ -26,15 +26,18 @@ export class ErrorHandling extends React.Component {
 
   componentWillMount() {
     const {firestack} = this.props;
-    firestack.auth.listenForAuth((user) => {
-      console.log('user -->', user);
+    this.unsubscribe = firebase.auth().onAuthStateChanged(function(user) {
+      console.log('auth state changed', user);
     });
   }
 
   
   componentWillUnmount() {
     const {firestack} = this.props;
     firestack.auth.unlistenForAuth();
+    if (this.unsubscribe) {
+      this.unsubscribe();
+    }
   }
 
   generateError(key) {
@@ -43,7 +46,7 @@ export class ErrorHandling extends React.Component {
     return () => {
       switch(key) {
         case ERRORS['badUsernamePassword']:
-          firestack.auth.signInWithEmail('ari@fullstack.io', 'definitely_not_my_password')
+          firestack.auth().signInWithEmailAndPassword('ari@fullstack.io', 'definitely_not_my_password')
           .then(user => console.log('Success'))
           .catch(err => {
             console.log('Error with signInWithEmail', err);
