Simplify CallContextBasicAuthenticator.handleAuthentication()

Author: YektaDev

oauth2-server-core/src/main/java/nl/myndocs/oauth2/request/auth/CallContextBasicAuthenticator.kt

@@ -4,17 +4,10 @@ import nl.myndocs.oauth2.request.CallContext
 import nl.myndocs.oauth2.router.RedirectRouter
 
 object CallContextBasicAuthenticator {
-    fun handleAuthentication(callContext: CallContext, callRouter: RedirectRouter) {
-        val basicAuthenticator = BasicAuthenticator(callContext)
-        if (basicAuthenticator.extractCredentials() == null) {
-            basicAuthenticator.openAuthenticationDialog()
-        } else {
-            callRouter.route(callContext, basicAuthenticator.extractCredentials())
-                .also {
-                    if (!it.successfulLogin) {
-                        basicAuthenticator.openAuthenticationDialog()
-                    }
-                }
+    fun handleAuthentication(context: CallContext, router: RedirectRouter) = with(BasicAuthenticator(context)) {
+        router.route(context, this.extractCredentials()).also { response ->
+            if (!response.successfulLogin)
+                openAuthenticationDialog()
         }
     }
 }