From 830cc669335fab0ac11dff8ebd1ff80873e62c0e Mon Sep 17 00:00:00 2001 From: Koitharu Date: Sun, 1 May 2022 09:18:02 +0300 Subject: [PATCH] JWT authorization for sync (Draft) --- .../koitharu/kotatsu/sync/data/AccountInterceptor.kt | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/app/src/main/java/org/koitharu/kotatsu/sync/data/AccountInterceptor.kt b/app/src/main/java/org/koitharu/kotatsu/sync/data/AccountInterceptor.kt index aaa718151..e195877fb 100644 --- a/app/src/main/java/org/koitharu/kotatsu/sync/data/AccountInterceptor.kt +++ b/app/src/main/java/org/koitharu/kotatsu/sync/data/AccountInterceptor.kt @@ -3,9 +3,9 @@ package org.koitharu.kotatsu.sync.data import android.accounts.Account import android.accounts.AccountManager import android.content.Context -import okhttp3.Credentials import okhttp3.Interceptor import okhttp3.Response +import org.koitharu.kotatsu.R class AccountInterceptor( context: Context, @@ -13,13 +13,13 @@ class AccountInterceptor( ) : Interceptor { private val accountManager = AccountManager.get(context) + private val tokenType = context.getString(R.string.account_type_sync) override fun intercept(chain: Interceptor.Chain): Response { - val password = accountManager.getPassword(account) - val request = if (password != null) { - val credential: String = Credentials.basic(account.name, password) + val token = accountManager.peekAuthToken(account, tokenType) + val request = if (token != null) { chain.request().newBuilder() - .header("Authorization", credential) + .header("Authorization", "Bearer $token") .build() } else { chain.request()