efim
/
scala-pocketbase-oauth-attempt
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

feat: use html redirect to auth and to index

This commit is contained in:
efim 2023-07-24 17:29:18 +00:00
parent bf1fc33469
commit 4517f5a1ae
3 changed files with 70 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
build.sbt
View File

@ -6,3 +6,4 @@ libraryDependencies += "com.lihaoyi" %% "upickle" % "3.1.2"
libraryDependencies += "com.lihaoyi" %% "requests" % "0.8.0" libraryDependencies += "com.lihaoyi" %% "requests" % "0.8.0"
libraryDependencies += "com.lihaoyi" %% "cask" % "0.9.1" libraryDependencies += "com.lihaoyi" %% "cask" % "0.9.1"
libraryDependencies += "com.lihaoyi" %% "mainargs" % "0.5.0" libraryDependencies += "com.lihaoyi" %% "mainargs" % "0.5.0"
libraryDependencies += "org.thymeleaf" % "thymeleaf" % "3.1.1.RELEASE"

28
src/main/resources/templates/redirect.html Normal file
View File

@ -0,0 +1,28 @@
<!DOCTYPE html>
<html class="no-js" lang="">
<head>
<meta charset="utf-8" />
<meta http-equiv="x-ua-compatible" content="ie=edge" />
<title>Will redirect</title>
<meta name="description" content="" />
<meta name="viewport" content="width=device-width, initial-scale=1" />
<meta http-equiv="refresh" content="0; url='/'"
th:content="|${redirectAfter}; url='${redirectTo}'|"
/>
<link rel="apple-touch-icon" href="/apple-touch-icon.png" />
<!-- Place favicon.ico in the root directory -->
</head>
<body>
<!--[if lt IE 8]>
<p class="browserupgrade">
You are using an <strong>outdated</strong> browser. Please
<a href="http://browsehappy.com/">upgrade your browser</a> to improve
your experience.
</p>
<![endif]-->
<p
th:text="${message}"
>You will be redirected soon!</p>
</body>
</html>

78
src/main/scala/example/AuthService.scala
View File

@ -5,6 +5,9 @@ import example.pocketbase.Api
import upickle.default._ import upickle.default._
import example.pocketbase.Models._ import example.pocketbase.Models._
import java.time.Instant import java.time.Instant
import org.thymeleaf.TemplateEngine
import org.thymeleaf.templateresolver.ClassLoaderTemplateResolver
import org.thymeleaf.context.{Context => PageContext}
case class AuthService()(implicit cc: castor.Context, log: cask.Logger) case class AuthService()(implicit cc: castor.Context, log: cask.Logger)
extends cask.Routes { extends cask.Routes {
@ -17,23 +20,14 @@ case class AuthService()(implicit cc: castor.Context, log: cask.Logger)
authCookieOpt match { authCookieOpt match {
case None => case None =>
println("cookie was None") println("cookie was None")
val redirectingHtml = """ val redirectToLogin = renderRedirectPage(
<!DOCTYPE html> "/login", "You will be redirected to login page soon", 0
<html> )
<head>
<meta http-equiv="refresh" content="0; url='/login'" />
</head>
<body>
<p>You will be redirected to w3docs.com soon!</p>
</body>
</html>
"""
cask.Response( cask.Response(
redirectingHtml, redirectToLogin,
200, 200,
Seq( Seq(
"Content-Type" -> "text/html;charset=UTF-8", "Content-Type" -> "text/html;charset=UTF-8",
"Cache-Control" -> "Cache-Control: max-age=0, no-cache, must-revalidate, proxy-revalidate"
) )
) )
case Some(authCookie) => case Some(authCookie) =>
@ -151,19 +145,12 @@ case class AuthService()(implicit cc: castor.Context, log: cask.Logger)
) )
case Some(result) => case Some(result) =>
// this is already fully successful auth // this is already fully successful auth
val redirectingHtml = """ val redirectToIndex = renderRedirectPage(
<!DOCTYPE html> "/", "You will be redirected to home page soon", 0
<html> )
<head>
<meta http-equiv="refresh" content="0; url='/login'" />
</head>
<body>
<p>Successful authorization, you will be redirected to main page soon.</p>
</body>
</html>
"""
cask.Response( cask.Response(
redirectingHtml, redirectToIndex,
headers = Seq("Content-Type" -> "text/html;charset=UTF-8"), headers = Seq("Content-Type" -> "text/html;charset=UTF-8"),
cookies = Seq( cookies = Seq(
cask.Cookie( cask.Cookie(
@ -181,18 +168,6 @@ case class AuthService()(implicit cc: castor.Context, log: cask.Logger)
) )
} }
/*
*
get provider from path param, get verifiers and state from cookie,
if cookie not present - abort,
if state doesn't fit one from redirect params - abort
issue 'auth with oauth 2' and based on response code - set the cookie with jwt
and delete the state\verifiers cookie
but then what? i guess call for redirect to root page again?
which should trigger auth check and main page render?
*/
okMessageFirst okMessageFirst
} }
@ -207,6 +182,17 @@ object AuthService {
// but if cookie is under https, should be ok // but if cookie is under https, should be ok
val oauthVerifiersCookieName = "oauthVerifiers" val oauthVerifiersCookieName = "oauthVerifiers"
val templateEngine = {
val templateResolver = new ClassLoaderTemplateResolver()
templateResolver.setPrefix("templates/");
templateResolver.setSuffix(".html")
templateResolver.setTemplateMode("HTML5")
val templateEngine = new TemplateEngine()
templateEngine.setTemplateResolver(templateResolver)
templateEngine
}
val pocketbaseApi = Api("http://127.0.0.1:8090") val pocketbaseApi = Api("http://127.0.0.1:8090")
val selfUri = "http://127.0.0.1:8080" val selfUri = "http://127.0.0.1:8080"
@ -221,4 +207,22 @@ object AuthService {
*/ */
def getRedirectUrl(provider: String): String = def getRedirectUrl(provider: String): String =
s"${selfUri}${baseRedirectUrl}/${provider}" s"${selfUri}${baseRedirectUrl}/${provider}"
/*
* this is a page of my site that does redirecting
* from index to register
* or from oauth provider redirect landing to index
*/
def renderRedirectPage(
redirectTo: String,
message: String,
redirectAfter: Int = 0
): String = {
val context = new PageContext()
context.setVariable("redirectTo", redirectTo)
context.setVariable("message", message)
context.setVariable("redirectAfter", redirectAfter)
templateEngine.process("redirect", context)
}
} }