From 2137c11f3e225b9eb86e277bf5a8a399a8e8462a Mon Sep 17 00:00:00 2001 From: Yanis JEDRZEJCZAK Date: Tue, 7 May 2024 14:29:04 +0200 Subject: [PATCH 1/7] removing circle ci configs --- .circleci/config.yml | 210 ------------------------------------------- 1 file changed, 210 deletions(-) delete mode 100644 .circleci/config.yml diff --git a/.circleci/config.yml b/.circleci/config.yml deleted file mode 100644 index d0f458b1..00000000 --- a/.circleci/config.yml +++ /dev/null @@ -1,210 +0,0 @@ -version: 2.1 - -orbs: - kubernetes: circleci/kubernetes@1.0.0 - helm: circleci/helm@2.0.1 - -jobs: - build-push-docker-image: - docker: - - image: cimg/base:stable - parameters: - NEXT_PUBLIC_BACK_API_HOST: - type: string - default: "" - NEXT_PUBLIC_BACK_API_PROTOCOL: - type: string - default: "" - NEXT_PUBLIC_BACK_API_ROOT_URL: - type: string - default: "" - NEXT_PUBLIC_BACK_API_VERSION: - type: string - default: "" - NEXT_PUBLIC_FC_AUTHORIZE_ENDPOINT: - type: string - default: "" - NEXT_PUBLIC_FC_CLIENT_ID: - type: string - default: "" - NEXT_PUBLIC_FRONT_APP_HOST: - type: string - default: "" - NEXT_PUBLIC_FRONT_APP_PORT: - type: string - default: "" - NEXT_PUBLIC_IDNOT_BASE_URL: - type: string - default: "" - NEXT_PUBLIC_IDNOT_AUTHORIZE_ENDPOINT: - type: string - default: "" - NEXT_PUBLIC_IDNOT_CLIENT_ID: - type: string - default: "" - NEXT_PUBLIC_DOCAPOST_API_URL: - type: string - default: "" - NEXT_PUBLIC_DOCAPOST_DOCUMENT_PROCESS_ID: - type: string - default: "" - NEXT_PUBLIC_DOCAPOST_CONNECT_PROCESS_ID: - type: string - default: "" - NEXT_PUBLIC_DOCAPOST_APP_ID: - type: string - default: "" - environment: - TAG: << pipeline.git.tag >> - NEXT_PUBLIC_BACK_API_HOST: << parameters.NEXT_PUBLIC_BACK_API_HOST >> - NEXT_PUBLIC_BACK_API_PROTOCOL: << parameters.NEXT_PUBLIC_BACK_API_PROTOCOL >> - NEXT_PUBLIC_BACK_API_ROOT_URL: << parameters.NEXT_PUBLIC_BACK_API_ROOT_URL >> - NEXT_PUBLIC_BACK_API_VERSION: << parameters.NEXT_PUBLIC_BACK_API_VERSION >> - NEXT_PUBLIC_FC_AUTHORIZE_ENDPOINT: << parameters.NEXT_PUBLIC_FC_AUTHORIZE_ENDPOINT >> - NEXT_PUBLIC_FC_CLIENT_ID: << parameters.NEXT_PUBLIC_FC_CLIENT_ID >> - NEXT_PUBLIC_FRONT_APP_HOST: << parameters.NEXT_PUBLIC_FRONT_APP_HOST >> - NEXT_PUBLIC_FRONT_APP_PORT: << parameters.NEXT_PUBLIC_FRONT_APP_PORT >> - NEXT_PUBLIC_IDNOT_BASE_URL: << parameters.NEXT_PUBLIC_IDNOT_BASE_URL >> - NEXT_PUBLIC_IDNOT_AUTHORIZE_ENDPOINT: << parameters.NEXT_PUBLIC_IDNOT_AUTHORIZE_ENDPOINT >> - NEXT_PUBLIC_IDNOT_CLIENT_ID: << parameters.NEXT_PUBLIC_IDNOT_CLIENT_ID >> - NEXT_PUBLIC_DOCAPOST_API_URL: << parameters.NEXT_PUBLIC_DOCAPOST_API_URL >> - NEXT_PUBLIC_DOCAPOST_DOCUMENT_PROCESS_ID: << parameters.NEXT_PUBLIC_DOCAPOST_DOCUMENT_PROCESS_ID >> - NEXT_PUBLIC_DOCAPOST_CONNECT_PROCESS_ID: << parameters.NEXT_PUBLIC_DOCAPOST_CONNECT_PROCESS_ID >> - NEXT_PUBLIC_DOCAPOST_APP_ID: << parameters.NEXT_PUBLIC_DOCAPOST_APP_ID >> - steps: - - checkout - - add_ssh_keys: - fingerprints: - - "39:25:57:64:62:43:1f:98:b1:5e:75:53:87:d8:e7:71" - - run: cp $HOME/.ssh/id_rsa_3925576462431f98b15e755387d8e771 id_rsa - - setup_remote_docker: - version: 20.10.12 - docker_layer_caching: true - - run: docker login rg.fr-par.scw.cloud/lecoffre -u nologin -p $SCW_SECRET_KEY_BIS - - run: docker build --tag rg.fr-par.scw.cloud/lecoffre/front:${CIRCLE_SHA1:0:7} . - - run: docker push rg.fr-par.scw.cloud/lecoffre/front:${CIRCLE_SHA1:0:7} - - deploy-docker-image: - docker: - - image: cimg/base:stable - environment: - TAG: << pipeline.git.tag >> - parameters: - env: - type: string - default: ppd - steps: - - checkout - - kubernetes/install-kubeconfig: - kubeconfig: KUBECONFIG_DATA - - helm/install-helm-client - - run: - name: Deploy - command: > - helm upgrade - lecoffre-front devops/ -i -f devops/<>.values.yaml - -n lecoffre-<> - --create-namespace - --set lecoffreFront.image.repository='rg.fr-par.scw.cloud/lecoffre/front' - --set lecoffreFront.image.tag=${CIRCLE_SHA1:0:7} - -workflows: - version: 2 - build-and-register-stg: - jobs: - - build-push-docker-image: - NEXT_PUBLIC_BACK_API_HOST: api.stg.lecoffre.smart-chain.fr - NEXT_PUBLIC_BACK_API_PROTOCOL: https:// - NEXT_PUBLIC_BACK_API_ROOT_URL: /api - NEXT_PUBLIC_BACK_API_VERSION: /v1 - NEXT_PUBLIC_FC_AUTHORIZE_ENDPOINT: https://fcp.integ01.dev-franceconnect.fr/api/v1/authorize - NEXT_PUBLIC_FC_CLIENT_ID: 211286433e39cce01db448d80181bdfd005554b19cd51b3fe7943f6b3b86ab6e - NEXT_PUBLIC_FRONT_APP_HOST: https://app.stg.lecoffre.smart-chain.fr - NEXT_PUBLIC_FRONT_APP_PORT: "3000" - NEXT_PUBLIC_IDNOT_BASE_URL: "https://qual-connexion.idnot.fr" - NEXT_PUBLIC_IDNOT_AUTHORIZE_ENDPOINT: "/IdPOAuth2/authorize/idnot_idp_v1" - NEXT_PUBLIC_IDNOT_CLIENT_ID: "4501646203F3EF67" - NEXT_PUBLIC_DOCAPOST_API_URL: "https://preprod.id360docaposte.com/api/1.0.0" - NEXT_PUBLIC_DOCAPOST_DOCUMENT_PROCESS_ID: 49508376-b160-475d-9224-9bb6511215b8 - NEXT_PUBLIC_DOCAPOST_CONNECT_PROCESS_ID: 54c14875-f864-4819-8cd4-4fc6dd4a947b - NEXT_PUBLIC_DOCAPOST_APP_ID: leCoffre@smart_chain - context: - - sc-shared-prd - filters: - branches: - only: staging - - deploy-docker-image: - env: stg - requires: - - build-push-docker-image - context: - - sc-shared-prd - filters: - branches: - only: staging - - build-and-register-ppd: - jobs: - - build-push-docker-image: - NEXT_PUBLIC_BACK_API_HOST: api.ppd.lecoffre.smart-chain.fr - NEXT_PUBLIC_BACK_API_PROTOCOL: https:// - NEXT_PUBLIC_BACK_API_ROOT_URL: /api - NEXT_PUBLIC_BACK_API_VERSION: /v1 - NEXT_PUBLIC_FC_AUTHORIZE_ENDPOINT: https://fcp.integ01.dev-franceconnect.fr/api/v1/authorize - NEXT_PUBLIC_FC_CLIENT_ID: 211286433e39cce01db448d80181bdfd005554b19cd51b3fe7943f6b3b86ab6e - NEXT_PUBLIC_FRONT_APP_HOST: https://app.ppd.lecoffre.smart-chain.fr - NEXT_PUBLIC_FRONT_APP_PORT: "3000" - NEXT_PUBLIC_IDNOT_BASE_URL: "https://qual-connexion.idnot.fr" - NEXT_PUBLIC_IDNOT_AUTHORIZE_ENDPOINT: "/IdPOAuth2/authorize/idnot_idp_v1" - NEXT_PUBLIC_IDNOT_CLIENT_ID: "4501646203F3EF67" - NEXT_PUBLIC_DOCAPOST_API_URL: "https://preprod.id360docaposte.com/api/1.0.0" - NEXT_PUBLIC_DOCAPOST_DOCUMENT_PROCESS_ID: 49508376-b160-475d-9224-9bb6511215b8 - NEXT_PUBLIC_DOCAPOST_CONNECT_PROCESS_ID: 54c14875-f864-4819-8cd4-4fc6dd4a947b - NEXT_PUBLIC_DOCAPOST_APP_ID: leCoffre@smart_chain - context: - - sc-shared-prd - filters: - branches: - only: preprod - - deploy-docker-image: - env: ppd - requires: - - build-push-docker-image - context: - - sc-shared-prd - filters: - branches: - only: preprod - - build-and-register-prd: - jobs: - - build-push-docker-image: - NEXT_PUBLIC_BACK_API_HOST: api.lecoffre.smart-chain.fr - NEXT_PUBLIC_BACK_API_PROTOCOL: https:// - NEXT_PUBLIC_BACK_API_ROOT_URL: /api - NEXT_PUBLIC_BACK_API_VERSION: /v1 - NEXT_PUBLIC_FC_AUTHORIZE_ENDPOINT: https://fcp.integ01.dev-franceconnect.fr/api/v1/authorize - NEXT_PUBLIC_FC_CLIENT_ID: 211286433e39cce01db448d80181bdfd005554b19cd51b3fe7943f6b3b86ab6e - NEXT_PUBLIC_FRONT_APP_HOST: https://app.lecoffre.smart-chain.fr - NEXT_PUBLIC_FRONT_APP_PORT: "3000" - NEXT_PUBLIC_IDNOT_BASE_URL: "https://qual-connexion.idnot.fr" - NEXT_PUBLIC_IDNOT_AUTHORIZE_ENDPOINT: "/IdPOAuth2/authorize/idnot_idp_v1" - NEXT_PUBLIC_IDNOT_CLIENT_ID: "4501646203F3EF67" - NEXT_PUBLIC_DOCAPOST_API_URL: "https://preprod.id360docaposte.com/api/1.0.0" - NEXT_PUBLIC_DOCAPOST_DOCUMENT_PROCESS_ID: 49508376-b160-475d-9224-9bb6511215b8 - NEXT_PUBLIC_DOCAPOST_CONNECT_PROCESS_ID: 54c14875-f864-4819-8cd4-4fc6dd4a947b - NEXT_PUBLIC_DOCAPOST_APP_ID: leCoffre@smart_chain - context: - - sc-shared-prd - filters: - branches: - only: main - - deploy-docker-image: - env: prd - requires: - - build-push-docker-image - context: - - sc-shared-prd - filters: - branches: - only: main From 89a6dea519055527dc4a174e4595953369c45566 Mon Sep 17 00:00:00 2001 From: Yanis JEDRZEJCZAK Date: Tue, 7 May 2024 14:29:16 +0200 Subject: [PATCH 2/7] removing kube ci configs --- devops/.helmignore | 23 -------- devops/Chart.yaml | 25 -------- devops/ppd.values.yaml | 33 ----------- devops/prd.values.yaml | 33 ----------- devops/stg.values.yaml | 34 ----------- devops/templates/docker-pull-secret.yaml | 1 - devops/templates/lecoffre-front.yaml | 74 ------------------------ devops/templates/sealed-secret.yaml | 1 - devops/templates/secret-store.yaml | 1 - devops/templates/secrets.yaml | 1 - devops/templates/service-account.yaml | 14 ----- devops/values.yaml | 35 ----------- 12 files changed, 275 deletions(-) delete mode 100644 devops/.helmignore delete mode 100644 devops/Chart.yaml delete mode 100644 devops/ppd.values.yaml delete mode 100644 devops/prd.values.yaml delete mode 100644 devops/stg.values.yaml delete mode 100644 devops/templates/docker-pull-secret.yaml delete mode 100644 devops/templates/lecoffre-front.yaml delete mode 100644 devops/templates/sealed-secret.yaml delete mode 100644 devops/templates/secret-store.yaml delete mode 100644 devops/templates/secrets.yaml delete mode 100644 devops/templates/service-account.yaml delete mode 100644 devops/values.yaml diff --git a/devops/.helmignore b/devops/.helmignore deleted file mode 100644 index 691fa13d..00000000 --- a/devops/.helmignore +++ /dev/null @@ -1,23 +0,0 @@ -# Patterns to ignore when building packages. -# This supports shell glob matching, relative path matching, and -# negation (prefixed with !). Only one pattern per line. -.DS_Store -# Common VCS dirs -.git/ -.gitignore -.bzr/ -.bzrignore -.hg/ -.hgignore -.svn/ -# Common backup files -*.swp -*.bak -*.tmp -*.orig -*~ -# Various IDEs -.project -.idea/ -*.tmproj -.vscode/ \ No newline at end of file diff --git a/devops/Chart.yaml b/devops/Chart.yaml deleted file mode 100644 index 208511fb..00000000 --- a/devops/Chart.yaml +++ /dev/null @@ -1,25 +0,0 @@ -apiVersion: v2 -name: leCoffre-back -description: A Helm chart for Kubernetes - -# A chart can be either an 'application' or a 'library' chart. -# -# Application charts are a collection of templates that can be packaged into versioned archives -# to be deployed. -# -# Library charts provide useful utilities or functions for the chart developer. They're included as -# a dependency of application charts to inject those utilities and functions into the rendering -# pipeline. Library charts do not define any templates and therefore cannot be deployed. -type: application - -# This is the chart version. This version number should be incremented each time you make changes -# to the chart and its templates, including the app version. -# Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 0.0.1 - -# This is the version number of the application being deployed. This version number should be -# incremented each time you make changes to the application. Versions are not expected to -# follow Semantic Versioning. They should reflect the version the application is using. -# It is recommended to use it with quotes. -appVersion: 0.5.6 - diff --git a/devops/ppd.values.yaml b/devops/ppd.values.yaml deleted file mode 100644 index 4db3e934..00000000 --- a/devops/ppd.values.yaml +++ /dev/null @@ -1,33 +0,0 @@ -dockerPullSecret: docker-pull-secret - -scwSecretKey: AgChoEnPitXp4Ny/rVMEcevaWKNVpyj2cJYAcq+yFqKwVwnLB+ffDvwqz9XBHu+6d4Nyyjkf37zUAMoaM21lEDWA7x3zfG2/D/j+rvX1qxzZgLD0mjBk7fGElVm332I6JA83oInes8AMMYEDPLElzHnpKRb9KtkIP4NzgOcCeW0ijft3N7Vroez6LEHsBPCA1I9XjKSkGEDvrO0MhWX3iJOlfz+SPMfJAV7rPawOs0ZmohTHrPW8qIvGDn8HCzKyU8zRBoMt+Ogpf5pH4U3JryEFuqD61KAQgablAM8edPIvsgNno9HAEuC2QtRLYA9aUhuKdaKuS58c9P2E80PHWXIlbpFCg6EugQTgNfnYp+3qDUNz8edeCfapYLvF4s9eCMGyMsGnpDR8EDNOyuGy7Y3l7okX8Xqu464gMp9E+hX7bHkcD6a4xfyIgJcWxsku0tm1TH1dpn4M1UXRuyZZif8P08nuE6MTUL67sAR9J1lpn4lVEL4kflk0pP2tZ5ncgPQFafJrRz05krMb0eU5tb2H4gs7ao/LL6idWo8MM9K1yr8lIuT5x2WW5CX+RjA+i50ex114V6vX3PNP5oVyt+DynTUB9QmXzVm3oLfDc3Cae1uqh7X0CFd+xiztJBtg0VtJaD/xUJcuWfY4cV2lERo9fRrykltzlJqiXHO4nowt8OtN0BcViVV8NJhPhYFzyb4ympxpOlTjm3GETuT2TYhUqdgS9nzleEAbOmOHZdIO2COunPE= - -lecoffreFront: - serviceAccountName: lecoffre-front-sa - envSecrets: ppd-env - command: "'sh', '-c', 'export $(xargs Date: Thu, 16 May 2024 16:34:22 +0200 Subject: [PATCH 3/7] redeploy front --- src/front/Components/Layouts/Login/index.tsx | 1 + 1 file changed, 1 insertion(+) diff --git a/src/front/Components/Layouts/Login/index.tsx b/src/front/Components/Layouts/Login/index.tsx index e5951e77..1642ef8a 100644 --- a/src/front/Components/Layouts/Login/index.tsx +++ b/src/front/Components/Layouts/Login/index.tsx @@ -15,6 +15,7 @@ import Confirm from "@Front/Components/DesignSystem/Modal/Confirm"; export default function Login() { const router = useRouter(); + const error = router.query["error"]; const [isErrorModalOpen, setIsErrorModalOpen] = useState(0); From abd2305607754f2258e090b9e8f547cc3f6762b1 Mon Sep 17 00:00:00 2001 From: Vins Date: Fri, 17 May 2024 15:54:38 +0200 Subject: [PATCH 4/7] Changed password Regexp to accept - and _ --- src/front/Components/Layouts/LoginCustomer/index.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/front/Components/Layouts/LoginCustomer/index.tsx b/src/front/Components/Layouts/LoginCustomer/index.tsx index 78c8af2e..6138b1f8 100644 --- a/src/front/Components/Layouts/LoginCustomer/index.tsx +++ b/src/front/Components/Layouts/LoginCustomer/index.tsx @@ -118,7 +118,7 @@ export default function Login() { return; } - const passwordRegex = new RegExp(/^(?=.*[a-z])(?=.*[A-Z])(?=.*\d)[A-Za-z\d@$!%*?&]{8,}$/); + const passwordRegex = new RegExp(/^(?=.*[a-z])(?=.*[A-Z])(?=.*\d)[A-Za-z\d@$!%*?&_\\-]{8,}$/); if (!passwordRegex.test(values["password"])) { setValidationErrors([ { From 74c5c388e407ce3c274ba4d699508f72ad3e1f43 Mon Sep 17 00:00:00 2001 From: Vins Date: Mon, 20 May 2024 15:55:39 +0200 Subject: [PATCH 5/7] Redeploy prod for new hotjar key --- src/pages/_app.tsx | 1 + 1 file changed, 1 insertion(+) diff --git a/src/pages/_app.tsx b/src/pages/_app.tsx index c2205983..8906aabf 100644 --- a/src/pages/_app.tsx +++ b/src/pages/_app.tsx @@ -68,6 +68,7 @@ const MyApp = (({ useEffect(() => { if (!hotjarSiteId || !hotjarVersion) { console.warn("No hotjar site id or version provided"); + return; } console.log("Intializing hotjar"); From 81be6e46f7602909120b0ab2b52575953bb3456e Mon Sep 17 00:00:00 2001 From: Vins Date: Mon, 20 May 2024 15:56:15 +0200 Subject: [PATCH 6/7] revert --- src/pages/_app.tsx | 1 - 1 file changed, 1 deletion(-) diff --git a/src/pages/_app.tsx b/src/pages/_app.tsx index 8906aabf..c2205983 100644 --- a/src/pages/_app.tsx +++ b/src/pages/_app.tsx @@ -68,7 +68,6 @@ const MyApp = (({ useEffect(() => { if (!hotjarSiteId || !hotjarVersion) { console.warn("No hotjar site id or version provided"); - return; } console.log("Intializing hotjar"); From 990d65ef490e827e4c55d2706450c25559c6f0c4 Mon Sep 17 00:00:00 2001 From: Vins Date: Mon, 20 May 2024 16:00:55 +0200 Subject: [PATCH 7/7] revert regexp password and redeploy --- src/front/Components/Layouts/LoginCustomer/index.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/front/Components/Layouts/LoginCustomer/index.tsx b/src/front/Components/Layouts/LoginCustomer/index.tsx index 6138b1f8..78c8af2e 100644 --- a/src/front/Components/Layouts/LoginCustomer/index.tsx +++ b/src/front/Components/Layouts/LoginCustomer/index.tsx @@ -118,7 +118,7 @@ export default function Login() { return; } - const passwordRegex = new RegExp(/^(?=.*[a-z])(?=.*[A-Z])(?=.*\d)[A-Za-z\d@$!%*?&_\\-]{8,}$/); + const passwordRegex = new RegExp(/^(?=.*[a-z])(?=.*[A-Z])(?=.*\d)[A-Za-z\d@$!%*?&]{8,}$/); if (!passwordRegex.test(values["password"])) { setValidationErrors([ {