Skip to content

Add AppCheck integration to functions-exp #4892

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jun 23, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions packages-exp/functions-exp/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,8 @@
"dependencies": {
"@firebase/component": "0.5.2",
"@firebase/messaging-types": "0.5.0",
"@firebase/auth-interop-types": "0.1.6",
"@firebase/app-check-interop-types": "0.1.0",
"@firebase/util": "1.1.0",
"node-fetch": "2.6.1",
"tslib": "^2.1.0"
Expand Down
5 changes: 5 additions & 0 deletions packages-exp/functions-exp/src/config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,10 @@ import {
InstanceFactory
} from '@firebase/component';
import { FUNCTIONS_TYPE } from './constants';
import { AppCheckInternalComponentName } from '@firebase/app-check-interop-types';

const APP_CHECK_INTERNAL_NAME: AppCheckInternalComponentName =
'app-check-internal';
export function registerFunctions(fetchImpl: typeof fetch): void {
const factory: InstanceFactory<'functions-exp'> = (
container: ComponentContainer,
Expand All @@ -34,12 +37,14 @@ export function registerFunctions(fetchImpl: typeof fetch): void {
const app = container.getProvider('app-exp').getImmediate();
const authProvider = container.getProvider('auth-internal');
const messagingProvider = container.getProvider('messaging');
const appCheckProvider = container.getProvider(APP_CHECK_INTERNAL_NAME);

// eslint-disable-next-line @typescript-eslint/no-explicit-any
return new FunctionsService(
app,
authProvider,
messagingProvider,
appCheckProvider,
regionOrCustomDomain,
fetchImpl
);
Expand Down
33 changes: 31 additions & 2 deletions packages-exp/functions-exp/src/context.ts
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,10 @@ import {
} from '@firebase/messaging-types';

import { Provider } from '@firebase/component';
import {
AppCheckInternalComponentName,
FirebaseAppCheckInternal
} from '@firebase/app-check-interop-types';

/**
* The metadata that should be supplied with function calls.
Expand All @@ -32,6 +36,7 @@ import { Provider } from '@firebase/component';
export interface Context {
authToken?: string;
messagingToken?: string;
appCheckToken: string | null;
}

/**
Expand All @@ -41,9 +46,11 @@ export interface Context {
export class ContextProvider {
private auth: FirebaseAuthInternal | null = null;
private messaging: FirebaseMessaging | null = null;
private appCheck: FirebaseAppCheckInternal | null = null;
constructor(
authProvider: Provider<FirebaseAuthInternalName>,
messagingProvider: Provider<FirebaseMessagingName>
messagingProvider: Provider<FirebaseMessagingName>,
appCheckProvider: Provider<AppCheckInternalComponentName>
) {
this.auth = authProvider.getImmediate({ optional: true });
this.messaging = messagingProvider.getImmediate({
Expand All @@ -67,6 +74,15 @@ export class ContextProvider {
}
);
}

if (!this.appCheck) {
appCheckProvider.get().then(
appCheck => (this.appCheck = appCheck),
() => {
/* get() never rejects */
}
);
}
}

async getAuthToken(): Promise<string | undefined> {
Expand Down Expand Up @@ -103,9 +119,22 @@ export class ContextProvider {
}
}

async getAppCheckToken(): Promise<string | null> {
if (this.appCheck) {
const result = await this.appCheck.getToken();
// If getToken() fails, it will still return a dummy token that also has
// an error field containing the error message. We will send any token
// provided here and show an error if/when it is rejected by the functions
// endpoint.
return result.token;
}
return null;
}

async getContext(): Promise<Context> {
const authToken = await this.getAuthToken();
const messagingToken = await this.getMessagingToken();
return { authToken, messagingToken };
const appCheckToken = await this.getAppCheckToken();
return { authToken, messagingToken, appCheckToken };
}
}
11 changes: 10 additions & 1 deletion packages-exp/functions-exp/src/service.ts
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ import { encode, decode } from './serializer';
import { Provider } from '@firebase/component';
import { FirebaseAuthInternalName } from '@firebase/auth-interop-types';
import { FirebaseMessagingName } from '@firebase/messaging-types';
import { AppCheckInternalComponentName } from '@firebase/app-check-interop-types';

export const DEFAULT_REGION = 'us-central1';

Expand Down Expand Up @@ -86,10 +87,15 @@ export class FunctionsService implements _FirebaseService {
readonly app: FirebaseApp,
authProvider: Provider<FirebaseAuthInternalName>,
messagingProvider: Provider<FirebaseMessagingName>,
appCheckProvider: Provider<AppCheckInternalComponentName>,
regionOrCustomDomain: string = DEFAULT_REGION,
readonly fetchImpl: typeof fetch
) {
this.contextProvider = new ContextProvider(authProvider, messagingProvider);
this.contextProvider = new ContextProvider(
authProvider,
messagingProvider,
appCheckProvider
);
// Cancels all ongoing requests when resolved.
this.cancelAllRequests = new Promise(resolve => {
this.deleteService = () => {
Expand Down Expand Up @@ -234,6 +240,9 @@ async function call(
if (context.messagingToken) {
headers['Firebase-Instance-ID-Token'] = context.messagingToken;
}
if (context.appCheckToken !== null) {
headers['X-Firebase-AppCheck'] = context.appCheckToken;
}

// Default timeout to 70s, but let the options override it.
const timeout = options.timeout || 70000;
Expand Down
6 changes: 6 additions & 0 deletions packages-exp/functions-exp/test/utils.ts
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ import { FirebaseOptions, FirebaseApp } from '@firebase/app-exp';
import { Provider, ComponentContainer } from '@firebase/component';
import { FirebaseAuthInternalName } from '@firebase/auth-interop-types';
import { FirebaseMessagingName } from '@firebase/messaging-types';
import { AppCheckInternalComponentName } from '@firebase/app-check-interop-types';
import { FunctionsService } from '../src/service';
import { useFunctionsEmulator } from '../src/api';
import nodeFetch from 'node-fetch';
Expand Down Expand Up @@ -51,6 +52,10 @@ export function createTestService(
messagingProvider = new Provider<FirebaseMessagingName>(
'messaging',
new ComponentContainer('test')
),
appCheckProvider = new Provider<AppCheckInternalComponentName>(
'app-check-internal',
new ComponentContainer('test')
)
): FunctionsService {
const fetchImpl: typeof fetch =
Expand All @@ -59,6 +64,7 @@ export function createTestService(
app,
authProvider,
messagingProvider,
appCheckProvider,
region,
fetchImpl
);
Expand Down