Merge pull request #4 from cryptlex/mumin/add-Ga-kay

chore: add ga to web-api
cryptlex · Aug 8, 2024 · 78fba2a · 78fba2a
2 parents f4310e7 + 67b9ea7
commit 78fba2a
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 13 deletions.
diff --git a/cryptlex/cryptlex-enterprise/Chart.yaml b/cryptlex/cryptlex-enterprise/Chart.yaml
@@ -6,7 +6,8 @@ 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.108"
+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.108"
+appVersion: "3.16.109"
+
diff --git 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.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
@@ -28,7 +28,9 @@ 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.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 }}
   {{ end }}

diff --git 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.webApi.google.sso.clientId | quote }}
diff --git 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.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
@@ -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,8 +247,13 @@ webApi:
   # Postmark
   postmark:
     accountToken: ""
-# SSO config
-sso:
+  # Google
   google:
-    # Refer to following for enabling Google SSO: https://docs.cryptlex.com/user-management/google-sso
-    clientId: ""
+    recaptcha:
+      secretKey: ""
+    analytics:
+      # G-XXXXXXX
+      key: ""
+    sso:
+      # Refer to following for enabling Google SSO: https://docs.cryptlex.com/user-management/google-sso
+      clientId: ""