From a81ea7cc8f8bb5528b438a88f56a351d8ddcae7e Mon Sep 17 00:00:00 2001 From: Fred KISSIE Date: Wed, 29 Oct 2025 03:34:44 +0100 Subject: [PATCH] =?UTF-8?q?=F0=9F=90=9B=20fix=20merge=20errors?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- server/auth/actions.ts | 3 -- server/routers/integration.ts | 95 +++++++++++++++++------------------ server/routers/org/index.ts | 1 - src/app/navigation.tsx | 6 +-- 4 files changed, 48 insertions(+), 57 deletions(-) diff --git a/server/auth/actions.ts b/server/auth/actions.ts index d00610de..d08457e5 100644 --- a/server/auth/actions.ts +++ b/server/auth/actions.ts @@ -119,11 +119,8 @@ export enum ActionsEnum { updateLoginPage = "updateLoginPage", getLoginPage = "getLoginPage", deleteLoginPage = "deleteLoginPage", - - // blueprints listBlueprints = "listBlueprints", getBlueprint = "getBlueprint", - applyBlueprint = "applyBlueprint" applyBlueprint = "applyBlueprint", viewLogs = "viewLogs", exportLogs = "exportLogs" diff --git a/server/routers/integration.ts b/server/routers/integration.ts index c1862120..7164c1de 100644 --- a/server/routers/integration.ts +++ b/server/routers/integration.ts @@ -53,7 +53,7 @@ authenticated.put( verifyApiKeyIsRoot, verifyApiKeyHasAction(ActionsEnum.createOrg), logActionAudit(ActionsEnum.createOrg), - org.createOrg, + org.createOrg ); authenticated.get( @@ -75,7 +75,7 @@ authenticated.post( verifyApiKeyOrgAccess, verifyApiKeyHasAction(ActionsEnum.updateOrg), logActionAudit(ActionsEnum.updateOrg), - org.updateOrg, + org.updateOrg ); authenticated.delete( @@ -83,7 +83,7 @@ authenticated.delete( verifyApiKeyIsRoot, verifyApiKeyHasAction(ActionsEnum.deleteOrg), logActionAudit(ActionsEnum.deleteOrg), - org.deleteOrg, + org.deleteOrg ); authenticated.put( @@ -91,7 +91,7 @@ authenticated.put( verifyApiKeyOrgAccess, verifyApiKeyHasAction(ActionsEnum.createSite), logActionAudit(ActionsEnum.createSite), - site.createSite, + site.createSite ); authenticated.get( @@ -127,7 +127,7 @@ authenticated.post( verifyApiKeySiteAccess, verifyApiKeyHasAction(ActionsEnum.updateSite), logActionAudit(ActionsEnum.updateSite), - site.updateSite, + site.updateSite ); authenticated.delete( @@ -135,7 +135,7 @@ authenticated.delete( verifyApiKeySiteAccess, verifyApiKeyHasAction(ActionsEnum.deleteSite), logActionAudit(ActionsEnum.deleteSite), - site.deleteSite, + site.deleteSite ); authenticated.get( @@ -150,7 +150,7 @@ authenticated.put( verifyApiKeySiteAccess, verifyApiKeyHasAction(ActionsEnum.createSiteResource), logActionAudit(ActionsEnum.createSiteResource), - siteResource.createSiteResource, + siteResource.createSiteResource ); authenticated.get( @@ -184,7 +184,7 @@ authenticated.post( verifyApiKeySiteResourceAccess, verifyApiKeyHasAction(ActionsEnum.updateSiteResource), logActionAudit(ActionsEnum.updateSiteResource), - siteResource.updateSiteResource, + siteResource.updateSiteResource ); authenticated.delete( @@ -194,7 +194,7 @@ authenticated.delete( verifyApiKeySiteResourceAccess, verifyApiKeyHasAction(ActionsEnum.deleteSiteResource), logActionAudit(ActionsEnum.deleteSiteResource), - siteResource.deleteSiteResource, + siteResource.deleteSiteResource ); authenticated.put( @@ -202,7 +202,7 @@ authenticated.put( verifyApiKeyOrgAccess, verifyApiKeyHasAction(ActionsEnum.createResource), logActionAudit(ActionsEnum.createResource), - resource.createResource, + resource.createResource ); authenticated.put( @@ -210,7 +210,7 @@ authenticated.put( verifyApiKeyOrgAccess, verifyApiKeyHasAction(ActionsEnum.createResource), logActionAudit(ActionsEnum.createResource), - resource.createResource, + resource.createResource ); authenticated.get( @@ -246,7 +246,7 @@ authenticated.post( verifyApiKeyOrgAccess, verifyApiKeyHasAction(ActionsEnum.inviteUser), logActionAudit(ActionsEnum.inviteUser), - user.inviteUser, + user.inviteUser ); authenticated.get( @@ -275,7 +275,7 @@ authenticated.post( verifyApiKeyResourceAccess, verifyApiKeyHasAction(ActionsEnum.updateResource), logActionAudit(ActionsEnum.updateResource), - resource.updateResource, + resource.updateResource ); authenticated.delete( @@ -283,7 +283,7 @@ authenticated.delete( verifyApiKeyResourceAccess, verifyApiKeyHasAction(ActionsEnum.deleteResource), logActionAudit(ActionsEnum.deleteResource), - resource.deleteResource, + resource.deleteResource ); authenticated.put( @@ -291,7 +291,7 @@ authenticated.put( verifyApiKeyResourceAccess, verifyApiKeyHasAction(ActionsEnum.createTarget), logActionAudit(ActionsEnum.createTarget), - target.createTarget, + target.createTarget ); authenticated.get( @@ -306,7 +306,7 @@ authenticated.put( verifyApiKeyResourceAccess, verifyApiKeyHasAction(ActionsEnum.createResourceRule), logActionAudit(ActionsEnum.createResourceRule), - resource.createResourceRule, + resource.createResourceRule ); authenticated.get( @@ -321,7 +321,7 @@ authenticated.post( verifyApiKeyResourceAccess, verifyApiKeyHasAction(ActionsEnum.updateResourceRule), logActionAudit(ActionsEnum.updateResourceRule), - resource.updateResourceRule, + resource.updateResourceRule ); authenticated.delete( @@ -329,7 +329,7 @@ authenticated.delete( verifyApiKeyResourceAccess, verifyApiKeyHasAction(ActionsEnum.deleteResourceRule), logActionAudit(ActionsEnum.deleteResourceRule), - resource.deleteResourceRule, + resource.deleteResourceRule ); authenticated.get( @@ -344,7 +344,7 @@ authenticated.post( verifyApiKeyTargetAccess, verifyApiKeyHasAction(ActionsEnum.updateTarget), logActionAudit(ActionsEnum.updateTarget), - target.updateTarget, + target.updateTarget ); authenticated.delete( @@ -352,7 +352,7 @@ authenticated.delete( verifyApiKeyTargetAccess, verifyApiKeyHasAction(ActionsEnum.deleteTarget), logActionAudit(ActionsEnum.deleteTarget), - target.deleteTarget, + target.deleteTarget ); authenticated.put( @@ -360,7 +360,7 @@ authenticated.put( verifyApiKeyOrgAccess, verifyApiKeyHasAction(ActionsEnum.createRole), logActionAudit(ActionsEnum.createRole), - role.createRole, + role.createRole ); authenticated.get( @@ -375,7 +375,7 @@ authenticated.delete( verifyApiKeyRoleAccess, verifyApiKeyHasAction(ActionsEnum.deleteRole), logActionAudit(ActionsEnum.deleteRole), - role.deleteRole, + role.deleteRole ); authenticated.get( @@ -391,7 +391,7 @@ authenticated.post( verifyApiKeyUserAccess, verifyApiKeyHasAction(ActionsEnum.addUserRole), logActionAudit(ActionsEnum.addUserRole), - user.addUserRole, + user.addUserRole ); authenticated.post( @@ -400,7 +400,7 @@ authenticated.post( verifyApiKeyRoleAccess, verifyApiKeyHasAction(ActionsEnum.setResourceRoles), logActionAudit(ActionsEnum.setResourceRoles), - resource.setResourceRoles, + resource.setResourceRoles ); authenticated.post( @@ -409,7 +409,7 @@ authenticated.post( verifyApiKeySetResourceUsers, verifyApiKeyHasAction(ActionsEnum.setResourceUsers), logActionAudit(ActionsEnum.setResourceUsers), - resource.setResourceUsers, + resource.setResourceUsers ); authenticated.post( @@ -417,7 +417,7 @@ authenticated.post( verifyApiKeyResourceAccess, verifyApiKeyHasAction(ActionsEnum.setResourcePassword), logActionAudit(ActionsEnum.setResourcePassword), - resource.setResourcePassword, + resource.setResourcePassword ); authenticated.post( @@ -425,7 +425,7 @@ authenticated.post( verifyApiKeyResourceAccess, verifyApiKeyHasAction(ActionsEnum.setResourcePincode), logActionAudit(ActionsEnum.setResourcePincode), - resource.setResourcePincode, + resource.setResourcePincode ); authenticated.post( @@ -433,7 +433,7 @@ authenticated.post( verifyApiKeyResourceAccess, verifyApiKeyHasAction(ActionsEnum.setResourceHeaderAuth), logActionAudit(ActionsEnum.setResourceHeaderAuth), - resource.setResourceHeaderAuth, + resource.setResourceHeaderAuth ); authenticated.post( @@ -441,7 +441,7 @@ authenticated.post( verifyApiKeyResourceAccess, verifyApiKeyHasAction(ActionsEnum.setResourceWhitelist), logActionAudit(ActionsEnum.setResourceWhitelist), - resource.setResourceWhitelist, + resource.setResourceWhitelist ); authenticated.post( @@ -470,7 +470,7 @@ authenticated.post( verifyApiKeyResourceAccess, verifyApiKeyHasAction(ActionsEnum.generateAccessToken), logActionAudit(ActionsEnum.generateAccessToken), - accessToken.generateAccessToken, + accessToken.generateAccessToken ); authenticated.delete( @@ -478,7 +478,7 @@ authenticated.delete( verifyApiKeyAccessTokenAccess, verifyApiKeyHasAction(ActionsEnum.deleteAcessToken), logActionAudit(ActionsEnum.deleteAcessToken), - accessToken.deleteAccessToken, + accessToken.deleteAccessToken ); authenticated.get( @@ -507,7 +507,7 @@ authenticated.post( verifyApiKeyIsRoot, verifyApiKeyHasAction(ActionsEnum.updateUser), logActionAudit(ActionsEnum.updateUser), - user.updateUser2FA, + user.updateUser2FA ); authenticated.get( @@ -529,7 +529,7 @@ authenticated.put( verifyApiKeyOrgAccess, verifyApiKeyHasAction(ActionsEnum.createOrgUser), logActionAudit(ActionsEnum.createOrgUser), - user.createOrgUser, + user.createOrgUser ); authenticated.post( @@ -538,7 +538,7 @@ authenticated.post( verifyApiKeyUserAccess, verifyApiKeyHasAction(ActionsEnum.updateOrgUser), logActionAudit(ActionsEnum.updateOrgUser), - user.updateOrgUser, + user.updateOrgUser ); authenticated.delete( @@ -547,7 +547,7 @@ authenticated.delete( verifyApiKeyUserAccess, verifyApiKeyHasAction(ActionsEnum.removeUser), logActionAudit(ActionsEnum.removeUser), - user.removeUserOrg, + user.removeUserOrg ); // authenticated.put( @@ -568,7 +568,7 @@ authenticated.post( verifyApiKeyIsRoot, verifyApiKeyHasAction(ActionsEnum.setApiKeyActions), logActionAudit(ActionsEnum.setApiKeyActions), - apiKeys.setApiKeyActions, + apiKeys.setApiKeyActions ); authenticated.get( @@ -583,7 +583,7 @@ authenticated.put( verifyApiKeyIsRoot, verifyApiKeyHasAction(ActionsEnum.createApiKey), logActionAudit(ActionsEnum.createApiKey), - apiKeys.createOrgApiKey, + apiKeys.createOrgApiKey ); authenticated.delete( @@ -591,7 +591,7 @@ authenticated.delete( verifyApiKeyIsRoot, verifyApiKeyHasAction(ActionsEnum.deleteApiKey), logActionAudit(ActionsEnum.deleteApiKey), - apiKeys.deleteApiKey, + apiKeys.deleteApiKey ); authenticated.put( @@ -599,7 +599,7 @@ authenticated.put( verifyApiKeyIsRoot, verifyApiKeyHasAction(ActionsEnum.createIdp), logActionAudit(ActionsEnum.createIdp), - idp.createOidcIdp, + idp.createOidcIdp ); authenticated.post( @@ -607,7 +607,7 @@ authenticated.post( verifyApiKeyIsRoot, verifyApiKeyHasAction(ActionsEnum.updateIdp), logActionAudit(ActionsEnum.updateIdp), - idp.updateOidcIdp, + idp.updateOidcIdp ); authenticated.get( @@ -629,7 +629,7 @@ authenticated.put( verifyApiKeyIsRoot, verifyApiKeyHasAction(ActionsEnum.createIdpOrg), logActionAudit(ActionsEnum.createIdpOrg), - idp.createIdpOrgPolicy, + idp.createIdpOrgPolicy ); authenticated.post( @@ -637,7 +637,7 @@ authenticated.post( verifyApiKeyIsRoot, verifyApiKeyHasAction(ActionsEnum.updateIdpOrg), logActionAudit(ActionsEnum.updateIdpOrg), - idp.updateIdpOrgPolicy, + idp.updateIdpOrgPolicy ); authenticated.delete( @@ -645,7 +645,7 @@ authenticated.delete( verifyApiKeyIsRoot, verifyApiKeyHasAction(ActionsEnum.deleteIdpOrg), logActionAudit(ActionsEnum.deleteIdpOrg), - idp.deleteIdpOrgPolicy, + idp.deleteIdpOrgPolicy ); authenticated.get( @@ -685,7 +685,7 @@ authenticated.put( verifyApiKeyOrgAccess, verifyApiKeyHasAction(ActionsEnum.createClient), logActionAudit(ActionsEnum.createClient), - client.createClient, + client.createClient ); authenticated.delete( @@ -694,7 +694,7 @@ authenticated.delete( verifyApiKeyClientAccess, verifyApiKeyHasAction(ActionsEnum.deleteClient), logActionAudit(ActionsEnum.deleteClient), - client.deleteClient, + client.deleteClient ); authenticated.post( @@ -703,14 +703,13 @@ authenticated.post( verifyApiKeyClientAccess, verifyApiKeyHasAction(ActionsEnum.updateClient), logActionAudit(ActionsEnum.updateClient), - client.updateClient, + client.updateClient ); authenticated.put( "/org/:orgId/blueprint", verifyApiKeyOrgAccess, verifyApiKeyHasAction(ActionsEnum.applyBlueprint), - blueprints.applyJSONBlueprint logActionAudit(ActionsEnum.applyBlueprint), - org.applyBlueprint, + blueprints.applyJSONBlueprint ); diff --git a/server/routers/org/index.ts b/server/routers/org/index.ts index 8ce01e92..b0db28d1 100644 --- a/server/routers/org/index.ts +++ b/server/routers/org/index.ts @@ -7,5 +7,4 @@ export * from "./checkId"; export * from "./getOrgOverview"; export * from "./listOrgs"; export * from "./pickOrgDefaults"; -export * from "./applyBlueprint"; export * from "./checkOrgUserAccess"; diff --git a/src/app/navigation.tsx b/src/app/navigation.tsx index 90b3bacc..e3478fa1 100644 --- a/src/app/navigation.tsx +++ b/src/app/navigation.tsx @@ -13,11 +13,7 @@ import { Globe, // Added from 'dev' branch MonitorUp, // Added from 'dev' branch Server, - CreditCard, - Bolt, - ScanText, - ReceiptText - Zap, + ReceiptText, CreditCard, Logs, SquareMousePointer,