Skip to content

Commit a9f8be7

Browse files
auserauser
committed
Added notes
1 parent 6150364 commit a9f8be7

File tree

3 files changed

+130
-40
lines changed

3 files changed

+130
-40
lines changed

‎android/src/main/java/io/fullstack/firestack/FirestackModule.java

Lines changed: 123 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@ public void onAuthStateChanged(@NonNull FirebaseAuth firebaseAuth) {
138138
}
139139

140140
@ReactMethod
141-
public void createUserWithEmailAndPassword(final String email, final String password, final Callback onSuccess, final Callback onFail) {
141+
public void createUserWithEmail(final String email, final String password, final Callback onComplete) {
142142
mAuth = FirebaseAuth.getInstance();
143143

144144
mAuth.createUserWithEmailAndPassword(email, password)
@@ -147,16 +147,16 @@ public void createUserWithEmailAndPassword(final String email, final String pass
147147
public void onComplete(@NonNull Task<AuthResult> task) {
148148
if (task.isSuccessful()) {
149149
user = task.getResult().getUser();
150-
userCallback(onSuccess);
150+
userCallback(user, onComplete);
151151
}else{
152-
userErrorCallback(task, onFail);
152+
userErrorCallback(task, onComplete);
153153
}
154154
}
155155
});
156156
}
157157

158158
@ReactMethod
159-
public void signInWithEmailAndPassword(final String email, final String password, final Callback onSuccess, final Callback onFail) {
159+
public void signInWithEmail(final String email, final String password, final Callback onSuccess, final Callback onFail) {
160160
mAuth = FirebaseAuth.getInstance();
161161

162162
mAuth.signInWithEmailAndPassword(email, password)
@@ -165,7 +165,7 @@ public void signInWithEmailAndPassword(final String email, final String password
165165
public void onComplete(@NonNull Task<AuthResult> task) {
166166
if (task.isSuccessful()) {
167167
user = task.getResult().getUser();
168-
userCallback(onSuccess);
168+
userCallback(user, onSuccess);
169169
} else {
170170
userErrorCallback(task, onFail);
171171
}
@@ -174,36 +174,100 @@ public void onComplete(@NonNull Task<AuthResult> task) {
174174
}
175175

176176
@ReactMethod
177-
public void getCurrentUser(final Callback onSuccess, final Callback onFail) {
178-
mAuth = FirebaseAuth.getInstance();
177+
public void signInWithProvider(final String provider, final String authToken, final String authSecret, final Callback callback) {
178+
// TODO
179+
todoNote("signInWithProvider", callback);
180+
}
179181

180-
user = mAuth.getCurrentUser();
181-
if(user == null){
182-
onFail.invoke("not logged in");
183-
}else{
184-
userCallback(onSuccess);
185-
}
182+
@ReactMethod
183+
public void signInWithCustomToken(final String customToken, final Callback callback) {
184+
// TODO
185+
todoNote("signInWithCustomToken", callback);
186+
}
187+
188+
@ReactMethod
189+
public void reauthenticateWithCredentialForProvider(final String provider, final String authToken, final String authSecret, final Callback callback) {
190+
// TODO:
191+
todoNote("reauthenticateWithCredentialForProvider", callback);
186192
}
187193

188194
@ReactMethod
189-
public void sendPasswordResetEmail(String email, final Callback onSuccess, final Callback onFail) {
195+
public void updateUserEmail(final String email, final Callback callback) {
196+
// TODO
197+
todoNote("updateUserEmail", callback);
198+
}
199+
200+
@ReactMethod
201+
public void updateUserPassword(final String newPassword, final Callback callback) {
202+
// TODO
203+
todoNote("updateUserPassword", callback);
204+
}
205+
206+
@ReactMethod
207+
public void sendPasswordResetWithEmail(final String email, final Callback callback) {
190208
mAuth = FirebaseAuth.getInstance();
191209

192210
mAuth.sendPasswordResetEmail(email)
193211
.addOnCompleteListener(new OnCompleteListener<Void>() {
194212
@Override
195213
public void onComplete(@NonNull Task<Void> task) {
196214
if(task.isSuccessful()){
197-
onSuccess.invoke("complete");
215+
WritableMap resp = new WritableMap();
216+
resp.putString("status", "complete");
217+
callback.invoke(null, resp);
198218
}else{
199-
onFail.invoke(task.getException().toString());
219+
callback.invoke(task.getException().toString());
200220
}
201221
}
202222
});
203223
}
204224

205225
@ReactMethod
206-
public void googleLogin(String IdToken, final Callback onSuccess, final Callback onFail) {
226+
public void deleteUser(final Callback callback) {
227+
// TODO
228+
todoNote("deleteUser", callback);
229+
}
230+
231+
@ReactMethod
232+
public void getToken(final Callback callback) {
233+
// TODO
234+
todoNote("getToken", callback);
235+
}
236+
237+
@ReactMethod
238+
public void updateUserProfile(final ReadableMap props, final Callback callback) {
239+
// TODO
240+
todoNote("updateUserProfile", callback);
241+
}
242+
243+
@ReactMethod
244+
public void signOut(final Callback callback) {
245+
// TODO
246+
todoNote("signOut", callback);
247+
}
248+
249+
@ReactMethod
250+
public void getCurrentUser(final Callback callback) {
251+
mAuth = FirebaseAuth.getInstance();
252+
253+
user = mAuth.getCurrentUser();
254+
if(user == null){
255+
noUserCallback(callback)
256+
}else{
257+
userCallback(user, callback);
258+
}
259+
}
260+
261+
@ReactMethod
262+
public void logEventWithName(final String name, final String props, final Callback callback) {
263+
// TODO
264+
todoNote("logEventWithName", callback);
265+
}
266+
267+
268+
// TODO: Check these things
269+
@ReactMethod
270+
public void googleLogin(String IdToken, final Callback callback) {
207271
mAuth = FirebaseAuth.getInstance();
208272

209273
AuthCredential credential = GoogleAuthProvider.getCredential(IdToken, null);
@@ -240,10 +304,30 @@ public void onComplete(@NonNull Task<AuthResult> task) {
240304
});
241305
}
242306

243-
public void userCallback(final Callback onSuccess) {
244-
mAuth = FirebaseAuth.getInstance();
307+
// STORAGE
308+
@ReactMethod
309+
public void uploadFile(final String name, final String filepath, final ReadableMap metadata, final Callback callback) {
310+
// TODO
311+
todoNote("uploadFile", callback);
312+
}
313+
314+
// TODO NOTE
315+
public void todoNote(final String name, final Callback callback) {
316+
Log.e(TAG, "The method " + name + " has not yet been implemented.")
317+
Log.e(TAG, "Feel free to contribute to finish the method in the source.")
318+
WritableMap errorMap = Arguments.createMap();
319+
errorMap.putString("error", "unimplemented");
320+
callback.invoke(errorMap);
321+
}
322+
323+
public void userCallback(@Nullable FirebaseUser user, final Callback onComplete) {
245324
WritableMap userMap = getUserMap();
246325

326+
if (!user) {
327+
mAuth = FirebaseAuth.getInstance();
328+
user = mAuth.getCurrentUser();
329+
}
330+
247331
user.getToken(true).addOnCompleteListener(new OnCompleteListener<GetTokenResult>() {
248332
@Override
249333
public void onComplete(@NonNull Task<GetTokenResult> task) {
@@ -254,11 +338,30 @@ public void onComplete(@NonNull Task<GetTokenResult> task) {
254338
userMap.putString("uid", user.getUid());
255339
userMap.putString("provider", user.getProviderId());
256340

257-
onSuccess.invoke(userMap);
341+
onComplete.invoke(null, userMap);
258342
}
259343
});
260344
}
261345

346+
public void noUserCallback(final Callback callback) {
347+
WritableMap message = Arguments.createMap();
348+
349+
message.putString("errorMessage", "no_user");
350+
message.putString("eventName", "no_user");
351+
message.putBoolean("authenticated", false);
352+
353+
callback.invoke(null, message);
354+
}
355+
356+
public void userErrorCallback(Task<AuthResult> task, final Callback onFail) {
357+
WritableMap error = Arguments.createMap();
358+
error.putInt("errorCode", task.getException().hashCode());
359+
error.putString("errorMessage", task.getException().getMessage());
360+
error.putString("allErrorMessage", task.getException().toString());
361+
362+
onFail.invoke(error);
363+
}
364+
262365
private WritableMap getUserMap() {
263366
WritableMap userMap = Arguments.createMap();
264367

@@ -279,25 +382,6 @@ private void sendEvent(String eventName,
279382
.emit(eventName, params);
280383
}
281384

282-
public void noUserCallback(final Callback callback) {
283-
WritableMap message = Arguments.createMap();
284-
285-
message.putString("errorMessage", "no_user");
286-
message.putString("eventName", "no_user");
287-
message.putBoolean("authenticated", false);
288-
289-
callback.invoke(message);
290-
}
291-
292-
public void userErrorCallback(Task<AuthResult> task, final Callback onFail) {
293-
WritableMap error = Arguments.createMap();
294-
error.putInt("errorCode", task.getException().hashCode());
295-
error.putString("errorMessage", task.getException().getMessage());
296-
error.putString("allErrorMessage", task.getException().toString());
297-
298-
onFail.invoke(error);
299-
}
300-
301385
@Override
302386
public void onHostResume() {
303387
WritableMap params = Arguments.createMap();

‎firestack.ios.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,6 @@
22
* @providesModule Firestack
33
* @flow
44
*/
5-
export { Firestack } from './lib/firestack'
5+
import Firestack from './lib/firestack'
66

77
export default Firestack

‎lib/firestack.js

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,22 +64,27 @@ export class Firestack {
6464

6565
// Auth
6666
listenForAuth(callback) {
67+
log.info('Setting up listenForAuth callback');
68+
6769
this.on('listenForAuth', auth => {
6870
this._updateUserTokenFromPromise(Promise.resolve(auth));
6971
});
7072

7173
const sub = this.on('listenForAuth', callback);
7274
FirebaseHelper.listenForAuth();
75+
log.info('Listening for auth...');
7376
return promisify(() => sub)(sub);
7477
}
7578

7679
unlistenForAuth() {
80+
log.info('Unlistening for auth');
7781
this.off('listenForAuth');
7882
return promisify('unlistenForAuth')();
7983
}
8084

8185
setStore(store) {
8286
if (store) {
87+
log.info('Setting the store for Firestack instance');
8388
this._store = store;
8489
}
8590
}
@@ -91,6 +96,7 @@ export class Firestack {
9196
* @return {Promise} A promise indicating the completion
9297
*/
9398
createUserWithEmail(email, password) {
99+
log.info('Creating user with email', email);
94100
return promisify('createUserWithEmail')(email, password);
95101
}
96102

0 commit comments

Comments
 (0)