From 674cbd1d495ce84bbe5bcab08359ccb6bb2e3fd2 Mon Sep 17 00:00:00 2001 From: mumin-khan Date: Mon, 5 Aug 2024 09:35:58 +0530 Subject: [PATCH 1/7] chore: add ga to web-api --- .../templates/config-maps/web-api-configmap.yaml | 2 ++ cryptlex/cryptlex-enterprise/values.yaml | 2 ++ 2 files changed, 4 insertions(+) diff --git a/cryptlex/cryptlex-enterprise/templates/config-maps/web-api-configmap.yaml b/cryptlex/cryptlex-enterprise/templates/config-maps/web-api-configmap.yaml index f984213f..f9c29d35 100644 --- a/cryptlex/cryptlex-enterprise/templates/config-maps/web-api-configmap.yaml +++ b/cryptlex/cryptlex-enterprise/templates/config-maps/web-api-configmap.yaml @@ -29,6 +29,8 @@ data: RABBITMQ_PREFETCHCOUNT: {{ .Values.services.rabbitMq.prefetchCount | quote }} RABBITMQ_DELAYEDMESSAGEPLUGINENABLED: {{ .Values.services.rabbitMq.delayedMessagePluginEnabled | quote }} GOOGLE_CLIENT_ID: {{ .Values.sso.google.clientId | quote }} + GOOGLE_ANALYTICS_KEY: {{.Values.webApi.googleAnalytics.key | quote}} + {{ range $index, $value := .Values.webApi.ipRateLimitOptions.ipWhitelist }} IPRATELIMITOPTIONS_IPWHITELIST_{{$index}}: {{ $value | quote }} {{ end }} diff --git a/cryptlex/cryptlex-enterprise/values.yaml b/cryptlex/cryptlex-enterprise/values.yaml index c048ab41..1849dc72 100644 --- a/cryptlex/cryptlex-enterprise/values.yaml +++ b/cryptlex/cryptlex-enterprise/values.yaml @@ -250,6 +250,8 @@ webApi: # Postmark postmark: accountToken: "" + googleAnalytics: + key: "G-XXXXXXX" # SSO config sso: google: From 3fa701ea664fef790bb10fc83ec84bb11f1aad83 Mon Sep 17 00:00:00 2001 From: mumin-khan Date: Wed, 7 Aug 2024 16:02:30 +0530 Subject: [PATCH 2/7] chore: default empty string --- cryptlex/cryptlex-enterprise/values.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cryptlex/cryptlex-enterprise/values.yaml b/cryptlex/cryptlex-enterprise/values.yaml index 1849dc72..ca4df3d9 100644 --- a/cryptlex/cryptlex-enterprise/values.yaml +++ b/cryptlex/cryptlex-enterprise/values.yaml @@ -251,7 +251,7 @@ webApi: postmark: accountToken: "" googleAnalytics: - key: "G-XXXXXXX" + key: "" # G-XXXXXXX # SSO config sso: google: From 0cfe8250e3d7451b8b847018060fe5e5e592d645 Mon Sep 17 00:00:00 2001 From: mumin-khan Date: Wed, 7 Aug 2024 16:59:00 +0530 Subject: [PATCH 3/7] chore: group google services --- cryptlex/cryptlex-enterprise/Chart.yaml | 4 ++-- .../templates/config-maps/web-api-configmap.yaml | 2 +- .../templates/secrets/web-api-secret.yaml | 2 +- cryptlex/cryptlex-enterprise/values.yaml | 12 +++++++----- 4 files changed, 11 insertions(+), 9 deletions(-) diff --git a/cryptlex/cryptlex-enterprise/Chart.yaml b/cryptlex/cryptlex-enterprise/Chart.yaml index 4a0fb5f8..382d7b76 100644 --- a/cryptlex/cryptlex-enterprise/Chart.yaml +++ b/cryptlex/cryptlex-enterprise/Chart.yaml @@ -6,7 +6,7 @@ home: https://cryptlex.com icon: https://cryptlex.com/images/cryptlex_icon.png # 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. -version: "3.16.103" +version: "3.16.105" # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. -appVersion: "3.16.103" +appVersion: "3.16.105" diff --git a/cryptlex/cryptlex-enterprise/templates/config-maps/web-api-configmap.yaml b/cryptlex/cryptlex-enterprise/templates/config-maps/web-api-configmap.yaml index f9c29d35..cffe6ed8 100644 --- a/cryptlex/cryptlex-enterprise/templates/config-maps/web-api-configmap.yaml +++ b/cryptlex/cryptlex-enterprise/templates/config-maps/web-api-configmap.yaml @@ -29,7 +29,7 @@ data: RABBITMQ_PREFETCHCOUNT: {{ .Values.services.rabbitMq.prefetchCount | quote }} RABBITMQ_DELAYEDMESSAGEPLUGINENABLED: {{ .Values.services.rabbitMq.delayedMessagePluginEnabled | quote }} GOOGLE_CLIENT_ID: {{ .Values.sso.google.clientId | quote }} - GOOGLE_ANALYTICS_KEY: {{.Values.webApi.googleAnalytics.key | quote}} + GOOGLE_ANALYTICS_KEY: {{.Values.google.analytics.key | quote}} {{ range $index, $value := .Values.webApi.ipRateLimitOptions.ipWhitelist }} IPRATELIMITOPTIONS_IPWHITELIST_{{$index}}: {{ $value | quote }} diff --git a/cryptlex/cryptlex-enterprise/templates/secrets/web-api-secret.yaml b/cryptlex/cryptlex-enterprise/templates/secrets/web-api-secret.yaml index 4c3aca99..f3b88488 100644 --- a/cryptlex/cryptlex-enterprise/templates/secrets/web-api-secret.yaml +++ b/cryptlex/cryptlex-enterprise/templates/secrets/web-api-secret.yaml @@ -52,7 +52,7 @@ stringData: MAILGUN_APIKEY: {{ .Values.webApi.email.mailgun.apiKey | quote }} POSTMARK_ACCOUNTTOKEN: {{ .Values.webApi.postmark.accountToken | quote }} SENDGRID_APIKEY: {{ .Values.webApi.email.sendgrid.apiKey | quote }} - GOOGLE_RECAPTCHA_SECRETKEY: {{ .Values.webApi.googleRecaptcha.secretKey | quote }} + GOOGLE_RECAPTCHA_SECRETKEY: {{ .Values.google.recaptcha.secretKey | quote }} BUGSNAG_APIKEY: {{ .Values.webApi.bugsnag.apiKey | quote }} {{ if .Values.webApi.fly }} {{ if .Values.webApi.fly.apiKey }} diff --git a/cryptlex/cryptlex-enterprise/values.yaml b/cryptlex/cryptlex-enterprise/values.yaml index ca4df3d9..e8d95466 100644 --- a/cryptlex/cryptlex-enterprise/values.yaml +++ b/cryptlex/cryptlex-enterprise/values.yaml @@ -228,9 +228,6 @@ webApi: # Sendgrid config, in case you are using Sendgrid for sending emails. sendgrid: apiKey: "" - # Google reCAPTCHA - googleRecaptcha: - secretKey: "" # Error monitoring bugsnag: apiKey: "" @@ -250,10 +247,15 @@ webApi: # Postmark postmark: accountToken: "" - googleAnalytics: - key: "" # G-XXXXXXX # SSO config sso: google: # Refer to following for enabling Google SSO: https://docs.cryptlex.com/user-management/google-sso clientId: "" + # Google + google: + recaptcha: + secretKey: "" + analytics: + # G-XXXXXXX + key: "" \ No newline at end of file From 8758e2db752cc206fdae12561d5ce56ea3aa5c3f Mon Sep 17 00:00:00 2001 From: mumin-khan Date: Wed, 7 Aug 2024 17:02:46 +0530 Subject: [PATCH 4/7] chore: version increment --- cryptlex/cryptlex-enterprise/Chart.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cryptlex/cryptlex-enterprise/Chart.yaml b/cryptlex/cryptlex-enterprise/Chart.yaml index 382d7b76..9475d3bb 100644 --- a/cryptlex/cryptlex-enterprise/Chart.yaml +++ b/cryptlex/cryptlex-enterprise/Chart.yaml @@ -6,7 +6,7 @@ home: https://cryptlex.com icon: https://cryptlex.com/images/cryptlex_icon.png # 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. -version: "3.16.105" +version: "3.16.109" # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. -appVersion: "3.16.105" +appVersion: "3.16.109" From 8c25477f4334c8402a55296b2b1410fed6c264f5 Mon Sep 17 00:00:00 2001 From: mumin-khan Date: Thu, 8 Aug 2024 11:53:40 +0530 Subject: [PATCH 5/7] chore: move sso to google --- .../config-maps/dashboard-configmap.yaml | 2 +- .../config-maps/web-api-configmap.yaml | 2 +- .../config-maps/web-portals-configmap.yaml | 2 +- cryptlex/cryptlex-enterprise/values.yaml | 18 ++++++++---------- 4 files changed, 11 insertions(+), 13 deletions(-) diff --git a/cryptlex/cryptlex-enterprise/templates/config-maps/dashboard-configmap.yaml b/cryptlex/cryptlex-enterprise/templates/config-maps/dashboard-configmap.yaml index 74b38a78..a66de4ae 100644 --- a/cryptlex/cryptlex-enterprise/templates/config-maps/dashboard-configmap.yaml +++ b/cryptlex/cryptlex-enterprise/templates/config-maps/dashboard-configmap.yaml @@ -18,4 +18,4 @@ data: WEB_API_BASE_URL: http://{{ .Values.ingress.hosts.webApiHost }} RELEASE_SERVER_BASE_URL: http://{{ .Values.ingress.hosts.releaseServerHost }} {{ end }} - GOOGLE_CLIENT_ID: {{ .Values.sso.google.clientId | quote }} + GOOGLE_CLIENT_ID: {{ .Values.google.sso.clientId | quote }} diff --git a/cryptlex/cryptlex-enterprise/templates/config-maps/web-api-configmap.yaml b/cryptlex/cryptlex-enterprise/templates/config-maps/web-api-configmap.yaml index cffe6ed8..5bb22ada 100644 --- a/cryptlex/cryptlex-enterprise/templates/config-maps/web-api-configmap.yaml +++ b/cryptlex/cryptlex-enterprise/templates/config-maps/web-api-configmap.yaml @@ -28,7 +28,7 @@ data: RABBITMQ_ENABLED: {{ .Values.services.rabbitMq.enabled | quote }} RABBITMQ_PREFETCHCOUNT: {{ .Values.services.rabbitMq.prefetchCount | quote }} RABBITMQ_DELAYEDMESSAGEPLUGINENABLED: {{ .Values.services.rabbitMq.delayedMessagePluginEnabled | quote }} - GOOGLE_CLIENT_ID: {{ .Values.sso.google.clientId | quote }} + GOOGLE_CLIENT_ID: {{ .Values.google.sso.clientId | quote }} GOOGLE_ANALYTICS_KEY: {{.Values.google.analytics.key | quote}} {{ range $index, $value := .Values.webApi.ipRateLimitOptions.ipWhitelist }} diff --git a/cryptlex/cryptlex-enterprise/templates/config-maps/web-portals-configmap.yaml b/cryptlex/cryptlex-enterprise/templates/config-maps/web-portals-configmap.yaml index 2b72e1c4..aee7bba8 100644 --- a/cryptlex/cryptlex-enterprise/templates/config-maps/web-portals-configmap.yaml +++ b/cryptlex/cryptlex-enterprise/templates/config-maps/web-portals-configmap.yaml @@ -18,4 +18,4 @@ data: WEB_API_BASE_URL: http://{{ .Values.ingress.hosts.webApiHost }} RELEASE_SERVER_BASE_URL: http://{{ .Values.ingress.hosts.releaseServerHost }} {{ end }} - GOOGLE_CLIENT_ID: {{ .Values.sso.google.clientId | quote }} + GOOGLE_CLIENT_ID: {{ .Values.google.sso.clientId | quote }} diff --git a/cryptlex/cryptlex-enterprise/values.yaml b/cryptlex/cryptlex-enterprise/values.yaml index 5849c49b..14904a82 100644 --- a/cryptlex/cryptlex-enterprise/values.yaml +++ b/cryptlex/cryptlex-enterprise/values.yaml @@ -247,15 +247,13 @@ webApi: # Postmark postmark: accountToken: "" -# SSO config -sso: - google: +# Google +google: + recaptcha: + secretKey: "" + analytics: + # G-XXXXXXX + key: "" + sso: # Refer to following for enabling Google SSO: https://docs.cryptlex.com/user-management/google-sso clientId: "" - # Google - google: - recaptcha: - secretKey: "" - analytics: - # G-XXXXXXX - key: "" \ No newline at end of file From 52809b6c51916d0af52f0e7af11869abc2018a1b Mon Sep 17 00:00:00 2001 From: mumin-khan Date: Thu, 8 Aug 2024 15:06:10 +0530 Subject: [PATCH 6/7] chore: move google inside webApi --- .../config-maps/dashboard-configmap.yaml | 2 +- .../config-maps/web-api-configmap.yaml | 4 ++-- .../templates/secrets/web-api-secret.yaml | 2 +- cryptlex/cryptlex-enterprise/values.yaml | 20 +++++++++---------- 4 files changed, 14 insertions(+), 14 deletions(-) diff --git a/cryptlex/cryptlex-enterprise/templates/config-maps/dashboard-configmap.yaml b/cryptlex/cryptlex-enterprise/templates/config-maps/dashboard-configmap.yaml index a66de4ae..030ecd94 100644 --- a/cryptlex/cryptlex-enterprise/templates/config-maps/dashboard-configmap.yaml +++ b/cryptlex/cryptlex-enterprise/templates/config-maps/dashboard-configmap.yaml @@ -18,4 +18,4 @@ data: WEB_API_BASE_URL: http://{{ .Values.ingress.hosts.webApiHost }} RELEASE_SERVER_BASE_URL: http://{{ .Values.ingress.hosts.releaseServerHost }} {{ end }} - GOOGLE_CLIENT_ID: {{ .Values.google.sso.clientId | quote }} + GOOGLE_CLIENT_ID: {{ .Values.webApi.google.sso.clientId | quote }} diff --git a/cryptlex/cryptlex-enterprise/templates/config-maps/web-api-configmap.yaml b/cryptlex/cryptlex-enterprise/templates/config-maps/web-api-configmap.yaml index 5bb22ada..b62e218d 100644 --- a/cryptlex/cryptlex-enterprise/templates/config-maps/web-api-configmap.yaml +++ b/cryptlex/cryptlex-enterprise/templates/config-maps/web-api-configmap.yaml @@ -28,8 +28,8 @@ data: RABBITMQ_ENABLED: {{ .Values.services.rabbitMq.enabled | quote }} RABBITMQ_PREFETCHCOUNT: {{ .Values.services.rabbitMq.prefetchCount | quote }} RABBITMQ_DELAYEDMESSAGEPLUGINENABLED: {{ .Values.services.rabbitMq.delayedMessagePluginEnabled | quote }} - GOOGLE_CLIENT_ID: {{ .Values.google.sso.clientId | quote }} - GOOGLE_ANALYTICS_KEY: {{.Values.google.analytics.key | quote}} + GOOGLE_CLIENT_ID: {{ .Values.webApi.google.sso.clientId | quote }} + GOOGLE_ANALYTICS_KEY: {{.Values.webApi.google.analytics.key | quote}} {{ range $index, $value := .Values.webApi.ipRateLimitOptions.ipWhitelist }} IPRATELIMITOPTIONS_IPWHITELIST_{{$index}}: {{ $value | quote }} diff --git a/cryptlex/cryptlex-enterprise/templates/secrets/web-api-secret.yaml b/cryptlex/cryptlex-enterprise/templates/secrets/web-api-secret.yaml index f3b88488..1f64019a 100644 --- a/cryptlex/cryptlex-enterprise/templates/secrets/web-api-secret.yaml +++ b/cryptlex/cryptlex-enterprise/templates/secrets/web-api-secret.yaml @@ -52,7 +52,7 @@ stringData: MAILGUN_APIKEY: {{ .Values.webApi.email.mailgun.apiKey | quote }} POSTMARK_ACCOUNTTOKEN: {{ .Values.webApi.postmark.accountToken | quote }} SENDGRID_APIKEY: {{ .Values.webApi.email.sendgrid.apiKey | quote }} - GOOGLE_RECAPTCHA_SECRETKEY: {{ .Values.google.recaptcha.secretKey | quote }} + GOOGLE_RECAPTCHA_SECRETKEY: {{ .Values.webApi.google.recaptcha.secretKey | quote }} BUGSNAG_APIKEY: {{ .Values.webApi.bugsnag.apiKey | quote }} {{ if .Values.webApi.fly }} {{ if .Values.webApi.fly.apiKey }} diff --git a/cryptlex/cryptlex-enterprise/values.yaml b/cryptlex/cryptlex-enterprise/values.yaml index 14904a82..8d6f28a3 100644 --- a/cryptlex/cryptlex-enterprise/values.yaml +++ b/cryptlex/cryptlex-enterprise/values.yaml @@ -247,13 +247,13 @@ webApi: # Postmark postmark: accountToken: "" -# Google -google: - recaptcha: - secretKey: "" - analytics: - # G-XXXXXXX - key: "" - sso: - # Refer to following for enabling Google SSO: https://docs.cryptlex.com/user-management/google-sso - clientId: "" + # Google + google: + recaptcha: + secretKey: "" + analytics: + # G-XXXXXXX + key: "" + sso: + # Refer to following for enabling Google SSO: https://docs.cryptlex.com/user-management/google-sso + clientId: "" From 67b9ea7ddfa592a20c9ff1b7078c9b5527ce057c Mon Sep 17 00:00:00 2001 From: mumin-khan Date: Thu, 8 Aug 2024 15:08:04 +0530 Subject: [PATCH 7/7] chore: add to web-portal --- .../templates/config-maps/web-portals-configmap.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cryptlex/cryptlex-enterprise/templates/config-maps/web-portals-configmap.yaml b/cryptlex/cryptlex-enterprise/templates/config-maps/web-portals-configmap.yaml index aee7bba8..e7087fcb 100644 --- a/cryptlex/cryptlex-enterprise/templates/config-maps/web-portals-configmap.yaml +++ b/cryptlex/cryptlex-enterprise/templates/config-maps/web-portals-configmap.yaml @@ -18,4 +18,4 @@ data: WEB_API_BASE_URL: http://{{ .Values.ingress.hosts.webApiHost }} RELEASE_SERVER_BASE_URL: http://{{ .Values.ingress.hosts.releaseServerHost }} {{ end }} - GOOGLE_CLIENT_ID: {{ .Values.google.sso.clientId | quote }} + GOOGLE_CLIENT_ID: {{ .Values.webApi.google.sso.clientId | quote }}