From 54e11a61e6c7a658a4820404e4398dc2d7a4e4c1 Mon Sep 17 00:00:00 2001
From: dab246 <tdvu@linagora.com>
Date: Tue, 4 Jun 2024 16:58:37 +0700
Subject: [PATCH] TF-2871 Use `refreshToken` again when the new refreshToken is
 null

---
 .../Network/Interceptor/AuthenticationInterceptor.swift  | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/ios/TwakeCore/Network/Interceptor/AuthenticationInterceptor.swift b/ios/TwakeCore/Network/Interceptor/AuthenticationInterceptor.swift
index c6cebaeae..ac43f2a6a 100644
--- a/ios/TwakeCore/Network/Interceptor/AuthenticationInterceptor.swift
+++ b/ios/TwakeCore/Network/Interceptor/AuthenticationInterceptor.swift
@@ -36,15 +36,16 @@ class AuthenticationInterceptor: RequestInterceptor {
         }
 
         handleRefreshToken(tokenRefreshManager: tokenRefreshManager) { tokenResponse in
-            guard let accessToken = tokenResponse.accessToken,
-                  let refreshToken = tokenResponse.refreshToken else {
+            guard let accessToken = tokenResponse.accessToken else {
                 return completion(.doNotRetryWithError(error))
             }
 
+            let newRefreshToken = tokenResponse.refreshToken ?? authenticationSSO.refreshToken
+            
             self.authentication = AuthenticationSSO(
                 type: AuthenticationType.oidc,
                 accessToken: accessToken,
-                refreshToken: refreshToken,
+                refreshToken: newRefreshToken,
                 expireTime: "\(tokenResponse.expiresTime ?? 0)"
             )
 
@@ -54,7 +55,7 @@ class AuthenticationInterceptor: RequestInterceptor {
                     token: accessToken,
                     tokenId: tokenResponse.tokenId,
                     expiredTime: "\(tokenResponse.expiresTime ?? 0)",
-                    refreshToken: refreshToken
+                    refreshToken: newRefreshToken
                 )
             )