Merge branch 'v3' into pr-208

* v3:
  Updated next version
  Make firestackModule.js working for v3
  Added github auth into v3
  Consistency with values emitted by firebase.auth.AuthProvider subclasses

Author: auser

ios/Firestack/FirestackAuth.m

@@ -67,14 +67,10 @@ @implementation FirestackAuth
 }
 
 RCT_EXPORT_METHOD(signInWithProvider:
-                  (NSString *)provider
-                  token:(NSString *)authToken
-                  secret:(NSString *)authTokenSecret
+                  (NSDictionary *)credentialData
                   callback:(RCTResponseSenderBlock)callback)
 {
-    FIRAuthCredential *credential = [self getCredentialForProvider:provider
-                                                             token:authToken
-                                                            secret:authTokenSecret];
+    FIRAuthCredential *credential = [self getCredentialForProvider:credentialData];
     if (credential == nil) {
         NSDictionary *err = @{
                               @"error": @"Unhandled provider"
@@ -340,14 +336,10 @@ @implementation FirestackAuth
 }
 
 RCT_EXPORT_METHOD(reauthenticateWithCredentialForProvider:
-                  (NSString *)provider
-                  token:(NSString *)authToken
-                  secret:(NSString *)authTokenSecret
+                  (NSDictionary *)credentialData
                   callback:(RCTResponseSenderBlock)callback)
 {
-    FIRAuthCredential *credential = [self getCredentialForProvider:provider
-                                                             token:authToken
-                                                            secret:authTokenSecret];
+    FIRAuthCredential *credential = [self getCredentialForProvider:credentialData];
     if (credential == nil) {
         NSDictionary *err = @{
                               @"error": @"Unhandled provider"
@@ -440,19 +432,23 @@ - (void) userPropsFromFIRUserWithToken:(FIRUser *) user
     }];
 }
 
-- (FIRAuthCredential *)getCredentialForProvider:(NSString *)provider
-                                          token:(NSString *)authToken
-                                         secret:(NSString *)authTokenSecret
+- (FIRAuthCredential *)getCredentialForProvider:(NSDictionary *)credentialData
 {
     FIRAuthCredential *credential;
-    if ([provider compare:@"twitter" options:NSCaseInsensitiveSearch] == NSOrderedSame) {
-        credential = [FIRTwitterAuthProvider credentialWithToken:authToken
-                                                          secret:authTokenSecret];
-    } else if ([provider compare:@"facebook" options:NSCaseInsensitiveSearch] == NSOrderedSame) {
-        credential = [FIRFacebookAuthProvider credentialWithAccessToken:authToken];
-    } else if ([provider compare:@"google" options:NSCaseInsensitiveSearch] == NSOrderedSame) {
-        credential = [FIRGoogleAuthProvider credentialWithIDToken:authToken
-                                                      accessToken:authTokenSecret];
+    NSString *provider = [credentialData valueForKey:@"provider"];
+    if ([provider compare:@"twitter.com" options:NSCaseInsensitiveSearch] == NSOrderedSame) {
+        NSString *accessToken = [credentialData valueForKey:@"accessToken"];
+        NSString *secret = [credentialData valueForKey:@"secret"];
+        credential = [FIRTwitterAuthProvider credentialWithToken:accessToken
+                                                          secret:secret];
+    } else if ([provider compare:@"facebook.com" options:NSCaseInsensitiveSearch] == NSOrderedSame) {
+        NSString *accessToken = [credentialData valueForKey:@"accessToken"];
+        credential = [FIRFacebookAuthProvider credentialWithAccessToken:accessToken];
+    } else if ([provider compare:@"google.com" options:NSCaseInsensitiveSearch] == NSOrderedSame) {
+        NSString *idToken = [credentialData valueForKey:@"idToken"];
+        NSString *accessToken = [credentialData valueForKey:@"accessToken"];
+        credential = [FIRGoogleAuthProvider credentialWithIDToken:idToken
+                                                      accessToken:accessToken];
     } else {
         NSLog(@"Provider not yet handled: %@", provider);
     }

lib/firestackModule.js

@@ -56,7 +56,7 @@ export class FirestackModule {
 
   makeRef(path) {
     const refName = [this._refName, path]
-    const ref = this._firestack.database.ref(...refName);
+    const ref = this._firestack.database().ref(...refName);
     return this._makeRef(ref);
   }
 

lib/modules/auth/index.js

@@ -150,16 +150,16 @@ export default class Auth extends Base {
    * Sign the user in with a third-party authentication provider
    * @return {Promise}           A promise resolved upon completion
    */
-  signInWithCredential(credential: CredentialType): Promise<Object> {
-    return promisify('signInWithProvider', FirestackAuth, 'auth/')(credential.provider, credential.token, credential.secret);
+  signInWithCredential(credential: any): Promise<Object> {
+    return promisify('signInWithProvider', FirestackAuth)(credential);
   }
 
   /**
    * Re-authenticate a user with a third-party authentication provider
    * @return {Promise}         A promise resolved upon completion
    */
-  reauthenticateUser(credential: CredentialType): Promise<Object> {
-    return promisify('reauthenticateWithCredentialForProvider', FirestackAuth, 'auth/')(credential.provider, credential.token, credential.secret);
+  reauthenticateUser(credential: any): Promise<Object> {
+    return promisify('reauthenticateWithCredentialForProvider', FirestackAuth)(credential);
   }
 
   /**

package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-firestack",
-  "version": "3.0.0-rc.2",
+  "version": "3.0.0-rc.3",
   "author": "Ari Lerner <[email protected]> (https://fullstackreact.com)",
   "description": "A firebase v3 adapter",
   "main": "index",