ForNetCode · timzaak · Jun 20, 2023 · Jun 20, 2023
diff --git a/.gitmodules b/.gitmodules
@@ -5,3 +5,6 @@
 [submodule "third/rust-tun"]
 	path = third/rust-tun
 	url = https://github.com/timzaak/rust-tun.git
+[submodule "third/web-sugar"]
+	path = third/web-sugar
+	url = git@github.com:ForNetCode/web-sugar.git
diff --git a/backend/build.sbt b/backend/build.sbt
@@ -1,4 +1,4 @@
-val scala3Version = "3.2.1"
+val scala3Version = "3.3.0"
 
 maintainer := "timzaak<zsy.evan#gmail.com>"
 
@@ -14,23 +14,22 @@ Compile / PB.targets := Seq(
 Compile / PB.protoSources += file("../protobuf")
 
 // zio-json default value needs this
-ThisBuild / scalacOptions ++= Seq("-Yretain-trees")
+//ThisBuild / scalacOptions ++= Seq("-Yretain-trees")
 
-import Dependencies._
+
+
+lazy val webSugar = RootProject(file("../third/web-sugar"))
 
 lazy val app = project
   .in(file("."))
   .settings(
     version := "0.0.3",
     scalaVersion := scala3Version,
-    libraryDependencies ++= grpc ++ persistence ++ logLib ++ webServer ++ configLib ++
-      keycloakLib ++ httpClient ++
-      Seq(
-        "dev.zio" %% "zio-prelude" % "1.0.0-RC16", // for validate
-        "com.github.seancfoley" % "ipaddress" % "5.4.0", // for ip parse
-        "org.bouncycastle" % "bcprov-jdk18on" % "1.72", // for x25519,
-        "org.hashids" % "hashids" % "1.0.3", // hashids
+    libraryDependencies ++= 
+      Seq(        
+        "org.eclipse.jetty" % "jetty-webapp" % "11.0.15" % "container;compile",
+        "org.bouncycastle" % "bcprov-jdk18on" % "1.72", // for x25519,        
         // "org.keycloak" % "keycloak-servlet-filter-adapter" % "20.0.1", //keycloak
         "org.scalameta" %% "munit" % "0.7.29" % Test
       )
-  ) //.enablePlugins(JlinkPlugin)
+  ).enablePlugins(ScalatraPlugin).enablePlugins(JavaAppPackaging).dependsOn(webSugar) //.enablePlugins(JlinkPlugin)
diff --git a/backend/src/main/scala/very/util/config/ConfigExtension.scala b/backend/src/main/scala/very/util/config/ConfigExtension.scala
diff --git a/backend/src/main/scala/very/util/entity/Pagination.scala b/backend/src/main/scala/very/util/entity/Pagination.scala
diff --git a/backend/src/main/scala/very/util/grpc/auth/SessionProvider.scala b/backend/src/main/scala/very/util/grpc/auth/SessionProvider.scala
diff --git a/backend/src/main/scala/very/util/grpc/auth/SessionServerInterceptor.scala b/backend/src/main/scala/very/util/grpc/auth/SessionServerInterceptor.scala
diff --git a/backend/src/main/scala/very/util/keycloak/JWKPublicKeyLocator.scala b/backend/src/main/scala/very/util/keycloak/JWKPublicKeyLocator.scala
diff --git a/backend/src/main/scala/very/util/keycloak/JWKTokenVerifier.scala b/backend/src/main/scala/very/util/keycloak/JWKTokenVerifier.scala
diff --git a/backend/src/main/scala/very/util/keycloak/KeycloakJWTAuthStrategy.scala b/backend/src/main/scala/very/util/keycloak/KeycloakJWTAuthStrategy.scala
diff --git a/backend/src/main/scala/very/util/persistence/FlywayMigrate.scala b/backend/src/main/scala/very/util/persistence/FlywayMigrate.scala
diff --git a/backend/src/main/scala/very/util/persistence/quill/IDSupport.scala b/backend/src/main/scala/very/util/persistence/quill/IDSupport.scala
diff --git a/backend/src/main/scala/very/util/persistence/quill/PageSupport.scala b/backend/src/main/scala/very/util/persistence/quill/PageSupport.scala