chore: fix ktlint errors

schibsted · Oct 1, 2024 · e44a7ef · e44a7ef
1 parent ce99f2c
commit e44a7ef
Show file tree

Hide file tree

Showing 9 changed files with 33 additions and 21 deletions.
diff --git a/...rc/main/java/com/schibsted/account/webflows/activities/AuthorizationManagementActivity.kt b/...rc/main/java/com/schibsted/account/webflows/activities/AuthorizationManagementActivity.kt
@@ -10,9 +10,7 @@
  * License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
  * express or implied. See the License for the specific language governing permissions and
  * limitations under the License.
- */
-
-/*
+ *
  * From: https://github.com/openid/AppAuth-Android
  * Notable changes:
  *  * Rewritten from Java to Kotlin.

diff --git a/...ws/src/main/java/com/schibsted/account/webflows/activities/RedirectUriReceiverActivity.kt b/...ws/src/main/java/com/schibsted/account/webflows/activities/RedirectUriReceiverActivity.kt
@@ -1,3 +1,4 @@
+package com.schibsted.account.webflows.activities
 /*
  * Copyright 2015 The AppAuth for Android Authors. All Rights Reserved.
  *
@@ -10,17 +11,13 @@
  * License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
  * express or implied. See the License for the specific language governing permissions and
  * limitations under the License.
- */
-
-/*
+ *
  * From: https://github.com/openid/AppAuth-Android
  * Notable changes:
  *  * Rewritten from Java to Kotlin.
  *  * Updated code comments.
  */
 
-package com.schibsted.account.webflows.activities
-
 import android.app.Activity
 import android.os.Bundle
 

diff --git a/webflows/src/main/java/com/schibsted/account/webflows/api/SchibstedAccountService.kt b/webflows/src/main/java/com/schibsted/account/webflows/api/SchibstedAccountService.kt
@@ -2,7 +2,13 @@ package com.schibsted.account.webflows.api
 
 import com.nimbusds.jose.jwk.JWKSet
 import retrofit2.Call
-import retrofit2.http.*
+import retrofit2.http.Field
+import retrofit2.http.FieldMap
+import retrofit2.http.FormUrlEncoded
+import retrofit2.http.GET
+import retrofit2.http.Headers
+import retrofit2.http.POST
+import retrofit2.http.Path
 
 internal interface SchibstedAccountService {
     @Headers("X-OIDC: v1")

diff --git a/webflows/src/main/java/com/schibsted/account/webflows/api/UserProfileResponse.kt b/webflows/src/main/java/com/schibsted/account/webflows/api/UserProfileResponse.kt
@@ -5,7 +5,7 @@ import com.google.gson.annotations.JsonAdapter
 import com.google.gson.annotations.SerializedName
 import com.google.gson.stream.JsonReader
 import com.google.gson.stream.JsonWriter
-import java.util.*
+import java.util.Locale
 
 data class UserProfileResponse(
     val uuid: String? = null,

diff --git a/webflows/src/main/java/com/schibsted/account/webflows/persistence/ObfuscatedSessionFinder.kt b/webflows/src/main/java/com/schibsted/account/webflows/persistence/ObfuscatedSessionFinder.kt
@@ -13,7 +13,6 @@ import java.util.Date
  * Crawls through the obfuscated session JSON to find the access token to enable auto log-in.
  */
 
-// TODO: remove Logs and printlns after RC build is accepted.
 internal object ObfuscatedSessionFinder {
     private const val USER_TOKENS_KEY = "userTokens"
     private const val REFRESH_TOKEN_KEY = "refreshToken"

diff --git a/webflows/src/main/java/com/schibsted/account/webflows/token/TokenHandler.kt b/webflows/src/main/java/com/schibsted/account/webflows/token/TokenHandler.kt
@@ -1,11 +1,14 @@
 package com.schibsted.account.webflows.token
 
-import com.schibsted.account.webflows.api.*
+import com.schibsted.account.webflows.api.HttpError
+import com.schibsted.account.webflows.api.RefreshTokenRequest
+import com.schibsted.account.webflows.api.SchibstedAccountApi
+import com.schibsted.account.webflows.api.UserTokenRequest
+import com.schibsted.account.webflows.api.UserTokenResponse
 import com.schibsted.account.webflows.client.AuthState
 import com.schibsted.account.webflows.client.ClientConfiguration
 import com.schibsted.account.webflows.jose.AsyncJwks
 import com.schibsted.account.webflows.jose.RemoteJwks
-import com.schibsted.account.webflows.token.TokenError.*
 import com.schibsted.account.webflows.util.Either
 import com.schibsted.account.webflows.util.Either.Left
 import com.schibsted.account.webflows.util.Either.Right
@@ -61,15 +64,15 @@ internal class TokenHandler(
                 .onSuccess { handleTokenResponse(it, authState, callback) }
                 .onFailure { err ->
                     Timber.d("Token request error response: $err")
-                    callback(Left(TokenRequestError(err)))
+                    callback(Left(TokenError.TokenRequestError(err)))
                 }
         }
     }
 
     fun makeTokenRequest(
         refreshToken: String,
         scope: String? = null,
-    ): Either<TokenRequestError, UserTokenResponse> {
+    ): Either<TokenError.TokenRequestError, UserTokenResponse> {
         val tokenRequest =
             RefreshTokenRequest(
                 refreshToken,
@@ -80,7 +83,7 @@ internal class TokenHandler(
             is Right -> result
             is Left -> {
                 Timber.d("Token request error response: ${result.value}")
-                Left(TokenRequestError(result.value))
+                Left(TokenError.TokenRequestError(result.value))
             }
         }
     }
@@ -93,7 +96,7 @@ internal class TokenHandler(
         val idToken = tokenResponse.id_token
         if (idToken == null) {
             Timber.e("Missing ID Token")
-            callback(Left(NoIdTokenReceived))
+            callback(Left(TokenError.NoIdTokenReceived))
             return
         }
 
@@ -125,7 +128,7 @@ internal class TokenHandler(
                         ),
                     )
                 }
-                .onFailure { callback(Left(IdTokenNotValid(it))) }
+                .onFailure { callback(Left(TokenError.IdTokenNotValid(it))) }
         }
     }
 }
diff --git a/webflows/src/main/java/com/schibsted/account/webflows/user/AuthenticatedRequests.kt b/webflows/src/main/java/com/schibsted/account/webflows/user/AuthenticatedRequests.kt
@@ -2,7 +2,11 @@ package com.schibsted.account.webflows.user
 
 import com.schibsted.account.webflows.util.Either.Left
 import com.schibsted.account.webflows.util.Either.Right
-import okhttp3.*
+import okhttp3.Authenticator
+import okhttp3.Interceptor
+import okhttp3.Request
+import okhttp3.Response
+import okhttp3.Route
 import timber.log.Timber
 
 /**

diff --git a/webflows/src/main/java/com/schibsted/account/webflows/user/User.kt b/webflows/src/main/java/com/schibsted/account/webflows/user/User.kt
@@ -14,7 +14,11 @@ import com.schibsted.account.webflows.util.Either
 import com.schibsted.account.webflows.util.Either.Left
 import com.schibsted.account.webflows.util.Either.Right
 import kotlinx.parcelize.Parcelize
-import okhttp3.*
+import okhttp3.Call
+import okhttp3.Callback
+import okhttp3.OkHttpClient
+import okhttp3.Request
+import okhttp3.Response
 import timber.log.Timber
 import java.io.IOException
 import java.net.URL

diff --git a/webflows/src/test/java/com/schibsted/account/webflows/client/OAuthErrorTest.kt b/webflows/src/test/java/com/schibsted/account/webflows/client/OAuthErrorTest.kt
@@ -1,6 +1,7 @@
 package com.schibsted.account.webflows.client
 
-import org.junit.Assert.*
+import org.junit.Assert.assertEquals
+import org.junit.Assert.assertNull
 import org.junit.Test
 
 class OAuthErrorTest {