From d9c3943f1739a30f54cf4f6928237103d427a3c8 Mon Sep 17 00:00:00 2001 From: Ari Lerner Date: Fri, 4 Nov 2016 14:26:59 -0700 Subject: [PATCH 1/7] Added try catch in user auth to prevent crashing --- .../io/fullstack/firestack/FirestackAuth.java | 161 ++++++++++++------ 1 file changed, 110 insertions(+), 51 deletions(-) diff --git a/android/src/main/java/io/fullstack/firestack/FirestackAuth.java b/android/src/main/java/io/fullstack/firestack/FirestackAuth.java index 29a4efb..40b0b8c 100644 --- a/android/src/main/java/io/fullstack/firestack/FirestackAuth.java +++ b/android/src/main/java/io/fullstack/firestack/FirestackAuth.java @@ -106,11 +106,15 @@ public void createUserWithEmail(final String email, final String password, final .addOnCompleteListener(new OnCompleteListener() { @Override public void onComplete(@NonNull Task task) { - if (task.isSuccessful()) { + try { + if (task.isSuccessful()) { user = task.getResult().getUser(); userCallback(user, onComplete); - }else{ + } else { userErrorCallback(task, onComplete); + } + } catch (Exception ex) { + userExceptionCallback(ex, onComplete); } } }); @@ -124,12 +128,17 @@ public void signInWithEmail(final String email, final String password, final Cal .addOnCompleteListener(new OnCompleteListener() { @Override public void onComplete(@NonNull Task task) { - if (task.isSuccessful()) { + try { + if (task.isSuccessful()) { user = task.getResult().getUser(); - userCallback(user, callback); - } else { - userErrorCallback(task, callback); + userCallback(user, onComplete); + } else { + userErrorCallback(task, onComplete); + } + } catch (Exception ex) { + userExceptionCallback(ex, onComplete); } + } } }); } @@ -155,12 +164,17 @@ public void signInAnonymously(final Callback callback) { public void onComplete(@NonNull Task task) { Log.d(TAG, "signInAnonymously:onComplete:" + task.isSuccessful()); - if (task.isSuccessful()) { + try { + if (task.isSuccessful()) { user = task.getResult().getUser(); anonymousUserCallback(user, callback); - }else{ - userErrorCallback(task, callback); + } else { + userErrorCallback(task, onComplete); + } + } catch (Exception ex) { + userExceptionCallback(ex, onComplete); } + } } }); @@ -175,11 +189,15 @@ public void signInWithCustomToken(final String customToken, final Callback callb @Override public void onComplete(@NonNull Task task) { Log.d(TAG, "signInWithCustomToken:onComplete:" + task.isSuccessful()); - if (task.isSuccessful()) { - user = task.getResult().getUser(); - userCallback(user, callback); - } else { - userErrorCallback(task, callback); + try { + if (task.isSuccessful()) { + user = task.getResult().getUser(); + userCallback(user, callback); + } else { + userErrorCallback(task, callback); + } + } catch (Exception ex) { + userExceptionCallback(ex, onComplete); } } }); @@ -202,12 +220,16 @@ public void updateUserEmail(final String email, final Callback callback) { .addOnCompleteListener(new OnCompleteListener() { @Override public void onComplete(@NonNull Task task) { - if (task.isSuccessful()) { - Log.d(TAG, "User email address updated"); - FirebaseUser u = FirebaseAuth.getInstance().getCurrentUser(); - userCallback(u, callback); - } else { - userErrorCallback(task, callback); + try { + if (task.isSuccessful()) { + Log.d(TAG, "User email address updated"); + FirebaseUser u = FirebaseAuth.getInstance().getCurrentUser(); + userCallback(u, callback); + } else { + userErrorCallback(task, callback); + } + } catch (Exception ex) { + userExceptionCallback(ex, callback); } } }); @@ -228,13 +250,17 @@ public void updateUserPassword(final String newPassword, final Callback callback .addOnCompleteListener(new OnCompleteListener() { @Override public void onComplete(@NonNull Task task) { - if (task.isSuccessful()) { - Log.d(TAG, "User password updated"); + try { + if (task.isSuccessful()) { + Log.d(TAG, "User password updated"); - FirebaseUser u = FirebaseAuth.getInstance().getCurrentUser(); - userCallback(u, callback); - } else { - userErrorCallback(task, callback); + FirebaseUser u = FirebaseAuth.getInstance().getCurrentUser(); + userCallback(u, callback); + } else { + userErrorCallback(task, callback); + } + } catch (Exception ex) { + userExceptionCallback(ex, callback); } } }); @@ -254,6 +280,7 @@ public void sendPasswordResetWithEmail(final String email, final Callback callba .addOnCompleteListener(new OnCompleteListener() { @Override public void onComplete(@NonNull Task task) { + try { if(task.isSuccessful()){ WritableMap resp = Arguments.createMap(); resp.putString("status", "complete"); @@ -261,6 +288,9 @@ public void onComplete(@NonNull Task task) { }else{ callback.invoke(task.getException().toString()); } + } catch (Exception ex) { + userExceptionCallback(ex, callback); + } } }); } @@ -274,14 +304,18 @@ public void deleteUser(final Callback callback) { .addOnCompleteListener(new OnCompleteListener() { @Override public void onComplete(@NonNull Task task) { - if (task.isSuccessful()) { - Log.d(TAG, "User account deleted"); - WritableMap resp = Arguments.createMap(); - resp.putString("status", "complete"); - resp.putString("msg", "User account deleted"); - callback.invoke(null, resp); - } else { - userErrorCallback(task, callback); + try { + if (task.isSuccessful()) { + Log.d(TAG, "User account deleted"); + WritableMap resp = Arguments.createMap(); + resp.putString("status", "complete"); + resp.putString("msg", "User account deleted"); + callback.invoke(null, resp); + } else { + userErrorCallback(task, callback); + } + } catch (Exception ex) { + userExceptionCallback(ex, callback); } } }); @@ -301,17 +335,21 @@ public void getToken(final Callback callback) { .addOnCompleteListener(new OnCompleteListener() { @Override public void onComplete(@NonNull Task task) { - if (task.isSuccessful()) { - String token = task.getResult().getToken(); - WritableMap resp = Arguments.createMap(); - resp.putString("status", "complete"); - resp.putString("token", token); - callback.invoke(null, resp); - } else { - WritableMap err = Arguments.createMap(); - err.putInt("errorCode", ERROR_FETCHING_TOKEN); - err.putString("errorMessage", task.getException().getMessage()); - callback.invoke(err); + try { + if (task.isSuccessful()) { + String token = task.getResult().getToken(); + WritableMap resp = Arguments.createMap(); + resp.putString("status", "complete"); + resp.putString("token", token); + callback.invoke(null, resp); + } else { + WritableMap err = Arguments.createMap(); + err.putInt("errorCode", ERROR_FETCHING_TOKEN); + err.putString("errorMessage", task.getException().getMessage()); + callback.invoke(err); + } + } catch (Exception ex) { + userExceptionCallback(ex, callback); } } }); @@ -342,12 +380,16 @@ public void updateUserProfile(ReadableMap props, final Callback callback) { .addOnCompleteListener(new OnCompleteListener() { @Override public void onComplete(@NonNull Task task) { - if (task.isSuccessful()) { - Log.d(TAG, "User profile updated"); - FirebaseUser u = FirebaseAuth.getInstance().getCurrentUser(); - userCallback(u, callback); - } else { - userErrorCallback(task, callback); + try { + if (task.isSuccessful()) { + Log.d(TAG, "User profile updated"); + FirebaseUser u = FirebaseAuth.getInstance().getCurrentUser(); + userCallback(u, callback); + } else { + userErrorCallback(task, callback); + } + } catch (Exception ex) { + userExceptionCallback(ex, callback); } } }); @@ -386,12 +428,16 @@ public void googleLogin(String IdToken, final Callback callback) { .addOnCompleteListener(new OnCompleteListener() { @Override public void onComplete(@NonNull Task task) { + try { if (task.isSuccessful()) { user = task.getResult().getUser(); userCallback(user, callback); }else{ userErrorCallback(task, callback); } + } catch (Exception ex) { + userExceptionCallback(ex, callback); + } } }); } @@ -405,12 +451,16 @@ public void facebookLogin(String Token, final Callback callback) { .addOnCompleteListener(new OnCompleteListener() { @Override public void onComplete(@NonNull Task task) { + try { if (task.isSuccessful()) { user = task.getResult().getUser(); userCallback(user, callback); }else{ userErrorCallback(task, callback); } + } catch (Exception ex) { + userExceptionCallback(ex, callback); + } } }); } @@ -497,6 +547,15 @@ public void userErrorCallback(Task task, final Callback onFail) { onFail.invoke(error); } + public void userExceptionCallback(Exception ex, final Callback onFail) { + WritableMap error = Arguments.createMap(); + error.putInt("errorCode", ex.hashCode()); + error.putString("errorMessage", ex.getMessage()); + error.putString("allErrorMessage", ex.toString()); + + onFail.invoke(error); + } + private WritableMap getUserMap() { WritableMap userMap = Arguments.createMap(); From cb2967549af03565703cb32389332165c73e4c79 Mon Sep 17 00:00:00 2001 From: Elliot Hesp Date: Sun, 6 Nov 2016 15:15:26 +0000 Subject: [PATCH 2/7] Fix callback/syntax issues --- .../io/fullstack/firestack/FirestackAuth.java | 20 +++++++++---------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/android/src/main/java/io/fullstack/firestack/FirestackAuth.java b/android/src/main/java/io/fullstack/firestack/FirestackAuth.java index 40b0b8c..9812eef 100644 --- a/android/src/main/java/io/fullstack/firestack/FirestackAuth.java +++ b/android/src/main/java/io/fullstack/firestack/FirestackAuth.java @@ -1,3 +1,4 @@ + package io.fullstack.firestack; import android.content.Context; @@ -131,16 +132,15 @@ public void onComplete(@NonNull Task task) { try { if (task.isSuccessful()) { user = task.getResult().getUser(); - userCallback(user, onComplete); + userCallback(user, callback); } else { - userErrorCallback(task, onComplete); + userErrorCallback(task, callback); } } catch (Exception ex) { - userExceptionCallback(ex, onComplete); + userExceptionCallback(ex, callback); } } - } - }); + }); } @ReactMethod @@ -169,15 +169,13 @@ public void onComplete(@NonNull Task task) { user = task.getResult().getUser(); anonymousUserCallback(user, callback); } else { - userErrorCallback(task, onComplete); + userErrorCallback(task, callback); } } catch (Exception ex) { - userExceptionCallback(ex, onComplete); + userExceptionCallback(ex, callback); } } - } - }); - + }); } @ReactMethod @@ -197,7 +195,7 @@ public void onComplete(@NonNull Task task) { userErrorCallback(task, callback); } } catch (Exception ex) { - userExceptionCallback(ex, onComplete); + userExceptionCallback(ex, callback); } } }); From 909e0c6684ab1d39245a5da07921d5ffa75fd932 Mon Sep 17 00:00:00 2001 From: Ari Lerner Date: Sun, 6 Nov 2016 13:46:55 -0800 Subject: [PATCH 3/7] Added onFailureListeners to all auth android methods --- .../io/fullstack/firestack/FirestackAuth.java | 37 +++++++++++++++++-- 1 file changed, 33 insertions(+), 4 deletions(-) diff --git a/android/src/main/java/io/fullstack/firestack/FirestackAuth.java b/android/src/main/java/io/fullstack/firestack/FirestackAuth.java index 2abf485..4b82b60 100644 --- a/android/src/main/java/io/fullstack/firestack/FirestackAuth.java +++ b/android/src/main/java/io/fullstack/firestack/FirestackAuth.java @@ -118,7 +118,9 @@ public void onComplete(@NonNull Task task) { userExceptionCallback(ex, callback); } } - }); + }).addOnFailureListener(new OnFailureListener(Exception ex) { + userExceptionCallback(ex, callback); + }); } @ReactMethod @@ -140,7 +142,9 @@ public void onComplete(@NonNull Task task) { userExceptionCallback(ex, callback); } } - }); + }).addOnFailureListener(new OnFailureListener(Exception ex) { + userExceptionCallback(ex, callback); + }); } @ReactMethod @@ -175,7 +179,10 @@ public void onComplete(@NonNull Task task) { userExceptionCallback(ex, callback); } } - }); + }) + .addOnFailureListener(new OnFailureListener(Exception ex) { + userExceptionCallback(ex, callback); + }); } @ReactMethod @@ -198,6 +205,8 @@ public void onComplete(@NonNull Task task) { userExceptionCallback(ex, callback); } } + }).addOnFailureListener(new OnFailureListener(Exception ex) { + userExceptionCallback(ex, callback); }); } @@ -230,6 +239,8 @@ public void onComplete(@NonNull Task task) { userExceptionCallback(ex, callback); } } + }).addOnFailureListener(new OnFailureListener(Exception ex) { + userExceptionCallback(ex, callback); }); } else { WritableMap err = Arguments.createMap(); @@ -261,6 +272,8 @@ public void onComplete(@NonNull Task task) { userExceptionCallback(ex, callback); } } + }).addOnFailureListener(new OnFailureListener(Exception ex) { + userExceptionCallback(ex, callback); }); } else { WritableMap err = Arguments.createMap(); @@ -290,7 +303,9 @@ public void onComplete(@NonNull Task task) { userExceptionCallback(ex, callback); } } - }); + }).addOnFailureListener(new OnFailureListener(Exception ex) { + userExceptionCallback(ex, callback); + }); } @ReactMethod @@ -316,6 +331,8 @@ public void onComplete(@NonNull Task task) { userExceptionCallback(ex, callback); } } + }).addOnFailureListener(new OnFailureListener(Exception ex) { + userExceptionCallback(ex, callback); }); } else { WritableMap err = Arguments.createMap(); @@ -350,6 +367,8 @@ public void onComplete(@NonNull Task task) { userExceptionCallback(ex, callback); } } + }).addOnFailureListener(new OnFailureListener(Exception ex) { + userExceptionCallback(ex, callback); }); } @@ -390,6 +409,8 @@ public void onComplete(@NonNull Task task) { userExceptionCallback(ex, callback); } } + }).addOnFailureListener(new OnFailureListener(Exception ex) { + userExceptionCallback(ex, callback); }); } @@ -437,6 +458,8 @@ public void onComplete(@NonNull Task task) { userExceptionCallback(ex, callback); } } + }).addOnFailureListener(new OnFailureListener(Exception ex) { + userExceptionCallback(ex, callback); }); } @@ -460,6 +483,8 @@ public void onComplete(@NonNull Task task) { userExceptionCallback(ex, callback); } } + }).addOnFailureListener(new OnFailureListener(Exception ex) { + userExceptionCallback(ex, callback); }); } @@ -489,6 +514,8 @@ public void onComplete(@NonNull Task task) { callback.invoke(null, msgMap); } + }).addOnFailureListener(new OnFailureListener(Exception ex) { + userExceptionCallback(ex, callback); }); } @@ -519,6 +546,8 @@ public void onComplete(@NonNull Task task) { callback.invoke(null, msgMap); } + }).addOnFailureListener(new OnFailureListener(Exception ex) { + userExceptionCallback(ex, callback); }); } From 68ea9fb20978f45410566048d8e14de59fc195f8 Mon Sep 17 00:00:00 2001 From: Ari Lerner Date: Sun, 6 Nov 2016 14:01:17 -0800 Subject: [PATCH 4/7] Fixed addOnFailureListener --- .../io/fullstack/firestack/FirestackAuth.java | 111 ++++++++++++------ 1 file changed, 75 insertions(+), 36 deletions(-) diff --git a/android/src/main/java/io/fullstack/firestack/FirestackAuth.java b/android/src/main/java/io/fullstack/firestack/FirestackAuth.java index 4b82b60..c4127f7 100644 --- a/android/src/main/java/io/fullstack/firestack/FirestackAuth.java +++ b/android/src/main/java/io/fullstack/firestack/FirestackAuth.java @@ -118,8 +118,11 @@ public void onComplete(@NonNull Task task) { userExceptionCallback(ex, callback); } } - }).addOnFailureListener(new OnFailureListener(Exception ex) { - userExceptionCallback(ex, callback); + }).addOnFailureListener(new OnFailureListener() { + @Override + public void onFailure(@NonNull Exception ex) { + userExceptionCallback(ex, callback); + } }); } @@ -142,8 +145,11 @@ public void onComplete(@NonNull Task task) { userExceptionCallback(ex, callback); } } - }).addOnFailureListener(new OnFailureListener(Exception ex) { - userExceptionCallback(ex, callback); + }).addOnFailureListener(new OnFailureListener() { + @Override + public void onFailure(@NonNull Exception ex) { + userExceptionCallback(ex, callback); + } }); } @@ -205,9 +211,12 @@ public void onComplete(@NonNull Task task) { userExceptionCallback(ex, callback); } } - }).addOnFailureListener(new OnFailureListener(Exception ex) { - userExceptionCallback(ex, callback); - }); + }).addOnFailureListener(new OnFailureListener() { + @Override + public void onFailure(@NonNull Exception ex) { + userExceptionCallback(ex, callback); + } + }); } @ReactMethod @@ -239,9 +248,12 @@ public void onComplete(@NonNull Task task) { userExceptionCallback(ex, callback); } } - }).addOnFailureListener(new OnFailureListener(Exception ex) { - userExceptionCallback(ex, callback); - }); + }).addOnFailureListener(new OnFailureListener() { + @Override + public void onFailure(@NonNull Exception ex) { + userExceptionCallback(ex, callback); + } + }); } else { WritableMap err = Arguments.createMap(); err.putInt("errorCode", NO_CURRENT_USER); @@ -272,9 +284,12 @@ public void onComplete(@NonNull Task task) { userExceptionCallback(ex, callback); } } - }).addOnFailureListener(new OnFailureListener(Exception ex) { - userExceptionCallback(ex, callback); - }); + }).addOnFailureListener(new OnFailureListener() { + @Override + public void onFailure(@NonNull Exception ex) { + userExceptionCallback(ex, callback); + } + }); } else { WritableMap err = Arguments.createMap(); err.putInt("errorCode", NO_CURRENT_USER); @@ -303,9 +318,12 @@ public void onComplete(@NonNull Task task) { userExceptionCallback(ex, callback); } } - }).addOnFailureListener(new OnFailureListener(Exception ex) { + }).addOnFailureListener(new OnFailureListener() { + @Override + public void onFailure(@NonNull Exception ex) { userExceptionCallback(ex, callback); - }); + } + }); } @ReactMethod @@ -331,9 +349,12 @@ public void onComplete(@NonNull Task task) { userExceptionCallback(ex, callback); } } - }).addOnFailureListener(new OnFailureListener(Exception ex) { - userExceptionCallback(ex, callback); - }); + }).addOnFailureListener(new OnFailureListener() { + @Override + public void onFailure(@NonNull Exception ex) { + userExceptionCallback(ex, callback); + } + }); } else { WritableMap err = Arguments.createMap(); err.putInt("errorCode", NO_CURRENT_USER); @@ -367,9 +388,12 @@ public void onComplete(@NonNull Task task) { userExceptionCallback(ex, callback); } } - }).addOnFailureListener(new OnFailureListener(Exception ex) { - userExceptionCallback(ex, callback); - }); + }).addOnFailureListener(new OnFailureListener() { + @Override + public void onFailure(@NonNull Exception ex) { + userExceptionCallback(ex, callback); + } + }); } @ReactMethod @@ -409,9 +433,12 @@ public void onComplete(@NonNull Task task) { userExceptionCallback(ex, callback); } } - }).addOnFailureListener(new OnFailureListener(Exception ex) { - userExceptionCallback(ex, callback); - }); + }).addOnFailureListener(new OnFailureListener() { + @Override + public void onFailure(@NonNull Exception ex) { + userExceptionCallback(ex, callback); + } + }); } @ReactMethod @@ -458,9 +485,12 @@ public void onComplete(@NonNull Task task) { userExceptionCallback(ex, callback); } } - }).addOnFailureListener(new OnFailureListener(Exception ex) { - userExceptionCallback(ex, callback); - }); + }).addOnFailureListener(new OnFailureListener() { + @Override + public void onFailure(@NonNull Exception ex) { + userExceptionCallback(ex, callback); + } + }); } @ReactMethod @@ -483,9 +513,12 @@ public void onComplete(@NonNull Task task) { userExceptionCallback(ex, callback); } } - }).addOnFailureListener(new OnFailureListener(Exception ex) { - userExceptionCallback(ex, callback); - }); + }).addOnFailureListener(new OnFailureListener() { + @Override + public void onFailure(@NonNull Exception ex) { + userExceptionCallback(ex, callback); + } + }); } // Internal helpers @@ -514,9 +547,12 @@ public void onComplete(@NonNull Task task) { callback.invoke(null, msgMap); } - }).addOnFailureListener(new OnFailureListener(Exception ex) { - userExceptionCallback(ex, callback); - }); + }).addOnFailureListener(new OnFailureListener() { + @Override + public void onFailure(@NonNull Exception ex) { + userExceptionCallback(ex, callback); + } + }); } // TODO: Reduce to one method @@ -546,9 +582,12 @@ public void onComplete(@NonNull Task task) { callback.invoke(null, msgMap); } - }).addOnFailureListener(new OnFailureListener(Exception ex) { - userExceptionCallback(ex, callback); - }); + }).addOnFailureListener(new OnFailureListener() { + @Override + public void onFailure(@NonNull Exception ex) { + userExceptionCallback(ex, callback); + } + }); } From 063c5b1457696fcb7b465c3111e467b6b1365c73 Mon Sep 17 00:00:00 2001 From: Ari Lerner Date: Sun, 6 Nov 2016 14:07:19 -0800 Subject: [PATCH 5/7] Fixed addOnFailureListener --- .../main/java/io/fullstack/firestack/FirestackAuth.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/android/src/main/java/io/fullstack/firestack/FirestackAuth.java b/android/src/main/java/io/fullstack/firestack/FirestackAuth.java index c4127f7..5888526 100644 --- a/android/src/main/java/io/fullstack/firestack/FirestackAuth.java +++ b/android/src/main/java/io/fullstack/firestack/FirestackAuth.java @@ -186,9 +186,12 @@ public void onComplete(@NonNull Task task) { } } }) - .addOnFailureListener(new OnFailureListener(Exception ex) { + }).addOnFailureListener(new OnFailureListener() { + @Override + public void onFailure(@NonNull Exception ex) { userExceptionCallback(ex, callback); - }); + } + }); } @ReactMethod From 5f7ee6094e1d734c50698e5f2f8583aefd3e2d86 Mon Sep 17 00:00:00 2001 From: Ari Lerner Date: Mon, 7 Nov 2016 02:04:56 -0800 Subject: [PATCH 6/7] Fixed typo in FirestackAuth --- android/build.gradle | 14 +++++++------- .../java/io/fullstack/firestack/FirestackAuth.java | 4 ++-- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/android/build.gradle b/android/build.gradle index a06d876..edd8c3b 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -20,13 +20,13 @@ android { dependencies { compile 'com.facebook.react:react-native:0.20.+' - compile 'com.google.android.gms:play-services-base:9.8.0' + compile 'com.google.android.gms:play-services-base:9.6.0' - compile 'com.google.firebase:firebase-core:9.8.0' - compile 'com.google.firebase:firebase-auth:9.8.0' - compile 'com.google.firebase:firebase-analytics:9.8.0' - compile 'com.google.firebase:firebase-database:9.8.0' - compile 'com.google.firebase:firebase-storage:9.8.0' - compile 'com.google.firebase:firebase-messaging:9.8.0' + compile 'com.google.firebase:firebase-core:9.6.0' + compile 'com.google.firebase:firebase-auth:9.6.0' + compile 'com.google.firebase:firebase-analytics:9.6.0' + compile 'com.google.firebase:firebase-database:9.6.0' + compile 'com.google.firebase:firebase-storage:9.6.0' + compile 'com.google.firebase:firebase-messaging:9.6.0' } diff --git a/android/src/main/java/io/fullstack/firestack/FirestackAuth.java b/android/src/main/java/io/fullstack/firestack/FirestackAuth.java index 5888526..af783c1 100644 --- a/android/src/main/java/io/fullstack/firestack/FirestackAuth.java +++ b/android/src/main/java/io/fullstack/firestack/FirestackAuth.java @@ -185,7 +185,6 @@ public void onComplete(@NonNull Task task) { userExceptionCallback(ex, callback); } } - }) }).addOnFailureListener(new OnFailureListener() { @Override public void onFailure(@NonNull Exception ex) { @@ -568,7 +567,8 @@ public void anonymousUserCallback(FirebaseUser passedUser, final Callback callba this.user = passedUser; } - this.user.getToken(true).addOnCompleteListener(new OnCompleteListener() { + this.user.getToken(true) + .addOnCompleteListener(new OnCompleteListener() { @Override public void onComplete(@NonNull Task task) { WritableMap msgMap = Arguments.createMap(); From 9c4deeb6526df504f48c62240ba7fa0957b86d22 Mon Sep 17 00:00:00 2001 From: Ari Lerner Date: Tue, 8 Nov 2016 09:55:26 -0800 Subject: [PATCH 7/7] WIP: testing --- lib/__tests__/firestack.spec.js | 12 ++++++++ lib/firestack.js | 2 +- lib/utils/__tests__/log-test.js | 14 --------- lib/utils/__tests__/promisify-test.js | 2 -- lib/utils/__tests__/singleton-test.js | 2 -- package.json | 42 +++++++++++++++------------ test/firestack.test.js | 19 ------------ test/test-helper.js | 8 ++--- 8 files changed, 41 insertions(+), 60 deletions(-) create mode 100644 lib/__tests__/firestack.spec.js delete mode 100644 test/firestack.test.js diff --git a/lib/__tests__/firestack.spec.js b/lib/__tests__/firestack.spec.js new file mode 100644 index 0000000..39b1dd5 --- /dev/null +++ b/lib/__tests__/firestack.spec.js @@ -0,0 +1,12 @@ +// import 'React' +import Firestack from '../firestack.js' + +describe('Firestack', () => { + + it('does not blow up on instantiation', () => { + expect(function() { + new Firestack({}); + }).not.toThrow() + }) + +}) \ No newline at end of file diff --git a/lib/firestack.js b/lib/firestack.js index 8bcbbfa..9448a96 100644 --- a/lib/firestack.js +++ b/lib/firestack.js @@ -10,7 +10,7 @@ import Log from './utils/log' // const storage = require('firebase/storage'); // const db = require('firebase/database'); -import {NativeModules, NativeEventEmitter, AsyncStorage} from 'react-native'; +import RN, {NativeModules, NativeEventEmitter} from 'react-native'; // TODO: Break out modules into component pieces // i.e. auth component, storage component, etc. const FirestackModule = NativeModules.Firestack; diff --git a/lib/utils/__tests__/log-test.js b/lib/utils/__tests__/log-test.js index 2d49a0e..abf8842 100644 --- a/lib/utils/__tests__/log-test.js +++ b/lib/utils/__tests__/log-test.js @@ -1,5 +1,3 @@ -jest.unmock('../log'); -jest.unmock('../window-or-global') import Log from '../log'; import root from '../window-or-global'; @@ -15,18 +13,6 @@ describe('Log', () => { expect(log).toBeDefined(); }); - it('can be enabled', () => { - log = new Log('test', true); - expect(log.enabled).toBeTruthy(); - }); - - it('can be disabled', () => { - log = new Log('test', true); - expect(log.enabled).toBeTruthy(); - log.enable(false); - expect(log.enabled).toBeFalsy(); - }); - describe('levels', () => { beforeEach(() => { log = new Log('test', true); diff --git a/lib/utils/__tests__/promisify-test.js b/lib/utils/__tests__/promisify-test.js index b159c66..f9f3cc6 100644 --- a/lib/utils/__tests__/promisify-test.js +++ b/lib/utils/__tests__/promisify-test.js @@ -1,5 +1,3 @@ -jest.unmock('../promisify'); - import promisify from '../promisify'; import sinon from 'sinon' diff --git a/lib/utils/__tests__/singleton-test.js b/lib/utils/__tests__/singleton-test.js index fb7a35c..4209f5d 100644 --- a/lib/utils/__tests__/singleton-test.js +++ b/lib/utils/__tests__/singleton-test.js @@ -1,5 +1,3 @@ -jest.unmock('../singleton'); - import Singleton from '../singleton'; import sinon from 'sinon' diff --git a/package.json b/package.json index e611094..735c0b0 100644 --- a/package.json +++ b/package.json @@ -17,13 +17,18 @@ "url": "https://github.com/fullstackreact/react-native-firestack.git" }, "jest": { - "preset": "jest-react-native", - "setupFiles": [], - "unmockedModulePathPatterns": [ - "./node_modules/react", - "./node_modules/react-native", - "./node_modules/react-native-mock", - "./node_modules/react-addons-test-utils" + "globals": { + "__DEV__": true + }, + "verbose": false, + "setupFiles": [ + "test/test-helper.js" + ], + "modulePaths": [ + "/node_modules/react-native" + ], + "modulePathIgnorePatterns": [ + "/node_modules/react" ] }, "license": "ISC", @@ -51,18 +56,19 @@ } }, "devDependencies": { - "babel-jest": "^14.1.0", + "babel-jest": "^16.0.0", "babel-preset-react-native": "^1.9.0", - "debug": "^2.2.0", - "enzyme": "^2.4.1", - "jest": "^14.1.0", - "jest-react-native": "^14.1.3", - "mocha": "^3.0.2", - "react": "^15.3.0", - "react-dom": "^15.3.0", - "react-native-mock": "^0.2.6", - "react-test-renderer": "^15.3.0", - "should": "^11.1.0", + "debug": "^2.3.0", + "enzyme": "^2.5.1", + "jest": "^16.0.2", + "jest-react-native": "^16.1.0", + "mocha": "^3.1.2", + "react": "^15.3.2", + "react-dom": "^15.3.2", + "react-native": "^0.36.1", + "react-native-mock": "^0.2.7", + "react-test-renderer": "^15.3.2", + "should": "^11.1.1", "sinon": "^2.0.0-pre.2" }, "dependencies": { diff --git a/test/firestack.test.js b/test/firestack.test.js deleted file mode 100644 index 0388a1a..0000000 --- a/test/firestack.test.js +++ /dev/null @@ -1,19 +0,0 @@ -const should = require('should'); -const { shallow } = require('enzyme'); -const Firestack = require('..'); -const React = require('react'); - -describe('Firestack', () => { - - let firestackInstance; - - before(() => { - firestackInstance = new Firestack({ - - }); - }); - - it('can be configured', () => { - true.should.be.false; - }); -}); \ No newline at end of file diff --git a/test/test-helper.js b/test/test-helper.js index 32d3926..ee8439b 100644 --- a/test/test-helper.js +++ b/test/test-helper.js @@ -1,7 +1,7 @@ -require('react-native-mock/mock'); +// require('react-native-mock'); -var { NativeEventEmitter, NativeModules } = require('react-native'); +// var { NativeEventEmitter, NativeModules } = require('react-native'); -NativeModules.Firestack = { +// NativeModules.Firestack = { -} \ No newline at end of file +// } \ No newline at end of file