Merge pull request #34 from FormidableLabs/bugfix/missing-params

Bugfix/missing params

Author: jevakallio

README.md

@@ -54,16 +54,26 @@ const result = await appAuth.authorize(scopes);
 // returns accessToken, accessTokenExpirationDate and refreshToken
 ```
 
-#### config
+#### `config`
 
 This is your configuration object for the client
-- **issuer**: (`string`) *REQUIRED* the url of the auth server
-- **clientId**: (`string`) *REQUIRED* your client id on the auth server
-- **redirectUrl**: (`string`) *REQUIRED* the url that links back to your app with the auth code
-- **additionalParameters**: (`object` | `null`) additional parameters that will be passed in the authorization request.
+- **issuer** - (`string`) *REQUIRED* the url of the auth server
+- **clientId** - (`string`) *REQUIRED* your client id on the auth server
+- **redirectUrl** - (`string`) *REQUIRED* the url that links back to your app with the auth code
+- **additionalParameters** - (`object` | `null`) additional parameters that will be passed in the authorization request.
 Must be string values! E.g. setting `additionalParameters: { hello: 'world', foo: 'bar' }` would add
 `hello=world&foo=bar` to the authorization request.
 
+### `result`
+
+This is the result from the auth server
+- **accessToken** - (`string`) the access token
+- **accessTokenExpirationDate** - (`string`) the token expiration date
+- **additionalParameters** - (`Object`) additional url parameters from the auth server
+- **idToken** - (`string`) the id token
+- **refreshToken** - (`string`) the refresh token
+- **tokenType** - (`string`) the token type, e.g. Bearer
+
 ### `refresh`
 
 This method will refresh the accessToken using the refreshToken. Some auth providers will also give

android/src/main/java/com/reactlibrary/RNAppAuthModule.java

@@ -29,6 +29,7 @@
 import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.HashMap;
+import java.util.Iterator;
 
 public class RNAppAuthModule extends ReactContextBaseJavaModule implements ActivityEventListener {
 
@@ -58,11 +59,28 @@ private WritableMap tokenResponseToMap(TokenResponse response) {
         Date expirationDate = new Date(response.accessTokenExpirationTime);
         SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ssZ");
         String expirationDateString = formatter.format(expirationDate);
+        WritableMap additionalParametersMap = Arguments.createMap();
+
+        if (!response.additionalParameters.isEmpty()) {
+
+            Iterator<String> iterator = response.additionalParameters.keySet().iterator();
+
+            while(iterator.hasNext()) {
+                String key = iterator.next();
+                additionalParametersMap.putString(key, response.additionalParameters.get(key));
+            }
+
+            map.putMap("additionalParameters", additionalParametersMap);
+        }
 
         WritableMap map = Arguments.createMap();
         map.putString("accessToken", response.accessToken);
         map.putString("accessTokenExpirationDate", expirationDateString);
+        map.putMap("additionalParameters", additionalParametersMap);
+        map.putString("idToken", response.idToken);
         map.putString("refreshToken", response.refreshToken);
+        map.putString("tokenType", response.tokenType);
+
         return map;
     }
 

ios/RNAppAuth.m

@@ -57,11 +57,11 @@ - (dispatch_queue_t)methodQueue
 
                                                                                                            NSDictionary *authStateDict = @{
                                                                                                                                            @"accessToken": authState.lastTokenResponse.accessToken,
-                                                                                                                                           @"tokenType": authState.lastTokenResponse.tokenType,
                                                                                                                                            @"accessTokenExpirationDate": exporationDateString,
+                                                                                                                                           @"additionalParameters": authState.lastTokenResponse.additionalParameters,
                                                                                                                                            @"idToken": authState.lastTokenResponse.idToken,
                                                                                                                                            @"refreshToken": authState.lastTokenResponse.refreshToken ? authState.lastTokenResponse.refreshToken : @"",
-                                                                                                                                           @"additionalParameters": authState.lastTokenResponse.additionalParameters,
+                                                                                                                                           @"tokenType": authState.lastTokenResponse.tokenType,
                                                                                                                                            };
                                                                                                            resolve(authStateDict);
                                                                                                          } else {
@@ -118,8 +118,11 @@ - (dispatch_queue_t)methodQueue
 
                                                                                                 resolve(@{
                                                                                                           @"accessToken": response.accessToken ? response.accessToken : @"",
-                                                                                                          @"refreshToken": response.refreshToken ? response.refreshToken : @"",
                                                                                                           @"accessTokenExpirationDate": exporationDateString,
+                                                                                                          @"additionalParameters": response.additionalParameters,
+                                                                                                          @"idToken": response.idToken ? response.idToken : @"",
+                                                                                                          @"refreshToken": response.refreshToken ? response.refreshToken : @"",
+                                                                                                          @"tokenType": response.tokenType ? response.tokenType : @"",
                                                                                                           });
                                                                                               } else {
                                                                                                 reject(@"RNAppAuth Error", [error localizedDescription], error);