status-im
/
react-native-firebase
mirror of
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

js: cleanup error util

This commit is contained in:
Salakar 2017-03-07 17:35:48 +00:00
parent a3f3cf930a
commit 51c63b2f3e
2 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/modules/database/reference.js
View File

@ -132,11 +132,17 @@ export default class Reference extends ReferenceBase {
}) })
.catch((error) => { .catch((error) => {
const firebaseError = this.db._toFirebaseError(error); const firebaseError = this.db._toFirebaseError(error);
if (isFunction(failureCallback)) failureCallback(firebaseError); if (isFunction(failureCallback)) return failureCallback(firebaseError);
return Promise.reject(firebaseError); return Promise.reject(firebaseError);
}); });
} }
/**
*
* @param eventType
* @param origCB
* @returns {*}
*/
off(eventType?: string = '', origCB?: () => any) { off(eventType?: string = '', origCB?: () => any) {
const path = this._dbPath(); const path = this._dbPath();
const modifiersString = this.query.getModifiersString(); const modifiersString = this.query.getModifiersString();

11
lib/utils/index.js
View File

@ -9,8 +9,15 @@ const _handler = (resolve, reject, errorPrefix, err, resp) => {
setImmediate(() => { setImmediate(() => {
if (err) { if (err) {
const firebaseError = new Error(err.message); const firebaseError = new Error(err.message);
firebaseError.code = toWebSDKErrorCode(err.code || err.errCode || err.errorCode || '', errorPrefix);
return reject(errorPrefix ? firebaseError : err); if (isObject(err)) {
Object.keys(err).forEach(key => Object.defineProperty(firebaseError, key, { value: err[key] }));
if (errorPrefix) {
firebaseError.code = toWebSDKErrorCode(err.code || '', errorPrefix);
}
}
return reject(firebaseError);
} }
return resolve(resp); return resolve(resp);
}); });