fix parsing of nonce from auth response on iOS (#332)

MaikuB · May 17, 2022 · b602242 · b602242
1 parent e28fdd9
commit b602242
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/flutter_appauth/CHANGELOG.md b/flutter_appauth/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 3.0.1
+
+* [iOS] fix `nonce` not being returned correctly on iOS
+
 ## 3.0.0
 
 * **Breaking change** `AuthorizationResponse`'s  constructor now includes `nonce` and has changed to take positional parameters

diff --git a/flutter_appauth/ios/Classes/FlutterAppauthPlugin.m b/flutter_appauth/ios/Classes/FlutterAppauthPlugin.m
@@ -218,6 +218,7 @@ - (void)performAuthorization:(OIDServiceConfiguration *)serviceConfiguration cli
                 [processedResponse setObject:authorizationResponse.additionalParameters forKey:@"authorizationAdditionalParameters"];
                 [processedResponse setObject:authorizationResponse.authorizationCode forKey:@"authorizationCode"];
                 [processedResponse setObject:authorizationResponse.request.codeVerifier forKey:@"codeVerifier"];
+                [processedResponse setObject:authorizationResponse.request.nonce forKey:@"nonce"];
                 result(processedResponse);
             } else {
                 [self finishWithError:AUTHORIZE_ERROR_CODE message:[self formatMessageWithError:AUTHORIZE_ERROR_MESSAGE_FORMAT error:error] result:result];
@@ -381,13 +382,8 @@ - (NSMutableDictionary *)processResponses:(OIDTokenResponse*) tokenResponse auth
     if(tokenResponse.accessTokenExpirationDate) {
         [processedResponses setValue:[[NSNumber alloc] initWithDouble:[tokenResponse.accessTokenExpirationDate timeIntervalSince1970] * 1000] forKey:@"accessTokenExpirationTime"];
     }
-    if(authResponse) {
-        if (authResponse.additionalParameters) {
-            [processedResponses setObject:authResponse.additionalParameters forKey:@"authorizationAdditionalParameters"];
-        }
-        if (authResponse.request && authResponse.request.nonce) {
-            [processedResponses setObject:authResponse.request.nonce forKey:@"nonce"];
-        }
+    if(authResponse && authResponse.additionalParameters) {
+        [processedResponses setObject:authResponse.additionalParameters forKey:@"authorizationAdditionalParameters"];
     }
     if(tokenResponse.additionalParameters) {
         [processedResponses setObject:tokenResponse.additionalParameters forKey:@"tokenAdditionalParameters"];

diff --git a/flutter_appauth/pubspec.yaml b/flutter_appauth/pubspec.yaml
@@ -1,6 +1,6 @@
 name: flutter_appauth
 description: This plugin provides an abstraction around the Android and iOS AppAuth SDKs so it can be used to communicate with OAuth 2.0 and OpenID Connect providers
-version: 3.0.0
+version: 3.0.1
 homepage: https://github.com/MaikuB/flutter_appauth/tree/master/flutter_appauth
 
 environment: