From 77a769169001cd0ca01912830faabfd06fafd004 Mon Sep 17 00:00:00 2001
From: Waldemar Reusch <lordvlad@users.noreply.github.com>
Date: Tue, 11 Jul 2023 21:45:13 +0000
Subject: [PATCH] Implement review suggestions

---
 .../quarkus/oidc/common/runtime/OidcCommonConfig.java  | 10 +++++-----
 .../quarkus/oidc/common/runtime/OidcCommonUtils.java   |  8 ++++----
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/extensions/oidc-common/runtime/src/main/java/io/quarkus/oidc/common/runtime/OidcCommonConfig.java b/extensions/oidc-common/runtime/src/main/java/io/quarkus/oidc/common/runtime/OidcCommonConfig.java
index 46bbc1d539296..3a67e82d84980 100644
--- a/extensions/oidc-common/runtime/src/main/java/io/quarkus/oidc/common/runtime/OidcCommonConfig.java
+++ b/extensions/oidc-common/runtime/src/main/java/io/quarkus/oidc/common/runtime/OidcCommonConfig.java
@@ -311,7 +311,7 @@ public static class Jwt {
              * Additional `scope` added to JWT claims.
              */
             @ConfigItem
-            public Optional<Set<String>> scope = Optional.empty();
+            public Optional<Set<String>> scopes = Optional.empty();
 
             /**
              * JWT life-span in seconds. It will be added to the time it was issued at to calculate the expiration time.
@@ -375,12 +375,12 @@ public void setKeyFile(String keyFile) {
                 this.keyFile = Optional.of(keyFile);
             }
 
-            public Optional<Set<String>> getScope() {
-                return scope;
+            public Optional<Set<String>> getScopes() {
+                return scopes;
             }
 
-            public void setScope(Set<String> scope) {
-                this.scope = Optional.of(scope);
+            public void setScopes(Set<String> scopes) {
+                this.scopes = Optional.of(scopes);
             }
         }
 
diff --git a/extensions/oidc-common/runtime/src/main/java/io/quarkus/oidc/common/runtime/OidcCommonUtils.java b/extensions/oidc-common/runtime/src/main/java/io/quarkus/oidc/common/runtime/OidcCommonUtils.java
index e1ed23c10d0cb..f6fa3503d243d 100644
--- a/extensions/oidc-common/runtime/src/main/java/io/quarkus/oidc/common/runtime/OidcCommonUtils.java
+++ b/extensions/oidc-common/runtime/src/main/java/io/quarkus/oidc/common/runtime/OidcCommonUtils.java
@@ -352,10 +352,10 @@ public static String signJwtWithKey(OidcCommonConfig oidcConfig, String tokenReq
                         ? removeLastPathSeparator(oidcConfig.credentials.jwt.getAudience().get())
                         : tokenRequestUri)
                 .expiresIn(oidcConfig.credentials.jwt.lifespan);
-
-        oidcConfig.credentials.jwt.scope.ifPresent((scope) -> {
-            claimsBuilder.claim("scope", String.join(",", scope));
-        });
+        
+        if (oidcConfig.credentials.jwt.scopes.isPresent()) {
+            claimsBuilder.claim(OidcConstants.TOKEN_SCOPE, String.join(",", oidcConfig.credentials.jwt.scopes.get()))
+        }
 
         JwtSignatureBuilder builder = claimsBuilder.jws();