From 27c376e1e56979aaf9e1a540386781f1c16550b6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EB=B0=95=EC=84=B1=ED=98=84?= Date: Mon, 18 Sep 2023 15:56:30 +0900 Subject: [PATCH] =?UTF-8?q?:recycle:=20::=20api=20=ED=82=A4=20=EA=B0=92?= =?UTF-8?q?=EC=97=90=20=EB=A7=9E=EC=B6=B0=EC=84=9C=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/msg/data/local/datasource/LocalDataSource.kt | 2 +- .../com/msg/data/local/datasource/LocalDataSourceImpl.kt | 6 +++--- .../main/java/com/msg/data/remote/util/AuthInterceptor.kt | 8 ++++---- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/data/src/main/java/com/msg/data/local/datasource/LocalDataSource.kt b/data/src/main/java/com/msg/data/local/datasource/LocalDataSource.kt index b441a932..c53fe50a 100644 --- a/data/src/main/java/com/msg/data/local/datasource/LocalDataSource.kt +++ b/data/src/main/java/com/msg/data/local/datasource/LocalDataSource.kt @@ -9,7 +9,7 @@ interface LocalDataSource { expiresAt: String ) - suspend fun saveRole(role: String) + suspend fun saveRole(roles: String) fun getAccessToken(): Flow diff --git a/data/src/main/java/com/msg/data/local/datasource/LocalDataSourceImpl.kt b/data/src/main/java/com/msg/data/local/datasource/LocalDataSourceImpl.kt index 6477df88..38f4fc93 100644 --- a/data/src/main/java/com/msg/data/local/datasource/LocalDataSourceImpl.kt +++ b/data/src/main/java/com/msg/data/local/datasource/LocalDataSourceImpl.kt @@ -20,7 +20,7 @@ class LocalDataSourceImpl @Inject constructor( private val ACCESS_TOKEN = stringPreferencesKey("access_token") private val REFRESH_TOKEN = stringPreferencesKey("refresh_token") private val EXPIRES_AT = stringPreferencesKey("expires_at") - private val ROLE = stringPreferencesKey("role") + private val ROLE = stringPreferencesKey("roles") } override suspend fun saveToken(accessToken: String, refreshToken: String, expiresAt: String) { @@ -31,9 +31,9 @@ class LocalDataSourceImpl @Inject constructor( } } - override suspend fun saveRole(role: String) { + override suspend fun saveRole(roles: String) { context.dataStore.edit { - it[ROLE] = role + it[ROLE] = roles } } diff --git a/data/src/main/java/com/msg/data/remote/util/AuthInterceptor.kt b/data/src/main/java/com/msg/data/remote/util/AuthInterceptor.kt index fbed3342..b797fcc1 100644 --- a/data/src/main/java/com/msg/data/remote/util/AuthInterceptor.kt +++ b/data/src/main/java/com/msg/data/remote/util/AuthInterceptor.kt @@ -56,11 +56,11 @@ class AuthInterceptor @Inject constructor( val token = JsonParser.parseString(response.body!!.string()) as JsonObject runBlocking { localDataSource.saveToken( - accessToken = token["access_token"].asString, - refreshToken = token["refresh_token"].asString, - expiresAt = token["expires_at"].asString + accessToken = token["accessToken"].asString, + refreshToken = token["refreshToken"].asString, + expiresAt = token["expiresAt"].asString ) - localDataSource.saveRole(token["role"].asString) + localDataSource.saveRole(token["roles"].asString) } } else throw TokenExpiredException() }