Added slack support auth for iOS

Author: auser

ios/OAuthManager/OAuthManager.m

@@ -379,6 +379,8 @@ - (NSDictionary *) getConfigForProvider:(NSString *)name
         return;
     }
 
+    NSDictionary *creds = [self credentialForAccount:providerName cfg:cfg];
+    
     // If we have the http in the string, use it as the URL, otherwise create one
     // with the configuration
     NSURL *apiUrl;
@@ -394,8 +396,18 @@ - (NSDictionary *) getConfigForProvider:(NSString *)name
     NSDictionary *params = [opts objectForKey:@"params"];
     if (params != nil) {
         for (NSString *key in params) {
-            NSURLQueryItem *item = [NSURLQueryItem queryItemWithName:key value:[params valueForKey:key]];
-            [items addObject:item];
+            
+            NSString *value = [params valueForKey:key];
+            
+            if ([value isEqualToString:@"access_token"]) {
+                value = [creds valueForKey:@"access_token"];
+            }
+            
+            NSURLQueryItem *item = [NSURLQueryItem queryItemWithName:key value:value];
+            
+            if (item != nil) {
+                [items addObject:item];
+            }
         }
     }
 
@@ -479,6 +491,31 @@ - (DCTAuthAccount *) accountForProvider:(NSString *) providerName
     }
 }
 
+- (NSDictionary *) credentialForAccount:(NSString *)providerName
+                                                cfg:(NSDictionary *)cfg
+{
+    DCTAuthAccount *account = [self accountForProvider:providerName];
+    if (!account) {
+        return nil;
+    }
+    
+    id credentials;
+    NSString *version = [cfg valueForKey:@"auth_version"];
+    if ([version isEqualToString:@"1.0"]) {
+        credentials = [account credential];
+    } else if ([version isEqualToString:@"2.0"]) {
+        credentials = [account credential];
+    } else {
+        return nil;
+    }
+    
+    NSDictionary *dict = @{
+                           @"access_token": [credentials accessToken]
+                           };
+    
+    return dict;
+}
+
 - (DCTAuthRequestMethod) getRequestMethodByString:(NSString *) method
 {
     if ([method compare:@"get" options:NSCaseInsensitiveSearch] == NSOrderedSame) {

lib/authProviders.js

@@ -59,6 +59,20 @@ export const authProviders = {
     api_url: 'https://api.github.com',
     callback_url: ({app_name}) => `${app_name}://oauth`,
     validate: validate()
+  },
+  'slack': {
+    auth_version: '2.0',
+    authorize_url: 'https://slack.com/oauth/authorize',
+    access_token_url: 'https://slack.com/api/oauth.access',
+    api_url: 'https://slack.com/api',
+    callback_url: ({app_name}) => `${app_name}://oauth`,
+    defaultParams: {
+      token: 'access_token'
+    },
+    validate: validate({
+      client_id: [notEmpty],
+      client_secret: [notEmpty]
+    })
   }
 }
 

react-native-oauth.js

@@ -67,6 +67,8 @@ export default class OAuthManager {
       app_name: this.appName
     });
 
+    console.log('making request', provider, url, opts);
+
     return promisify('makeRequest')(provider, url, options)
       .then(response => {
         // Little bit of a hack to support Android until we have a better
@@ -107,16 +109,19 @@ export default class OAuthManager {
     invariant(OAuthManager.isSupported(name), `The provider ${name} is not supported yet`);
 
     const providerCfg = Object.assign({}, authProviders[name]);
-    let { validate = identity, transform = identity, callback_url, api_url } = providerCfg;
+    let { validate = identity, transform = identity, callback_url } = providerCfg;
     delete providerCfg.transform;
     delete providerCfg.validate;
 
     let config = Object.assign({}, {
       app_name: this.appName,
-      callback_url,
-      api_url
+      callback_url
     }, providerCfg, props);
 
+    if (config.defaultParams) {
+      delete config.defaultParams;
+    }
+
     config = Object.keys(config)
       .reduce((sum, key) => ({
         ...sum,