Merge pull request #41 from morinoparty/develop

Add GitHub actions

.github/workflows/check_pull_request.yml

@@ -17,16 +17,21 @@ jobs:
           token: ${{ secrets.GITHUB_TOKEN }}
           status: pending
           context: Check pull request
+
       - uses: actions/checkout@v3
+
       - uses: actions/setup-java@v3
         with:
           distribution: 'temurin'
-          java-version: '17'
+          java-version: '21'
           cache: 'gradle'
+
       - name: Change wrapper permissions
         run: chmod +x ./gradlew
+
       - name: Build with Gradle
         run: ./gradlew build -x test
+
       - name: Set final commit status
         uses: myrotvorets/set-commit-status-action@master
         if: always()

.github/workflows/deploy_docs.yml

@@ -22,4 +22,19 @@ jobs:
           pip install mkdocs-static-i18n[material]
           pip install mkdocs-render-swagger-plugin
       - run: git pull
+      - uses: actions/setup-java@v3
+        with:
+          distribution: 'temurin'
+          java-version: '21'
+          cache: 'gradle'
+
+      - name: Change wrapper permissions
+        run: chmod +x ./gradlew
+
+      - name: Build with Gradle
+        run: ./gradlew :api:dokkaHtml
+
+      - name: Copy dokkaHtml to docs
+        run: cp -r ./api/build/dokka/html ./docs/docs/dokka
+
       - run: mkdocs gh-deploy --config-file ./docs/mkdocs.yml

.github/workflows/release.yml

@@ -21,12 +21,15 @@ jobs:
       - uses: actions/setup-java@v3
         with:
           distribution: 'temurin'
-          java-version: '17'
+          java-version: '21'
           cache: 'gradle'
 
       - name: Change wrapper permissions
         run: chmod +x ./gradlew
 
+      - name: Build with Gradle
+        run: ./gradlew build -x test
+
       - uses: release-drafter/release-drafter@v5
         id: release-drafter
         with:

.github/workflows/upload.yml

@@ -14,7 +14,7 @@ jobs:
       - uses: actions/setup-java@v3
         with:
           distribution: 'temurin'
-          java-version: '17'
+          java-version: '21'
           cache: 'gradle'
 
       - name: Change wrapper permissions
@@ -27,16 +27,16 @@ jobs:
           sed -i -e "s/minecraft_plugin_version/$after/i" './gradle.properties'
 
       - name: Build with Gradle
-        run: ./gradlew build -x test
+        run: ./gradlew :core:build -x test
 
       - name: Upload release
         uses: actions/upload-release-asset@v1
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
           upload_url: ${{ github.event.release.upload_url }}
-          asset_path: ./mineauth-core/build/libs/MineAuth-${{ github.event.release.tag_name }}.jar
-          asset_name: MineAuth_${{ github.event.release.tag_name }}.jar
+          asset_path: ./core/build/libs/core-${{ github.event.release.tag_name }}.jar
+          asset_name: MineAuth-core_${{ github.event.release.tag_name }}.jar
           asset_content_type: application/jar
 
 

api/build.gradle.kts

@@ -0,0 +1,28 @@
+plugins {
+    alias(libs.plugins.kotlin.jvm)
+}
+
+dependencies {
+    compileOnly(libs.paper.api)
+    implementation(kotlin("stdlib-jdk8"))
+}
+
+group = project.group
+version = project.version.toString()
+
+kotlin {
+    jvmToolchain {
+        (this).languageVersion.set(JavaLanguageVersion.of(21))
+    }
+    jvmToolchain(21)
+}
+
+tasks {
+    compileKotlin {
+        kotlinOptions.jvmTarget = "21"
+        kotlinOptions.javaParameters = true
+    }
+}
+repositories {
+    mavenCentral()
+}

api/src/main/kotlin/party/morino/mineauth/api/MineAuthAPI.kt

@@ -0,0 +1,7 @@
+package party.morino.mineauth.api
+
+import org.bukkit.plugin.java.JavaPlugin
+
+interface MineAuthAPI {
+    abstract fun createHandler(plugin : JavaPlugin): RegisterHandler
+}

api/src/main/kotlin/party/morino/mineauth/api/RegisterHandler.kt

@@ -0,0 +1,7 @@
+package party.morino.mineauth.api
+
+
+interface RegisterHandler {
+    fun register(vararg endpoints: Any): RegisterHandler
+
+}

api/src/main/kotlin/party/morino/mineauth/api/annotations/Parms.kt

@@ -0,0 +1,6 @@
+package party.morino.mineauth.api.annotations
+
+@Target(AnnotationTarget.VALUE_PARAMETER)
+annotation class Parms(
+    val value: Array<String>
+)

build.gradle.kts

@@ -3,6 +3,7 @@ import org.gradle.api.tasks.testing.logging.TestExceptionFormat
 plugins {
     java
     alias(libs.plugins.kotlin.jvm)
+    alias(libs.plugins.dokka)
 }
 
 val projectVersion: String by project
@@ -13,10 +14,6 @@ buildscript {
     repositories {
         mavenCentral()
     }
-    dependencies {
-        classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.7.10")
-        classpath("org.jetbrains.dokka:dokka-gradle-plugin:1.5.31")
-    }
 }
 
 subprojects {

mineauth-core/build.gradle.kts → core/build.gradle.kts

@@ -18,11 +18,11 @@ repositories {
     maven("https://repo.codemc.io/repository/maven-public/")
 }
 
-group = "party.morino"
-version = "1.0-SNAPSHOT"
+group = project.group
+version = project.version.toString()
 
 dependencies {
-    implementation(project(":mineauth-api"))
+    implementation(project(":api"))
     compileOnly(libs.paper.api)
 
     implementation(libs.bundles.commands)
@@ -39,12 +39,14 @@ dependencies {
     implementation(libs.bundles.exposed)
 
     implementation(libs.koin.core)
+    implementation(kotlin("stdlib-jdk8"))
 }
 
 kotlin {
     jvmToolchain {
         (this).languageVersion.set(JavaLanguageVersion.of(17))
     }
+    jvmToolchain(17)
 }
 
 tasks {
@@ -77,6 +79,7 @@ sourceSets.main {
             main = "$group.mineauth.core.MineAuth"
             apiVersion = "1.20"
             libraries = libs.bundles.coroutines.asString()
+            softDepend = listOf("Vault")
         }
     }
 }

mineauth-core/src/main/kotlin/party/morino/mineauth/core/MineAuth.kt → core/src/main/kotlin/party/morino/mineauth/core/MineAuth.kt

@@ -2,9 +2,11 @@ package party.morino.mineauth.core
 
 import com.github.shynixn.mccoroutine.bukkit.SuspendingJavaPlugin
 import org.bukkit.Bukkit
+import org.bukkit.plugin.java.JavaPlugin
 import org.koin.core.context.GlobalContext
 import org.koin.dsl.module
 import party.morino.mineauth.api.MineAuthAPI
+import party.morino.mineauth.api.RegisterHandler
 import party.morino.mineauth.core.commands.HelpCommand
 import party.morino.mineauth.core.commands.RegisterCommand
 import party.morino.mineauth.core.commands.ReloadCommand
@@ -66,5 +68,8 @@ open class MineAuth: SuspendingJavaPlugin() , MineAuthAPI {
         }
     }
 
+    override fun createHandler(plugin: JavaPlugin): RegisterHandler {
+        TODO("Not yet implemented")
+    }
 
 }

mineauth-core/src/main/kotlin/party/morino/mineauth/core/web/WebServer.kt → core/src/main/kotlin/party/morino/mineauth/core/web/WebServer.kt

@@ -69,7 +69,6 @@ object WebServer: KoinComponent {
 
 private fun Application.module() {
     val plugin: MineAuth by inject(MineAuth::class.java)
-    val webServerConfigData: WebServerConfigData = get(WebServerConfigData::class.java)
     val jwtConfigData: JWTConfigData = get(JWTConfigData::class.java)
     install(ContentNegotiation) {
         json()
@@ -110,6 +109,14 @@ private fun Application.module() {
                 call.respondText("Hello World!")
             }
         }
+        route("/list") {
+            get {
+                val list = getRoutes(this@routing).map { it.toString() }
+                call.respond(
+                    list
+                )
+            }
+        }
         staticFiles("assets", plugin.dataFolder.resolve("assets"))
 
         authRouter()
@@ -134,3 +141,12 @@ private fun Application.module() {
         } //        openAPI(path = "openapi", swaggerFile = "openapi/documentation.yaml") {}
     }
 }
+
+private fun getRoutes(route: Route): List<Route> {
+    val list = mutableListOf<Route>()
+    route.children.forEach {
+        list.addAll(getRoutes(it))
+    }
+    list.add(route)
+    return list
+}

mineauth-core/src/main/kotlin/party/morino/mineauth/core/web/router/plugin/PluginRouter.kt → core/src/main/kotlin/party/morino/mineauth/core/web/router/plugin/PluginRouter.kt

@@ -3,13 +3,13 @@ package party.morino.mineauth.core.web.router.plugin
 import io.ktor.server.application.*
 import io.ktor.server.response.*
 import io.ktor.server.routing.*
+import party.morino.mineauth.core.web.router.plugin.vault.VaultRouter.vaultRouter
 
 object PluginRouter {
     fun Route.pluginRouter() {
-        route("/plugin") {
-            get {
-                call.respondText("Hello, plugin!")
-            }
+        get {
+            call.respondText("Hello, plugin!")
         }
+        vaultRouter()
     }
 }

core/src/main/kotlin/party/morino/mineauth/core/web/router/plugin/vault/VaultRouter.kt

@@ -0,0 +1,13 @@
+package party.morino.mineauth.core.web.router.plugin.vault
+
+import io.ktor.server.routing.*
+
+object VaultRouter {
+    fun Route.vaultRouter() {
+        route("/vault") {
+            get {
+               this@route
+            }
+        }
+    }
+}

mineauth-core/src/main/resources/openapi/documentation.yaml → core/src/main/resources/openapi/documentation.yaml

@@ -31,8 +31,28 @@ security:
   - oauth2: [ read.*, write.* ]
 
 paths:
-  /oauth2/userinfo:
+  - /oauth2/userinfo:
     get:
       summary: Get user information
       security:
         - oauth2: [ read ]
+      responses:
+        '200':
+          description: OK
+          content:
+            application/json:
+              schema:
+                type: object
+                properties:
+                  id:
+                    type: string
+                    description: The user UUID
+                  username:
+                    type: string
+                    description: The user name
+        '401':
+          description: Unauthorized
+        '403':
+          description: Forbidden
+        '404':
+          description: Not Found

docs/CNAME

@@ -0,0 +1 @@
+mineauth-docs.morino.party

docs/docs/assets/documentation.yaml

@@ -37,6 +37,22 @@ paths:
       summary: Get user information
       security:
         - oauth2: [ profile ]
+      responses:
+        '200':
+          description: OK
+          content:
+            application/json:
+              schema:
+                type: object
+                properties:
+                  id:
+                    type: string
+                    example: "069a79f4-44e9-4726-a5be-fca90e38aaf5"
+                    description: The user UUID
+                  username:
+                    type: string
+                    example: "Notch"
+                    description: The user name
   /oauth2/revoke:
     post:
       summary: Revoke access token

gradle.properties

@@ -1,8 +1,5 @@
 xyz.jpenilla.run-paper.updateCheckFrequency=12h
 projectVersion=1.0-SNAPSHOT
-
-sourceCompatibility = 17
-targetCompatibility = 17
 # Gradle Properties
 org.gradle.caching=true
 org.gradle.parallel=true

gradle/libs.versions.toml

@@ -48,7 +48,7 @@ koin-core = { group = "io.insert-koin", name = "koin-core", version.ref = "koinV
 run-paper = { id = "xyz.jpenilla.run-paper", version = "2.2.3" }
 resource-factory = { id = "xyz.jpenilla.resource-factory", version = "1.1.1" }
 shadow = { id = "com.github.johnrengelman.shadow", version = "8.1.1" }
-kotlin-jvm = { id = "org.jetbrains.kotlin.jvm", version = "1.9.23" }
+kotlin-jvm = { id = "org.jetbrains.kotlin.jvm", version = "1.9.24" }
 kotlin-serialization = { id = "org.jetbrains.kotlin.plugin.serialization", version = "1.9.23" }
 dokka = { id = "org.jetbrains.dokka", version = "1.9.20" }