Make _delete() idempotent

Author: hsubox76

packages/database/src/exp/Database.ts

@@ -256,17 +256,12 @@ export class FirebaseDatabase implements _FirebaseService {
   }
 
   _delete(): Promise<void> {
-    this._checkNotDeleted('delete');
-    repoManagerDeleteRepo(this._repo, this.app.name);
-    this._repoInternal = null;
-    this._rootInternal = null;
-    return Promise.resolve();
-  }
-
-  _checkNotDeleted(apiName: string) {
-    if (this._rootInternal === null) {
-      fatal('Cannot call ' + apiName + ' on a deleted database.');
+    if (this._rootInternal !== null) {
+      repoManagerDeleteRepo(this._repo, this.app.name);
+      this._repoInternal = null;
+      this._rootInternal = null;
     }
+    return Promise.resolve();
   }
 }
 

packages/storage/compat/service.ts

@@ -33,18 +33,10 @@ import { Compat } from '@firebase/util';
  * @param opt_url gs:// url to a custom Storage Bucket
  */
 export class StorageServiceCompat
-  implements types.FirebaseStorage, Compat<StorageService> {
+  implements types.FirebaseStorage, Compat<StorageService>
+{
   constructor(public app: FirebaseApp, readonly _delegate: StorageService) {}
 
-  INTERNAL = {
-    /**
-     * Called when the associated app is deleted.
-     */
-    delete: () => {
-      return this._delegate._delete();
-    }
-  };
-
   get maxOperationRetryTime(): number {
     return this._delegate.maxOperationRetryTime;
   }

packages/storage/src/service.ts

@@ -269,9 +269,11 @@ export class StorageService implements _FirebaseService {
    * Stop running requests and prevent more from being created.
    */
   _delete(): Promise<void> {
-    this._deleted = true;
-    this._requests.forEach(request => request.cancel());
-    this._requests.clear();
+    if (!this._deleted) {
+      this._deleted = true;
+      this._requests.forEach(request => request.cancel());
+      this._requests.clear();
+    }
     return Promise.resolve();
   }