update flow expired token

qiscus · May 2, 2024 · fdf6e9f · fdf6e9f
1 parent 002554c
commit fdf6e9f
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 6 deletions.
diff --git a/chat-core/src/main/java/com/qiscus/sdk/chat/core/QiscusCore.java b/chat-core/src/main/java/com/qiscus/sdk/chat/core/QiscusCore.java
@@ -42,6 +42,7 @@
 import com.qiscus.sdk.chat.core.data.model.QiscusRefreshToken;
 import com.qiscus.sdk.chat.core.data.remote.QiscusApi;
 import com.qiscus.sdk.chat.core.data.remote.QiscusPusherApi;
+import com.qiscus.sdk.chat.core.event.QiscusRefreshTokenEvent;
 import com.qiscus.sdk.chat.core.event.QiscusUserEvent;
 import com.qiscus.sdk.chat.core.service.QiscusNetworkCheckerJobService;
 import com.qiscus.sdk.chat.core.service.QiscusSyncJobService;
@@ -1135,6 +1136,12 @@ public void onSuccess(QiscusRefreshToken refreshToken) {
                         @Override
                         public void onError(Throwable throwable) {
                             QiscusErrorLogger.print(throwable);
+                            //need to relogin
+                            EventBus.getDefault().post(
+                                    new QiscusRefreshTokenEvent(
+                                            401, "Unauthorized"
+                                    )
+                            );
                         }
                     })
             );

diff --git a/chat-core/src/main/java/com/qiscus/sdk/chat/core/data/remote/QiscusInterceptor.java b/chat-core/src/main/java/com/qiscus/sdk/chat/core/data/remote/QiscusInterceptor.java
@@ -112,15 +112,31 @@ private static void handleResponse(int code, JSONObject jsonResponse) throws JSO
         JSONObject jsonObject = jsonResponse.getJSONObject("error");
 
         autoRefreshToken(code, jsonObject);
-        sendEvent(code, jsonObject);
     }
 
     private static void autoRefreshToken(int code, JSONObject jsonObject) throws JSONException {
         if (QiscusCore.isAutoRefreshToken()
                 && code == EXPIRED_TOKEN
                 && jsonObject.getString("message").equals(TOKEN_EXPIRED_MESSAGE)
         ) {
-            QiscusCore.refreshToken(null);
+            QiscusCore.refreshToken(new QiscusCore.SetRefreshTokenListener() {
+                @Override
+                public void onSuccess(QiscusRefreshToken refreshToken) {
+
+                }
+
+                @Override
+                public void onError(Throwable throwable) {
+                    //need to relogin
+                    EventBus.getDefault().post(
+                            new QiscusRefreshTokenEvent(
+                                    401, "Unauthorized"
+                            )
+                    );
+                }
+            });
+        }else{
+            sendEvent(code, jsonObject);
         }
     }
 

diff --git a/gradle.properties b/gradle.properties
@@ -42,8 +42,8 @@ chatVersionPatch=0
 
 # === qiscus chat-core library version ===
 chatCoreVersionMajor=1
-chatCoreVersionMinor=7
-chatCoreVersionPatch=1
+chatCoreVersionMinor=8
+chatCoreVersionPatch=0
 
 # === qiscus default base url
 BASE_URL_SERVER="https://api.qiscus.com/"
@@ -54,12 +54,12 @@ QISCUS_SDK_APP_ID="sdksample"
 
 # === properties for androidx
 android.useAndroidX=true
-android.enableJetifier=true
+    android.enableJetifier=true
 #android.enableR8=true
 
 libraryGroupId=com.qiscus.sdk
 libraryArtifactId=chat-core
-libraryVersion=1.7.1
+libraryVersion=1.8.0
 
 libraryGroupIdChat=com.qiscus.sdk
 libraryArtifactIdChat=chat