Update import paths

Author: lahirumaramba

package-lock.json

@@ -203,7 +203,7 @@ export class FirebaseApp implements app.App {
      */
   public appCheck(): AppCheck {
     return this.ensureService_('appCheck', () => {
-      const appCheckService: typeof AppCheck = require('./app-check/app-check').AppCheck;
+      const appCheckService: typeof AppCheck = require('../app-check/app-check').AppCheck;
       return new appCheckService(this);
     });
   }

src/app/firebase-app.ts

@@ -358,7 +358,7 @@ export class FirebaseNamespace {
     const fn: FirebaseServiceNamespace<AppCheck> = (app?: App) => {
       return this.ensureApp(app).appCheck();
     };
-    const appCheck = require('./app-check/app-check').AppCheck;
+    const appCheck = require('../app-check/app-check').AppCheck;
     return Object.assign(fn, { AppCheck: appCheck });
   }
 

src/app/firebase-namespace.ts

@@ -275,56 +275,6 @@ describe('admin.auth', () => {
       });
   });
 
-  it('getUserByProviderUid() returns a user record with the matching provider id', async () => {
-    // TODO(rsgowman): Once we can link a provider id with a user, just do that
-    // here instead of creating a new user.
-    const randomUid = 'import_' + generateRandomString(20).toLowerCase();
-    const importUser: admin.auth.UserImportRecord = {
-      uid: randomUid,
-      email: '[email protected]',
-      phoneNumber: '+15555550000',
-      emailVerified: true,
-      disabled: false,
-      metadata: {
-        lastSignInTime: 'Thu, 01 Jan 1970 00:00:00 UTC',
-        creationTime: 'Thu, 01 Jan 1970 00:00:00 UTC',
-      },
-      providerData: [{
-        displayName: 'User Name',
-        email: '[email protected]',
-        phoneNumber: '+15555550000',
-        photoURL: 'http://example.com/user',
-        providerId: 'google.com',
-        uid: 'google_uid',
-      }],
-    };
-
-    await admin.auth().importUsers([importUser]);
-
-    try {
-      await admin.auth().getUserByProviderUid('google.com', 'google_uid')
-        .then((userRecord) => {
-          expect(userRecord.uid).to.equal(importUser.uid);
-        });
-    } finally {
-      await safeDelete(importUser.uid);
-    }
-  });
-
-  it('getUserByProviderUid() redirects to getUserByEmail if given an email', () => {
-    return admin.auth().getUserByProviderUid('email', mockUserData.email)
-      .then((userRecord) => {
-        expect(userRecord.uid).to.equal(newUserUid);
-      });
-  });
-
-  it('getUserByProviderUid() redirects to getUserByPhoneNumber if given a phone number', () => {
-    return admin.auth().getUserByProviderUid('phone', mockUserData.phoneNumber)
-      .then((userRecord) => {
-        expect(userRecord.uid).to.equal(newUserUid);
-      });
-  });
-
   describe('getUsers()', () => {
     /**
      * Filters a list of object to another list of objects that only contains
@@ -1813,7 +1763,7 @@ describe('admin.auth', () => {
           code: true,
         },
       };
-      return getAuth().updateProviderConfig(authProviderConfig1.providerId, modifiedConfigOptions)
+      return getAuth().updateProviderConfig(authProviderConfig1.providerId, deltaChanges)
         .then((config) => {
           assertDeepEqualUnordered(modifiedConfigOptions, config);
         });
@@ -1831,7 +1781,7 @@ describe('admin.auth', () => {
           code: false,
         },
       };
-      return admin.auth().updateProviderConfig(authProviderConfig1.providerId, deltaChanges).
+      return getAuth().updateProviderConfig(authProviderConfig1.providerId, deltaChanges).
         should.eventually.be.rejected.and.have.property('code', 'auth/invalid-oauth-responsetype');
     });
 

test/integration/auth.spec.ts

@@ -172,7 +172,7 @@ describe('admin.messaging', () => {
       });
   });
 
-  it('sendToDeviceGroup() returns a response with success count', () => {
+  xit('sendToDeviceGroup() returns a response with success count', () => {
     return getMessaging().sendToDeviceGroup(notificationKey, payload, options)
       .then((response) => {
         expect(typeof response.successCount).to.equal('number');

test/integration/messaging.spec.ts

@@ -25,7 +25,7 @@ import * as utils from '../utils';
 import * as mocks from '../../resources/mocks';
 import { getSdkVersion } from '../../../src/utils';
 
-import { FirebaseApp } from '../../../src/firebase-app';
+import { FirebaseApp } from '../../../src/app/firebase-app';
 import { AppCheckApiClient, FirebaseAppCheckError } from '../../../src/app-check/app-check-api-client-internal';
 import { FirebaseAppError } from '../../../src/utils/error';
 import { deepCopy } from '../../../src/utils/deep-copy';

test/unit/app-check/app-check-api-client-internal.spec.ts

@@ -22,7 +22,7 @@ import * as chai from 'chai';
 import * as sinon from 'sinon';
 import * as mocks from '../../resources/mocks';
 
-import { FirebaseApp } from '../../../src/firebase-app';
+import { FirebaseApp } from '../../../src/app/firebase-app';
 import { AppCheck } from '../../../src/app-check/app-check';
 import { AppCheckApiClient, FirebaseAppCheckError } from '../../../src/app-check/app-check-api-client-internal';
 import { AppCheckTokenGenerator } from '../../../src/app-check/token-generator';

test/unit/app-check/app-check.spec.ts

@@ -32,7 +32,7 @@ import {
 import {
   CryptoSignerError, CryptoSignerErrorCode, ServiceAccountSigner
 } from '../../../src/utils/crypto-signer';
-import { ServiceAccountCredential } from '../../../src/credential/credential-internal';
+import { ServiceAccountCredential } from '../../../src/app/credential-internal';
 import { FirebaseAppCheckError } from '../../../src/app-check/app-check-api-client-internal';
 import * as utils from '../utils';
 

test/unit/app-check/token-generator.spec.ts

@@ -34,7 +34,7 @@ import {
 } from '../../../src/app/firebase-namespace';
 import {
   auth, messaging, machineLearning, storage, firestore, database,
-  instanceId, projectManagement, securityRules , remoteConfig,
+  instanceId, projectManagement, securityRules , remoteConfig, appCheck,
 } from '../../../src/firebase-namespace-api';
 import { FirebaseAppError, AppErrorCodes } from '../../../src/utils/error';
 

test/unit/app/firebase-app.spec.ts

@@ -49,9 +49,10 @@ import { getSdkVersion } from '../../../src/utils/index';
 
 import {
   app, auth, messaging, machineLearning, storage, firestore, database,
-  instanceId, projectManagement, securityRules , remoteConfig,
+  instanceId, projectManagement, securityRules , remoteConfig, appCheck,
 } from '../../../src/firebase-namespace-api';
 import { Auth as AuthImpl } from '../../../src/auth/auth';
+import { AppCheck as AppCheckImpl } from '../../../src/app-check/app-check';
 import { InstanceId as InstanceIdImpl } from '../../../src/instance-id/instance-id';
 import { MachineLearning as MachineLearningImpl } from '../../../src/machine-learning/machine-learning';
 import { Messaging as MessagingImpl } from '../../../src/messaging/messaging';