From 7b6aa43e8422b17ed528b459a3a0f82356181b2d Mon Sep 17 00:00:00 2001 From: Kadi Kraman Date: Fri, 23 Feb 2018 13:45:13 +0000 Subject: [PATCH] Handle no expiry date returned on Android --- .../java/com/reactlibrary/RNAppAuthModule.java | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/android/src/main/java/com/reactlibrary/RNAppAuthModule.java b/android/src/main/java/com/reactlibrary/RNAppAuthModule.java index 411647e9..47cc0c87 100644 --- a/android/src/main/java/com/reactlibrary/RNAppAuthModule.java +++ b/android/src/main/java/com/reactlibrary/RNAppAuthModule.java @@ -332,10 +332,17 @@ private String arrayToString(ReadableArray array) { * Read raw token response into a React Native map to be passed down the bridge */ private WritableMap tokenResponseToMap(TokenResponse response) { + WritableMap map = Arguments.createMap(); + + map.putString("accessToken", response.accessToken); + + if (response.accessTokenExpirationTime != null) { + Date expirationDate = new Date(response.accessTokenExpirationTime); + SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ssZ"); + String expirationDateString = formatter.format(expirationDate); + map.putString("accessTokenExpirationDate", expirationDateString); + } - 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()) { @@ -348,9 +355,6 @@ private WritableMap tokenResponseToMap(TokenResponse response) { } } - 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); @@ -423,4 +427,4 @@ public void onNewIntent(Intent intent) { public String getName() { return "RNAppAuth"; } -} \ No newline at end of file +}