Formatting, License

Author: sam-gc

packages-exp/auth-exp/src/core/strategies/redirect.test.ts

@@ -198,11 +198,13 @@ describe('core/strategies/redirect', () => {
 
   it('bypasses initialization if no key set', async () => {
     await reInitAuthWithRedirectUser(MATCHING_EVENT_ID);
-    const resolverInstance = _getInstance<PopupRedirectResolverInternal>(resolver);
+    const resolverInstance = _getInstance<PopupRedirectResolverInternal>(
+      resolver
+    );
 
     sinon.spy(resolverInstance, '_initialize');
     redirectPersistence.hasPendingRedirect = false;
-   
+
     expect(await redirectAction.execute()).to.eq(null);
     expect(await redirectAction.execute()).to.eq(null);
     expect(resolverInstance._initialize).not.to.have.been.called;

packages-exp/auth-exp/src/core/strategies/redirect.ts

@@ -66,7 +66,10 @@ export class RedirectAction extends AbstractPopupRedirectOperation {
     let readyOutcome = redirectOutcomeMap.get(this.auth._key());
     if (!readyOutcome) {
       try {
-        const hasPendingRedirect = await _getAndClearPendingRedirectStatus(this.resolver, this.auth);
+        const hasPendingRedirect = await _getAndClearPendingRedirectStatus(
+          this.resolver,
+          this.auth
+        );
         const result = hasPendingRedirect ? await super.execute() : null;
         readyOutcome = () => Promise.resolve(result);
       } catch (e) {
@@ -104,25 +107,38 @@ export class RedirectAction extends AbstractPopupRedirectOperation {
   cleanUp(): void {}
 }
 
-export async function _getAndClearPendingRedirectStatus(resolver: PopupRedirectResolverInternal, auth: AuthInternal): Promise<boolean> {
+export async function _getAndClearPendingRedirectStatus(
+  resolver: PopupRedirectResolverInternal,
+  auth: AuthInternal
+): Promise<boolean> {
   const key = pendingRedirectKey(auth);
-  const hasPendingRedirect = await resolverPersistence(resolver)._get(key) === 'true';
+  const hasPendingRedirect =
+    (await resolverPersistence(resolver)._get(key)) === 'true';
   await resolverPersistence(resolver)._remove(key);
   return hasPendingRedirect;
 }
 
-export async function _setPendingRedirectStatus(resolver: PopupRedirectResolverInternal, auth: AuthInternal): Promise<void> {
+export async function _setPendingRedirectStatus(
+  resolver: PopupRedirectResolverInternal,
+  auth: AuthInternal
+): Promise<void> {
   return resolverPersistence(resolver)._set(pendingRedirectKey(auth), 'true');
 }
 
 export function _clearRedirectOutcomes(): void {
   redirectOutcomeMap.clear();
 }
 
-function resolverPersistence(resolver: PopupRedirectResolverInternal): PersistenceInternal {
+function resolverPersistence(
+  resolver: PopupRedirectResolverInternal
+): PersistenceInternal {
   return _getInstance(resolver._redirectPersistence);
 }
 
 function pendingRedirectKey(auth: AuthInternal): string {
-  return _persistenceKeyName(PENDING_REDIRECT_KEY, auth.config.apiKey, auth.name);
-}
+  return _persistenceKeyName(
+    PENDING_REDIRECT_KEY,
+    auth.config.apiKey,
+    auth.name
+  );
+}

packages-exp/auth-exp/src/platform_browser/auth.test.ts

@@ -194,7 +194,9 @@ describe('core/auth/initializeAuth', () => {
 
     it('does not early-initialize the resolver', async () => {
       const popupRedirectResolver = makeMockPopupRedirectResolver();
-      const resolverInternal: PopupRedirectResolverInternal = _getInstance(popupRedirectResolver);
+      const resolverInternal: PopupRedirectResolverInternal = _getInstance(
+        popupRedirectResolver
+      );
       sinon.stub(resolverInternal, '_shouldInitProactively').value(false);
       sinon.spy(resolverInternal, '_initialize');
       await initAndWait(inMemoryPersistence, popupRedirectResolver);
@@ -203,7 +205,9 @@ describe('core/auth/initializeAuth', () => {
 
     it('does early-initialize the resolver', async () => {
       const popupRedirectResolver = makeMockPopupRedirectResolver();
-      const resolverInternal: PopupRedirectResolverInternal = _getInstance(popupRedirectResolver);
+      const resolverInternal: PopupRedirectResolverInternal = _getInstance(
+        popupRedirectResolver
+      );
       sinon.stub(resolverInternal, '_shouldInitProactively').value(true);
       sinon.spy(resolverInternal, '_initialize');
       await initAndWait(inMemoryPersistence, popupRedirectResolver);

packages-exp/auth-exp/src/platform_browser/strategies/redirect.test.ts

@@ -83,7 +83,9 @@ describe('platform_browser/strategies/redirect', () => {
     )._redirectPersistence = RedirectPersistence;
     auth = await testAuth(resolver);
     idpStubs = sinon.stub(idpTasks);
-    _getInstance<RedirectPersistence>(RedirectPersistence).hasPendingRedirect = true;
+    _getInstance<RedirectPersistence>(
+      RedirectPersistence
+    ).hasPendingRedirect = true;
   });
 
   afterEach(() => {
@@ -425,7 +427,9 @@ describe('platform_browser/strategies/redirect', () => {
         type: AuthEventType.LINK_VIA_REDIRECT
       });
       expect(await promise).to.eq(cred);
-      expect(redirectPersistence._remove).to.have.been.calledWith('firebase:redirectUser:test-api-key:test-app');
+      expect(redirectPersistence._remove).to.have.been.calledWith(
+        'firebase:redirectUser:test-api-key:test-app'
+      );
       expect(auth._currentUser?._redirectEventId).to.be.undefined;
       expect(auth.persistenceLayer.lastObjectSet?._redirectEventId).to.be
         .undefined;
@@ -449,7 +453,9 @@ describe('platform_browser/strategies/redirect', () => {
         type: AuthEventType.LINK_VIA_REDIRECT
       });
       expect(await promise).to.eq(cred);
-      expect(redirectPersistence._remove).not.to.have.been.calledWith('firebase:redirectUser:test-api-key:test-app');
+      expect(redirectPersistence._remove).not.to.have.been.calledWith(
+        'firebase:redirectUser:test-api-key:test-app'
+      );
       expect(auth._currentUser?._redirectEventId).not.to.be.undefined;
       expect(auth.persistenceLayer.lastObjectSet?._redirectEventId).not.to.be
         .undefined;

packages-exp/auth-exp/src/platform_browser/strategies/redirect.ts

@@ -32,7 +32,10 @@ import { _generateEventId } from '../../core/util/event_id';
 import { AuthEventType } from '../../model/popup_redirect';
 import { UserInternal } from '../../model/user';
 import { _withDefaultResolver } from '../../core/util/resolver';
-import { RedirectAction, _setPendingRedirectStatus } from '../../core/strategies/redirect';
+import {
+  RedirectAction,
+  _setPendingRedirectStatus
+} from '../../core/strategies/redirect';
 
 /**
  * Authenticates a Firebase client using a full-page redirect flow.

packages-exp/auth-exp/src/platform_cordova/popup_redirect/popup_redirect.ts

@@ -52,7 +52,7 @@ const INITIAL_EVENT_TIMEOUT_MS = 500;
 
 class CordovaPopupRedirectResolver implements PopupRedirectResolverInternal {
   readonly _redirectPersistence = browserSessionPersistence;
-  readonly _shouldInitProactively = true;  // This is lightweight for Cordova
+  readonly _shouldInitProactively = true; // This is lightweight for Cordova
   private readonly eventManagers = new Map<string, CordovaAuthEventManager>();
 
   _completeRedirectFn = _getRedirectResult;

packages-exp/auth-exp/test/helpers/redirect_persistence.ts

@@ -1,12 +1,29 @@
+/**
+ * @license
+ * Copyright 2020 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 import { PersistenceValue } from '../../src/core/persistence';
 import { InMemoryPersistence } from '../../src/core/persistence/in_memory';
 
 /** Helper class for handling redirect persistence */
 export class RedirectPersistence extends InMemoryPersistence {
   hasPendingRedirect = false;
-  redirectUser: object|null = null;
+  redirectUser: object | null = null;
 
-  async _get<T extends PersistenceValue>(key: string): Promise<T|null> {
+  async _get<T extends PersistenceValue>(key: string): Promise<T | null> {
     if (key.includes('pendingRedirect')) {
       return this.hasPendingRedirect.toString() as T;
     }