From 8efcc97ec42d32cf027d2f46c26b34e157b34583 Mon Sep 17 00:00:00 2001 From: akumar Date: Thu, 14 Mar 2024 14:45:18 +0100 Subject: [PATCH] fix: provide roleScopingEntityURN in config --- Dockerfile | 5 +---- src/utilts.ts | 8 ++++---- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/Dockerfile b/Dockerfile index 27dc27d..dcd6d68 100644 --- a/Dockerfile +++ b/Dockerfile @@ -25,10 +25,7 @@ USER node ARG APP_HOME=/home/node/srv WORKDIR $APP_HOME -COPY package.json package.json -COPY package-lock.json package-lock.json - -COPY --chown=node:node . $APP_HOME +COPY --chown=node:node ./cfg $APP_HOME/cfg COPY --chown=node:node --from=build $APP_HOME/lib $APP_HOME/lib EXPOSE 50051 diff --git a/src/utilts.ts b/src/utilts.ts index d2cdac8..907ed96 100644 --- a/src/utilts.ts +++ b/src/utilts.ts @@ -21,9 +21,9 @@ import { Logger } from 'winston'; // Create a ids client instance let idsClientInstance: UserServiceClient; +const cfg = createServiceConfig(process.cwd()); const getUserServiceClient = async () => { if (!idsClientInstance) { - const cfg = createServiceConfig(process.cwd()); // identity-srv client to resolve subject ID by token const grpcIDSConfig = cfg.get('client:user'); const loggerCfg = cfg.get('logger'); @@ -124,7 +124,7 @@ export async function checkAccessRequest(ctx: GQLClientContext, resource: Resour let result: DecisionResponse | PolicySetRQResponse; try { - result = await accessRequest(subject, resource, action, ctx, operation); + result = await accessRequest(subject, resource, action, ctx, { operation, roleScopingEntityURN: cfg?.get('authorization:urns:organization') }); } catch (err) { return { decision: Response_Decision.DENY, @@ -148,11 +148,11 @@ export function _filterJobData(data: Data, encode: boolean, logger: Logger): Pic } } - if(picked?.meta?.created && typeof picked.meta.created === 'string') { + if (picked?.meta?.created && typeof picked.meta.created === 'string') { picked.meta.created = new Date(picked.meta.created); } - if(picked?.meta?.modified && typeof picked.meta.modified === 'string') { + if (picked?.meta?.modified && typeof picked.meta.modified === 'string') { picked.meta.modified = new Date(picked.meta.modified); }