Add return params in a consistent order for iOS and Android

Author: Kadi Kraman

README.md

@@ -68,11 +68,11 @@ Must be string values! E.g. setting `additionalParameters: { hello: 'world', foo
 
 This is the result from the auth server
 - **accessToken** - (`string`) the access token
-- **tokenType** - (`string`) the token type, e.g. Bearer
 - **accessTokenExpirationDate** - (`string`) the token expiration date
-- **refreshToken** - (`string`) the refresh token
-- **idToken** - (`string`) the id token
 - **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`
 

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

@@ -59,14 +59,6 @@ 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 map = Arguments.createMap();
-        map.putString("accessToken", response.accessToken);
-        map.putString("tokenType", response.tokenType);
-        map.putString("accessTokenExpirationDate", expirationDateString);
-        map.putString("refreshToken", response.refreshToken);
-        map.putString("idToken", response.idToken);
-
         WritableMap additionalParametersMap = Arguments.createMap();
 
         if (!response.additionalParameters.isEmpty()) {
@@ -81,7 +73,13 @@ private WritableMap tokenResponseToMap(TokenResponse response) {
             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,11 +118,11 @@ - (dispatch_queue_t)methodQueue
 
                                                                                                 resolve(@{
                                                                                                           @"accessToken": response.accessToken ? response.accessToken : @"",
-                                                                                                          @"refreshToken": response.refreshToken ? response.refreshToken : @"",
                                                                                                           @"accessTokenExpirationDate": exporationDateString,
-                                                                                                          @"tokenType": response.tokenType ? response.tokenType : @"",
-                                                                                                          @"idToken": response.idToken ? response.idToken : @"",
                                                                                                           @"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);