From ca2ea888a9a1e89d09b0e9ff8cd1df1b485f6f11 Mon Sep 17 00:00:00 2001 From: kai Date: Mon, 17 May 2021 11:50:45 -0700 Subject: [PATCH 1/2] Function await messaging#getToken --- packages/functions/src/context.ts | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/packages/functions/src/context.ts b/packages/functions/src/context.ts index 8f6923853f8..71b66bca99d 100644 --- a/packages/functions/src/context.ts +++ b/packages/functions/src/context.ts @@ -1,3 +1,7 @@ +import { + FirebaseAuthInternal, + FirebaseAuthInternalName +} from '@firebase/auth-interop-types'; /** * @license * Copyright 2017 Google LLC @@ -18,10 +22,7 @@ import { FirebaseMessaging, FirebaseMessagingName } from '@firebase/messaging-types'; -import { - FirebaseAuthInternal, - FirebaseAuthInternalName -} from '@firebase/auth-interop-types'; + import { Provider } from '@firebase/component'; /** @@ -93,7 +94,7 @@ export class ContextProvider { } try { - return this.messaging.getToken(); + return await this.messaging.getToken(); } catch (e) { // We don't warn on this, because it usually means messaging isn't set up. // console.warn('Failed to retrieve instance id token.', e); From 478cd12e1a10e470f3c1a4b43bb44d5dd2d5312b Mon Sep 17 00:00:00 2001 From: kai Date: Mon, 17 May 2021 11:54:16 -0700 Subject: [PATCH 2/2] Update context.ts --- packages-exp/functions-exp/src/context.ts | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/packages-exp/functions-exp/src/context.ts b/packages-exp/functions-exp/src/context.ts index 7ccd5f8823a..75090447037 100644 --- a/packages-exp/functions-exp/src/context.ts +++ b/packages-exp/functions-exp/src/context.ts @@ -1,3 +1,7 @@ +import { + FirebaseAuthInternal, + FirebaseAuthInternalName +} from '@firebase/auth-interop-types'; /** * @license * Copyright 2017 Google LLC @@ -18,10 +22,7 @@ import { FirebaseMessaging, FirebaseMessagingName } from '@firebase/messaging-types'; -import { - FirebaseAuthInternal, - FirebaseAuthInternalName -} from '@firebase/auth-interop-types'; + import { Provider } from '@firebase/component'; /** @@ -92,7 +93,7 @@ export class ContextProvider { } try { - return this.messaging.getToken(); + return await this.messaging.getToken(); } catch (e) { // We don't warn on this, because it usually means messaging isn't set up. // console.warn('Failed to retrieve instance id token.', e);