Merge branch 'master' into modular-admin

Author: samtstern

auth/email_action_links.js

@@ -31,27 +31,13 @@ getAuth()
   .then((link) => {
     // Construct password reset email template, embed the link and send
     // using custom SMTP server.
-    return sendCustomPasswordResetEmail(email, displayName, link);
+    return sendCustomPasswordResetEmail(userEmail, displayName, link);
   })
   .catch((error) => {
     // Some error occurred.
   });
 // [END password_reset_link]
 
-// [START email_verification_link]
-// Admin SDK API to generate the password reset link.
-const email = '[email protected]';
-getAuth()
-  .generatePasswordResetLink(email, actionCodeSettings)
-  .then((link) => {
-    // Construct password reset email template, embed the link and send
-    // using custom SMTP server.
-    return sendCustomPasswordResetEmail(email, displayName, link);
-  })
-  .catch((error) => {
-    // Some error occurred.
-  });
-
 // [START email_verification_link]
 // Admin SDK API to generate the email verification link.
 const useremail = '[email protected]';

auth/package-lock.json

@@ -9,7 +9,7 @@
   },
   "dependencies": {
     "express": "^4.17.1",
-    "firebase-admin": "^10.0.0",
-    "firebase-functions": "^3.14.1"
+    "firebase-admin": "^9.12.0",
+    "firebase-functions": "^3.15.7"
   }
 }