From 133e3e96cad954a5034e3acb7891d3c066568d6b Mon Sep 17 00:00:00 2001 From: Vins Date: Mon, 25 Mar 2024 14:55:30 +0100 Subject: [PATCH 1/9] Entrypoint get office memberships --- src/app/api/idnot/OfficeController.ts | 34 +++++++++++++++++++ src/app/index.ts | 3 +- .../common/IdNotService/IdNotService.ts | 13 +++++++ 3 files changed, 49 insertions(+), 1 deletion(-) create mode 100644 src/app/api/idnot/OfficeController.ts diff --git a/src/app/api/idnot/OfficeController.ts b/src/app/api/idnot/OfficeController.ts new file mode 100644 index 00000000..3e00e7bf --- /dev/null +++ b/src/app/api/idnot/OfficeController.ts @@ -0,0 +1,34 @@ +import { Response, Request } from "express"; +import { Controller, Get } from "@ControllerPattern/index"; +import ApiController from "@Common/system/controller-pattern/ApiController"; +import { Service } from "typedi"; +import IdNotService from "@Services/common/IdNotService/IdNotService"; + +@Controller() +@Service() +export default class UserController extends ApiController { + constructor (private idNotService: IdNotService) { + super(); + } + + @Get("/api/v1/idnot/office/:uid/office-memberships") + protected async getOfficeMemberships(req: Request, response: Response) { + try { + const uid = req.params["uid"]; + if (!uid) { + this.httpBadRequest(response, "uid is required"); + return; + } + + const officeMemberships = await this.idNotService.getOfficeMemberships(uid); + this.httpSuccess(response, officeMemberships); + } catch (error) { + console.log(error); + this.httpInternalError(response); + return; + } + } +} + + + diff --git a/src/app/index.ts b/src/app/index.ts index 510d903d..20343be2 100644 --- a/src/app/index.ts +++ b/src/app/index.ts @@ -48,7 +48,7 @@ import UserNotificationController from "./api/notary/UserNotificationController" import AuthController from "./api/customer/AuthController"; import NotaryOfficeRibController from "./api/notary/OfficeRibController"; import CustomerOfficeRibController from "./api/customer/OfficeRibController"; - +import IdNotOfficeController from "./api/idnot/OfficeController"; /** * @description This allow to declare all controllers used in the application */ @@ -104,5 +104,6 @@ export default { Container.get(AuthController); Container.get(NotaryOfficeRibController); Container.get(CustomerOfficeRibController); + Container.get(IdNotOfficeController) }, }; diff --git a/src/services/common/IdNotService/IdNotService.ts b/src/services/common/IdNotService/IdNotService.ts index 047868af..051132aa 100644 --- a/src/services/common/IdNotService/IdNotService.ts +++ b/src/services/common/IdNotService/IdNotService.ts @@ -173,6 +173,19 @@ export default class IdNotService extends BaseService { } } + public async getOfficeMemberships(officeId: string) { + const officeInfos = await this.officeService.getByUid(officeId); + const office = Office.hydrate(officeInfos!); + const searchParams = new URLSearchParams({ + key: this.variables.IDNOT_API_KEY, + }); + return (await ( + await fetch(`${this.variables.IDNOT_API_BASE_URL}/api/pp/v2/entites/${office.idNot}/personnes?` + searchParams, { + method: "GET", + }) + ).json()) as any; + } + public getOfficeStatus(statusName: string) { switch (statusName) { case "Pourvu": From 889e6ec6ba4b68ef87c9765195a3348e2bfa1b6e Mon Sep 17 00:00:00 2001 From: Vins Date: Wed, 27 Mar 2024 10:28:18 +0100 Subject: [PATCH 2/9] Debug logs --- src/services/common/IdNotService/IdNotService.ts | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/services/common/IdNotService/IdNotService.ts b/src/services/common/IdNotService/IdNotService.ts index 051132aa..99b732ba 100644 --- a/src/services/common/IdNotService/IdNotService.ts +++ b/src/services/common/IdNotService/IdNotService.ts @@ -121,12 +121,20 @@ export default class IdNotService extends BaseService { code: code, grant_type: "authorization_code", }); + console.log(this.variables.IDNOT_BASE_URL + this.variables.IDNOT_CONNEXION_URL + "?" + query.toString()); + const token = await fetch(this.variables.IDNOT_BASE_URL + this.variables.IDNOT_CONNEXION_URL + "?" + query, { method: "POST" }); + console.log(token.status); + if(token.status !== 200) console.error(await token.text()); const decodedToken = (await token.json()) as IIdNotToken; + console.log(decodedToken); + const decodedIdToken = jwt.decode(decodedToken.id_token) as IdNotJwtPayload; + console.log(decodedIdToken); + return decodedIdToken; } From 478b967896b4d21aa3de9f39373769392a7dddd0 Mon Sep 17 00:00:00 2001 From: Vins Date: Wed, 27 Mar 2024 11:14:03 +0100 Subject: [PATCH 3/9] Removed logs --- src/services/common/IdNotService/IdNotService.ts | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/src/services/common/IdNotService/IdNotService.ts b/src/services/common/IdNotService/IdNotService.ts index 99b732ba..2cfe91ee 100644 --- a/src/services/common/IdNotService/IdNotService.ts +++ b/src/services/common/IdNotService/IdNotService.ts @@ -120,20 +120,15 @@ export default class IdNotService extends BaseService { redirect_uri: this.variables.IDNOT_REDIRECT_URL, code: code, grant_type: "authorization_code", - }); - console.log(this.variables.IDNOT_BASE_URL + this.variables.IDNOT_CONNEXION_URL + "?" + query.toString()); - + }); const token = await fetch(this.variables.IDNOT_BASE_URL + this.variables.IDNOT_CONNEXION_URL + "?" + query, { method: "POST" }); - console.log(token.status); if(token.status !== 200) console.error(await token.text()); const decodedToken = (await token.json()) as IIdNotToken; - console.log(decodedToken); const decodedIdToken = jwt.decode(decodedToken.id_token) as IdNotJwtPayload; - console.log(decodedIdToken); return decodedIdToken; From f8ead423ee07bf1c3b5fa49245edde3f39660753 Mon Sep 17 00:00:00 2001 From: Yanis JEDRZEJCZAK Date: Thu, 28 Mar 2024 15:51:23 +0100 Subject: [PATCH 4/9] Prod CICD yml --- .github/workflows/prd.yml | 73 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 73 insertions(+) create mode 100644 .github/workflows/prd.yml diff --git a/.github/workflows/prd.yml b/.github/workflows/prd.yml new file mode 100644 index 00000000..c6e0e663 --- /dev/null +++ b/.github/workflows/prd.yml @@ -0,0 +1,73 @@ +name: Prod - Build & Deploy to Scaleway + +on: + push: + branches: [main] + +env: + PROJECT_ID: c0ed1e9e-d945-461f-920c-98c844ef1ad4 + NAMESPACE_ID: 7a009438-0af3-4824-8112-a8b9a91f292a + CONTAINER_REGISTRY_ENDPOINT: rg.fr-par.scw.cloud/funcscwlecoffreprdg7h5bbub + IMAGE_NAME: back + CONTAINER_NAME: back + +jobs: + build-and-push-image: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v4 + - name: Setup SSH + run: | + mkdir -p ~/.ssh + echo "${{ secrets.SSH_PRIVATE_KEY }}" > ~/.ssh/id_rsa + chmod 600 ~/.ssh/id_rsa + ssh-keyscan -t rsa github.com >> ~/.ssh/known_hosts + env: + SSH_PRIVATE_KEY: ${{ secrets.SSH_PRIVATE_KEY }} + - name: Copy SSH + run: cp ~/.ssh/id_rsa id_rsa + - name: Login to Scaleway Container Registry + uses: docker/login-action@v3 + with: + username: nologin + password: ${{ secrets.SCW_SECRET_KEY }} + registry: ${{ env.CONTAINER_REGISTRY_ENDPOINT }} + - name: Build the Docker Image + run: docker build . -t ${{ env.CONTAINER_REGISTRY_ENDPOINT }}/${{ env.IMAGE_NAME }} + - name: Push the Docker Image to Scaleway Container Registry + run: docker push ${{ env.CONTAINER_REGISTRY_ENDPOINT }}/${{ env.IMAGE_NAME }} + deploy-to-scaleway: + needs: build-and-push-image + runs-on: ubuntu-latest + environment: prod + steps: + - name: Install CLI + uses: scaleway/action-scw@v0 + - name: Get container ID + run: | + echo "CONTAINER_ID=$(scw container container list namespace-id=${{env.NAMESPACE_ID}} -o json | jq -r '.[] | select(.name == "${{ env.CONTAINER_NAME }}") | .id')" >> $GITHUB_ENV + env: + SCW_ACCESS_KEY: ${{ secrets.SCW_ACCESS_KEY }} + SCW_SECRET_KEY: ${{ secrets.SCW_SECRET_KEY }} + SCW_DEFAULT_PROJECT_ID: ${{ env.PROJECT_ID }} + SCW_DEFAULT_ORGANIZATION_ID: ${{ secrets.SCW_ORGANIZATION_ID }} + - name: Deploy the container based on the new image + run: | + env_string="" + while IFS= read -r line; do + if [[ "$line" == *"="* ]]; then + key=$(echo "$line" | cut -d '=' -f 1) + value=$(echo "$line" | cut -d '=' -f 2-) + if [[ -n "$key" ]]; then + env_string+="environment-variables.$key=$value " + fi + fi + done <<< "$ENV_VARS" + env_string=$(echo $env_string | sed 's/ $//') + scw container container update ${{ env.CONTAINER_ID }} $env_string + env: + ENV_VARS: ${{ secrets.ENV }} + SCW_ACCESS_KEY: ${{ secrets.SCW_ACCESS_KEY }} + SCW_SECRET_KEY: ${{ secrets.SCW_SECRET_KEY }} + SCW_DEFAULT_PROJECT_ID: ${{ env.PROJECT_ID }} + SCW_DEFAULT_ORGANIZATION_ID: ${{ secrets.SCW_ORGANIZATION_ID }} From a5ef2dc1e05ef8b0699179a7b65877616c58fdc2 Mon Sep 17 00:00:00 2001 From: Yanis JEDRZEJCZAK Date: Thu, 28 Mar 2024 15:51:32 +0100 Subject: [PATCH 5/9] Staging CICD yml --- .github/workflows/stg.yml | 73 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 73 insertions(+) create mode 100644 .github/workflows/stg.yml diff --git a/.github/workflows/stg.yml b/.github/workflows/stg.yml new file mode 100644 index 00000000..c1ebc338 --- /dev/null +++ b/.github/workflows/stg.yml @@ -0,0 +1,73 @@ +name: Staging - Build & Deploy to Scaleway + +on: + push: + branches: [staging] + +env: + PROJECT_ID: c0ed1e9e-d945-461f-920c-98c844ef1ad4 + NAMESPACE_ID: 9f949ff2-97bc-4979-ade2-1994dcaabde0 + CONTAINER_REGISTRY_ENDPOINT: rg.fr-par.scw.cloud/funcscwlecoffrestgqhhn4ixh + IMAGE_NAME: back + CONTAINER_NAME: back + +jobs: + build-and-push-image: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v4 + - name: Setup SSH + run: | + mkdir -p ~/.ssh + echo "${{ secrets.SSH_PRIVATE_KEY }}" > ~/.ssh/id_rsa + chmod 600 ~/.ssh/id_rsa + ssh-keyscan -t rsa github.com >> ~/.ssh/known_hosts + env: + SSH_PRIVATE_KEY: ${{ secrets.SSH_PRIVATE_KEY }} + - name: Copy SSH + run: cp ~/.ssh/id_rsa id_rsa + - name: Login to Scaleway Container Registry + uses: docker/login-action@v3 + with: + username: nologin + password: ${{ secrets.SCW_SECRET_KEY }} + registry: ${{ env.CONTAINER_REGISTRY_ENDPOINT }} + - name: Build the Docker Image + run: docker build . -t ${{ env.CONTAINER_REGISTRY_ENDPOINT }}/${{ env.IMAGE_NAME }} + - name: Push the Docker Image to Scaleway Container Registry + run: docker push ${{ env.CONTAINER_REGISTRY_ENDPOINT }}/${{ env.IMAGE_NAME }} + deploy-to-scaleway: + needs: build-and-push-image + runs-on: ubuntu-latest + environment: staging + steps: + - name: Install CLI + uses: scaleway/action-scw@v0 + - name: Get container ID + run: | + echo "CONTAINER_ID=$(scw container container list namespace-id=${{env.NAMESPACE_ID}} -o json | jq -r '.[] | select(.name == "${{ env.CONTAINER_NAME }}") | .id')" >> $GITHUB_ENV + env: + SCW_ACCESS_KEY: ${{ secrets.SCW_ACCESS_KEY }} + SCW_SECRET_KEY: ${{ secrets.SCW_SECRET_KEY }} + SCW_DEFAULT_PROJECT_ID: ${{ env.PROJECT_ID }} + SCW_DEFAULT_ORGANIZATION_ID: ${{ secrets.SCW_ORGANIZATION_ID }} + - name: Deploy the container based on the new image + run: | + env_string="" + while IFS= read -r line; do + if [[ "$line" == *"="* ]]; then + key=$(echo "$line" | cut -d '=' -f 1) + value=$(echo "$line" | cut -d '=' -f 2-) + if [[ -n "$key" ]]; then + env_string+="environment-variables.$key=$value " + fi + fi + done <<< "$ENV_VARS" + env_string=$(echo $env_string | sed 's/ $//') + scw container container update ${{ env.CONTAINER_ID }} $env_string + env: + ENV_VARS: ${{ secrets.ENV }} + SCW_ACCESS_KEY: ${{ secrets.SCW_ACCESS_KEY }} + SCW_SECRET_KEY: ${{ secrets.SCW_SECRET_KEY }} + SCW_DEFAULT_PROJECT_ID: ${{ env.PROJECT_ID }} + SCW_DEFAULT_ORGANIZATION_ID: ${{ secrets.SCW_ORGANIZATION_ID }} From 357509c970fca2dfce7d91af74d0faecd0fc0921 Mon Sep 17 00:00:00 2001 From: Yanis JEDRZEJCZAK Date: Thu, 28 Mar 2024 15:51:39 +0100 Subject: [PATCH 6/9] Preprod CICD yml --- .github/workflows/ppd.yml | 73 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 73 insertions(+) create mode 100644 .github/workflows/ppd.yml diff --git a/.github/workflows/ppd.yml b/.github/workflows/ppd.yml new file mode 100644 index 00000000..f2ee1638 --- /dev/null +++ b/.github/workflows/ppd.yml @@ -0,0 +1,73 @@ +name: Preprod - Build & Deploy to Scaleway + +on: + push: + branches: [preprod] + +env: + PROJECT_ID: c0ed1e9e-d945-461f-920c-98c844ef1ad4 + NAMESPACE_ID: 2f2a5040-b5d9-40dc-8a80-f8d5653edd6f + CONTAINER_REGISTRY_ENDPOINT: rg.fr-par.scw.cloud/funcscwlecoffreppdw9e10llz + IMAGE_NAME: back + CONTAINER_NAME: back + +jobs: + build-and-push-image: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v4 + - name: Setup SSH + run: | + mkdir -p ~/.ssh + echo "${{ secrets.SSH_PRIVATE_KEY }}" > ~/.ssh/id_rsa + chmod 600 ~/.ssh/id_rsa + ssh-keyscan -t rsa github.com >> ~/.ssh/known_hosts + env: + SSH_PRIVATE_KEY: ${{ secrets.SSH_PRIVATE_KEY }} + - name: Copy SSH + run: cp ~/.ssh/id_rsa id_rsa + - name: Login to Scaleway Container Registry + uses: docker/login-action@v3 + with: + username: nologin + password: ${{ secrets.SCW_SECRET_KEY }} + registry: ${{ env.CONTAINER_REGISTRY_ENDPOINT }} + - name: Build the Docker Image + run: docker build . -t ${{ env.CONTAINER_REGISTRY_ENDPOINT }}/${{ env.IMAGE_NAME }} + - name: Push the Docker Image to Scaleway Container Registry + run: docker push ${{ env.CONTAINER_REGISTRY_ENDPOINT }}/${{ env.IMAGE_NAME }} + deploy-to-scaleway: + needs: build-and-push-image + runs-on: ubuntu-latest + environment: preprod + steps: + - name: Install CLI + uses: scaleway/action-scw@v0 + - name: Get container ID + run: | + echo "CONTAINER_ID=$(scw container container list namespace-id=${{env.NAMESPACE_ID}} -o json | jq -r '.[] | select(.name == "${{ env.CONTAINER_NAME }}") | .id')" >> $GITHUB_ENV + env: + SCW_ACCESS_KEY: ${{ secrets.SCW_ACCESS_KEY }} + SCW_SECRET_KEY: ${{ secrets.SCW_SECRET_KEY }} + SCW_DEFAULT_PROJECT_ID: ${{ env.PROJECT_ID }} + SCW_DEFAULT_ORGANIZATION_ID: ${{ secrets.SCW_ORGANIZATION_ID }} + - name: Deploy the container based on the new image + run: | + env_string="" + while IFS= read -r line; do + if [[ "$line" == *"="* ]]; then + key=$(echo "$line" | cut -d '=' -f 1) + value=$(echo "$line" | cut -d '=' -f 2-) + if [[ -n "$key" ]]; then + env_string+="environment-variables.$key=$value " + fi + fi + done <<< "$ENV_VARS" + env_string=$(echo $env_string | sed 's/ $//') + scw container container update ${{ env.CONTAINER_ID }} $env_string + env: + ENV_VARS: ${{ secrets.ENV }} + SCW_ACCESS_KEY: ${{ secrets.SCW_ACCESS_KEY }} + SCW_SECRET_KEY: ${{ secrets.SCW_SECRET_KEY }} + SCW_DEFAULT_PROJECT_ID: ${{ env.PROJECT_ID }} + SCW_DEFAULT_ORGANIZATION_ID: ${{ secrets.SCW_ORGANIZATION_ID }} From d86a3ebfe5d0a252f3b342e0f76ab479e5a342bd Mon Sep 17 00:00:00 2001 From: Yanis JEDRZEJCZAK Date: Thu, 28 Mar 2024 15:55:35 +0100 Subject: [PATCH 7/9] Renaming SCW env variables --- src/common/config/variables/Variables.ts | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/common/config/variables/Variables.ts b/src/common/config/variables/Variables.ts index 10df52e7..93a426b2 100644 --- a/src/common/config/variables/Variables.ts +++ b/src/common/config/variables/Variables.ts @@ -186,10 +186,10 @@ export class BackendVariables { this.OVH_CONSUMER_KEY = process.env["OVH_CONSUMER_KEY"]!; this.OVH_SMS_SERVICE_NAME = process.env["OVH_SMS_SERVICE_NAME"]!; this.SMS_FACTOR_TOKEN = process.env["SMS_FACTOR_TOKEN"]!; - this.SCW_ACCESS_KEY_ID = process.env["SCW_ACCESS_KEY_ID"]!; - this.SCW_ACCESS_KEY_SECRET = process.env["SCW_ACCESS_KEY_SECRET"]!; - this.SCW_BUCKET_ENDPOINT = process.env["SCW_BUCKET_ENDPOINT"]!; - this.SCW_BUCKET_NAME = process.env["SCW_BUCKET_NAME"]!; + this.SCW_ACCESS_KEY_ID = process.env["ACCESS_KEY_ID"]!; + this.SCW_ACCESS_KEY_SECRET = process.env["ACCESS_KEY_SECRET"]!; + this.SCW_BUCKET_ENDPOINT = process.env["BUCKET_ENDPOINT"]!; + this.SCW_BUCKET_NAME = process.env["BUCKET_NAME"]!; } public async validate(groups?: string[]) { const validationOptions = groups ? { groups } : undefined; From ad128c2e709301b549c6ffd67dae63a5b0f4443e Mon Sep 17 00:00:00 2001 From: Yanis JEDRZEJCZAK Date: Fri, 29 Mar 2024 09:56:57 +0100 Subject: [PATCH 8/9] Change ingress value --- devops/stg.values.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/devops/stg.values.yaml b/devops/stg.values.yaml index 74a13fa8..0ff182f3 100644 --- a/devops/stg.values.yaml +++ b/devops/stg.values.yaml @@ -18,10 +18,10 @@ lecoffreBack: limits: memory: 2Gi ingress: - host: api.stg.lecoffre.smart-chain.fr + host: api-tp.stg.lecoffre.smart-chain.fr tls: hosts: - - api.stg.lecoffre.smart-chain.fr + - api-tp.stg.lecoffre.smart-chain.fr secretName: api-tls annotations: kubernetes.io/ingress.class: nginx From a71fddc1db5bb4ba072ea931f69ef143aab78ca7 Mon Sep 17 00:00:00 2001 From: Yanis JEDRZEJCZAK Date: Tue, 2 Apr 2024 15:34:49 +0200 Subject: [PATCH 9/9] Update env namespaces --- .github/workflows/ppd.yml | 2 +- .github/workflows/prd.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ppd.yml b/.github/workflows/ppd.yml index f2ee1638..5cfa7f16 100644 --- a/.github/workflows/ppd.yml +++ b/.github/workflows/ppd.yml @@ -6,7 +6,7 @@ on: env: PROJECT_ID: c0ed1e9e-d945-461f-920c-98c844ef1ad4 - NAMESPACE_ID: 2f2a5040-b5d9-40dc-8a80-f8d5653edd6f + NAMESPACE_ID: a052faf9-a712-41d7-bbfa-8293ee948e70 CONTAINER_REGISTRY_ENDPOINT: rg.fr-par.scw.cloud/funcscwlecoffreppdw9e10llz IMAGE_NAME: back CONTAINER_NAME: back diff --git a/.github/workflows/prd.yml b/.github/workflows/prd.yml index c6e0e663..99b9e27c 100644 --- a/.github/workflows/prd.yml +++ b/.github/workflows/prd.yml @@ -6,7 +6,7 @@ on: env: PROJECT_ID: c0ed1e9e-d945-461f-920c-98c844ef1ad4 - NAMESPACE_ID: 7a009438-0af3-4824-8112-a8b9a91f292a + NAMESPACE_ID: 17374437-5428-468c-9f41-d89787ffce0e CONTAINER_REGISTRY_ENDPOINT: rg.fr-par.scw.cloud/funcscwlecoffreprdg7h5bbub IMAGE_NAME: back CONTAINER_NAME: back