diff --git a/app/src/main/java/com/shaarit/core/network/AuthInterceptor.kt b/app/src/main/java/com/shaarit/core/network/AuthInterceptor.kt index 675b0e5..9bd1801 100644 --- a/app/src/main/java/com/shaarit/core/network/AuthInterceptor.kt +++ b/app/src/main/java/com/shaarit/core/network/AuthInterceptor.kt @@ -28,16 +28,17 @@ class AuthInterceptor @Inject constructor( return chain.proceed(original) } - // Remember whether the first token was generated before we knew the server time. If - // so, a 401 is ambiguous: bad secret, or device clock skew pushed `iat` outside - // Shaarli's tolerance. The Date header of the failed response calibrates our clock, - // so retry exactly once with a regenerated token. - val clockWasUnknown = !serverClock.isSynced - + // A 401 is ambiguous: bad secret, or device/server clock skew pushed `iat` + // outside Shaarli's tolerance. The Date header of the failed response is the + // freshest server-clock estimate we have, so retry exactly once with a + // regenerated token, on every 401 — not only when the clock was never synced. + // Previously the retry was gated on `!serverClock.isSynced`, so once an offset + // had been stored (possibly from a stale or proxy-derived Date header) it was + // trusted for the rest of the process and a correct secret could fail forever. var response = chain.proceed(original.withAuth(apiSecret)) serverClock.syncFromResponse(response) - if (response.code == 401 && clockWasUnknown) { + if (response.code == 401) { response.close() response = chain.proceed(original.withAuth(apiSecret)) serverClock.syncFromResponse(response)