Skip to content

[internal-1640] download d2e connector, customizer and experience files #4

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
SantanM merged 19 commits into from
Apr 22, 2025
Merged

[internal-1640] download d2e connector, customizer and experience files #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
a57c73e
download d2e connector, customizer and experience files
SantanM Apr 2, 2025
809f457
fixes in docker build
SantanM Apr 2, 2025
b91f112
separate alp-connector build
SantanM Apr 3, 2025
1b99655
add d2e connector after production build
SantanM Apr 3, 2025
3099e8d
remove copy of jwt-customizer.ts
SantanM Apr 4, 2025
4f7e576
reset jwt-customizer to original code
SantanM Apr 14, 2025
904c879
copy jwt-customizer from d2e source code
SantanM Apr 14, 2025
0851cea
add experience relevant changes to experience-legacy
SantanM Apr 15, 2025
e17e312
change d2e release tag
SantanM Apr 15, 2025
db4dd8e
reorder alp connector build
SantanM Apr 15, 2025
4bbf94a
remove pnpm lock file before and try build
SantanM Apr 15, 2025
b11d860
rm pnpm lock
SantanM Apr 15, 2025
cc31aa7
remove custom-jwt in core-kit
SantanM Apr 15, 2025
a86bf86
revert dockerfile changes
SantanM Apr 16, 2025
1ef9e75
add ARG version to dockerfile
SantanM Apr 16, 2025
40f1f43
rename version to D2E_VERSIOn
SantanM Apr 17, 2025
cb01c55
add missing link connector
SantanM Apr 21, 2025
c94b609
add default build args
SantanM Apr 22, 2025
6987a9d
refactor docker tag name and push
SantanM Apr 22, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 15 additions & 7 deletions .github/workflows/docker-push.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,10 @@ on:
description: Enter BranchName
required: true
type: string
D2E_BRANCH_NAME:
default: develop
description: Enter D2E Branch
type: string

concurrency:
group: ${{ github.event.inputs.GIT_BRANCH_NAME || github.head_ref || github.ref_name }}-${{ github.event_name }}-docker-build
Expand Down Expand Up @@ -66,14 +70,16 @@ jobs:
id: setup
run: |
ACR_IMAGE_PUSH=true
if [ $GIT_BRANCH_NAME = 'develop' ]; then
ACR_IMAGE_PUSH=true
fi

if [ $GIT_BRANCH_NAME == "develop" ]; then
DOCKER_IMG_TAG_NAME=develop
DOCKER_IMG_TAG_NAME=develop
elif [ $GITHUB_EVENT_NAME = "workflow_dispatch" ]; then
DOCKER_IMG_TAG_NAME=${{ github.event.inputs.GIT_BRANCH_NAME }}
if [[ $GIT_BRANCH_NAME = */* ]]; then
DOCKER_IMG_TAG_NAME=$(printf "%s" "$GIT_BRANCH_NAME" | awk -F '/' '{print $2}')
fi
else
DOCKER_IMG_TAG_NAME=$(echo $(git rev-parse --short HEAD))
ACR_IMAGE_PUSH=false
DOCKER_IMG_TAG_NAME=$(echo ${{ github.sha }} | cut -c1-8)
fi

echo GIT_BRANCH_NAME="${GIT_BRANCH_NAME}" | tee -a $GITHUB_OUTPUT | tee -a $GITHUB_STEP_SUMMARY
Expand Down Expand Up @@ -110,4 +116,6 @@ jobs:
file: ${{ matrix.DOCKER_BUILD_FILE_PATH }}
platforms: ${{ steps.setup.outputs.DOCKER_BUILD_PLATFORMS }}
push: ${{ steps.setup.outputs.ACR_IMAGE_PUSH }}
tags: ghcr.io/data2evidence/${{ matrix.name }}:${{ env.DOCKER_IMG_TAG_NAME }}
tags: ghcr.io/data2evidence/${{ matrix.name }}:${{ env.DOCKER_IMG_TAG_NAME }}
build-args: |
D2E_VERSION=${{ env.D2E_BRANCH_NAME || 'develop' }}
20 changes: 19 additions & 1 deletion Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,18 +1,25 @@
###### [STAGE] Build ######
FROM node:20-alpine as builder

Check warning on line 2 in Dockerfile

View workflow job for this annotation

GitHub Actions / dockerize (logto-with-logto-schema, ., ./Dockerfile)

The 'as' keyword should match the case of the 'from' keyword 

FromAsCasing: 'as' and 'FROM' keywords' casing do not match
More info: https://docs.docker.com/go/dockerfile/rule/from-as-casing/

Check warning on line 2 in Dockerfile

View workflow job for this annotation

GitHub Actions / main-dockerize

The 'as' keyword should match the case of the 'from' keyword 

FromAsCasing: 'as' and 'FROM' keywords' casing do not match
More info: https://docs.docker.com/go/dockerfile/rule/from-as-casing/

Check warning on line 2 in Dockerfile

View workflow job for this annotation

GitHub Actions / dockerize (logto-with-logto-schema, ., ./Dockerfile)

The 'as' keyword should match the case of the 'from' keyword 

FromAsCasing: 'as' and 'FROM' keywords' casing do not match
More info: https://docs.docker.com/go/dockerfile/rule/from-as-casing/
WORKDIR /etc/logto
ENV CI=true

# No need for Docker build
ENV PUPPETEER_SKIP_DOWNLOAD=true
ARG D2E_VERSION=develop
ENV D2E_VERSION=${D2E_VERSION}

### Install toolchain ###
RUN npm add --location=global pnpm@^9.0.0
# https://github.com/nodejs/docker-node/blob/main/docs/BestPractices.md#node-gyp-alpine
RUN apk add --no-cache python3 make g++ rsync
RUN apk add --no-cache python3 make g++ rsync py3-setuptools git

COPY . .

RUN git clone --branch ${D2E_VERSION} https://github.com/OHDSI/d2e.git /etc/d2e
RUN cp /etc/d2e/services/alp-logto/to-replace/SignIn/Main.tsx /etc/logto/packages/experience/src/pages/SignIn/Main.tsx
RUN cp /etc/d2e/services/alp-logto/to-replace/SignIn/Main.tsx /etc/logto/packages/experience-legacy/src/pages/SignIn/Main.tsx
RUN cp /etc/d2e/services/alp-logto/to-replace/core/src/libraries/jwt-customizer.ts /etc/logto/packages/core/src/libraries/jwt-customizer.ts

### Install dependencies and build ###
RUN pnpm i

Expand All @@ -22,6 +29,7 @@

ARG applicationinsights_connection_string
ENV APPLICATIONINSIGHTS_CONNECTION_STRING=${applicationinsights_connection_string}

RUN pnpm -r build

### Add official connectors ###
Expand All @@ -33,11 +41,21 @@
RUN rm -rf node_modules packages/**/node_modules
RUN NODE_ENV=production pnpm i

# Note: D2E connector build and link
RUN cp -r /etc/d2e/services/alp-logto/connector-alp-azuread /etc/logto/packages/connectors/connector-alp-azuread
WORKDIR /etc/logto/packages/connectors/connector-alp-azuread
RUN npm i
RUN npm run build
WORKDIR /etc/logto/
RUN pnpm cli connector link $ADDITIONAL_CONNECTOR_ARGS -p .

### Clean up ###
RUN rm -rf .scripts pnpm-*.yaml packages/cloud
RUN rm -rf /etc/d2e

###### [STAGE] Seal ######
FROM node:20-alpine as app

Check warning on line 57 in Dockerfile

View workflow job for this annotation

GitHub Actions / dockerize (logto-with-logto-schema, ., ./Dockerfile)

The 'as' keyword should match the case of the 'from' keyword 

FromAsCasing: 'as' and 'FROM' keywords' casing do not match
More info: https://docs.docker.com/go/dockerfile/rule/from-as-casing/

Check warning on line 57 in Dockerfile

View workflow job for this annotation

GitHub Actions / main-dockerize

The 'as' keyword should match the case of the 'from' keyword 

FromAsCasing: 'as' and 'FROM' keywords' casing do not match
More info: https://docs.docker.com/go/dockerfile/rule/from-as-casing/

Check warning on line 57 in Dockerfile

View workflow job for this annotation

GitHub Actions / dockerize (logto-with-logto-schema, ., ./Dockerfile)

The 'as' keyword should match the case of the 'from' keyword 

FromAsCasing: 'as' and 'FROM' keywords' casing do not match
More info: https://docs.docker.com/go/dockerfile/rule/from-as-casing/
RUN apk update && apk add openssl>3
WORKDIR /etc/logto
COPY --from=builder /etc/logto .
RUN mkdir -p /etc/logto/packages/cli/alteration-scripts && chmod g+w /etc/logto/packages/cli/alteration-scripts
Expand Down
23 changes: 3 additions & 20 deletions packages/core/src/libraries/jwt-customizer.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,31 +53,14 @@ export class JwtCustomizerLibrary {
// Convert errors to WithTyped client response error to share the error handling logic.
static async runScriptInLocalVm(data: CustomJwtFetcher) {
try {
const mapId = (data as any).context["user"].primaryEmail;
const payload: CustomJwtScriptPayload = {
...(data.tokenType === LogtoJwtTokenKeyType.AccessToken
? {
...pick(data, 'token', 'context', 'environmentVariables'),
extra: {
// @ts-ignore
thirdPartyToken: globalThis.tokenMap
? // @ts-ignore
globalThis.tokenMap[mapId]
: undefined,
// @ts-ignore
thirdPartyRefreshToken: globalThis.refreshTokenMap
? // @ts-ignore
globalThis.refreshTokenMap[mapId]
: undefined,
},
}
? pick(data, 'token', 'context', 'environmentVariables')
: pick(data, 'token', 'environmentVariables')),
api: apiContext,
};
const result = await runScriptFunctionInLocalVm(data.script, 'getCustomJwtClaims', payload);

// @ts-ignore
delete globalThis.tokenMap[mapId];
const result = await runScriptFunctionInLocalVm(data.script, 'getCustomJwtClaims', payload);

// If the `result` is not a record, we cannot merge it to the existing token payload.
return z.record(z.unknown()).parse(result);
Expand Down Expand Up @@ -250,4 +233,4 @@ export class JwtCustomizerLibrary {
body: deepmerge(customizerScriptsFromDatabase, newCustomizerScripts),
});
}
}
}
6 changes: 1 addition & 5 deletions packages/toolkit/core-kit/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,7 @@
"import": "./lib/index.js"
},
"./declaration": "./declaration/index.ts",
"./scss/*": "./scss/*.scss",
"./custom-jwt": {
"node": "./lib/custom-jwt/index.js",
"types": "./lib/custom-jwt/index.d.ts"
}
"./scss/*": "./scss/*.scss"
},
"types": "./lib/index.d.ts",
"files": [
Expand Down
Loading