Merge commit '0470f4f4fcf74407ad1e070091c4a542dc8378a5'

# Conflicts:
#	tests/ios/Podfile.lock
This commit is contained in:
Chris Bianca
2017-10-03 15:34:08 +01:00
15 changed files with 322 additions and 730 deletions

View File

@@ -111,13 +111,15 @@ export default class FirebaseApp {
* @return {Promise}
*/
delete() {
if (this._name === INTERNALS.STRINGS.DEFAULT_APP_NAME && this._nativeInitialized) {
return Promise.reject(
new Error('Unable to delete the default native firebase app instance.'),
);
}
return FirebaseCoreModule.deleteApp(this._name);
throw new Error(INTERNALS.STRINGS.ERROR_UNSUPPORTED_CLASS_METHOD('app', 'delete'));
// TODO only the ios sdk currently supports delete, add back in when android also supports it
// if (this._name === INTERNALS.STRINGS.DEFAULT_APP_NAME && this._nativeInitialized) {
// return Promise.reject(
// new Error('Unable to delete the default native firebase app instance.'),
// );
// }
//
// return FirebaseCoreModule.deleteApp(this._name);
}