Merge pull request #1205 from KkevinLi/web-auth-signin

Web auth signin

Author: EddyVerbruggen

docs/AUTHENTICATION.md

@@ -461,6 +461,9 @@ Note that changing a password may fail if your login for this `email` was too lo
 ### Custom login
 Use this login type to authenticate against firebase using a token generated by your own backend server. See these [instructions on how to generate the authentication token](https://firebase.google.com/docs/auth/server).
 
+<details>
+ <summary>Native API</summary>
+
 ```js
   var token = "myBackendToken";
 
@@ -478,6 +481,17 @@ Use this login type to authenticate against firebase using a token generated by
       }
   );
 ```
+</details>
+
+<details>
+ <summary>Web API</summary>
+
+```typescript
+  firebaseWebApi.auth().signInWithCustomToken(token)
+      .then(result => console.log(JSON.stringify(result)))
+      .catch(error => console.log(JSON.stringify(error)));
+```
+</details>
 
 ### Facebook login
 

src/app/auth/index.ts

@@ -1,16 +1,50 @@
 import * as firebase from "../../firebase";
 import { FirebaseEmailLinkActionCodeSettings, LoginType, User } from "../../firebase";
 
-export module auth {
+export namespace auth {
   export class Auth {
     private authStateChangedHandler;
     public currentUser: User;
     public languageCode: string | null;
 
+    private loginHelper(options: firebase.LoginOptions) {
+      return new Promise((resolve, reject) => {
+        firebase.login(options)
+        .then((user: User) => {
+          this.currentUser = user;
+          this.authStateChangedHandler && this.authStateChangedHandler(user);
+          resolve({
+            additionalUserInfo: user.additionalUserInfo,
+            credential: null,
+            operationType: "SignIn",
+            user: user,
+          });
+        }).catch(err => {
+          let code = 'auth/exception';
+          let message = err.toString();
+          // Identify code for android. Note that the IOS implementation doesn't return a code.
+          if (message.includes('com.google.firebase.auth.FirebaseAuthInvalidCredentialsException')) {
+            code = 'auth/wrong-password';
+          } else if (message.includes('com.google.firebase.auth.FirebaseAuthInvalidUserException')) {
+            code = 'auth/user-not-found';
+            // Note that Android returns one exception for both user not found and invalid email whereas
+            // the web api returns seperate codes. Therefore the conditional below can never be satisfied
+            // for android.
+            // } else if (message.includes('com.google.firebase.auth.FirebaseAuthInvalidUserException')) {
+            //   code = 'auth/invalid-email'
+          }
+          reject({
+            code: code,
+            message: message
+          });
+        });
+      });
+    }
+
     public onAuthStateChanged(handler: (user: User) => void): void {
       this.authStateChangedHandler = handler;
       console.log(">> added onAuthStateChanged handler");
-    };
+    }
 
     public signOut(): Promise<any> {
       return new Promise((resolve, reject) => {
@@ -46,63 +80,53 @@ export module auth {
     }
 
     public signInWithEmailAndPassword(email: string, password: string): Promise<any> {
-      return new Promise((resolve, reject) => {
-        firebase.login({
-          type: LoginType.PASSWORD,
-          passwordOptions: {
-            email: email,
-            password: password
-          }
-        }).then((user: User) => {
-          this.currentUser = user;
-          this.authStateChangedHandler && this.authStateChangedHandler(user);
-          resolve({
-            additionalUserInfo: user.additionalUserInfo,
-            credential: null,
-            operationType: "SignIn",
-            user: user,
-          });
-        }).catch(err => {
-          let code = 'auth/exception';
-          let message = err.toString();
-          // Identify code for android. Note that the IOS implementation doesn't return a code.
-          if (message.includes('com.google.firebase.auth.FirebaseAuthInvalidCredentialsException')) {
-            code = 'auth/wrong-password';
-          } else if (message.includes('com.google.firebase.auth.FirebaseAuthInvalidUserException')) {
-            code = 'auth/user-not-found';
-            // Note that Android returns one exception for both user not found and invalid email whereas
-            // the web api returns seperate codes. Therefore the conditional below can never be satisfied
-            // for android.
-            // } else if (message.includes('com.google.firebase.auth.FirebaseAuthInvalidUserException')) {
-            //   code = 'auth/invalid-email'
-          }
-          reject({
-            code: code,
-            message: message
-          })
-        });
-      });
+      const emailOption: firebase.LoginOptions = {
+        type: LoginType.PASSWORD,
+        passwordOptions: {
+          email: email,
+          password: password
+        }
+      };
+      return this.loginHelper(emailOption);
+    }
+
+    public signInWithCustomToken(token: string): Promise<any> {
+      const customTokenOption: firebase.LoginOptions = {
+        type: LoginType.CUSTOM,
+        customOptions: {
+          token: token
+        }
+      };
+      return this.loginHelper(customTokenOption);
+    }
+
+    public signInAnonymously(): Promise<any> {
+      const anonymousOption: firebase.LoginOptions = {
+        type: LoginType.ANONYMOUS
+      };
+      return this.loginHelper(anonymousOption);
     }
 
     public sendSignInLinkToEmail(email: string, actionCodeSettings: FirebaseEmailLinkActionCodeSettings): Promise<any> {
-      return new Promise((resolve, reject) => {
-        firebase.login({
-          type: LoginType.EMAIL_LINK,
+      const sendSignInLinklOption: firebase.LoginOptions = {
+        type: LoginType.EMAIL_LINK,
           emailLinkOptions: {
             email: email,
             url: actionCodeSettings.url,
           }
-        }).then((user: User) => {
-          this.currentUser = user;
-          this.authStateChangedHandler && this.authStateChangedHandler(user);
-          resolve();
-        }, (err => {
-          reject({
-            // code: "",
-            message: err
-          });
-        }));
-      });
+      };
+      return this.loginHelper(sendSignInLinklOption);
+    }
+
+    public signInWithEmailLink(email: string, emailLink: string): Promise<any> {
+      const signInWithEmailOption: firebase.LoginOptions = {
+        type: firebase.LoginType.EMAIL_LINK,
+        emailLinkOptions: {
+          email: email,
+          url: emailLink
+        }
+      };
+      return this.loginHelper(signInWithEmailOption);
     }
 
     public createUserWithEmailAndPassword(email: string, password: string): Promise<User> {
@@ -114,47 +138,30 @@ export module auth {
           this.currentUser = user;
           resolve(user);
         }).catch(err => reject(err));
-      })
+      });
     }
 
     public updateEmail(newEmail: string): Promise<void> {
       return new Promise<void>((resolve, reject) => {
         firebase.updateEmail(newEmail)
             .then(() => resolve())
             .catch(err => reject(err));
-      })
+      });
     }
 
     public updatePassword(newPassword: string): Promise<void> {
       return new Promise<void>((resolve, reject) => {
         firebase.updatePassword(newPassword)
             .then(() => resolve())
             .catch(err => reject(err));
-      })
+      });
     }
 
     public sendPasswordResetEmail(email: string): Promise<void> {
       return new Promise<void>((resolve, reject) => {
         firebase.sendPasswordResetEmail(email)
             .then(() => resolve())
             .catch(err => reject(err));
-      })
-    }
-
-    public signInAnonymously(): Promise<any> {
-      return new Promise((resolve, reject) => {
-        firebase.login({
-          type: LoginType.ANONYMOUS
-        }).then((user: User) => {
-          this.currentUser = user;
-          this.authStateChangedHandler && this.authStateChangedHandler(user);
-          resolve();
-        }, (err => {
-          reject({
-            // code: "",
-            message: err
-          });
-        }));
       });
     }
 

src/firebase.android.ts

@@ -809,7 +809,7 @@ function toLoginResult(user, additionalUserInfo?): User {
     getIdToken: (forceRefresh?: boolean) => new Promise((resolve, reject) => {
       firebase.getAuthToken({forceRefresh})
           .then((result: GetAuthTokenResult) => resolve(result.token))
-          .catch(reject)
+          .catch(reject);
     }),
     sendEmailVerification: (actionCodeSettings?: ActionCodeSettings) => firebase.sendEmailVerification(actionCodeSettings)
   };