Merge branch 'dev' into auth-providers-clients

server/routers/external.ts

@@ -32,7 +32,6 @@ import {
     verifyIsLoggedInUser,
     verifyClientAccess,
     verifyApiKeyAccess,
-    verifyValidLicense
 } from "@server/middlewares";
 import { verifyUserHasAction } from "../middlewares/verifyUserHasAction";
 import { ActionsEnum } from "@server/auth/actions";
@@ -581,28 +580,24 @@ authenticated.get("/idp/:idpId", verifyUserIsServerAdmin, idp.getIdp);
 
 authenticated.put(
     "/idp/:idpId/org/:orgId",
-    verifyValidLicense,
     verifyUserIsServerAdmin,
     idp.createIdpOrgPolicy
 );
 
 authenticated.post(
     "/idp/:idpId/org/:orgId",
-    verifyValidLicense,
     verifyUserIsServerAdmin,
     idp.updateIdpOrgPolicy
 );
 
 authenticated.delete(
     "/idp/:idpId/org/:orgId",
-    verifyValidLicense,
     verifyUserIsServerAdmin,
     idp.deleteIdpOrgPolicy
 );
 
 authenticated.get(
     "/idp/:idpId/org",
-    verifyValidLicense,
     verifyUserIsServerAdmin,
     idp.listIdpOrgPolicies
 );
@@ -636,49 +631,42 @@ authenticated.post(
 
 authenticated.get(
     `/api-key/:apiKeyId`,
-    verifyValidLicense,
     verifyUserIsServerAdmin,
     apiKeys.getApiKey
 );
 
 authenticated.put(
     `/api-key`,
-    verifyValidLicense,
     verifyUserIsServerAdmin,
     apiKeys.createRootApiKey
 );
 
 authenticated.delete(
     `/api-key/:apiKeyId`,
-    verifyValidLicense,
     verifyUserIsServerAdmin,
     apiKeys.deleteApiKey
 );
 
 authenticated.get(
     `/api-keys`,
-    verifyValidLicense,
     verifyUserIsServerAdmin,
     apiKeys.listRootApiKeys
 );
 
 authenticated.get(
     `/api-key/:apiKeyId/actions`,
-    verifyValidLicense,
     verifyUserIsServerAdmin,
     apiKeys.listApiKeyActions
 );
 
 authenticated.post(
     `/api-key/:apiKeyId/actions`,
-    verifyValidLicense,
     verifyUserIsServerAdmin,
     apiKeys.setApiKeyActions
 );
 
 authenticated.get(
     `/org/:orgId/api-keys`,
-    verifyValidLicense,
     verifyOrgAccess,
     verifyUserHasAction(ActionsEnum.listApiKeys),
     apiKeys.listOrgApiKeys
@@ -686,7 +674,6 @@ authenticated.get(
 
 authenticated.post(
     `/org/:orgId/api-key/:apiKeyId/actions`,
-    verifyValidLicense,
     verifyOrgAccess,
     verifyApiKeyAccess,
     verifyUserHasAction(ActionsEnum.setApiKeyActions),
@@ -695,7 +682,6 @@ authenticated.post(
 
 authenticated.get(
     `/org/:orgId/api-key/:apiKeyId/actions`,
-    verifyValidLicense,
     verifyOrgAccess,
     verifyApiKeyAccess,
     verifyUserHasAction(ActionsEnum.listApiKeyActions),
@@ -704,7 +690,6 @@ authenticated.get(
 
 authenticated.put(
     `/org/:orgId/api-key`,
-    verifyValidLicense,
     verifyOrgAccess,
     verifyUserHasAction(ActionsEnum.createApiKey),
     apiKeys.createOrgApiKey
@@ -712,7 +697,6 @@ authenticated.put(
 
 authenticated.delete(
     `/org/:orgId/api-key/:apiKeyId`,
-    verifyValidLicense,
     verifyOrgAccess,
     verifyApiKeyAccess,
     verifyUserHasAction(ActionsEnum.deleteApiKey),
@@ -721,7 +705,6 @@ authenticated.delete(
 
 authenticated.get(
     `/org/:orgId/api-key/:apiKeyId`,
-    verifyValidLicense,
     verifyOrgAccess,
     verifyApiKeyAccess,
     verifyUserHasAction(ActionsEnum.getApiKey),