Merge 2973aea into b278cea

Author: sam-gc

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

@@ -74,6 +74,14 @@ describe('core/user/token_manager', () => {
     });
   });
 
+  describe('#clearRefreshToken', () => {
+    it('sets refresh token to null', () => {
+      stsTokenManager.refreshToken = 'refresh-token';
+      stsTokenManager.clearRefreshToken();
+      expect(stsTokenManager.refreshToken).to.be.null;
+    });
+  });
+
   describe('#getToken', () => {
     context('with endpoint setup', () => {
       let mock: fetch.Route;

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

@@ -81,6 +81,10 @@ export class StsTokenManager {
     };
   }
 
+  clearRefreshToken(): void {
+    this.refreshToken = null;
+  }
+
   toPlainObject(): object {
     return {
       refreshToken: this.refreshToken,

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

@@ -17,25 +17,37 @@
 
 import { expect, use } from 'chai';
 import * as chaiAsPromised from 'chai-as-promised';
+import * as sinon from 'sinon';
+import * as sinonChai from 'sinon-chai';
 
 import { FirebaseError } from '@firebase/util';
 
+import { mockEndpoint } from '../../../test/api/helper';
 import { makeJWT } from '../../../test/jwt';
 import { mockAuth } from '../../../test/mock_auth';
+import * as fetch from '../../../test/mock_fetch';
+import { Endpoint } from '../../api';
 import { IdTokenResponse } from '../../model/id_token';
 import { StsTokenManager } from './token_manager';
 import { UserImpl } from './user_impl';
 
+use(sinonChai);
 use(chaiAsPromised);
 
 describe('core/user/user_impl', () => {
   const auth = mockAuth;
   let stsTokenManager: StsTokenManager;
 
   beforeEach(() => {
+    fetch.setUp();
     stsTokenManager = new StsTokenManager();
   });
 
+  afterEach(() => {
+    sinon.restore();
+    fetch.tearDown();
+  });
+
   describe('.constructor', () => {
     it('attaches required fields', () => {
       const user = new UserImpl({ uid: 'uid', auth, stsTokenManager });
@@ -116,9 +128,22 @@ describe('core/user/user_impl', () => {
   });
 
   describe('#delete', () => {
-    it('throws', () => {
+    it('calls delete endpoint', async () => {
+      stsTokenManager.updateFromServerResponse({
+        idToken: 'id-token',
+        refreshToken: 'refresh-token-string',
+        expiresIn: '100000'
+      } as IdTokenResponse);
       const user = new UserImpl({ uid: 'uid', auth, stsTokenManager });
-      expect(() => user.delete()).to.throw();
+      const endpoint = mockEndpoint(Endpoint.DELETE_ACCOUNT, {});
+      const signOut = sinon.stub(auth, 'signOut');
+
+      await user.delete();
+      expect(endpoint.calls[0].request).to.eql({
+        idToken: 'id-token'
+      });
+      expect(signOut).to.have.been.called;
+      expect(stsTokenManager.refreshToken).to.be.null;
     });
   });
 

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

@@ -17,6 +17,7 @@
 
 import { IdTokenResult } from '@firebase/auth-types-exp';
 
+import { deleteAccount } from '../../api/account_management/account';
 import { Auth } from '../../model/auth';
 import { User } from '../../model/user';
 import { PersistedBlob } from '../persistence';
@@ -99,8 +100,15 @@ export class UserImpl implements User {
     return reload(this);
   }
 
-  delete(): Promise<void> {
-    throw new Error('Method not implemented.');
+  async delete(): Promise<void> {
+    const idToken = await this.getIdToken();
+    await deleteAccount(this.auth, { idToken });
+    this.stsTokenManager.clearRefreshToken();
+
+    // TODO: Determine if cancellable-promises are necessary to use in this class so that delete()
+    //       cancels pending actions...
+
+    return this.auth.signOut();
   }
 
   toPlainObject(): PersistedBlob {