v3.1.0

README.md

@@ -2,6 +2,11 @@
 <h2 align="center">React Native App Auth</h2>
 <p align="center">
 <strong>React native bridge for AppAuth - an SDK for communicating with OAuth2 providers</strong>
+</p>
+<br><br>
+<p align="center">
+<img src="https://media.giphy.com/media/30pELz7CcpHsRINk7S/giphy.gif" />
+</p>
 <br><br>
 
 [![Build Status](https://travis-ci.org/FormidableLabs/react-native-app-auth.svg?branch=master)](https://travis-ci.org/FormidableLabs/react-native-app-auth)

android/build.gradle

@@ -5,7 +5,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:1.3.1'
+        classpath 'com.android.tools.build:gradle:2.3.2'
     }
 }
 
@@ -14,7 +14,7 @@ apply plugin: 'com.android.library'
 android {
     compileSdkVersion 23
     buildToolsVersion '26.0.2'
-    
+
     defaultConfig {
         minSdkVersion 16
         targetSdkVersion 22

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

@@ -54,6 +54,10 @@ public RNAppAuthModule(ReactApplicationContext reactContext) {
         this.reactContext = reactContext;
         reactContext.addActivityEventListener(this);
     }
+    @Override
+    public void onNewIntent(Intent intent) {
+
+    }
 
     @ReactMethod
     public void authorize(
@@ -210,7 +214,18 @@ public void onActivityResult(Activity activity, int requestCode, int resultCode,
             AuthorizationResponse response = AuthorizationResponse.fromIntent(data);
             AuthorizationException exception = AuthorizationException.fromIntent(data);
             if (exception != null) {
-                promise.reject("RNAppAuth Error", "Failed to authenticate", exception);
+                this.promise.reject("RNAppAuth Error", "Failed to authenticate", exception);
+                return;
+            }
+
+            if (this.additionalParametersMap.containsKey("skipTokenExchange")
+                    && this.additionalParametersMap.get("skipTokenExchange") != null
+                    && this.additionalParametersMap.get("skipTokenExchange").equals("true")) {
+                WritableMap map = Arguments.createMap();
+                map.putString("code", response.authorizationCode);
+                map.putString("state", response.state);
+                map.putString("redirectUri", response.request.redirectUri.toString());
+                this.promise.resolve(map);
                 return;
             }
 
@@ -223,8 +238,8 @@ public void onActivityResult(Activity activity, int requestCode, int resultCode,
 
             TokenRequest tokenRequest = response.createTokenExchangeRequest(this.additionalParametersMap);
 
-            AuthorizationService.TokenResponseCallback tokenResponseCallback = new AuthorizationService.TokenResponseCallback() {
-
+            AuthorizationService.TokenResponseCallback tokenResponseCallback
+                    = new AuthorizationService.TokenResponseCallback() {
                 @Override
                 public void onTokenRequestCompleted(
                         TokenResponse resp, AuthorizationException ex) {
@@ -466,12 +481,17 @@ private AuthorizationServiceConfiguration createAuthorizationServiceConfiguratio
             throw new Exception("serviceConfiguration passed without an authorizationEndpoint");
         }
 
-        if (!serviceConfiguration.hasKey("tokenEndpoint")) {
+        Uri tokenEndpoint = Uri.EMPTY;
+        if (serviceConfiguration.hasKey("tokenEndpoint")) {
+            tokenEndpoint = Uri.parse(serviceConfiguration.getString("tokenEndpoint"));
+        } else if (!this.additionalParametersMap.containsKey("skipTokenExchange")
+                || !this.additionalParametersMap.get("skipTokenExchange").equals("true")) {
+            // tokenEndpoint is required unless `skipTokenExchange` is set to true
             throw new Exception("serviceConfiguration passed without a tokenEndpoint");
         }
 
         Uri authorizationEndpoint = Uri.parse(serviceConfiguration.getString("authorizationEndpoint"));
-        Uri tokenEndpoint = Uri.parse(serviceConfiguration.getString("tokenEndpoint"));
+
         Uri registrationEndpoint = null;
         if (serviceConfiguration.hasKey("registrationEndpoint")) {
             registrationEndpoint = Uri.parse(serviceConfiguration.getString("registrationEndPoint"));
@@ -484,14 +504,9 @@ private AuthorizationServiceConfiguration createAuthorizationServiceConfiguratio
         );
     }
 
-
-    @Override
-    public void onNewIntent(Intent intent) {
-
-    }
-
     @Override
     public String getName() {
         return "RNAppAuth";
     }
+
 }

index.d.ts

@@ -21,6 +21,7 @@ interface BuiltInParameters {
   display?: "page" | "popup" | "touch" | "wap";
   login_prompt?: string;
   prompt?: "consent" |"login" | "none" | "select_account";
+  skipTokenExchange: boolean;
 }
 
 export type AuthConfiguration = BaseAuthConfiguration & {
@@ -40,6 +41,12 @@ export interface AuthorizeResult {
   tokenType: string;
 }
 
+export interface AuthorizeWithoutTokenExchangeResult {
+  code: string; // i.e. authorizationCode
+  state: string;
+  redirectUri: string;
+}
+
 export interface RevokeConfiguration {
   tokenToRevoke: string;
   sendClientId?: boolean;
@@ -49,7 +56,7 @@ export interface RefreshConfiguration {
   refreshToken: string;
 }
 
-export function authorize(config: AuthConfiguration): Promise<AuthorizeResult>;
+export function authorize(config: AuthConfiguration): Promise<AuthorizeResult|AuthorizeWithoutTokenExchangeResult>;
 
 export function refresh(
   config: AuthConfiguration,

index.js

@@ -7,8 +7,7 @@ const validateIssuerOrServiceConfigurationEndpoints = (issuer, serviceConfigurat
   invariant(
     typeof issuer === 'string' ||
       (serviceConfiguration &&
-        typeof serviceConfiguration.authorizationEndpoint === 'string' &&
-        typeof serviceConfiguration.tokenEndpoint === 'string'),
+        typeof serviceConfiguration.authorizationEndpoint === 'string'),
     'Config error: you must provide either an issuer or a service endpoints'
   );
 const validateIssuerOrServiceConfigurationRevocationEndpoint = (issuer, serviceConfiguration) =>

ios/RNAppAuth.m

@@ -142,18 +142,36 @@ - (void)authorizeWithConfiguration: (OIDServiceConfiguration *) configuration
     // performs authentication request
     id<UIApplicationDelegate, RNAppAuthAuthorizationFlowManager> appDelegate = (id<UIApplicationDelegate, RNAppAuthAuthorizationFlowManager>)[UIApplication sharedApplication].delegate;
 
-    id<OIDAuthorizationFlowSession> currentSession =
-    [OIDAuthState authStateByPresentingAuthorizationRequest:request
-                                   presentingViewController:appDelegate.window.rootViewController
-                                                   callback:^(OIDAuthState *_Nullable authState,
-                                                              NSError *_Nullable error) {
-                                                       if (authState) {
-                                                           resolve([self formatResponse:authState.lastTokenResponse]);
-                                                       } else {
-                                                           reject(@"RNAppAuth Error", [error localizedDescription], error);
-                                                       }
-
-                                                   }]; // end [OIDAuthState authStateByPresentingAuthorizationRequest:request
+    id<OIDAuthorizationFlowSession> currentSession;
+
+    if (additionalParameters[@"skipTokenExchange"] && [additionalParameters[@"skipTokenExchange"] isEqualToString:@"true"]) {
+      currentSession = [OIDAuthorizationService presentAuthorizationRequest:request presentingViewController:appDelegate.window.rootViewController callback:^(OIDAuthorizationResponse * _Nullable response, NSError * _Nullable error) {
+           if (error) {
+              reject(@"RNAppAuth Auth Callback Error",[error localizedDescription], error);
+          } else {
+               NSDictionary *map = @{
+                                   @"code" : response.authorizationCode,
+                                   @"state" : response.state,
+                                   @"redirectUri" : [response.request.redirectURL absoluteString]
+                                   };
+               resolve(map);
+          }
+       }];
+    } else {
+      currentSession =
+      [OIDAuthState authStateByPresentingAuthorizationRequest:request
+      presentingViewController:appDelegate.window.rootViewController
+      callback:^(OIDAuthState *_Nullable authState,
+        NSError *_Nullable error) {
+          if (authState) {
+            resolve([self formatResponse:authState.lastTokenResponse]);
+          } else {
+            reject(@"RNAppAuth Error", [error localizedDescription], error);
+          }
+
+        }]; // end [OIDAuthState authStateByPresentingAuthorizationRequest:request
+    }
+
     if ([[appDelegate class] conformsToProtocol:@protocol(RNAppAuthAuthorizationFlowManager)]
         && [appDelegate respondsToSelector: @selector(setCurrentAuthorizationFlowSession:)]) {
         [appDelegate setCurrentAuthorizationFlowSession:currentSession];
@@ -189,6 +207,8 @@ - (void)refreshWithConfiguration: (OIDServiceConfiguration *)configuration
                                       codeVerifier:nil
                               additionalParameters:additionalParameters];
 
+
+
     [OIDAuthorizationService performTokenRequest:tokenRefreshRequest
                                         callback:^(OIDTokenResponse *_Nullable response,
                                                    NSError *_Nullable error) {