Add signInWithCredential to auth-next (#2963)

* Add signInWithCredential to auth-next

* [AUTOMATED]: Prettier Code Styling

* Add conditional delays to auth-next (#2934)

* Add conditional delays to auth-next

* [AUTOMATED]: Prettier Code Styling

* Use typescript asserts keyword for typesafe assertions

* [AUTOMATED]: Prettier Code Styling

* Rebase conflicts & PR feedback

* More PR Feedback

* Strip debug asserts from prod builds

* [AUTOMATED]: Prettier Code Styling

* [AUTOMATED]: API Reports

* Fix logic in assertion

* Revert merge artifacts

* PR Feedback

* Cleanup & PR Feedback

* [AUTOMATED]: Prettier Code Styling

* [AUTOMATED]: License Headers

* Add more tests

* [AUTOMATED]: Prettier Code Styling

* Rebase conflicts

* Cleanup type exports

* PR feedback

* Declare abstract class abstractly

Author: avolkovi

packages-exp/auth-exp/src/api/account_management/account.test.ts

@@ -15,14 +15,14 @@
  * limitations under the License.
  */
 
+import { ProviderId } from '@firebase/auth-types-exp';
 import { FirebaseError } from '@firebase/util';
 import { expect, use } from 'chai';
 import * as chaiAsPromised from 'chai-as-promised';
 import { Endpoint } from '..';
 import { mockEndpoint } from '../../../test/api/helper';
 import { mockAuth } from '../../../test/mock_auth';
 import * as mockFetch from '../../../test/mock_fetch';
-import { ProviderId } from '../../core/providers';
 import { ServerError } from '../errors';
 import { deleteAccount, deleteLinkedAccounts, getAccountInfo } from './account';
 

packages-exp/auth-exp/src/api/authentication/custom_token.test.ts

@@ -15,14 +15,14 @@
  * limitations under the License.
  */
 
+import { ProviderId } from '@firebase/auth-types-exp';
 import { FirebaseError } from '@firebase/util';
 import { expect, use } from 'chai';
 import * as chaiAsPromised from 'chai-as-promised';
 import { Endpoint } from '..';
 import { mockEndpoint } from '../../../test/api/helper';
 import { mockAuth } from '../../../test/mock_auth';
 import * as mockFetch from '../../../test/mock_fetch';
-import { ProviderId } from '../../core/providers';
 import { ServerError } from '../errors';
 import { signInWithCustomToken } from './custom_token';
 

packages-exp/auth-exp/src/api/authentication/sms.test.ts

@@ -15,14 +15,14 @@
  * limitations under the License.
  */
 
+import { ProviderId } from '@firebase/auth-types-exp';
 import { FirebaseError } from '@firebase/util';
 import { expect, use } from 'chai';
 import * as chaiAsPromised from 'chai-as-promised';
 import { Endpoint } from '..';
 import { mockEndpoint } from '../../../test/api/helper';
 import { mockAuth } from '../../../test/mock_auth';
 import * as mockFetch from '../../../test/mock_fetch';
-import { ProviderId } from '../../core/providers';
 import { ServerError } from '../errors';
 import {
   linkWithPhoneNumber,

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

@@ -0,0 +1,84 @@
+/**
+ * @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 { OperationType, ProviderId, SignInMethod } from '@firebase/auth-types-exp';
+import { expect, use } from 'chai';
+import * as chaiAsPromised from 'chai-as-promised';
+import { mockEndpoint } from '../../../test/api/helper';
+import { mockAuth } from '../../../test/mock_auth';
+import { MockAuthCredential } from '../../../test/mock_auth_credential';
+import * as mockFetch from '../../../test/mock_fetch';
+import { Endpoint } from '../../api';
+import { APIUserInfo } from '../../api/account_management/account';
+import { IdTokenResponse } from '../../model/id_token';
+import { signInWithCredential } from './credential';
+
+use(chaiAsPromised);
+
+describe('core/strategies/signInWithCredential', () => {
+  const serverUser: APIUserInfo = {
+    localId: 'local-id',
+    displayName: 'display-name',
+    photoUrl: 'photo-url',
+    email: 'email',
+    emailVerified: true,
+    phoneNumber: 'phone-number',
+    tenantId: 'tenant-id',
+    createdAt: 123,
+    lastLoginAt: 456
+  };
+
+  const idTokenResponse: IdTokenResponse = {
+    idToken: 'my-id-token',
+    refreshToken: 'my-refresh-token',
+    expiresIn: '1234',
+    localId: serverUser.localId!,
+    kind: 'my-kind'
+  };
+
+  const authCredential = new MockAuthCredential(
+    ProviderId.FIREBASE,
+    SignInMethod.EMAIL_LINK
+  );
+
+  beforeEach(() => {
+    mockFetch.setUp();
+    authCredential._setIdTokenResponse(idTokenResponse);
+    mockEndpoint(Endpoint.GET_ACCOUNT_INFO, {
+      users: [serverUser]
+    });
+  });
+  afterEach(mockFetch.tearDown);
+
+  it('should return a valid user credential', async () => {
+    const { credential, user, operationType } = await signInWithCredential(
+      mockAuth,
+      authCredential
+    );
+    expect(credential!.providerId).to.eq(ProviderId.FIREBASE);
+    expect(credential!.signInMethod).to.eq(SignInMethod.EMAIL_LINK);
+    expect(user.uid).to.eq('local-id');
+    expect(user.tenantId).to.eq('tenant-id');
+    expect(user.displayName).to.eq('display-name');
+    expect(operationType).to.eq(OperationType.SIGN_IN);
+  });
+
+  it('should update the current user', async () => {
+    const { user } = await signInWithCredential(mockAuth, authCredential);
+    expect(mockAuth.currentUser).to.eq(user);
+  });
+});

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

@@ -0,0 +1,38 @@
+/**
+ * @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 { OperationType, UserCredential } from '@firebase/auth-types-exp';
+import { Auth } from '../../model/auth';
+import { AuthCredential } from '../../model/auth_credential';
+import { User } from '../../model/user';
+import { UserCredentialImpl } from '../user/user_credential_impl';
+
+export async function signInWithCredential(
+  auth: Auth,
+  credential: AuthCredential
+): Promise<UserCredential> {
+  // TODO: handle mfa by wrapping with callApiWithMfaContext
+  const response = await credential._getIdTokenResponse(auth);
+  const userCredential = await UserCredentialImpl._fromIdTokenResponse(
+    auth,
+    credential,
+    OperationType.SIGN_IN,
+    response
+  );
+  await auth.updateCurrentUser(userCredential.user as User);
+  return userCredential;
+}

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

@@ -15,6 +15,7 @@
  * limitations under the License.
  */
 
+import { ProviderId } from '@firebase/auth-types-exp';
 import { FirebaseError } from '@firebase/util';
 import { expect, use } from 'chai';
 import * as chaiAsPromised from 'chai-as-promised';
@@ -26,7 +27,6 @@ import * as mockFetch from '../../../test/mock_fetch';
 import { Endpoint } from '../../api';
 import { ServerError } from '../../api/errors';
 import { Operation } from '../../model/action_code_info';
-import { ProviderId } from '../providers';
 import * as location from '../util/location';
 import { fetchSignInMethodsForEmail, sendEmailVerification } from './email';
 

packages-exp/auth-exp/src/core/user/id_token_result.test.ts

@@ -20,11 +20,11 @@ import * as chaiAsPromised from 'chai-as-promised';
 import * as sinon from 'sinon';
 
 import { FirebaseError } from '@firebase/util';
+import { ProviderId } from '@firebase/auth-types-exp';
 
 import { makeJWT } from '../../../test/jwt';
 import { testUser } from '../../../test/mock_auth';
 import { User } from '../../model/user';
-import { ProviderId } from '../providers';
 import { getIdTokenResult } from './id_token_result';
 
 use(chaiAsPromised);

packages-exp/auth-exp/src/core/user/id_token_result.ts

@@ -19,7 +19,6 @@ import * as externs from '@firebase/auth-types-exp';
 import { base64Decode } from '@firebase/util';
 
 import { User } from '../../model/user';
-import { ProviderId } from '../providers';
 import { assert } from '../util/assert';
 import { _logError } from '../util/log';
 
@@ -42,14 +41,10 @@ export async function getIdTokenResult(
   const firebase =
     typeof claims.firebase === 'object' ? claims.firebase : undefined;
 
-  const signInProvider: ProviderId | undefined = firebase?.[
+  const signInProvider: externs.ProviderId | undefined = firebase?.[
     'sign_in_provider'
-  ] as ProviderId;
-  assert(
-    !signInProvider || Object.values(ProviderId).includes(signInProvider),
-    user.auth.name
-  );
-
+  ] as externs.ProviderId;
+ 
   return {
     claims,
     token,

packages-exp/auth-exp/src/core/user/reload.test.ts

@@ -20,8 +20,7 @@ import * as chaiAsPromised from 'chai-as-promised';
 import * as sinon from 'sinon';
 import * as sinonChai from 'sinon-chai';
 
-import { UserInfo } from '@firebase/auth-types-exp';
-import { FirebaseError } from '@firebase/util';
+import { UserInfo, ProviderId } from '@firebase/auth-types-exp';
 
 import { mockEndpoint } from '../../../test/api/helper';
 import { testUser } from '../../../test/mock_auth';
@@ -31,7 +30,6 @@ import {
   APIUserInfo,
   ProviderUserInfo
 } from '../../api/account_management/account';
-import { ProviderId } from '../providers';
 import { _reloadWithoutSaving, reload } from './reload';
 
 use(chaiAsPromised);
@@ -147,27 +145,6 @@ describe('core/user/reload', () => {
     ]);
   });
 
-  it('throws an error if the providerData providerId is invalid', async () => {
-    const user = testUser('abc', '', true);
-    mockEndpoint(Endpoint.GET_ACCOUNT_INFO, {
-      users: [
-        {
-          providerUserInfo: [
-            {
-              ...BASIC_USER_INFO,
-              providerId: 'naaaah'
-            }
-          ]
-        }
-      ]
-    });
-
-    await expect(_reloadWithoutSaving(user)).to.be.rejectedWith(
-      FirebaseError,
-      'Firebase: An internal AuthError has occurred. (auth/internal-error).'
-    );
-  });
-
   it('reload calls auth.updateCurrentUser after completion', async () => {
     mockEndpoint(Endpoint.GET_ACCOUNT_INFO, {
       users: [{}]

packages-exp/auth-exp/src/core/user/reload.ts

@@ -22,7 +22,6 @@ import {
   ProviderUserInfo
 } from '../../api/account_management/account';
 import { User } from '../../model/user';
-import { ProviderId } from '../providers';
 import { assert } from '../util/assert';
 
 export async function _reloadWithoutSaving(user: User): Promise<void> {
@@ -34,7 +33,7 @@ export async function _reloadWithoutSaving(user: User): Promise<void> {
 
   const coreAccount = response.users[0];
   const newProviderData = coreAccount.providerUserInfo?.length
-    ? extractProviderData(coreAccount.providerUserInfo, auth.name)
+    ? extractProviderData(coreAccount.providerUserInfo)
     : [];
   const updates: Partial<User> = {
     uid: coreAccount.localId,
@@ -75,20 +74,15 @@ function mergeProviderData(
 }
 
 function extractProviderData(
-  providers: ProviderUserInfo[],
-  appName: string
+  providers: ProviderUserInfo[]
 ): externs.UserInfo[] {
   return providers.map(({ providerId, ...provider }) => {
-    assert(
-      providerId && Object.values<string>(ProviderId).includes(providerId),
-      appName
-    );
     return {
       uid: provider.rawId || '',
       displayName: provider.displayName || null,
       email: provider.email || null,
       phoneNumber: provider.phoneNumber || null,
-      providerId: providerId as ProviderId,
+      providerId: providerId as externs.ProviderId,
       photoURL: provider.photoUrl || null
     };
   });