fix: allow basic auth

sgpublic · Jun 1, 2024 · 5da0f48 · 5da0f48
1 parent dd64170
commit 5da0f48
Showing 1 changed file with 16 additions and 11 deletions.
diff --git a/server/src/main/kotlin/io/github/sgpublic/agentgate/filters/TokenFilterImpl.kt b/server/src/main/kotlin/io/github/sgpublic/agentgate/filters/TokenFilterImpl.kt
@@ -47,17 +47,22 @@ object TokenFilterImpl: GatewayFilter {
             }
         }
 
-        val auth = request.cookies[Config.AGENT_GATE_TOKEN_COOKIE_KEY]
-            ?.firstOrNull()?.value?.takeIf { it.isNotBlank() }
-            ?: request.headers[HttpHeaders.AUTHORIZATION]?.firstOrNull()
-        val errorType = when {
-            Config.AGENT_GATE_AUTH_ALLOW_BASIC && auth?.startsWith("Basic ") == true ->
-                checkBasicAuth(auth)
-            auth != null ->
-                checkTag(auth)
-            else ->
-                FailedResult.Auth.ExpiredToken
+        var errorType: FailedResult? = FailedResult.Auth.ExpiredToken
+
+        if (Config.AGENT_GATE_AUTH_ALLOW_BASIC) {
+            request.headers[HttpHeaders.AUTHORIZATION]?.firstOrNull()
+                ?.takeIf { it.startsWith("Basic ") }
+                ?.let { auth ->
+                    errorType = checkBasicAuth(auth)
+                }
         }
+
+        request.cookies[Config.AGENT_GATE_TOKEN_COOKIE_KEY]
+            ?.firstOrNull()?.value?.takeIf { it.isNotBlank() }
+            ?.let { auth ->
+                errorType = checkTag(auth)
+            }
+
         if (errorType == null) {
             return chain.filter(exchange)
         }
@@ -67,6 +72,6 @@ object TokenFilterImpl: GatewayFilter {
                 it.statusCode = HttpStatus.MOVED_TEMPORARILY
                 it.headers.location = URI.create("${Config.AGENT_GATE_BASE_PATH}/web/")
             }
-            .write(errorType)
+            .write(errorType!!)
     }
 }