10394429029

Committed 14 Aug 2024 08:19PM UTC coverage: 15.844% (+0.001%) from 15.843%

Build # 10394429029

Build Type

push

github

Committed by

web-flow

Commit Message

Merge pull request #8850 from hicommonwealth/8728.jake.fix-substrate-login

Eliminate createAddressHelper and fix Substrate login.

Run Details

3603 of 21144 branches covered (17.04%)

Branch coverage included in aggregate %.

38 of 75 new or added lines in 2 files covered. (50.67%)

2 existing lines in 2 files now uncovered.

4712 of 31335 relevant lines covered (15.04%)

5.32 hits per line

Source File
Press 'n' to go to next uncovered line, 'b' for previous

77.27

/packages/commonwealth/server/controllers/server_analytics_controller.ts

import { analytics, config } from '@hicommonwealth/core';
import { AnalyticsPayload } from 'shared/analytics/types';

export type TrackOptions = Record<string, any> & AnalyticsPayload;

export class ServerAnalyticsController {
  /**
   * Tracks an analytics event.
   * Can optionally pass a request object to add browser info to event.
   */
  async track(options: TrackOptions, req?: any) {
    let newOptions = { ...options };
    const host = req?.get?.('host');
    if (req) {
      const browserInfo = getRequestBrowserInfo(req);
      newOptions = {
        ...newOptions,
        ...browserInfo,
        ...(host && { isCustomDomain: config.SERVER_URL.includes(host) }),
      };
    }
    const reqIsPWA = req?.headers?.['isPWA'] === 'true';
    const { event, ...payload } = newOptions;
    payload.isPWA = reqIsPWA;
    analytics().track(event, payload);
  }
}

/**
 * Returns a record containing condensed browser info.
 * Expects the 'express-useragent' middleware to be
 * applied to the route.
 */
function getRequestBrowserInfo(req: any): Record<string, any> {
  if (!req.useragent) {
    return {};
  }
  if (Object.keys(req.useragent).length === 0) {
    return {};
  }
  // take the useragent data and pick certain entries to add to browserInfo
  const browserInfo = {};
  const userAgent = (req as any).useragent || {};
  for (const [k, v] of Object.entries(userAgent)) {
    if (k.startsWith('is') && v) {
      // for keys like 'isChrome' and 'isFirefox', only include them if the value is true
      browserInfo[k] = v;
    } else if (typeof v === 'string') {
      // or include any entry where the value is a string
      browserInfo[k] = v;
    }
  }
  // manually check for Brave since middleware thinks Brave is Chrome
  const brand = req.headers['sec-ch-ua'];
  if (typeof brand === 'string' && brand.includes('Brave')) {
    delete browserInfo['isChrome'];
    browserInfo['isBrave'] = true;
    browserInfo['browser'] = 'Brave';
  }
  return browserInfo;
}

1	import { analytics, config } from '@hicommonwealth/core';
2	import { AnalyticsPayload } from 'shared/analytics/types';
3
4	export type TrackOptions = Record<string, any> & AnalyticsPayload;
5
6	export class ServerAnalyticsController {
7	/**
8	* Tracks an analytics event.
9	* Can optionally pass a request object to add browser info to event.
10	*/
11	async track(options: TrackOptions, req?: any) {
12	let newOptions = { ...options };	195✔
13	const host = req?.get?.('host');	195✔
14	if (req) {	195✔
15	const browserInfo = getRequestBrowserInfo(req);	194✔
16	newOptions = {	194✔
17	...newOptions,
18	...browserInfo,
19	...(host && { isCustomDomain: config.SERVER_URL.includes(host) }),	776✔
20	};
21	}
22	const reqIsPWA = req?.headers?.['isPWA'] === 'true';	195✔
23	const { event, ...payload } = newOptions;	195✔
24	payload.isPWA = reqIsPWA;	195✔
25	analytics().track(event, payload);	195✔
26	}
27	}
28
29	/**
30	* Returns a record containing condensed browser info.
31	* Expects the 'express-useragent' middleware to be
32	* applied to the route.
33	*/
34	function getRequestBrowserInfo(req: any): Record<string, any> {
35	if (!req.useragent) {	194!
UNCOV 36	return {};	×
37	}
38	if (Object.keys(req.useragent).length === 0) {	194!
39	return {};	×
40	}
41	// take the useragent data and pick certain entries to add to browserInfo
42	const browserInfo = {};	194✔
43	const userAgent = (req as any).useragent \|\| {};	194!
44	for (const [k, v] of Object.entries(userAgent)) {	194✔
45	if (k.startsWith('is') && v) {	10,864✔
46	// for keys like 'isChrome' and 'isFirefox', only include them if the value is true
47	browserInfo[k] = v;	194✔
48	} else if (typeof v === 'string') {	10,670✔
49	// or include any entry where the value is a string
50	browserInfo[k] = v;	970✔
51	}
52	}
53	// manually check for Brave since middleware thinks Brave is Chrome
54	const brand = req.headers['sec-ch-ua'];	194✔
55	if (typeof brand === 'string' && brand.includes('Brave')) {	194!
56	delete browserInfo['isChrome'];	×
57	browserInfo['isBrave'] = true;	×
58	browserInfo['browser'] = 'Brave';	×
59	}
60	return browserInfo;	194✔
61	}

hicommonwealth / commonwealth / 10394429029

Source File Press 'n' to go to next uncovered line, 'b' for previous

Source File
Press 'n' to go to next uncovered line, 'b' for previous