Merge branch 'master' into ss-admin-auth-features

Author: samtstern

.gitignore

@@ -2,7 +2,11 @@ node_modules
 keyfile.json
 service-account.json
 
+tsconfig.json
+
 .firebaserc
 firebase-debug.log
 
 *-debug.log
+
+.DS_Store

auth/custom_claims.js

@@ -3,7 +3,8 @@ const admin = require('firebase-admin');
 admin.initializeApp();
 
 const uid = 'firebaseUserId123';
-let idToken;
+const idToken = 'some-invalid-token';
+
 // [START set_custom_user_claims]
 // Set admin privilege on the user corresponding to uid.
 
@@ -27,7 +28,7 @@ admin.auth().verifyIdToken(idToken).then((claims) => {
 // Lookup the user associated with the specified uid.
 admin.auth().getUser(uid).then((userRecord) => {
   // The claims can be accessed on the user record.
-  console.log(userRecord.customClaims.admin);
+  console.log(userRecord.customClaims['admin']);
 });
 // [END read_custom_user_claims]
 
@@ -51,7 +52,7 @@ admin.auth().getUserByEmail('[email protected]').then((user) => {
 admin.auth().getUserByEmail('[email protected]').then((user) => {
   // Add incremental custom claim without overwriting existing claims.
   const currentCustomClaims = user.customClaims;
-  if (currentCustomClaims.admin) {
+  if (currentCustomClaims['admin']) {
     // Add level.
     currentCustomClaims['accessLevel'] = 10;
     // Add custom claims for additional privileges.

auth/email_action_links.js

@@ -78,7 +78,13 @@ admin.auth().generateSignInWithEmailLink(usremail, actionCodeSettings)
 // [END sign_in_with_email_link]
 
 let displayName;
-function sendSignInEmail() {}
-function sendCustomVerificationEmail() {}
-function sendCustomPasswordResetEmail() {}
+function sendSignInEmail(...args) {
+  // TODO: this function is just here to make the code "compile"
+}
+function sendCustomVerificationEmail(...args) {
+    // TODO: this function is just here to make the code "compile"
+}
+function sendCustomPasswordResetEmail(...args) {
+    // TODO: this function is just here to make the code "compile"
+}
 

auth/get_service_account_tokens.js

@@ -17,7 +17,7 @@
 // [START get_service_account_tokens]
 const admin = require('firebase-admin');
 
-const serviceAccount = require('path/to/serviceAccountKey.json');
+const serviceAccount = require('./path/to/serviceAccountKey.json');
 const credential = admin.credential.cert(serviceAccount);
 
 credential.getAccessToken().then((accessTokenInfo) => {

auth/import_users.js

@@ -21,23 +21,20 @@ let userImportRecords = [
 ];
 //[END build_user_list]
 
-let userImportOptions = {
-  hash: {
-    algorithm: 'HMAC_SHA256',
-    key: Buffer.from('secretKey')
-  }
-};
-
 // [START import_users]
-admin.auth().importUsers(userImportRecords, userImportOptions)
+admin.auth().importUsers(userImportRecords, {
+    hash: {
+      algorithm: 'HMAC_SHA256',
+      key: Buffer.from('secretKey')
+    }
+  })
   .then(function(userImportResult) {
     // The number of successful imports is determined via: userImportResult.successCount.
     // The number of failed imports is determined via: userImportResult.failureCount.
     // To get the error details.
-    userImportResult.forEach(function(indexedError) {
-        // The corresponding user that failed to upload.
-        console.log(userImportRecords[indexedError.index].uid +' failed to import',
-            indexedError.error);
+    userImportResult.errors.forEach(function(indexedError) {
+      // The corresponding user that failed to upload.
+      console.log('Error ' + indexedError.index, ' failed to import: ' ,indexedError.error);
     });
   })
   .catch(function(error) {
@@ -150,14 +147,14 @@ admin.auth().importUsers([{
   // Must be provided in a byte buffer.
   passwordHash: Buffer.from('base64-password-hash', 'base64'),
   // Must be provided in a byte buffer.
-  passwordSalt: Buffer.from('base64-salt', 'base64')
+  passwordSalt: Buffer.from('base64-salt', 'base64'),
 }], {
   hash: {
     algorithm: 'SCRYPT',
     // All the parameters below can be obtained from the Firebase Console's users section.
     // Must be provided in a byte buffer.
     key: Buffer.from('base64-secret', 'base64'),
-    saltSeparator: Buffer.from('base64SaltSeparator', 'base64'),
+    saltSeparator: Buffer.from('base64SaltSeparator', 'base64').toString(),
     rounds: 8,
     memoryCost: 14
   }

auth/manage_cookies.js

@@ -113,5 +113,9 @@ app.post('/sessionLogout', (req, res) => {
 });
 // [END session_clear_and_revoke]
 
-function serveContentForAdmin(){}
-function serveContentForUser(){}
+function serveContentForAdmin(...args){
+    // TODO: this function is just here to make the code "compile"
+}
+function serveContentForUser(...args){
+    // TODO: this function is just here to make the code "compile"
+}

auth/manage_sessions.js

@@ -2,6 +2,10 @@
 const admin = require('firebase-admin');
 admin.initializeApp();
 
+const uid = 'some_uid_1234';
+const idToken = 'some_id_token';
+const utcRevocationTimeSecs = 60 * 60;
+
 // [START revoke_tokens]
 // Revoke all refresh tokens for a specified user for whatever reason.
 // Retrieve the timestamp of the revocation, in seconds since the epoch.
@@ -40,6 +44,4 @@ admin.auth().verifyIdToken(idToken, checkRevoked)
       // Token is invalid.
     }
   });
-// [END verify_id_token_check_revoked]
-
-let uid, idToken, utcRevocationTimeSecs;
+// [END verify_id_token_check_revoked]

auth/manage_users.js

@@ -2,6 +2,13 @@
 const admin = require('firebase-admin');
 admin.initializeApp();
 
+const uid = 'some_uid_1234';
+const uid1 = 'some_uid_1';
+const uid2 = 'some_uid_2';
+const uid3 = 'some_uid_3';
+const email = '[email protected]';
+const phoneNumber = '+15558675309';
+
 // [START get_user_by_id]
 admin.auth().getUser(uid)
   .then(function(userRecord) {
@@ -196,6 +203,4 @@ function listAllUsers(nextPageToken) {
 }
 // Start listing users from the beginning, 1000 at a time.
 listAllUsers();
-// [END list_all_users]
-
-let uid, uid1, uid2, uid3, email, phoneNumber;
+// [END list_all_users]