Merge branch 'master' into je-impersonation

Author: jonathanedey

.github/actions/send-email/package-lock.json

@@ -13,11 +13,13 @@ export interface ActionCodeSettings {
         installApp?: boolean;
         minimumVersion?: string;
     };
+    // @deprecated
     dynamicLinkDomain?: string;
     handleCodeInApp?: boolean;
     iOS?: {
         bundleId: string;
     };
+    linkDomain?: string;
     url: string;
 }
 
@@ -221,6 +223,11 @@ export class AuthClientErrorCode {
         message: string;
     };
     // (undocumented)
+    static INVALID_HOSTING_LINK_DOMAIN: {
+        code: string;
+        message: string;
+    };
+    // (undocumented)
     static INVALID_ID_TOKEN: {
         code: string;
         message: string;
@@ -757,6 +764,14 @@ export interface ListUsersResult {
     users: UserRecord[];
 }
 
+// @public
+export interface MobileLinksConfig {
+    domain?: MobileLinksDomain;
+}
+
+// @public
+export type MobileLinksDomain = 'HOSTING_DOMAIN' | 'FIREBASE_DYNAMIC_LINK_DOMAIN';
+
 // @public
 export interface MultiFactorConfig {
     factorIds?: AuthFactorType[];
@@ -847,6 +862,7 @@ export class PhoneMultiFactorInfo extends MultiFactorInfo {
 // @public
 export class ProjectConfig {
     readonly emailPrivacyConfig?: EmailPrivacyConfig;
+    readonly mobileLinksConfig?: MobileLinksConfig;
     get multiFactorConfig(): MultiFactorConfig | undefined;
     readonly passwordPolicyConfig?: PasswordPolicyConfig;
     get recaptchaConfig(): RecaptchaConfig | undefined;
@@ -996,6 +1012,7 @@ export interface UpdatePhoneMultiFactorInfoRequest extends BaseUpdateMultiFactor
 // @public
 export interface UpdateProjectConfigRequest {
     emailPrivacyConfig?: EmailPrivacyConfig;
+    mobileLinksConfig?: MobileLinksConfig;
     multiFactorConfig?: MultiFactorConfig;
     passwordPolicyConfig?: PasswordPolicyConfig;
     recaptchaConfig?: RecaptchaConfig;

etc/firebase-admin.auth.api.md

@@ -1,6 +1,6 @@
 {
   "name": "firebase-admin",
-  "version": "13.0.2",
+  "version": "13.1.0",
   "description": "Firebase admin SDK for Node.js",
   "author": "Firebase <[email protected]> (https://firebase.google.com/)",
   "license": "Apache-2.0",

package-lock.json

@@ -94,15 +94,27 @@ export interface ActionCodeSettings {
    * configured per project. This field provides the ability to explicitly choose
    * configured per project. This fields provides the ability explicitly choose
    * one. If none is provided, the oldest domain is used by default.
+   * @deprecated use `linkDomain` instead
    */
   dynamicLinkDomain?: string;
+
+  /**
+   * Defines the custom Firebase Hosting domain to use when the link is to be opened
+   * via a specified mobile app,
+   * This is a replacement of Firebase Dynamic Link.
+   * If none is provided, 
+   * a default hosting domain will be used (for example, `example.firebaseapp.com`)
+   */
+
+  linkDomain?: string;
 }
 
 /** Defines the email action code server request. */
 interface EmailActionCodeRequest {
   continueUrl?: string;
   canHandleCodeInApp?: boolean;
   dynamicLinkDomain?: string;
+  linkDomain?: string;
   androidPackageName?: string;
   androidMinimumVersion: string;
   androidInstallApp?: boolean;
@@ -123,6 +135,7 @@ export class ActionCodeSettingsBuilder {
   private ibi?: string;
   private canHandleCodeInApp?: boolean;
   private dynamicLinkDomain?: string;
+  private linkDomain?: string;
 
   /**
    * ActionCodeSettingsBuilder constructor.
@@ -166,6 +179,14 @@ export class ActionCodeSettingsBuilder {
     }
     this.dynamicLinkDomain = actionCodeSettings.dynamicLinkDomain;
 
+    if (typeof actionCodeSettings.linkDomain !== 'undefined' &&
+      !validator.isNonEmptyString(actionCodeSettings.linkDomain)) {
+      throw new FirebaseAuthError(
+        AuthClientErrorCode.INVALID_HOSTING_LINK_DOMAIN,
+      );
+    }
+    this.linkDomain = actionCodeSettings.linkDomain;
+
     if (typeof actionCodeSettings.iOS !== 'undefined') {
       if (!validator.isNonNullObject(actionCodeSettings.iOS)) {
         throw new FirebaseAuthError(
@@ -230,6 +251,7 @@ export class ActionCodeSettingsBuilder {
       continueUrl: this.continueUrl,
       canHandleCodeInApp: this.canHandleCodeInApp,
       dynamicLinkDomain: this.dynamicLinkDomain,
+      linkDomain: this.linkDomain,
       androidPackageName: this.apn,
       androidMinimumVersion: this.amv,
       androidInstallApp: this.installApp,

package.json

@@ -2137,6 +2137,60 @@ export interface PasswordPolicyConfig {
   constraints?: CustomStrengthOptionsConfig;
 }
 
+/**
+ * Configuration for settings related to univeral links (iOS)
+ * and app links (Android).
+ */
+export interface MobileLinksConfig {
+  /**
+   * Use Firebase Hosting or dynamic link domain as the out-of-band code domain.
+   */
+  domain?: MobileLinksDomain;
+}
+
+/**
+ * Open code in app domain to use for app links and universal links.
+ */
+export type MobileLinksDomain = 'HOSTING_DOMAIN' | 'FIREBASE_DYNAMIC_LINK_DOMAIN';
+
+/**
+ * Defines the MobileLinksAuthConfig class used for validation.
+ *
+ * @internal
+ */
+export class MobileLinksAuthConfig {
+  public static validate(options: MobileLinksConfig): void {
+    if (!validator.isNonNullObject(options)) {
+      throw new FirebaseAuthError(
+        AuthClientErrorCode.INVALID_CONFIG,
+        '"MobileLinksConfig" must be a non-null object.',
+      );
+    }
+
+    const validKeys = {
+      domain: true,
+    };
+
+    for (const key in options) {
+      if (!(key in validKeys)) {
+        throw new FirebaseAuthError(
+          AuthClientErrorCode.INVALID_CONFIG,
+          `"${key}" is not a valid "MobileLinksConfig" parameter.`,
+        );
+      }
+    }
+
+    if (typeof options.domain !== 'undefined'
+      && options.domain !== 'HOSTING_DOMAIN'
+      && options.domain !== 'FIREBASE_DYNAMIC_LINK_DOMAIN') {
+      throw new FirebaseAuthError(
+        AuthClientErrorCode.INVALID_CONFIG,
+        '"MobileLinksConfig.domain" must be either "HOSTING_DOMAIN" or "FIREBASE_DYNAMIC_LINK_DOMAIN".',
+      );
+    }
+  }
+}
+
 /**
  * A password policy's enforcement state.
  */

src/auth/action-code-settings-builder.ts

@@ -749,7 +749,7 @@ export abstract class BaseAuth {
    *     minimumVersion: '12'
    *   },
    *   handleCodeInApp: true,
-   *   dynamicLinkDomain: 'custom.page.link'
+   *   linkDomain: 'project-id.firebaseapp.com'
    * };
    * admin.auth()
    *     .generatePasswordResetLink('[email protected]', actionCodeSettings)
@@ -802,7 +802,7 @@ export abstract class BaseAuth {
    *     minimumVersion: '12'
    *   },
    *   handleCodeInApp: true,
-   *   dynamicLinkDomain: 'custom.page.link'
+   *   linkDomain: 'project-id.firebaseapp.com'
    * };
    * admin.auth()
    *     .generateEmailVerificationLink('[email protected]', actionCodeSettings)
@@ -883,7 +883,7 @@ export abstract class BaseAuth {
    *     minimumVersion: '12'
    *   },
    *   handleCodeInApp: true,
-   *   dynamicLinkDomain: 'custom.page.link'
+   *   linkDomain: 'project-id.firebaseapp.com'
    * };
    * admin.auth()
    *     .generateEmailVerificationLink('[email protected]', actionCodeSettings)

src/auth/auth-config.ts

@@ -104,6 +104,8 @@ export {
   PasswordPolicyEnforcementState,
   CustomStrengthOptionsConfig,
   EmailPrivacyConfig,
+  MobileLinksConfig,
+  MobileLinksDomain,
 } from './auth-config';
 
 export {