firebase user provider data? #196

Author: EddyVerbruggen

firebase.android.js

@@ -466,12 +466,7 @@ firebase.getCurrentUser = function (arg) {
       var firebaseAuth = com.google.firebase.auth.FirebaseAuth.getInstance();
       var user = firebaseAuth.getCurrentUser();
       if (user !== null) {
-        resolve({
-          uid: user.getUid(),
-          name: user.getDisplayName(),
-          email: user.getEmail(),
-          profileImageURL: user.getPhotoUrl() ? user.getPhotoUrl().toString() : null
-        });
+        resolve(toLoginResult(user));
       } else {
         reject();
       }
@@ -574,11 +569,24 @@ function toLoginResult(user) {
     return false;
   }
 
+  // for convenience return the result in multiple formats
+  var providers = [];
+  var providerData = user.getProviderData();
+  for (var i = 0; i < providerData.size(); i++) {
+    var pid = providerData.get(i).getProviderId();
+    providers.push({
+      id: pid
+    });
+  }
+
   return {
     uid: user.getUid(),
     name: user.getDisplayName(),
     email: user.getEmail(),
-    // expiresAtUnixEpochSeconds: authData.getExpires(),
+    emailVerified: user.isEmailVerified(),
+    // provider: user.getProviderId(), // always 'firebase'
+    providers: providers,
+    anonymous: user.isAnonymous(),
     profileImageURL: user.getPhotoUrl() ? user.getPhotoUrl().toString() : null
   };
 }

firebase.ios.js

@@ -613,16 +613,7 @@ firebase.getCurrentUser = function (arg) {
 
       var user = fAuth.currentUser;
       if (user) {
-        resolve({
-          uid: user.uid,
-          // anonymous: user.anonymous,
-          // provider: user.providerID,
-          profileImageURL: user.photoURL ? user.photoURL.absoluteString : null,
-          email: user.email,
-          emailVerified: user.emailVerified,
-          name: user.displayName,
-          refreshToken: user.refreshToken
-        });
+        resolve(toLoginResult(user));
       } else {
         reject();
       }
@@ -681,16 +672,30 @@ firebase.logout = function (arg) {
 };
 
 function toLoginResult(user) {
-  return user && {
-        uid: user.uid,
-        // anonymous: user.anonymous,
-        // provider: user.providerID,
-        profileImageURL: user.photoURL ? user.photoURL.absoluteString : null,
-        email: user.email,
-        emailVerified: user.emailVerified,
-        name: user.displayName,
-        refreshToken: user.refreshToken
-      };
+  if (!user) {
+    return false;
+  }
+
+  var providers = [];
+  for (i = 0, l = user.providerData.count; i < l; i++) {
+    var firUserInfo = user.providerData.objectAtIndex(i);
+    var pid = firUserInfo.valueForKey("providerID");
+    providers.push({
+      id: pid
+    });
+  }
+
+  return {
+    uid: user.uid,
+    anonymous: user.anonymous,
+    // provider: user.providerID, // always 'Firebase'
+    providers: providers,
+    profileImageURL: user.photoURL ? user.photoURL.absoluteString : null,
+    email: user.email,
+    emailVerified: user.emailVerified,
+    name: user.displayName,
+    refreshToken: user.refreshToken
+  };
 }
 
 firebase.getAuthToken = function (arg) {

index.d.ts

@@ -162,6 +162,10 @@ export interface GetAuthTokenOptions {
     forceRefresh?: boolean;
 }
 
+export interface Provider {
+    id: string;
+}
+
 /**
  * The options object passed into the login function.
  */
@@ -193,11 +197,13 @@ export interface LoginOptions {
 export interface User {
     uid: string;
     email?: string;
+    emailVerified: boolean;
     name?: string;
-    provider?: LoginType;
-    expiresAtUnixEpochSeconds?: number;
+    anonymous: boolean;
+    providers: Array<Provider>;
     profileImageURL?: string;
-    token?: string;
+    /** iOS only */
+    refreshToken?: string;
 }
 
 /**

package.json

@@ -1,6 +1,6 @@
 {
   "name": "nativescript-plugin-firebase",
-  "version": "3.8.2",
+  "version": "3.8.3",
   "description": "Fire. Base. Firebase!",
   "main": "firebase.js",
   "typings": "index.d.ts",

scripts/installer.js

@@ -14,7 +14,8 @@ var directories = {
 console.log('NativeScript Firebase Plugin Installation');
 
 var appRoot = "../../";
-var pluginConfigPath = path.join(appRoot, "firebase.nativescript.json");
+var pluginConfigFile = "firebase.nativescript.json";
+var pluginConfigPath = path.join(appRoot, pluginConfigFile);
 
 var config = {};
 function mergeConfig(result) {
@@ -29,20 +30,20 @@ function readConfig() {
     try {
         config = JSON.parse(fs.readFileSync(pluginConfigPath));
     } catch(e) {
-        console.log("Failed reading config at " + pluginConfigPath);
+        console.log("Failed reading " + pluginConfigFile);
         console.log(e);
         config = {};
     }
 }
 
 if (process.argv.indexOf("config") == -1 && fs.existsSync(pluginConfigPath)) {
     readConfig();
-    console.log("Config exists at: " + pluginConfigPath);
+    console.log("Config file exists (" + pluginConfigFile + ")");
     askiOSPromptResult(config);
     askAndroidPromptResult(config);
     promptQuestionsResult(config);
 } else {
-    console.log("No existing config found at: " + pluginConfigPath + ", so let's configure the Firebase plugin!");
+    console.log("No existing " + pluginConfigFile + " config file found, so let's configure the Firebase plugin!");
     prompt.start();
     askiOSPrompt();
 }
@@ -146,7 +147,7 @@ function promptQuestionsResult(result) {
 function askSaveConfigPrompt() {
     prompt.get({
         name: 'save_config',
-        description: 'Do you want to save the selected configuration. Reinstalling the dependency will reuse the setup from: ' + pluginConfigPath + '. CI will be easier. (y/n)',
+        description: 'Do you want to save the selected configuration. Reinstalling the dependency will reuse the setup from: ' + pluginConfigFile + '. CI will be easier. (y/n)',
         default: 'y'
     }, function (err, result) {
         if (err) {