From 477643bf6cc1fc6226ce7790e05c1a981324d06e Mon Sep 17 00:00:00 2001
From: Puja Sharma <pujas.works@gmail.com>
Date: Thu, 3 Mar 2022 18:15:57 +0530
Subject: [PATCH] fix: change in swagger spec for jwks to return missing
 attributes

---
 jans-cli/cli/jca.yaml                               | 13 +++++++++++--
 jans-config-api/docs/jans-config-api-swagger.yaml   |  6 ++++++
 .../configapi/rest/resource/auth/JwksResource.java  |  1 +
 3 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/jans-cli/cli/jca.yaml b/jans-cli/cli/jca.yaml
index 979f43deeb4..dc3a15e923a 100644
--- a/jans-cli/cli/jca.yaml
+++ b/jans-cli/cli/jca.yaml
@@ -1816,13 +1816,13 @@ paths:
           description: The 1-based index of the first query result.
         - schema:
             type: string
-            default: 1
+            default: inum
           in: query
           name: sortBy
           description: Attribute whose value will be used to order the returned response.
         - schema:
             type: string
-            default: 1
+            default: ascending
             enum:
               - ascending
               - descending
@@ -3797,6 +3797,12 @@ components:
         - alg
         - exp
       properties:
+        name:
+          type: string
+          description: Name of the key.
+        descr:
+          type: string
+          description: key description.
         kid:
           type: string
           description: The unique identifier for the key.
@@ -6471,6 +6477,9 @@ components:
         description:
           type: string
           description: role description
+        deletable:
+          type: boolean
+          description: can we delete the role?
     AdminPermission:
       type: object
       description: Admin permission
diff --git a/jans-config-api/docs/jans-config-api-swagger.yaml b/jans-config-api/docs/jans-config-api-swagger.yaml
index 9786a60a967..dc3a15e923a 100644
--- a/jans-config-api/docs/jans-config-api-swagger.yaml
+++ b/jans-config-api/docs/jans-config-api-swagger.yaml
@@ -3797,6 +3797,12 @@ components:
         - alg
         - exp
       properties:
+        name:
+          type: string
+          description: Name of the key.
+        descr:
+          type: string
+          description: key description.
         kid:
           type: string
           description: The unique identifier for the key.
diff --git a/jans-config-api/server/src/main/java/io/jans/configapi/rest/resource/auth/JwksResource.java b/jans-config-api/server/src/main/java/io/jans/configapi/rest/resource/auth/JwksResource.java
index 1af0b161350..2f98785d1ba 100644
--- a/jans-config-api/server/src/main/java/io/jans/configapi/rest/resource/auth/JwksResource.java
+++ b/jans-config-api/server/src/main/java/io/jans/configapi/rest/resource/auth/JwksResource.java
@@ -43,6 +43,7 @@ public class JwksResource extends BaseResource {
     @ProtectedApi(scopes = { ApiAccessConstants.JWKS_READ_ACCESS })
     public Response get() {
         final String json = configurationService.findConf().getWebKeys().toString();
+		log.debug("JWKS json = " + json);
         return Response.ok(json).build();
     }