Set the currentUser in this Web API function: createUserWithEmailAndPassword #770

Author: EddyVerbruggen

demo/app/main-view-model.ts

@@ -169,16 +169,19 @@ export class HelloWorldModel extends Observable {
   }
 
   public doWebCreateUser(): void {
-    firebaseWebApi.auth().createUserWithEmailAndPassword('[email protected]', 'firebase')
-        .then(result => {
+    firebaseWebApi.auth().createUserWithEmailAndPassword('[email protected]', 'firebase')
+        .then((user: User) => {
+          console.log("User created: " + JSON.stringify(user));
+          this.set("userEmailOrPhone", user.email);
           alert({
             title: "User created",
-            message: JSON.stringify(result),
+            message: JSON.stringify(user),
             okButtonText: "Nice!"
           });
         })
         .catch(
             error => {
+              console.log("Error creating user: " + error);
               alert({
                 title: "No user created",
                 message: JSON.stringify(error),
@@ -191,12 +194,15 @@ export class HelloWorldModel extends Observable {
   public doWebGetCurrentUser(): void {
     const user = firebaseWebApi.auth().currentUser;
     if (user) {
+      console.log("Current user: " + JSON.stringify(user));
+      this.set("userEmailOrPhone", user.email);
       alert({
         title: "Current user",
         message: JSON.stringify(user),
         okButtonText: "Nice!"
       });
     } else {
+      console.log("No current user");
       alert({
         title: "No current user",
         okButtonText: "OK, thanks"
@@ -690,10 +696,11 @@ export class HelloWorldModel extends Observable {
 
   public doGetCurrentUser(): void {
     firebase.getCurrentUser().then(
-        result => {
+        user => {
+          this.set("userEmailOrPhone", user.email);
           alert({
             title: "Current user",
-            message: JSON.stringify(result),
+            message: JSON.stringify(user),
             okButtonText: "Nice!"
           });
         },
@@ -814,20 +821,23 @@ export class HelloWorldModel extends Observable {
 
   public doCreateUser(): void {
     firebase.createUser({
-      email: '[email protected]',
+      email: 'eddyverbruggen+firebasetest@gmail.com',
       password: 'firebase'
     }).then(
-        result => {
+        (user: User) => {
+          console.log("User created: " + JSON.stringify(user));
+          this.set("userEmailOrPhone", user.email);
           alert({
             title: "User created",
-            message: JSON.stringify(result),
+            message: JSON.stringify(user),
             okButtonText: "Nice!"
           });
         },
-        errorMessage => {
+        error => {
+          console.log("Error creating user: " + error);
           alert({
             title: "No user created",
-            message: errorMessage,
+            message: error,
             okButtonText: "OK, got it"
           });
         }

docs/AUTHENTICATION.md

@@ -333,10 +333,10 @@ This may not work on an (Android) simulator. See #463.
     email: '[email protected]',
     password: 'firebase'
   }).then(
-      function (result) {
+      function (user) {
         dialogs.alert({
           title: "User created",
-          message: "userid: " + result.key,
+          message: "email: " + user.email,
           okButtonText: "Nice!"
         })
       },
@@ -355,14 +355,15 @@ This may not work on an (Android) simulator. See #463.
  <summary>Web API</summary>
 
 ```typescript
-  firebaseWebApi.auth().signOut()
-      .then(() => console.log("Logout OK"))
-      .catch(error => "Logout error: " + JSON.stringify(error));
+  firebaseWebApi.auth().createUserWithEmailAndPassword('[email protected]', 'firebase')
+      .then((user: User) => {
+        console.log("User created: " + JSON.stringify(user));
+      })
+      .catch(error => console.log("Error creating user: " + error));
 ```
 </details>
 
 
-
 #### Resetting a password
 ```js
   firebase.resetPassword({

src/app/auth/index.ts

@@ -70,11 +70,16 @@ export module auth {
       });
     }
 
-    public createUserWithEmailAndPassword(email: string, password: string): Promise<any> {
-      return firebase.createUser({
-        email: email,
-        password: password
-      });
+    public createUserWithEmailAndPassword(email: string, password: string): Promise<User> {
+      return new Promise((resolve, reject) => {
+        firebase.createUser({
+          email: email,
+          password: password
+        }).then((user: User) => {
+          this.currentUser = user;
+          resolve(user);
+        }).catch(err => reject(err));
+      })
     }
 
     public signInAnonymously(): Promise<any> {

src/firebase.android.ts

@@ -1470,7 +1470,8 @@ firebase.createUser = arg => {
               reject("Creating a user failed. " + (task.getException() && task.getException().getReason ? task.getException().getReason() : task.getException()));
             } else {
               const user = task.getResult().getUser();
-              resolve({key: user.getUid()});
+              const additionalUserInfo = task.getResult().getAdditionalUserInfo();
+              resolve(toLoginResult(user, additionalUserInfo));
             }
           }
         });

src/firebase.d.ts

@@ -338,13 +338,6 @@ export interface AddEventListenerResult {
   listeners: Array<any>;
 }
 
-/**
- * The returned object from the createUser function.
- */
-export interface CreateUserResult {
-  key: string;
-}
-
 /**
  * The options object passed into the createUser function.
  */
@@ -802,7 +795,7 @@ export function fetchSignInMethodsForEmail(email: string): Promise<Array<string>
 
 export function sendEmailVerification(): Promise<any>;
 
-export function createUser(options: CreateUserOptions): Promise<CreateUserResult>;
+export function createUser(options: CreateUserOptions): Promise<User>;
 
 export function deleteUser(): Promise<any>;
 

src/firebase.ios.ts

@@ -1589,9 +1589,7 @@ firebase.createUser = arg => {
         if (error) {
           reject(error.localizedDescription);
         } else {
-          resolve({
-            key: authResult.user.uid
-          });
+          resolve(toLoginResult(authResult.user, authResult.additionalUserInfo));
         }
       };