Cleanup type exports

Author: avolkovi

packages-exp/auth-exp/package.json

@@ -30,14 +30,13 @@
     "@firebase/auth-types-exp": "0.x"
   },
   "dependencies": {
-    "@firebase/logger": "^0.2.2",
-    "@firebase/util": "^0.2.44",
+    "@firebase/logger": "0.x",
+    "@firebase/util": "0.x",
     "tslib": "1.11.1"
   },
   "license": "Apache-2.0",
   "devDependencies": {
     "@rollup/plugin-strip": "^1.3.2",
-    "@firebase/app-exp": "0.x",
     "rollup": "1.32.1",
     "rollup-plugin-json": "4.0.0",
     "rollup-plugin-replace": "2.2.0",

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/auth/auth_impl.ts

@@ -38,7 +38,7 @@ export const DEFAULT_TOKEN_API_HOST = 'securetoken.googleapis.com';
 export const DEFAULT_API_HOST = 'identitytoolkit.googleapis.com';
 export const DEFAULT_API_SCHEME = 'https';
 
-class AuthImpl implements Auth {
+export class AuthImpl implements Auth {
   currentUser: User | null = null;
   private operations = Promise.resolve();
   private persistenceManager?: PersistenceUserManager;

packages-exp/auth-exp/src/core/providers/index.ts

@@ -15,31 +15,3 @@
  * limitations under the License.
  */
 
-/**
- * Supported providers
- */
-export enum ProviderId {
-  ANONYMOUS = 'anonymous',
-  CUSTOM = 'custom',
-  FACEBOOK = 'facebook.com',
-  FIREBASE = 'firebase',
-  GITHUB = 'github.com',
-  GOOGLE = 'google.com',
-  PASSWORD = 'password',
-  PHONE = 'phone',
-  TWITTER = 'twitter.com'
-}
-
-/**
- * Supported sign in methods
- */
-export enum SignInMethod {
-  ANONYMOUS = 'anonymous',
-  EMAIL_LINK = 'emailLink',
-  EMAIL_PASSWORD = 'password',
-  FACEBOOK = 'facebook.com',
-  GITHUB = 'github.com',
-  GOOGLE = 'google.com',
-  PHONE = 'phone',
-  TWITTER = 'twitter.com'
-}

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

@@ -15,14 +15,14 @@
  * limitations under the License.
  */
 
+import { ProviderId, SignInMethod } from '@firebase/auth-types-exp';
 import { expect, use } from 'chai';
 import * as chaiAsPromised from 'chai-as-promised';
 import { mockAuth } from '../../../test/mock_auth';
 import { MockAuthCredential } from '../../../test/mock_auth_credential';
 import * as mockFetch from '../../../test/mock_fetch';
 import { APIUserInfo } from '../../api/account_management/account';
 import { IdTokenResponse } from '../../model/id_token';
-import { ProviderId, SignInMethod } from '../providers';
 import { signInWithCredential } from './credential';
 import { mockEndpoint } from '../../../test/api/helper';
 import { Endpoint } from '../../api';

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,11 +41,11 @@ 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;
+  ] as externs.ProviderId;
   assert(
-    !signInProvider || Object.values(ProviderId).includes(signInProvider),
+    !signInProvider || Object.values(externs.ProviderId).includes(signInProvider),
     user.auth.name
   );
 

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

@@ -20,7 +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 { UserInfo, ProviderId } from '@firebase/auth-types-exp';
 import { FirebaseError } from '@firebase/util';
 
 import { mockEndpoint } from '../../../test/api/helper';
@@ -31,7 +31,6 @@ import {
   APIUserInfo,
   ProviderUserInfo
 } from '../../api/account_management/account';
-import { ProviderId } from '../providers';
 import { _reloadWithoutSaving, reload } from './reload';
 
 use(chaiAsPromised);

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> {
@@ -80,15 +79,15 @@ function extractProviderData(
 ): externs.UserInfo[] {
   return providers.map(({ providerId, ...provider }) => {
     assert(
-      providerId && Object.values<string>(ProviderId).includes(providerId),
+      providerId && Object.values<string>(externs.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
     };
   });

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

@@ -15,6 +15,7 @@
  * limitations under the License.
  */
 
+import { ProviderId, SignInMethod } from '@firebase/auth-types-exp';
 import { expect, use } from 'chai';
 import * as chaiAsPromised from 'chai-as-promised';
 import * as sinon from 'sinon';
@@ -28,7 +29,6 @@ import { APIUserInfo } from '../../api/account_management/account';
 import { AuthCredential } from '../../model/auth_credential';
 import { IdTokenResponse } from '../../model/id_token';
 import { OperationType } from '../../model/user_credential';
-import { ProviderId, SignInMethod } from '../providers';
 import { UserCredentialImpl } from './user_credential_impl';
 
 use(chaiAsPromised);

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

@@ -15,13 +15,12 @@
  * limitations under the License.
  */
 
-import { IdTokenResult } from '@firebase/auth-types-exp';
+import { IdTokenResult, ProviderId } from '@firebase/auth-types-exp';
 import { deleteAccount } from '../../api/account_management/account';
 import { Auth } from '../../model/auth';
 import { IdTokenResponse } from '../../model/id_token';
 import { User } from '../../model/user';
 import { PersistedBlob } from '../persistence';
-import { ProviderId } from '../providers';
 import { assert } from '../util/assert';
 import { getIdTokenResult } from './id_token_result';
 import { reload, _reloadWithoutSaving } from './reload';

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

@@ -23,9 +23,6 @@ export {browserLocalPersistence, browserSessionPersistence} from './core/persist
 export {inMemoryPersistence} from './core/persistence/in_memory';
 export {indexedDBLocalPersistence} from './core/persistence/indexed_db';
 
-// core/providers
-export {ProviderId} from './core/providers';
-
 // core/strategies
 export {sendPasswordResetEmail, confirmPasswordReset, checkActionCode, verifyPasswordResetCode} from './core/strategies/email_and_password';
 export {sendSignInLinkToEmail, isSignInWithEmailLink} from './core/strategies/email_link';

packages-exp/auth-exp/src/model/auth_credential.d.ts

@@ -15,21 +15,22 @@
  * limitations under the License.
  */
 
-import { ProviderId, SignInMethod } from '../core/providers';
+import * as externs from '@firebase/auth-types-exp';
+
 import { Auth } from './auth';
 import { IdTokenResponse } from './id_token';
 import { PhoneOrOauthTokenResponse } from '../api/authentication/mfa';
 
-export interface AuthCredential {
-  readonly providerId: ProviderId;
-  readonly signInMethod: SignInMethod;
+export interface AuthCredential extends externs.AuthCredential {
+  readonly providerId: externs.ProviderId;
+  readonly signInMethod: externs.SignInMethod;
   toJSON(): object;
   _getIdTokenResponse(auth: Auth): Promise<PhoneOrOauthTokenResponse>;
   _linkToIdToken(auth: Auth, idToken: string): Promise<IdTokenResponse>;
   _matchIdTokenWithUid(auth: Auth, uid: string): Promise<IdTokenResponse>;
 }
 
-export interface OAuthCredential extends AuthCredential {
+export interface OAuthCredential extends externs.AuthCredential {
   readonly idToken?: string;
   readonly accessToken?: string;
   readonly secret?: string;

packages-exp/auth-exp/src/model/id_token.d.ts

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-import { ProviderId } from '../core/providers/index';
+import { ProviderId } from '@firebase/auth-types-exp';
 
 /**
  * Raw encoded JWT

packages-exp/auth-exp/src/model/user.d.ts

@@ -18,7 +18,6 @@
 import * as externs from '@firebase/auth-types-exp';
 
 import { PersistedBlob } from '../core/persistence';
-import { ProviderId } from '../core/providers';
 import { Auth } from './auth';
 
 export interface User extends externs.User {
@@ -29,7 +28,7 @@ export interface User extends externs.User {
   photoURL: string | null;
 
   auth: Auth;
-  providerId: ProviderId.FIREBASE;
+  providerId: externs.ProviderId.FIREBASE;
   refreshToken: string;
   emailVerified: boolean;
   tenantId: string | null;

packages-exp/auth-exp/test/mock_auth_credential.ts

@@ -15,8 +15,8 @@
  * limitations under the License.
  */
 
+import { ProviderId, SignInMethod } from '@firebase/auth-types-exp';
 import { PhoneOrOauthTokenResponse } from '../src/api/authentication/mfa';
-import { ProviderId, SignInMethod } from '../src/core/providers';
 import { Auth } from '../src/model/auth';
 import { AuthCredential } from '../src/model/auth_credential';
 import { IdTokenResponse } from '../src/model/id_token';
@@ -33,6 +33,10 @@ export class MockAuthCredential implements AuthCredential {
     throw new Error('Method not implemented.');
   }
 
+  fromJSON(_json: string | object): AuthCredential | null {
+    throw new Error('Method not implemented.');
+  }
+
   /**
    * For testing purposes only
    * @param response

packages-exp/auth-types-exp/index.d.ts

@@ -153,4 +153,53 @@ type ActionCodeOperationType =
  | 'EMAIL_SIGNIN'
  | 'VERIFY_EMAIL'
  | 'VERIFY_AND_CHANGE_EMAIL'
- | 'REVERT_SECOND_FACTOR_ADDITION'
+ | 'REVERT_SECOND_FACTOR_ADDITION'
+ 
+/**
+ * Supported providers
+ */
+export enum ProviderId {
+  ANONYMOUS = 'anonymous',
+  CUSTOM = 'custom',
+  FACEBOOK = 'facebook.com',
+  FIREBASE = 'firebase',
+  GITHUB = 'github.com',
+  GOOGLE = 'google.com',
+  PASSWORD = 'password',
+  PHONE = 'phone',
+  TWITTER = 'twitter.com'
+}
+
+/**
+ * Supported sign in methods
+ */
+export enum SignInMethod {
+  ANONYMOUS = 'anonymous',
+  EMAIL_LINK = 'emailLink',
+  EMAIL_PASSWORD = 'password',
+  FACEBOOK = 'facebook.com',
+  GITHUB = 'github.com',
+  GOOGLE = 'google.com',
+  PHONE = 'phone',
+  TWITTER = 'twitter.com'
+}
+ 
+export interface AuthCredential {
+  readonly providerId: ProviderId;
+  readonly signInMethod: SignInMethod;
+  toJSON(): object;
+  fromJSON(json: object | string): AuthCredential | null;
+}
+
+export class OAuthCredential implements AuthCredential {
+  readonly accessToken?: string;
+  readonly idToken?: string;
+  readonly secret?: string;
+  readonly providerId: ProviderId;
+  readonly signInMethod: SignInMethod;
+
+  constructor();
+
+  toJSON(): object;
+  fromJSON(json: object | string): OAuthCredential | null;
+}