From 32ee7f4ec705d2e8bbcdf5d7d4f7ce56c64613b6 Mon Sep 17 00:00:00 2001
From: Frederic Kneier <frederic@kneier.net>
Date: Sat, 20 Apr 2024 18:12:01 +0200
Subject: [PATCH] Switches to username and client id as subject

---
 .github/workflows/build.yml                                   | 4 ++--
 .../de/solugo/oidc/token/grant/ClientCredentialsGrant.kt      | 2 +-
 src/main/kotlin/de/solugo/oidc/token/grant/PasswordGrant.kt   | 3 +--
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 8543966..c455713 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -23,7 +23,7 @@ jobs:
       version: ${{ steps.version.outputs.VERSION }}
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           fetch-depth: 0
       - name: Calculate version
@@ -45,4 +45,4 @@ jobs:
           distribution: 'temurin'
           java-version: '21'
       - name: Build
-        run: ./gradlew test jib -Djib.to.image=ghcr.io/${{ github.repository }} -Djib.to.tags=${{ needs.version.outputs.version }},latest -Djib.to.auth.username=${{ github.actor }} -Djib.to.auth.password=${{ secrets.GITHUB_TOKEN }} --no-daemon
+        run: ./gradlew test jib -Djib.to.image=ghcr.io/${{ github.repository }} -Djib.to.tags=${{ needs.version.outputs.version }},latest -Djib.to.auth.username=${{ github.actor }} -Djib.to.auth.password=${{ secrets.GITHUB_TOKEN }} --console=plain --no-daemon
diff --git a/src/main/kotlin/de/solugo/oidc/token/grant/ClientCredentialsGrant.kt b/src/main/kotlin/de/solugo/oidc/token/grant/ClientCredentialsGrant.kt
index ea0fc8c..69ec8fa 100644
--- a/src/main/kotlin/de/solugo/oidc/token/grant/ClientCredentialsGrant.kt
+++ b/src/main/kotlin/de/solugo/oidc/token/grant/ClientCredentialsGrant.kt
@@ -16,7 +16,7 @@ class ClientCredentialsGrant : TokenGrant {
         )
 
         context.user = object : User {
-            override val id = uuid(value = client.id)
+            override val id = client.id
             override val username = client.id
         }
     }
diff --git a/src/main/kotlin/de/solugo/oidc/token/grant/PasswordGrant.kt b/src/main/kotlin/de/solugo/oidc/token/grant/PasswordGrant.kt
index 35ab3fc..4bf0ed3 100644
--- a/src/main/kotlin/de/solugo/oidc/token/grant/PasswordGrant.kt
+++ b/src/main/kotlin/de/solugo/oidc/token/grant/PasswordGrant.kt
@@ -5,7 +5,6 @@ import de.solugo.oidc.token.TokenContext
 import de.solugo.oidc.token.TokenGrant
 import de.solugo.oidc.token.user
 import de.solugo.oidc.token.username
-import de.solugo.oidc.util.uuid
 import org.springframework.stereotype.Component
 
 @Component
@@ -16,7 +15,7 @@ class PasswordGrant : TokenGrant {
         val username = context.username ?: return
 
         context.user = object : User {
-            override val id = uuid(value = username)
+            override val id = username
             override val username = username
         }
     }