MFA

Author: sam-gc

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

@@ -34,7 +34,7 @@ import {
   convertConfirmationResult,
   convertCredential
 } from './user_credential';
-import { unwrap, Wrapper } from './wrap';
+import { ReverseWrapper, unwrap, Wrapper } from './wrap';
 
 const _assert: typeof exp._assert = exp._assert;
 
@@ -45,6 +45,7 @@ export class Auth
   constructor(readonly app: FirebaseApp, provider: Provider<'auth-exp'>) {
     if (provider.isInitialized()) {
       this.auth = provider.getImmediate() as exp.AuthImpl;
+      this.linkUnderlyingAuth();
       return;
     }
 
@@ -89,6 +90,7 @@ export class Auth
     }) as exp.AuthImpl;
 
     this.auth._updateErrorMap(exp.debugErrorMap);
+    this.linkUnderlyingAuth();
   }
 
   get emulatorConfig(): compat.EmulatorConfig | null {
@@ -330,6 +332,9 @@ export class Auth
   _delete(): Promise<void> {
     return this.auth._delete();
   }
+  private linkUnderlyingAuth(): void {
+    (this.auth as unknown as ReverseWrapper<Auth>).wrapped = () => this;
+  }
 }
 
 function wrapObservers(

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

@@ -18,7 +18,9 @@
 import * as exp from '@firebase/auth-exp/internal';
 import * as compat from '@firebase/auth-types';
 import { FirebaseError } from '@firebase/util';
+import { Auth } from './auth';
 import { User } from './user';
+import { unwrap, wrapped } from './wrap';
 
 const enum CredentialFrom {
   ERROR = 'credentialFromError',
@@ -39,7 +41,7 @@ function modifyError(
   const response = (e.customData as exp.TaggedWithTokenResponse|undefined)?._tokenResponse as unknown as Record<string, string>;
   if (e.code === 'auth/multi-factor-auth-required') {
     const mfaErr = e as compat.MultiFactorError;
-    mfaErr.resolver = exp.getMultiFactorResolver(auth, e as any);
+    mfaErr.resolver = new MultiFactorResolver(auth, exp.getMultiFactorResolver(auth, e as any));
   } else if (response) {
     const credential = credentialFromObject(e);
     const credErr = e as compat.AuthError;
@@ -110,7 +112,7 @@ function credentialFromObject(object: FirebaseError|exp.UserCredential): exp.Aut
       // TODO(avolkovi): uncomment this and get it working with SAML & OIDC
       if (pendingToken) {
         if (providerId.indexOf('saml.') == 0) {
-          return exp.SAMLAuthProvider.credential(providerId, pendingToken);
+          return exp.SAMLAuthCredential._create(providerId, pendingToken);
         } else {
           // OIDC and non-default providers excluding Twitter.
           return exp.OAuthCredential._fromParams(
@@ -169,3 +171,22 @@ export async function convertConfirmationResult(
       convertCredential(auth, confirmationResultExp.confirm(verificationCode))
   };
 }
+
+class MultiFactorResolver implements compat.MultiFactorResolver {
+  readonly auth: Auth;
+  constructor(auth: exp.Auth, private readonly resolver: exp.MultiFactorResolver) {
+    this.auth = wrapped(auth);
+  }
+
+  get session(): compat.MultiFactorSession {
+    return this.resolver.session;
+  }
+
+  get hints(): compat.MultiFactorInfo[] {
+    return this.resolver.hints;
+  }
+
+  resolveSignIn(assertion: compat.MultiFactorAssertion): Promise<compat.UserCredential> {
+    return convertCredential(unwrap(this.auth), this.resolver.resolveSignIn(assertion as exp.MultiFactorAssertion));
+  }
+}

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

@@ -15,10 +15,20 @@
  * limitations under the License.
  */
 
+/** Forward direction wrapper from Compat --unwrap-> Exp */
 export interface Wrapper<T> {
   unwrap(): T;
 }
 
+/** Reverse direction wrapper from Exp --wrapped--> Compat */
+export interface ReverseWrapper<T> {
+  wrapped(): T;
+}
+
 export function unwrap<T>(object: unknown): T {
   return (object as Wrapper<T>).unwrap();
 }
+
+export function wrapped<T>(object: unknown): T {
+  return (object as ReverseWrapper<T>).wrapped();
+}

packages-exp/auth-exp/internal/index.ts

@@ -44,3 +44,4 @@ export { AuthPopup } from '../src/platform_browser/util/popup';
 export { _getRedirectResult } from '../src/platform_browser/strategies/redirect';
 export { cordovaPopupRedirectResolver } from '../src/platform_cordova/popup_redirect/popup_redirect';
 export { FetchProvider } from '../src/core/util/fetch_provider';
+export { SAMLAuthCredential } from '../src/core/credentials/saml';