Revert "add retain, release, and ref counters"

This reverts commit db51c76.

Author: Lauren Long

src/apps.ts

@@ -1,136 +1,32 @@
 import * as _ from 'lodash';
 import * as firebase from 'firebase';
 import { FirebaseEnv } from './env';
-import * as Promise from 'bluebird';
 
 export interface AuthMode {
   admin: boolean;
   variable?: any;
 }
 
-export interface RefCounter {
-  admin: number;
-  noauth: number;
-  user: {[uuid: string]: number};
-}
-
 export default class Apps {
   private static _noauth: firebase.app.App;
   private static _admin: firebase.app.App;
+
   private _env: FirebaseEnv;
-  private _refCounter: RefCounter;
 
   constructor(env: FirebaseEnv) {
     this._env = env;
-    this._refCounter = {
-      admin: 0,
-      noauth: 0,
-      user: {},
-    };
-  }
-
-  _waitToDestroyApp(app: firebase.app.App) {
-    if (!app) {
-      console.log('resolved promise since app is empty');
-      return Promise.resolve();
-    }
-    return Promise.delay(120000).then(() => {
-      console.log('deleting app');
-      return app.delete();
-    }).then(() => {
-      console.log('app deleted');
-    });
-  }
-
-  _changeRefCounter() {
-    return Promise.delay(120000).then(() => {
-      console.log('time passed');
-      this._refCounter = {
-        admin: 1000,
-        noauth: 1000,
-        user: {},
-      };
-    });
-  }
-
-  _waitToDestroyUserApp(key: string) {
-    try {
-      let app = firebase.app(key);
-      console.log('deleting user app...');
-      return this._waitToDestroyApp(app);
-    } catch (e) {
-      return Promise.resolve();
-    }
-  }
-
-  _waitToDestroyAdmin() {
-    console.log('deleting admin app...');
-    return this._waitToDestroyApp(Apps._admin);
   }
 
-  _waitToDestroyNoauth() {
-    console.log('deleting noauth app...');
-    return this._waitToDestroyApp(Apps._noauth);
-  }
-
-  retain(payload) {
-    let auth: AuthMode | null = _.get(payload, 'auth', null);
-    this._refCounter.admin ++;
-    if (!auth || typeof auth !== 'object') {
-      this._refCounter.noauth ++;
-    } else if (auth.admin) {
-      this._refCounter.admin ++;
-    } else if (!auth.variable) {
-      this._refCounter.noauth ++;
-    } else {
-      const key = JSON.stringify(auth.variable);
-      let count = _.get(this._refCounter.user, key, 0);
-      _.set(this._refCounter.user, key, count+1);
-    }
-  }
-
-  release(payload) {
-    let auth: AuthMode | null = _.get(payload, 'auth', null);
-    this._refCounter.admin --;
-    if (!auth || typeof auth !== 'object') {
-      this._refCounter.noauth --;
-    } else if (auth.admin) {
-      this._refCounter.admin --;
-    } else if (!auth.variable) {
-      this._refCounter.noauth --;
-    } else {
-      const key = JSON.stringify(auth.variable);
-      let count = _.get(this._refCounter.user, key, 0);
-      if (count < 2) {
-        this._waitToDestroyUserApp(key);
-      }
-      _.set(this._refCounter.user, key, count-1);
-    }
-    if (this._refCounter.admin === 0) {
-      this._waitToDestroyAdmin();
-    }
-    if (this._refCounter.noauth === 0) {
-      this._waitToDestroyNoauth();
-    }
-  }
   get admin(): firebase.app.App {
-    try {
-      return firebase.app('__admin__');
-    } catch (e) {
-      console.log('Need to init admin app');
-      Apps._admin = firebase.initializeApp(this.firebaseArgs, '__admin__');
-      return Apps._admin;
-    }
+    // TODO(inlined) add credential to env
+    Apps._admin = Apps._admin || firebase.initializeApp(this.firebaseArgs, '__admin__');
+    return Apps._admin;
   }
 
   get noauth(): firebase.app.App {
-    try {
-      return firebase.app('__noauth__');
-    } catch (e) {
-      console.log('Need to init noauth app');
-      Apps._noauth = firebase.initializeApp(_.omit(this.firebaseArgs, 'credential'), '__noauth__');
-      return Apps._noauth;
-    }
+    Apps._noauth = Apps._noauth ||
+                  firebase.initializeApp(_.omit(this.firebaseArgs, 'credential'), '__noauth__');
+    return Apps._noauth;
   }
 
   forMode(auth: AuthMode): firebase.app.App {

test/apps.spec.ts

@@ -1,5 +1,5 @@
 import { expect } from 'chai';
-import * as sinon from 'sinon';
+
 import { FakeEnv } from './support/helpers';
 import Apps from '../src/apps';
 import * as firebase from 'firebase';
@@ -31,97 +31,4 @@ describe('apps', () => {
     const userAppAgain = apps.forMode({ admin: false, variable: claims });
     expect(userApp).to.equal(userAppAgain);
   });
-
-  it('should retain/release ref counters appropriately without auth', function() {
-    apps.retain();
-    expect(apps._refCounter).to.deep.equal({
-      admin: 1,
-      noauth: 1,
-      user: {},
-    });
-    apps.release();
-    expect(apps._refCounter).to.deep.equal({
-      admin: 0,
-      noauth: 0,
-      user: {},
-    });
-  });
-
-  it('should retain/release ref counters appropriately with admin auth', function() {
-    apps.retain({auth: {admin: true}});
-    expect(apps._refCounter).to.deep.equal({
-      admin: 2,
-      noauth: 0,
-      user: {},
-    });
-    apps.release({auth: {admin: true}});
-    expect(apps._refCounter).to.deep.equal({
-      admin: 0,
-      noauth: 0,
-      user: {},
-    });
-  });
-
-  it('should retain/release ref counters appropriately with user auth', function() {
-    apps.retain({auth: {admin: false, variable: 1111}});
-    expect(apps._refCounter).to.deep.equal({
-      admin: 1,
-      noauth: 0,
-      user: {'1111': 1},
-    });
-    apps.release({auth: {admin: false, variable: 1111}});
-    expect(apps._refCounter).to.deep.equal({
-      admin: 0,
-      noauth: 0,
-      user: {'1111': 0},
-    });
-  });
-
-  it('should trigger app deletion when ref count is 0', function() {
-    // overwrite some deletion functions
-    // apps.retain();
-    // expect deletion functions to be called
-  });
-
-  it('waits 2 min before destroying app', function(done) {
-    let clock = sinon.useFakeTimers();
-    let testApp = firebase.initializeApp(apps.firebaseArgs, 'test');
-    let spy = sinon.spy();
-    testApp.delete = spy;
-
-    apps._waitToDestroyApp(testApp);
-    clock.tick(100000);
-    expect(spy.called).to.be.false;
-    clock.tick(20000);
-    expect(spy.called).to.be.true;
-
-    clock.restore();
-    done();
-  });
-
-  it('should be able to recreate admin after destruction', function() {
-    let getAdmin = () => {
-      firebase.app('__admin__');
-    };
-    let admin = apps.admin;
-
-    return admin.delete().then(() => {
-      expect(getAdmin).to.throw(Error);
-      expect(apps.admin).to.be.an('object'); // Calling getter creates another app
-      expect(getAdmin).to.not.throw(Error);
-    });
-  });
-
-  it('should be able to recreate noauth after destruction', function() {
-    let getNoauth = () => {
-      firebase.app('__noauth__');
-    };
-    let noauth = apps.noauth;
-
-    return noauth.delete().then(() => {
-      expect(getNoauth).to.throw(Error);
-      expect(apps.noauth).to.be.an('object'); // Calling getter creates another app
-      expect(getNoauth).to.not.throw(Error);
-    });
-  });
 });