@servicetitan/marketing-ui 3.3.0 → 3.4.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (6) hide show
  1. package/dist/utils/marketing-parner-handlers.d.ts +2 -0
  2. package/dist/utils/marketing-parner-handlers.d.ts.map +1 -1
  3. package/dist/utils/marketing-parner-handlers.js +10 -1
  4. package/dist/utils/marketing-parner-handlers.js.map +1 -1
  5. package/package.json +2 -2
  6. package/src/utils/marketing-parner-handlers.ts +19 -7
package/dist/utils/marketing-parner-handlers.d.ts CHANGED
@@ -2,6 +2,8 @@ import type { AxiosInstance } from 'axios';
2
2
  export interface AuthResponse {
3
3
  redirect_uri: string;
4
4
  redirect_query_param: string;
5
+ auth_tenant_query_param?: string;
6
+ auth_tenant_query_param_source?: string;
5
7
  }
6
8
  export declare type RedirectTarget = '_self' | '_blank' | '_parent' | '_top';
7
9
  /**
package/dist/utils/marketing-parner-handlers.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"marketing-parner-handlers.d.ts","sourceRoot":"","sources":["../../src/utils/marketing-parner-handlers.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,OAAO,CAAC;AAG3C,MAAM,WAAW,YAAY;IACzB,YAAY,EAAE,MAAM,CAAC;IACrB,oBAAoB,EAAE,MAAM,CAAC;CAChC;AAED,oBAAY,cAAc,GAAG,OAAO,GAAG,QAAQ,GAAG,SAAS,GAAG,MAAM,CAAC;AAOrE;;GAEG;AACH,wBAAgB,mBAAmB,CAC/B,GAAG,EAAE;IAAE,MAAM,EAAE,MAAM,CAAC;IAAC,IAAI,CAAC,EAAE,YAAY,CAAA;CAAE,GAAG,SAAS,EACxD,MAAM,CAAC,EAAE,cAAc,wBAc1B;AAED,wBAAgB,gBAAgB,CAAC,YAAY,EAAE,aAAa,EAAE,MAAM,CAAC,EAAE,cAAc,UAKpF"}
1
+ {"version":3,"file":"marketing-parner-handlers.d.ts","sourceRoot":"","sources":["../../src/utils/marketing-parner-handlers.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,OAAO,CAAC;AAG3C,MAAM,WAAW,YAAY;IACzB,YAAY,EAAE,MAAM,CAAC;IACrB,oBAAoB,EAAE,MAAM,CAAC;IAC7B,uBAAuB,CAAC,EAAE,MAAM,CAAC;IACjC,8BAA8B,CAAC,EAAE,MAAM,CAAC;CAC3C;AAED,oBAAY,cAAc,GAAG,OAAO,GAAG,QAAQ,GAAG,SAAS,GAAG,MAAM,CAAC;AAUrE;;GAEG;AACH,wBAAgB,mBAAmB,CAC/B,GAAG,EAAE;IAAE,MAAM,EAAE,MAAM,CAAC;IAAC,IAAI,CAAC,EAAE,YAAY,CAAA;CAAE,GAAG,SAAS,EACxD,MAAM,CAAC,EAAE,cAAc,wBAqB1B;AAED,wBAAgB,gBAAgB,CAAC,YAAY,EAAE,aAAa,EAAE,MAAM,CAAC,EAAE,cAAc,UAKpF"}
package/dist/utils/marketing-parner-handlers.js CHANGED
@@ -2,13 +2,22 @@ const joinUrlParameter = (url, key, value) => {
2
2
  const separator = url.includes('?') ? '&' : '?';
3
3
  return `${url}${separator}${key}=${encodeURIComponent(value)}`;
4
4
  };
5
+ const readTenantAuthParam = (paramName) => new URLSearchParams(window.location.search).get(paramName);
5
6
  /**
6
7
  * @see https://servicetitan.atlassian.net/wiki/spaces/EN/pages/2459272255/Frontend+redirect+issue
7
8
  */
8
9
  export function execPartnerRedirect(res, target) {
9
10
  var _a, _b;
10
11
  if ((res === null || res === void 0 ? void 0 : res.status) === 401 && ((_a = res.data) === null || _a === void 0 ? void 0 : _a.redirect_uri) && ((_b = res.data) === null || _b === void 0 ? void 0 : _b.redirect_query_param)) {
11
- return window.open(joinUrlParameter(res.data.redirect_uri, res.data.redirect_query_param, window.location.href), target !== null && target !== void 0 ? target : '_self');
12
+ let uri = joinUrlParameter(res.data.redirect_uri, res.data.redirect_query_param, window.location.href);
13
+ /** @see https://servicetitan.atlassian.net/browse/MPA-1255 */
14
+ if (res.data.auth_tenant_query_param && res.data.auth_tenant_query_param_source) {
15
+ const tenantParam = readTenantAuthParam(res.data.auth_tenant_query_param_source);
16
+ uri = tenantParam
17
+ ? joinUrlParameter(uri, res.data.auth_tenant_query_param, tenantParam)
18
+ : uri;
19
+ }
20
+ return window.open(uri, target !== null && target !== void 0 ? target : '_self');
12
21
  }
13
22
  return true;
14
23
  }
package/dist/utils/marketing-parner-handlers.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"marketing-parner-handlers.js","sourceRoot":"","sources":["../../src/utils/marketing-parner-handlers.ts"],"names":[],"mappings":"AAUA,MAAM,gBAAgB,GAAG,CAAC,GAAW,EAAE,GAAW,EAAE,KAAa,EAAE,EAAE;IACjE,MAAM,SAAS,GAAG,GAAG,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC;IAChD,OAAO,GAAG,GAAG,GAAG,SAAS,GAAG,GAAG,IAAI,kBAAkB,CAAC,KAAK,CAAC,EAAE,CAAC;AACnE,CAAC,CAAC;AAEF;;GAEG;AACH,MAAM,UAAU,mBAAmB,CAC/B,GAAwD,EACxD,MAAuB;;IAEvB,IAAI,CAAA,GAAG,aAAH,GAAG,uBAAH,GAAG,CAAE,MAAM,MAAK,GAAG,KAAI,MAAA,GAAG,CAAC,IAAI,0CAAE,YAAY,CAAA,KAAI,MAAA,GAAG,CAAC,IAAI,0CAAE,oBAAoB,CAAA,EAAE;QACjF,OAAO,MAAM,CAAC,IAAI,CACd,gBAAgB,CACZ,GAAG,CAAC,IAAI,CAAC,YAAY,EACrB,GAAG,CAAC,IAAI,CAAC,oBAAoB,EAC7B,MAAM,CAAC,QAAQ,CAAC,IAAI,CACvB,EACD,MAAM,aAAN,MAAM,cAAN,MAAM,GAAI,OAAO,CACpB,CAAC;KACL;IAED,OAAO,IAAI,CAAC;AAChB,CAAC;AAED,MAAM,UAAU,gBAAgB,CAAC,YAA2B,EAAE,MAAuB;IACjF,OAAO,YAAY,CAAC,YAAY,CAAC,QAAQ,CAAC,GAAG,CACzC,QAAQ,CAAC,EAAE,CAAC,QAAQ,EACpB,GAAG,CAAC,EAAE,CAAC,mBAAmB,CAAC,GAAG,CAAC,QAAQ,EAAE,MAAM,CAAC,IAAI,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,CAC1E,CAAC;AACN,CAAC"}
1
+ {"version":3,"file":"marketing-parner-handlers.js","sourceRoot":"","sources":["../../src/utils/marketing-parner-handlers.ts"],"names":[],"mappings":"AAYA,MAAM,gBAAgB,GAAG,CAAC,GAAW,EAAE,GAAW,EAAE,KAAa,EAAE,EAAE;IACjE,MAAM,SAAS,GAAG,GAAG,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC;IAChD,OAAO,GAAG,GAAG,GAAG,SAAS,GAAG,GAAG,IAAI,kBAAkB,CAAC,KAAK,CAAC,EAAE,CAAC;AACnE,CAAC,CAAC;AAEF,MAAM,mBAAmB,GAAG,CAAC,SAAiB,EAAE,EAAE,CAC9C,IAAI,eAAe,CAAC,MAAM,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;AAE/D;;GAEG;AACH,MAAM,UAAU,mBAAmB,CAC/B,GAAwD,EACxD,MAAuB;;IAEvB,IAAI,CAAA,GAAG,aAAH,GAAG,uBAAH,GAAG,CAAE,MAAM,MAAK,GAAG,KAAI,MAAA,GAAG,CAAC,IAAI,0CAAE,YAAY,CAAA,KAAI,MAAA,GAAG,CAAC,IAAI,0CAAE,oBAAoB,CAAA,EAAE;QACjF,IAAI,GAAG,GAAG,gBAAgB,CACtB,GAAG,CAAC,IAAI,CAAC,YAAY,EACrB,GAAG,CAAC,IAAI,CAAC,oBAAoB,EAC7B,MAAM,CAAC,QAAQ,CAAC,IAAI,CACvB,CAAC;QAEF,8DAA8D;QAC9D,IAAI,GAAG,CAAC,IAAI,CAAC,uBAAuB,IAAI,GAAG,CAAC,IAAI,CAAC,8BAA8B,EAAE;YAC7E,MAAM,WAAW,GAAG,mBAAmB,CAAC,GAAG,CAAC,IAAI,CAAC,8BAA8B,CAAC,CAAC;YACjF,GAAG,GAAG,WAAW;gBACb,CAAC,CAAC,gBAAgB,CAAC,GAAG,EAAE,GAAG,CAAC,IAAI,CAAC,uBAAuB,EAAE,WAAW,CAAC;gBACtE,CAAC,CAAC,GAAG,CAAC;SACb;QAED,OAAO,MAAM,CAAC,IAAI,CAAC,GAAG,EAAE,MAAM,aAAN,MAAM,cAAN,MAAM,GAAI,OAAO,CAAC,CAAC;KAC9C;IAED,OAAO,IAAI,CAAC;AAChB,CAAC;AAED,MAAM,UAAU,gBAAgB,CAAC,YAA2B,EAAE,MAAuB;IACjF,OAAO,YAAY,CAAC,YAAY,CAAC,QAAQ,CAAC,GAAG,CACzC,QAAQ,CAAC,EAAE,CAAC,QAAQ,EACpB,GAAG,CAAC,EAAE,CAAC,mBAAmB,CAAC,GAAG,CAAC,QAAQ,EAAE,MAAM,CAAC,IAAI,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,CAC1E,CAAC;AACN,CAAC"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@servicetitan/marketing-ui",
3
- "version": "3.3.0",
3
+ "version": "3.4.0",
4
4
  "description": "Marketing UI component and utils",
5
5
  "repository": {
6
6
  "type": "git",
@@ -52,5 +52,5 @@
52
52
  "less": true,
53
53
  "webpack": false
54
54
  },
55
- "gitHead": "a0f93bd089adb9bf7f293b43d345d9b5a4da28da"
55
+ "gitHead": "6d906ac51ebcbdb18068cc482cb63064756ccf83"
56
56
  }
package/src/utils/marketing-parner-handlers.ts CHANGED
@@ -4,6 +4,8 @@ import type { AxiosInstance } from 'axios';
4
4
  export interface AuthResponse {
5
5
  redirect_uri: string;
6
6
  redirect_query_param: string;
7
+ auth_tenant_query_param?: string;
8
+ auth_tenant_query_param_source?: string;
7
9
  }
8
10
 
9
11
  export type RedirectTarget = '_self' | '_blank' | '_parent' | '_top';
@@ -13,6 +15,9 @@ const joinUrlParameter = (url: string, key: string, value: string) => {
13
15
  return `${url}${separator}${key}=${encodeURIComponent(value)}`;
14
16
  };
15
17
 
18
+ const readTenantAuthParam = (paramName: string) =>
19
+ new URLSearchParams(window.location.search).get(paramName);
20
+
16
21
  /**
17
22
  * @see https://servicetitan.atlassian.net/wiki/spaces/EN/pages/2459272255/Frontend+redirect+issue
18
23
  */
@@ -21,14 +26,21 @@ export function execPartnerRedirect(
21
26
  target?: RedirectTarget
22
27
  ) {
23
28
  if (res?.status === 401 && res.data?.redirect_uri && res.data?.redirect_query_param) {
24
- return window.open(
25
- joinUrlParameter(
26
- res.data.redirect_uri,
27
- res.data.redirect_query_param,
28
- window.location.href
29
- ),
30
- target ?? '_self'
29
+ let uri = joinUrlParameter(
30
+ res.data.redirect_uri,
31
+ res.data.redirect_query_param,
32
+ window.location.href
31
33
  );
34
+
35
+ /** @see https://servicetitan.atlassian.net/browse/MPA-1255 */
36
+ if (res.data.auth_tenant_query_param && res.data.auth_tenant_query_param_source) {
37
+ const tenantParam = readTenantAuthParam(res.data.auth_tenant_query_param_source);
38
+ uri = tenantParam
39
+ ? joinUrlParameter(uri, res.data.auth_tenant_query_param, tenantParam)
40
+ : uri;
41
+ }
42
+
43
+ return window.open(uri, target ?? '_self');
32
44
  }
33
45
 
34
46
  return true;