From 4fae29cca3c51514524863f43eb6e5a8a6a908af Mon Sep 17 00:00:00 2001 From: Elias Lecomte Date: Thu, 19 May 2022 14:41:53 +0200 Subject: [PATCH 1/4] dep(android): update net.openid:appauth from 0.8.1 to 0.11.1 --- android/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/android/build.gradle b/android/build.gradle index 85fb638a..5b682549 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -56,6 +56,6 @@ repositories { dependencies { //noinspection GradleDynamicVersion implementation 'com.facebook.react:react-native:+' // From node_modules - implementation 'net.openid:appauth:0.8.1' + implementation 'net.openid:appauth:0.11.1' implementation 'androidx.browser:browser:1.2.0' } From 9d67f8f7bd1a57a41fad350dbd646e23099e3791 Mon Sep 17 00:00:00 2001 From: Elias Lecomte Date: Thu, 19 May 2022 16:18:43 +0200 Subject: [PATCH 2/4] dep(android): bump androidx.browser from 1.2.0 to 1.4.0 --- android/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/android/build.gradle b/android/build.gradle index 5b682549..3eff1a2f 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -57,5 +57,5 @@ dependencies { //noinspection GradleDynamicVersion implementation 'com.facebook.react:react-native:+' // From node_modules implementation 'net.openid:appauth:0.11.1' - implementation 'androidx.browser:browser:1.2.0' + implementation 'androidx.browser:browser:1.4.0' } From 4bbabc8b3abc373b79c1c1d3a49dec14f3b0cb11 Mon Sep 17 00:00:00 2001 From: Elias Lecomte Date: Fri, 20 May 2022 09:13:56 +0200 Subject: [PATCH 3/4] fix: use new builder & new properties after appauth update --- android/src/main/java/com/rnappauth/RNAppAuthModule.java | 8 +++----- .../com/rnappauth/utils/EndSessionResponseFactory.java | 4 ++-- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/android/src/main/java/com/rnappauth/RNAppAuthModule.java b/android/src/main/java/com/rnappauth/RNAppAuthModule.java index 8736904a..207c176f 100644 --- a/android/src/main/java/com/rnappauth/RNAppAuthModule.java +++ b/android/src/main/java/com/rnappauth/RNAppAuthModule.java @@ -784,11 +784,9 @@ private void endSessionWithConfiguration( final Activity currentActivity = getCurrentActivity(); EndSessionRequest.Builder endSessionRequestBuilder = - new EndSessionRequest.Builder( - serviceConfiguration, - idTokenHint, - Uri.parse(postLogoutRedirectUri) - ); + new EndSessionRequest.Builder(serviceConfiguration) + .setIdTokenHint(idTokenHint) + .setPostLogoutRedirectUri(Uri.parse(postLogoutRedirectUri)); if (additionalParametersMap != null) { if (additionalParametersMap.containsKey("state")) { diff --git a/android/src/main/java/com/rnappauth/utils/EndSessionResponseFactory.java b/android/src/main/java/com/rnappauth/utils/EndSessionResponseFactory.java index 4cad2da2..7369c432 100644 --- a/android/src/main/java/com/rnappauth/utils/EndSessionResponseFactory.java +++ b/android/src/main/java/com/rnappauth/utils/EndSessionResponseFactory.java @@ -13,8 +13,8 @@ public static final WritableMap endSessionResponseToMap(EndSessionResponse respo WritableMap map = Arguments.createMap(); map.putString("state", response.state); - map.putString("idTokenHint", response.request.idToken); - map.putString("postLogoutRedirectUri", response.request.redirectUri.toString()); + map.putString("idTokenHint", response.request.idTokenHint); + map.putString("postLogoutRedirectUri", response.request.postLogoutRedirectUri.toString()); return map; } From 0ddb67848955a037274e1e323463cc5614a7fc7c Mon Sep 17 00:00:00 2001 From: Elias Lecomte Date: Fri, 20 May 2022 09:29:07 +0200 Subject: [PATCH 4/4] fix: add a null check as postLogoutRedirectUri can be null --- .../java/com/rnappauth/utils/EndSessionResponseFactory.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/android/src/main/java/com/rnappauth/utils/EndSessionResponseFactory.java b/android/src/main/java/com/rnappauth/utils/EndSessionResponseFactory.java index 7369c432..1bc35c76 100644 --- a/android/src/main/java/com/rnappauth/utils/EndSessionResponseFactory.java +++ b/android/src/main/java/com/rnappauth/utils/EndSessionResponseFactory.java @@ -14,7 +14,9 @@ public static final WritableMap endSessionResponseToMap(EndSessionResponse respo map.putString("state", response.state); map.putString("idTokenHint", response.request.idTokenHint); - map.putString("postLogoutRedirectUri", response.request.postLogoutRedirectUri.toString()); + if (response.request.postLogoutRedirectUri != null) { + map.putString("postLogoutRedirectUri", response.request.postLogoutRedirectUri.toString()); + } return map; }