Completed upgrade to spring boot 3.x

Bump plugin.spring from 1.7.21 to 1.7.22

.github/dependabot.yml

@@ -0,0 +1,11 @@
+# To get started with Dependabot version updates, you'll need to specify which
+# package ecosystems to update and where the package manifests are located.
+# Please see the documentation for all configuration options:
+# https://docs.github.com/github/administering-a-repository/configuration-options-for-dependency-updates
+
+version: 2
+updates:
+  - package-ecosystem: "gradle" # See documentation for possible values
+    directory: "/" # Location of package manifests
+    schedule:
+      interval: "daily"

.gitmodules

@@ -1,3 +1,8 @@
-[submodule "cubetiq-security-jwt"]
-	path = cubetiq-security-jwt
-	url = https://git.cubetiqs.com/CUBETIQ/cubetiq-security-jwt.git
+[submodule "cubetiq-security-core"]
+	path = cubetiq-security-core
+	url = https://git.cubetiqs.com/cubetiq/cubetiq-security-core.git
+	branch = main
+[submodule "cubetiq-security-web"]
+	path = cubetiq-security-web
+	url = https://git.cubetiqs.com/cubetiq/cubetiq-security-web.git
+	branch = main

README.md

@@ -1,7 +1,7 @@
 # GraphQL & Spring Boot (Demo Project)
-- Spring Boot (2.6)
-- DGS Framework (4.5.0)
-- Kotlin (1.5.21)
+- Spring Boot
+- DGS Framework
+- Kotlin
 
 # Contributors
-- Sambo Chea <sombochea@cubetiqs.com>
+- Sambo Chea <sombochea@cubetiqs.com>

build.gradle.kts

@@ -1,23 +1,23 @@
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 plugins {
-    id("org.springframework.boot") version "2.5.3" apply false
-    id("io.spring.dependency-management") version "1.0.11.RELEASE" apply false
-    kotlin("jvm") version "1.5.21" apply false
-    kotlin("plugin.spring") version "1.5.21" apply false
-    kotlin("plugin.jpa") version "1.5.21" apply false
-    id("com.netflix.dgs.codegen") version "5.0.5" apply false
+    id("org.springframework.boot") version "3.0.0" apply false
+    id("io.spring.dependency-management") version "1.1.0" apply false
+    kotlin("jvm") version "1.7.22" apply false
+    kotlin("plugin.spring") version "1.7.22" apply false
+    kotlin("plugin.jpa") version "1.7.22" apply false
+    id("com.netflix.dgs.codegen") version "5.6.3" apply false
 }
 
 allprojects {
     repositories {
-        maven { url = uri("https://m.ctdn.net") }
+        mavenCentral()
     }
 
     group = "com.cubetiqs"
     version = "0.0.1-SNAPSHOT"
 
-    val javaVersion = "11"
+    val javaVersion = "17"
 
     tasks.withType<JavaCompile> {
         sourceCompatibility = javaVersion

cubetiq-security-core

@@ -0,0 +1 @@
+Subproject commit 612bafe9af476798a40a536c82112c63c8627f4f

cubetiq-security-jwt

@@ -1 +0,0 @@
-Subproject commit d69f52fee0d6c8c0fad3eab64dc0645470168a49

cubetiq-security-web

@@ -0,0 +1 @@
+Subproject commit 62d0e718e59af79db15871bde67affd8c38b15e5

dgs-graphql/build.gradle.kts

@@ -7,13 +7,12 @@ plugins {
 	id("com.netflix.dgs.codegen")
 }
 
-extra["dgsVersion"] = "4.5.0"
-
 dependencies {
-	api(project(":cubetiq-security-jwt"))
+	api(project(":cubetiq-security-web"))
 
-	implementation("com.netflix.graphql.dgs:graphql-dgs-spring-boot-starter:${property("dgsVersion")}")
-	runtimeOnly("com.netflix.graphql.dgs:graphql-dgs-subscriptions-websockets-autoconfigure:${property("dgsVersion")}")
+	implementation(platform("com.netflix.graphql.dgs:graphql-dgs-platform-dependencies:5.4.3"))
+	implementation("com.netflix.graphql.dgs:graphql-dgs-spring-boot-starter")
+	runtimeOnly("com.netflix.graphql.dgs:graphql-dgs-subscriptions-websockets-autoconfigure")
 
 	implementation("org.springframework.boot:spring-boot-starter-security")
 	implementation("org.springframework.boot:spring-boot-starter-actuator")

dgs-graphql/src/main/kotlin/com/cubetiqs/graphql/demo/GraphqlDemoApplication.kt

@@ -1,10 +1,19 @@
 package com.cubetiqs.graphql.demo
 
+import com.cubetiqs.sp.security.util.PasswordUtils
+import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.boot.autoconfigure.SpringBootApplication
 import org.springframework.boot.runApplication
+import org.springframework.security.crypto.password.PasswordEncoder
 
 @SpringBootApplication
-class GraphqlDemoApplication
+class GraphqlDemoApplication @Autowired constructor(
+    private val passwordEncoder: PasswordEncoder,
+) {
+    init {
+        PasswordUtils.setEncoder(passwordEncoder)
+    }
+}
 
 fun main(args: Array<String>) {
     runApplication<GraphqlDemoApplication>(*args)

dgs-graphql/src/main/kotlin/com/cubetiqs/graphql/demo/config/WebSecurityConfig.kt

@@ -1,37 +1,44 @@
 package com.cubetiqs.graphql.demo.config
 
 import com.cubetiqs.graphql.demo.security.AuthService
-import com.cubetiqs.security.jwt.AuthenticationExceptionEntryPoint
-import com.cubetiqs.security.jwt.JwtSecurityConfigurer
+import com.cubetiqs.sp.security.EnableCubetiqSecurityModule
+import com.cubetiqs.sp.security.jwt.CubetiqJwtProperties
+import com.cubetiqs.sp.security.jwt.JwtSecurityConfigurer
+import com.cubetiqs.sp.security.support.AuthenticationExceptionEntryPoint
 import org.springframework.beans.factory.annotation.Autowired
+import org.springframework.context.annotation.Bean
 import org.springframework.context.annotation.Configuration
-import org.springframework.security.config.annotation.method.configuration.EnableGlobalMethodSecurity
+import org.springframework.security.config.annotation.method.configuration.EnableMethodSecurity
 import org.springframework.security.config.annotation.web.builders.HttpSecurity
 import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity
-import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter
 import org.springframework.security.config.http.SessionCreationPolicy
+import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder
+import org.springframework.security.crypto.password.PasswordEncoder
+import org.springframework.security.web.SecurityFilterChain
 
 @Configuration
 @EnableWebSecurity
-@EnableGlobalMethodSecurity(prePostEnabled = true)
-class WebSecurityConfig : WebSecurityConfigurerAdapter() {
-    @Autowired
-    private lateinit var authService: AuthService
+@EnableMethodSecurity(prePostEnabled = true)
+@EnableCubetiqSecurityModule
+class WebSecurityConfig @Autowired constructor(
+    private val authService: AuthService,
+    private val cubetiqJwtProperties: CubetiqJwtProperties,
+) {
+    @Bean
+    fun passwordEncoder(): PasswordEncoder {
+        return BCryptPasswordEncoder(10)
+    }
 
-    override fun configure(http: HttpSecurity) {
-        http.csrf().disable()
-            .sessionManagement()
-            .sessionCreationPolicy(SessionCreationPolicy.STATELESS)
+    @Bean
+    fun filterChain(http: HttpSecurity): SecurityFilterChain {
+        http.csrf().disable().sessionManagement().sessionCreationPolicy(SessionCreationPolicy.STATELESS)
 
-        http
-            .exceptionHandling()
-            .authenticationEntryPoint(AuthenticationExceptionEntryPoint())
+        http.exceptionHandling().authenticationEntryPoint(AuthenticationExceptionEntryPoint())
 
-        http
-            .apply(JwtSecurityConfigurer(authService))
+        http.apply(JwtSecurityConfigurer(authService, cubetiqJwtProperties))
 
-        http
-            .authorizeRequests()
-            .anyRequest().permitAll()
+        http.authorizeHttpRequests().anyRequest().permitAll()
+
+        return http.build()
     }
 }

dgs-graphql/src/main/kotlin/com/cubetiqs/graphql/demo/domain/AbstractEntity.kt

@@ -2,8 +2,8 @@ package com.cubetiqs.graphql.demo.domain
 
 import org.springframework.data.jpa.domain.support.AuditingEntityListener
 import java.io.Serializable
-import javax.persistence.EntityListeners
-import javax.persistence.MappedSuperclass
+import jakarta.persistence.EntityListeners
+import jakarta.persistence.MappedSuperclass
 
 @MappedSuperclass
 @EntityListeners(AuditingEntityListener::class)

dgs-graphql/src/main/kotlin/com/cubetiqs/graphql/demo/domain/account/Account.kt

@@ -8,7 +8,7 @@ import org.springframework.data.annotation.CreatedDate
 import org.springframework.data.annotation.LastModifiedDate
 import java.math.BigDecimal
 import java.util.*
-import javax.persistence.*
+import jakarta.persistence.*
 
 @Entity
 @Table(name = "accounts", indexes = [

dgs-graphql/src/main/kotlin/com/cubetiqs/graphql/demo/domain/account/AccountEntityListener.kt

@@ -1,9 +1,9 @@
 package com.cubetiqs.graphql.demo.domain.account
 
 import java.util.*
-import javax.persistence.PostPersist
-import javax.persistence.PrePersist
-import javax.persistence.PreUpdate
+import jakarta.persistence.PostPersist
+import jakarta.persistence.PrePersist
+import jakarta.persistence.PreUpdate
 
 class AccountEntityListener {
     @PrePersist

dgs-graphql/src/main/kotlin/com/cubetiqs/graphql/demo/domain/user/User.kt

@@ -7,7 +7,7 @@ import org.hibernate.Hibernate
 import org.springframework.data.annotation.CreatedDate
 import org.springframework.data.annotation.LastModifiedDate
 import java.util.*
-import javax.persistence.*
+import jakarta.persistence.*
 
 @Entity
 @Table(

dgs-graphql/src/main/kotlin/com/cubetiqs/graphql/demo/domain/user/UserEntityListener.kt

@@ -1,8 +1,8 @@
 package com.cubetiqs.graphql.demo.domain.user
 
 import java.util.*
-import javax.persistence.PrePersist
-import javax.persistence.PreUpdate
+import jakarta.persistence.PrePersist
+import jakarta.persistence.PreUpdate
 
 class UserEntityListener {
     @PrePersist

dgs-graphql/src/main/kotlin/com/cubetiqs/graphql/demo/resolver/mutation/LoginMutationResolver.kt

@@ -4,7 +4,7 @@ import com.cubetiqs.graphql.demo.context.GMutation
 import com.cubetiqs.graphql.demo.dgmodel.DgsConstants
 import com.cubetiqs.graphql.demo.dgmodel.types.LoginResponse
 import com.cubetiqs.graphql.demo.security.AuthService
-import com.cubetiqs.security.jwt.util.JwtUtils
+import com.cubetiqs.sp.security.jwt.util.JwtTokenUtils
 import com.netflix.graphql.dgs.DgsMutation
 import org.springframework.beans.factory.annotation.Autowired
 
@@ -16,7 +16,10 @@ class LoginMutationResolver {
     @DgsMutation(field = DgsConstants.MUTATION.Login)
     fun login(username: String, password: String): LoginResponse {
         val auth = authService.login(username, password)
-        val token = JwtUtils.encryptToken(auth)
-        return LoginResponse(token)
+        val token = JwtTokenUtils.createTokens(auth)
+        return LoginResponse(
+            accessToken = token.accessToken,
+            refreshToken = token.refreshToken,
+        )
     }
 }

dgs-graphql/src/main/kotlin/com/cubetiqs/graphql/demo/resolver/mutation/UserMutationResolver.kt

@@ -7,7 +7,7 @@ import com.cubetiqs.graphql.demo.domain.user.User
 import com.cubetiqs.graphql.demo.domain.user.UserInput
 import com.cubetiqs.graphql.demo.domain.user.UserMapper
 import com.cubetiqs.graphql.demo.repository.UserRepository
-import com.cubetiqs.security.jwt.util.JwtUtils
+import com.cubetiqs.sp.security.util.PasswordUtils
 import com.netflix.graphql.dgs.DgsMutation
 import com.netflix.graphql.dgs.exceptions.DgsEntityNotFoundException
 import org.springframework.beans.factory.annotation.Autowired
@@ -30,7 +30,7 @@ class UserMutationResolver @Autowired constructor(
     @DgsMutation(field = DgsConstants.MUTATION.ChangeUserPassword)
     fun changePassword(input: UserChangePasswordInput): User {
         val user = userRepository.queryByUsername(input.username).orElse(null) ?: throw DgsEntityNotFoundException("User not found!")
-        user.password = JwtUtils.passwordEncoder().encode(input.password)
+        user.password = PasswordUtils.encode(input.password)
         return userRepository.save(user)
     }
 }

dgs-graphql/src/main/kotlin/com/cubetiqs/graphql/demo/security/AuthDetails.kt

@@ -1,7 +1,8 @@
 package com.cubetiqs.graphql.demo.security
 
 import com.cubetiqs.graphql.demo.domain.user.User
-import com.cubetiqs.security.jwt.util.JwtUtils
+import com.cubetiqs.sp.security.jwt.util.JwtTokenUtils
+import com.cubetiqs.sp.security.util.PasswordUtils
 import org.springframework.security.core.GrantedAuthority
 import org.springframework.security.core.authority.SimpleGrantedAuthority
 import org.springframework.security.core.userdetails.UserDetails
@@ -47,7 +48,7 @@ data class AuthDetails(
     }
 
     fun isPasswordValid(password: String): Boolean {
-        return JwtUtils.passwordEncoder().matches(password, this.getPassword())
+        return PasswordUtils.matches(password, this.getPassword())
     }
 
     companion object {

dgs-graphql/src/main/resources/.gitignore

@@ -0,0 +1 @@
+application-local.yml

dgs-graphql/src/main/resources/application.yml

@@ -3,6 +3,8 @@ server:
 
 # Spring Boot
 spring:
+  profiles:
+    active: ${APP_PROFILE:}
   datasource:
     url: jdbc:postgresql://${DB_HOST:localhost}:5432/${DB_NAME:graphql-demo}
     username: ${DB_USER:your-username}

dgs-graphql/src/main/resources/schema/user.graphql

@@ -14,7 +14,8 @@ input UserInput {
 }
 
 type LoginResponse {
-    token: String
+    accessToken: String
+    refreshToken: String
 }
 
 input UserChangePasswordInput {

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.1.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

settings.gradle.kts

@@ -1,4 +1,3 @@
-rootProject.name = "graphql-demo"
+rootProject.name = "spring-graphql-demo"
 
-include("dgs-graphql")
-include("cubetiq-security-jwt")
+include("cubetiq-security-core", "cubetiq-security-web", "dgs-graphql")