chore: Merge main branch into modular-sdk

.github/dependabot.yml

@@ -0,0 +1,6 @@
+version: 2
+updates:
+  - package-ecosystem: "npm"
+    directory: "/"
+    schedule:
+      interval: "weekly"

.github/scripts/run_integration_tests.sh

@@ -22,4 +22,6 @@ gpg --quiet --batch --yes --decrypt --passphrase="${FIREBASE_SERVICE_ACCT_KEY}"
 
 echo "${FIREBASE_API_KEY}" > test/resources/apikey.txt
 
+echo "${FIREBASE_APP_ID}" > test/resources/appid.txt
+
 npm run test:integration -- --updateRules --testMultiTenancy

.github/workflows/nightly.yml

@@ -55,6 +55,7 @@ jobs:
       env:
         FIREBASE_SERVICE_ACCT_KEY: ${{ secrets.FIREBASE_SERVICE_ACCT_KEY }}
         FIREBASE_API_KEY: ${{ secrets.FIREBASE_API_KEY }}
+        FIREBASE_APP_ID: ${{ secrets.FIREBASE_APP_ID }}
 
     - name: Package release artifacts
       run: |

.github/workflows/release.yml

@@ -66,6 +66,7 @@ jobs:
       env:
         FIREBASE_SERVICE_ACCT_KEY: ${{ secrets.FIREBASE_SERVICE_ACCT_KEY }}
         FIREBASE_API_KEY: ${{ secrets.FIREBASE_API_KEY }}
+        FIREBASE_APP_ID: ${{ secrets.FIREBASE_APP_ID }}
 
     - name: Package release artifacts
       run: |

.gitignore

@@ -14,6 +14,7 @@ node_modules/
 # Real key file should not be checked in
 test/resources/key.json
 test/resources/apikey.txt
+test/resources/appid.txt
 
 # Release tarballs should not be checked in
 firebase-admin-*.tgz

CONTRIBUTING.md

@@ -87,7 +87,7 @@ information on using pull requests.
 
 ### Prerequisites
 
-1. Node.js 10.10.0 or higher.
+1. Node.js 10.13.0 or higher.
 2. NPM 5 or higher (NPM 6 recommended).
 3. Google Cloud SDK ([`gcloud`](https://cloud.google.com/sdk/downloads) utility)
 

README.md

@@ -55,7 +55,7 @@ requests, code review feedback, and also pull requests.
 
 ## Supported Environments
 
-We support Node.js 10.10.0 and higher.
+We support Node.js 10.13.0 and higher.
 
 Please also note that the Admin SDK should only
 be used in server-side/back-end environments controlled by the app developer.

etc/firebase-admin.api.md

@@ -17,6 +17,8 @@ export function app(name?: string): app.App;
 export namespace app {
     // Warning: (ae-forgotten-export) The symbol "App" needs to be exported by the entry point default-namespace.d.ts
     export interface App extends App {
+        // (undocumented)
+        appCheck(): appCheck.AppCheck;
         // (undocumented)
         auth(): auth.Auth;
         // (undocumented)
@@ -41,6 +43,37 @@ export namespace app {
     }
 }
 
+// @public
+export function appCheck(app?: app.App): appCheck.AppCheck;
+
+// @public (undocumented)
+export namespace appCheck {
+    export interface AppCheck {
+        // (undocumented)
+        app: app.App;
+        createToken(appId: string): Promise<AppCheckToken>;
+        verifyToken(appCheckToken: string): Promise<VerifyAppCheckTokenResponse>;
+    }
+    export interface AppCheckToken {
+        token: string;
+        ttlMillis: number;
+    }
+    export interface DecodedAppCheckToken {
+        // (undocumented)
+        [key: string]: any;
+        app_id: string;
+        aud: string[];
+        exp: number;
+        iat: number;
+        iss: string;
+        sub: string;
+    }
+    export interface VerifyAppCheckTokenResponse {
+        appId: string;
+        token: appCheck.DecodedAppCheckToken;
+    }
+}
+
 // @public
 export interface AppOptions {
     // Warning: (ae-forgotten-export) The symbol "Credential" needs to be exported by the entry point default-namespace.d.ts

etc/firebase-admin.auth.api.md

@@ -32,11 +32,7 @@ export class Auth extends BaseAuth {
 export type AuthFactorType = 'phone';
 
 // @public
-export interface AuthProviderConfig {
-    displayName?: string;
-    enabled: boolean;
-    providerId: string;
-}
+export type AuthProviderConfig = SAMLAuthProviderConfig | OIDCAuthProviderConfig;
 
 // @public
 export interface AuthProviderConfigFilter {
@@ -75,13 +71,12 @@ export abstract class BaseAuth {
 }
 
 // @public
-export interface CreateMultiFactorInfoRequest {
-    displayName?: string;
-    factorId: string;
-}
+export type CreateMultiFactorInfoRequest = CreatePhoneMultiFactorInfoRequest;
 
+// Warning: (ae-forgotten-export) The symbol "BaseCreateMultiFactorInfoRequest" needs to be exported by the entry point index.d.ts
+//
 // @public
-export interface CreatePhoneMultiFactorInfoRequest extends CreateMultiFactorInfoRequest {
+export interface CreatePhoneMultiFactorInfoRequest extends BaseCreateMultiFactorInfoRequest {
     phoneNumber: string;
 }
 
@@ -204,18 +199,25 @@ export interface MultiFactorUpdateSettings {
     enrolledFactors: UpdateMultiFactorInfoRequest[] | null;
 }
 
+// Warning: (ae-forgotten-export) The symbol "BaseAuthProviderConfig" needs to be exported by the entry point index.d.ts
+//
 // @public
-export interface OIDCAuthProviderConfig extends AuthProviderConfig {
+export interface OIDCAuthProviderConfig extends BaseAuthProviderConfig {
     clientId: string;
+    clientSecret?: string;
     issuer: string;
+    // Warning: (ae-forgotten-export) The symbol "OAuthResponseType" needs to be exported by the entry point index.d.ts
+    responseType?: OAuthResponseType;
 }
 
 // @public
 export interface OIDCUpdateAuthProviderRequest {
     clientId?: string;
+    clientSecret?: string;
     displayName?: string;
     enabled?: boolean;
     issuer?: string;
+    responseType?: OAuthResponseType;
 }
 
 // @public
@@ -239,7 +241,7 @@ export interface ProviderIdentifier {
 }
 
 // @public
-export interface SAMLAuthProviderConfig extends AuthProviderConfig {
+export interface SAMLAuthProviderConfig extends BaseAuthProviderConfig {
     callbackURL?: string;
     idpEntityId: string;
     rpEntityId: string;
@@ -305,15 +307,12 @@ export interface UidIdentifier {
 export type UpdateAuthProviderRequest = SAMLUpdateAuthProviderRequest | OIDCUpdateAuthProviderRequest;
 
 // @public
-export interface UpdateMultiFactorInfoRequest {
-    displayName?: string;
-    enrollmentTime?: string;
-    factorId: string;
-    uid?: string;
-}
+export type UpdateMultiFactorInfoRequest = UpdatePhoneMultiFactorInfoRequest;
 
+// Warning: (ae-forgotten-export) The symbol "BaseUpdateMultiFactorInfoRequest" needs to be exported by the entry point index.d.ts
+//
 // @public
-export interface UpdatePhoneMultiFactorInfoRequest extends UpdateMultiFactorInfoRequest {
+export interface UpdatePhoneMultiFactorInfoRequest extends BaseUpdateMultiFactorInfoRequest {
     phoneNumber: string;
 }