fix(countly): remove app_key from template and put it into the applic…

…ation
wireapp · Oct 17, 2024 · 1266aa4 · 1266aa4
1 parent e8f2214
commit 1266aa4
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 13 deletions.
diff --git a/server/Server.ts b/server/Server.ts
@@ -213,7 +213,6 @@ class Server {
  APP_BASE: this.config.APP_BASE,
  OPEN_GRAPH: this.config.OPEN_GRAPH,
  VERSION: this.config.VERSION,
- COUNTLY_API_KEY: this.config.COUNTLY_API_KEY,
  COUNTLY_NONCE: this.config.COUNTLY_NONCE,
  };
  }

diff --git a/server/config/server.config.ts b/server/config/server.config.ts
@@ -125,7 +125,6 @@ export function generateConfig(params: ConfigGeneratorParams, env: Env) {
  ALLOWED_HOSTS: ['app.wire.com'],
  DISALLOW: readFile(ROBOTS_DISALLOW_FILE, 'User-agent: *\r\nDisallow: /'),
  },
- COUNTLY_API_KEY: env.COUNTLY_API_KEY || '',
  COUNTLY_NONCE: COUNTLY_NONCE.value,
  SSL_CERTIFICATE_KEY_PATH:
  env.SSL_CERTIFICATE_KEY_PATH || path.join(__dirname, '../certificate/development-key.pem'),

diff --git a/src/page/auth.ejs b/src/page/auth.ejs
@@ -27,8 +27,6 @@
  var Countly = Countly || {};
  Countly.q = Countly.q || [];
 
- Countly.app_key = "<%= COUNTLY_API_KEY %>";
- Countly.url = "https://countly.wire.com/";
  Countly.offline_mode = true;
  Countly.use_session_cookie = false;
  Countly.storage = 'localstorage';

diff --git a/src/page/index.ejs b/src/page/index.ejs
@@ -27,8 +27,6 @@
  var Countly = Countly || {};
  Countly.q = Countly.q || [];
 
- Countly.app_key = "<%= COUNTLY_API_KEY %>";
- Countly.url = "https://countly.wire.com/";
  Countly.offline_mode = true;
  Countly.use_session_cookie = false;
  Countly.storage = 'localstorage';

diff --git a/src/script/tracking/EventTrackingRepository.ts b/src/script/tracking/EventTrackingRepository.ts
@@ -238,7 +238,7 @@ export class EventTrackingRepository {
  this.unsubscribeFromProductTrackingEvents();
  }
 
- private async startProductReporting(trackingId?: string): Promise<void> {
+ private async startProductReporting(trackingId: string = ''): Promise<void> {
  // This is a global object provided by the countly.min.js script
  if (!isCountlyLoaded()) {
  this.countlyLogger.warn('Countly is not available');
@@ -253,23 +253,27 @@ export class EventTrackingRepository {
 
  // Add Parameters to previous Countly object
 
- const {COUNTLY_ENABLE_LOGGING, VERSION} = Config.getConfig();
+ const {COUNTLY_ENABLE_LOGGING, VERSION, COUNTLY_API_KEY} = Config.getConfig();
 
  // Initialize Countly if it is not initialized yet
  if (!this.countlyInitialized) {
  window.Countly.app_version = VERSION;
+ window.Countly.app_key = COUNTLY_API_KEY;
  window.Countly.debug = COUNTLY_ENABLE_LOGGING;
+ window.Countly.url = 'https://countly.wire.com/';
  window.Countly.init();
- this.countlyInitialized = true;
  this.countlyLogger.info(
  'Countly has been initialized with version',
  VERSION,
- 'and logging',
+ ', logging',
  COUNTLY_ENABLE_LOGGING,
+ 'and app_key',
+ COUNTLY_API_KEY,
  );
+ this.countlyInitialized = true;
  }
 
- const device_id = trackingId || this.countlyDeviceId;
+ const device_id = Boolean(trackingId.length) ? trackingId : this.countlyDeviceId;
  window.Countly.q.push(['change_id', device_id]);
  window.Countly.q.push(['disable_offline_mode', device_id]);
  this.countlyLogger.info(`Countly tracking id is now ${device_id}`);

diff --git a/webpack.config.common.js b/webpack.config.common.js
@@ -45,8 +45,6 @@ const templateParameters = {
  OPEN_GRAPH_TITLE: serverConfig.OPEN_GRAPH.TITLE,
  OPEN_GRAPH_DESCRIPTION: serverConfig.OPEN_GRAPH.DESCRIPTION,
  OPEN_GRAPH_IMAGE_URL: serverConfig.OPEN_GRAPH.IMAGE_URL,
- COUNTLY_API_KEY: serverConfig.COUNTLY_API_KEY,
- COUNTLY_ENABLE_LOGGING: serverConfig.COUNTLY_ENABLE_LOGGING,
  COUNTLY_NONCE: serverConfig.COUNTLY_NONCE,
 };