Merge branch 'master' into dependabot/maven/prod-deps-74988eaad3

folio-org · Nov 4, 2024 · 5f4d846 · 5f4d846
2 parents 69e2baf + d8a1074
commit 5f4d846
Showing 1 changed file with 61 additions and 16 deletions.
diff --git a/descriptors/ModuleDescriptor-template.json b/descriptors/ModuleDescriptor-template.json
@@ -144,33 +144,33 @@
     },
     {
       "id": "authtoken",
-      "version": "2.0",
+      "version": "2.1",
       "handlers": [
         {
           "methods": [ "POST" ],
           "pathPattern": "/token",
-          "permissionsRequired": [ "auth.signtoken" ]
+          "permissionsRequired": [ "auth.token.post" ]
         },
         {
           "methods": [ "POST" ],
           "pathPattern": "/refreshtoken",
-          "permissionsRequired": [ "auth.signrefreshtoken" ]
+          "permissionsRequired": [ "auth.refreshtoken.post" ]
         }
       ]
     },
     {
       "id": "authtoken2",
-      "version": "1.0",
+      "version": "1.1",
       "handlers": [
         {
           "methods": [ "POST" ],
           "pathPattern": "/token/sign",
-          "permissionsRequired": [ "auth.signtoken" ]
+          "permissionsRequired": [ "auth.token.sign.post" ]
         },
         {
           "methods": [ "POST" ],
           "pathPattern": "/token/refresh",
-          "permissionsRequired": [ "auth.signrefreshtoken" ]
+          "permissionsRequired": [ "auth.token.refresh.post" ]
         },
         {
           "methods": [ "POST" ],
@@ -257,16 +257,6 @@
       "displayName" : "Credentials existence get",
       "description" : "Get credentials existence"
     },
-    {
-      "permissionName": "auth.signtoken",
-      "displayName": "auth-token - sign token",
-      "description": "sign token"
-    },
-    {
-      "permissionName": "auth.signrefreshtoken",
-      "displayName": "auth-token - sign refresh token",
-      "description": "sign refresh token"
-    },
     {
       "permissionName" : "login.all",
       "displayName" : "login credentials",
@@ -285,6 +275,61 @@
         "login.event.delete",
         "login.credentials-existence.get"
       ]
+    },
+    {
+      "permissionName": "auth.token.post",
+      "displayName": "auth-token - sign token - legacy, deprecated",
+      "description": "sign token, legacy, deprecated"
+    },
+    {
+      "permissionName": "auth.refreshtoken.post",
+      "displayName": "auth-token - sign refresh token - legacy, deprecated",
+      "description": "sign refresh token, legacy, deprecated"
+    },
+    {
+      "permissionName": "auth.token.sign.post",
+      "displayName": "auth-token - sign expiring token",
+      "description": "sign expiring token"
+    },
+    {
+      "permissionName": "auth.token.refresh.post",
+      "displayName": "auth-token - use refresh token to sign a new expiring token",
+      "description": "sign expiring token using refresh token"
+    },
+    {
+      "permissionName": "auth.signtoken.all",
+      "displayName": "auth-token - sign token",
+      "description": "sign token",
+      "subPermissions" : [
+        "auth.token.post",
+        "auth.token.sign.post"
+      ],
+      "replaces": [
+        "auth.signtoken"
+      ]
+    },
+    {
+      "permissionName": "auth.signrefreshtoken.all",
+      "displayName": "auth-token - sign refresh token",
+      "description": "sign refresh token",
+      "subPermissions" : [
+        "auth.refreshtoken.post",
+        "auth.token.refresh.post"
+      ],
+      "replaces": [
+        "auth.signrefreshtoken"
+      ]
+    },
+    {
+      "permissionName": "auth.sign-and-refresh-token.all",
+      "displayName": "auth-token - sign and refresh token",
+      "description": "sign and refresh token",
+      "subPermissions" : [
+        "auth.token.post",
+        "auth.token.sign.post",
+        "auth.refreshtoken.post",
+        "auth.token.refresh.post"
+      ]
     }
   ],
   "launchDescriptor": {