Merge branch 'master' into lm-taskq-api

Author: lahirumaramba

etc/firebase-admin.auth.api.md

@@ -55,6 +55,7 @@ export abstract class BaseAuth {
     generateEmailVerificationLink(email: string, actionCodeSettings?: ActionCodeSettings): Promise<string>;
     generatePasswordResetLink(email: string, actionCodeSettings?: ActionCodeSettings): Promise<string>;
     generateSignInWithEmailLink(email: string, actionCodeSettings: ActionCodeSettings): Promise<string>;
+    generateVerifyAndChangeEmailLink(email: string, newEmail: string, actionCodeSettings?: ActionCodeSettings): Promise<string>;
     getProviderConfig(providerId: string): Promise<AuthProviderConfig>;
     getUser(uid: string): Promise<UserRecord>;
     getUserByEmail(email: string): Promise<UserRecord>;

package-lock.json

@@ -214,7 +214,7 @@
     "http-message-parser": "^0.0.34",
     "lodash": "^4.17.15",
     "minimist": "^1.2.6",
-    "mocha": "^9.1.2",
+    "mocha": "^10.0.0",
     "mz": "^2.7.0",
     "nock": "^13.0.0",
     "npm-run-all": "^4.1.5",

package.json

@@ -26,7 +26,7 @@ import * as validator from '../utils/validator';
 import { AppCheckToken } from './app-check-api'
 
 // App Check backend constants
-const FIREBASE_APP_CHECK_V1_API_URL_FORMAT = 'https://firebaseappcheck.googleapis.com/v1beta/projects/{projectId}/apps/{appId}:exchangeCustomToken';
+const FIREBASE_APP_CHECK_V1_API_URL_FORMAT = 'https://firebaseappcheck.googleapis.com/v1/projects/{projectId}/apps/{appId}:exchangeCustomToken';
 
 const FIREBASE_APP_CHECK_CONFIG_HEADERS = {
   'X-Firebase-Client': `fire-admin-node/${utils.getSdkVersion()}`
@@ -144,7 +144,7 @@ export class AppCheckApiClient {
    * @returns An AppCheckToken instance.
    */
   private toAppCheckToken(resp: HttpResponse): AppCheckToken {
-    const token = resp.data.attestationToken;
+    const token = resp.data.token;
     // `ttl` is a string with the suffix "s" preceded by the number of seconds,
     // with nanoseconds expressed as fractional seconds.
     const ttlMillis = this.stringToMilliseconds(resp.data.ttl);

src/app-check/app-check-api-client-internal.ts

@@ -31,7 +31,7 @@ const ONE_MINUTE_IN_MILLIS = ONE_MINUTE_IN_SECONDS * 1000;
 const ONE_DAY_IN_MILLIS = 24 * 60 * 60 * 1000;
 
 // Audience to use for Firebase App Check Custom tokens
-const FIREBASE_APP_CHECK_AUDIENCE = 'https://firebaseappcheck.googleapis.com/google.firebase.appcheck.v1beta.TokenExchangeService';
+const FIREBASE_APP_CHECK_AUDIENCE = 'https://firebaseappcheck.googleapis.com/google.firebase.appcheck.v1.TokenExchangeService';
 
 /**
  * Class for generating Firebase App Check tokens.

src/app-check/token-generator.ts

@@ -26,7 +26,7 @@ import { DecodedAppCheckToken } from './app-check-api'
 import { App } from '../app';
 
 const APP_CHECK_ISSUER = 'https://firebaseappcheck.googleapis.com/';
-const JWKS_URL = 'https://firebaseappcheck.googleapis.com/v1beta/jwks';
+const JWKS_URL = 'https://firebaseappcheck.googleapis.com/v1/jwks';
 
 /**
  * Class for verifying Firebase App Check tokens.