Skip to content

Commit 4f2f9dc

Browse files
committed
Fix popup/redirect stuff
1 parent 6cfe9f5 commit 4f2f9dc

File tree

2 files changed

+17
-12
lines changed

2 files changed

+17
-12
lines changed

packages-exp/auth-compat-exp/src/popup_redirect.test.ts

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,9 @@ describe('popup_redirect/CompatPopupRedirectResolver', () => {
2929
// Do not run these tests in node; in node, this resolver
3030
// is never instantiated.
3131
if (typeof window === 'undefined') {
32-
console.log('Skipping popup/redirect resolver tests in non-browser environment');
32+
console.log(
33+
'Skipping popup/redirect resolver tests in non-browser environment'
34+
);
3335
return;
3436
}
3537

@@ -82,9 +84,11 @@ describe('popup_redirect/CompatPopupRedirectResolver', () => {
8284

8385
beforeEach(() => {
8486
underlyingResolver = sinon.createStubInstance(FakeResolver);
85-
((compatResolver as unknown) as {
86-
underlyingResolver: exp.PopupRedirectResolverInternal;
87-
}).underlyingResolver = underlyingResolver;
87+
(
88+
compatResolver as unknown as {
89+
underlyingResolver: exp.PopupRedirectResolverInternal;
90+
}
91+
).underlyingResolver = underlyingResolver;
8892
provider = new exp.GoogleAuthProvider();
8993
});
9094

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

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -22,14 +22,13 @@ const _assert: typeof exp._assert = exp._assert;
2222

2323
/** Platform-agnostic popup-redirect resolver */
2424
export class CompatPopupRedirectResolver
25-
implements exp.PopupRedirectResolverInternal {
25+
implements exp.PopupRedirectResolverInternal
26+
{
2627
// Create both resolvers for dynamic resolution later
27-
private readonly browserResolver: exp.PopupRedirectResolverInternal = exp._getInstance(
28-
exp.browserPopupRedirectResolver
29-
);
30-
private readonly cordovaResolver: exp.PopupRedirectResolverInternal = exp._getInstance(
31-
exp.cordovaPopupRedirectResolver
32-
);
28+
private readonly browserResolver: exp.PopupRedirectResolverInternal =
29+
exp._getInstance(exp.browserPopupRedirectResolver);
30+
private readonly cordovaResolver: exp.PopupRedirectResolverInternal =
31+
exp._getInstance(exp.cordovaPopupRedirectResolver);
3332
// The actual resolver in use: either browserResolver or cordovaResolver.
3433
private underlyingResolver: exp.PopupRedirectResolverInternal | null = null;
3534
_redirectPersistence = exp.browserSessionPersistence;
@@ -103,6 +102,8 @@ export class CompatPopupRedirectResolver
103102
// We haven't yet determined whether or not we're in Cordova; go ahead
104103
// and determine that state now.
105104
const isCordova = await _isCordova();
106-
this.underlyingResolver = isCordova ? this.cordovaResolver : this.browserResolver;
105+
this.underlyingResolver = isCordova
106+
? this.cordovaResolver
107+
: this.browserResolver;
107108
}
108109
}

0 commit comments

Comments
 (0)