diff --git a/src/main/resources/public/out.css b/src/main/resources/public/out.css
index e37e91e..29d148a 100644
--- a/src/main/resources/public/out.css
+++ b/src/main/resources/public/out.css
@@ -546,18 +546,10 @@ video {
width: 100vw;
}
-.flex-auto {
- flex: 1 1 auto;
-}
-
.flex-1 {
flex: 1 1 0%;
}
-.grow {
- flex-grow: 1;
-}
-
.flex-row {
flex-direction: row;
}
@@ -586,10 +578,6 @@ video {
border-width: 4px;
}
-.border {
- border-width: 1px;
-}
-
.border-b-8 {
border-bottom-width: 8px;
}
@@ -599,11 +587,6 @@ video {
border-color: rgb(96 165 250 / var(--tw-border-opacity));
}
-.border-black {
- --tw-border-opacity: 1;
- border-color: rgb(0 0 0 / var(--tw-border-opacity));
-}
-
.bg-blue-100 {
--tw-bg-opacity: 1;
background-color: rgb(219 234 254 / var(--tw-bg-opacity));
diff --git a/src/main/resources/templates/auth.html b/src/main/resources/templates/auth.html
index 47e6f90..ba4a526 100644
--- a/src/main/resources/templates/auth.html
+++ b/src/main/resources/templates/auth.html
@@ -21,26 +21,46 @@
Authorizatoin options
+ Authorizatoin options
-
-
-
-
+
+
+
+
+
+
$options
-will use ${githubRedirect}
-Go to github -""" cask.Response( - html, + authPage, headers = Seq("Content-Type" -> "text/html;charset=UTF-8"), cookies = Seq( - cask.Cookie(name = oauthVerifiersCookieName, value = yoyo, path = "/") + cask.Cookie( + name = oauthVerifiersCookieName, + value = oauthCookieEncoded, + path = "/" + ) ) ) @@ -108,6 +125,9 @@ case class AuthService()(implicit cc: castor.Context, log: cask.Logger) provider: String, state: String, code: String, + scope: Option[String] = None, + prompt: Option[String] = None, + authuser: Option[String] = None, request: cask.Request ) = { println( @@ -127,7 +147,7 @@ case class AuthService()(implicit cc: castor.Context, log: cask.Logger) provider = provider, code = code, verifier = authVerifier.codeVerifier, - redirectUrl = getRedirectUrl(provider) + redirectUrl = getRedirectLandingUrl(provider) ) .toOption } yield pocketbaseAuthResult @@ -145,7 +165,9 @@ case class AuthService()(implicit cc: castor.Context, log: cask.Logger) case Some(result) => // this is already fully successful auth val redirectToIndex = renderRedirectPage( - "/", "You will be redirected to home page soon", 0 + "/", + "You will be redirected to home page soon", + 0 ) cask.Response( @@ -206,7 +228,7 @@ object AuthService { * it's possible, but path param looks simpler right now * github redirect : http://127.0.0.1:8080/api/oauth2-redirect/github */ - def getRedirectUrl(provider: String): String = + def getRedirectLandingUrl(provider: String): String = s"${selfUri}${baseRedirectUrl}/${provider}" /*