@smg-automotive/auth 8.3.0-lschuerch-FED-782-sync-tenant.2 → 8.3.0-lschuerch-FED-782-sync-tenant.3

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.
@@ -1,11 +1,20 @@
1
1
  'use strict';
2
2
 
3
+ var debug = require('debug');
3
4
  var getManagedSellers = require('../../api/user/getManagedSellers.js');
4
5
  require('../../api/user/client.js');
5
6
  var getEntitlements = require('../../api/entitlements/getEntitlements.js');
6
7
  require('../../api/entitlements/client.js');
7
8
 
9
+ function _interopDefaultCompat (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; }
10
+
11
+ var debug__default = /*#__PURE__*/_interopDefaultCompat(debug);
12
+
13
+ const log = debug__default.default('@smg-automotive/auth:user');
8
14
  const enrichUser = async ({ user, accessToken, brand, }) => {
15
+ if (user.isMultiTenantUser) {
16
+ log('Fetching managed sellers for user');
17
+ }
9
18
  const managedSellersResponse = user.isMultiTenantUser
10
19
  ? await getManagedSellers.getManagedSellers({
11
20
  userId: user.userId,
@@ -20,11 +29,13 @@ const enrichUser = async ({ user, accessToken, brand, }) => {
20
29
  });
21
30
  // We can not load entitlements without a selected sellerId
22
31
  if (user.forceTenantSelection) {
32
+ log('Returning user to force multi-tenant selection without entitlements');
23
33
  return Object.assign(user, {
24
34
  managedSellers: sortedManagedSellers,
25
35
  entitlements: null,
26
36
  });
27
37
  }
38
+ log('Fetching entitlements for user');
28
39
  const fullEntitlements = await getEntitlements.getEntitlements({
29
40
  sellerId: parseInt(user.sellerId, 10),
30
41
  accessToken,
@@ -32,6 +43,7 @@ const enrichUser = async ({ user, accessToken, brand, }) => {
32
43
  const entitlements = fullEntitlements && fullEntitlements[brand]
33
44
  ? fullEntitlements[brand]
34
45
  : null;
46
+ log('Returning enriched user');
35
47
  return Object.assign(user, {
36
48
  managedSellers: sortedManagedSellers,
37
49
  entitlements,
@@ -1 +1 @@
1
- {"version":3,"file":"session.js","sources":["../../../../../src/lib/enrichUser/session.ts"],"sourcesContent":[null],"names":["getManagedSellers","getEntitlements"],"mappings":";;;;;;;AAKO,MAAM,UAAU,GAAG,OAAO,EAC/B,IAAI,EACJ,WAAW,EACX,KAAK,GAKN,KAAkC;AACjC,IAAA,MAAM,sBAAsB,GAAG,IAAI,CAAC;UAChC,MAAMA,mCAAiB,CAAC;YACtB,MAAM,EAAE,IAAI,CAAC,MAAM;YACnB,WAAW;SACZ;UACD,IAAI;AACR,IAAA,MAAM,EAAE,OAAO,EAAE,cAAc,EAAE,GAAG;AAClC,UAAE;AACF,UAAE,EAAE,OAAO,EAAE,EAA0B,EAAE;IAC3C,MAAM,oBAAoB,GAAG,cAAc,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,KAAI;AACxD,QAAA,OAAO,CAAC,CAAC,CAAC,WAAW,IAAI,EAAE,EAAE,aAAa,CAAC,CAAC,CAAC,WAAW,IAAI,EAAE,CAAC;AACjE,IAAA,CAAC,CAAC;;AAGF,IAAA,IAAI,IAAI,CAAC,oBAAoB,EAAE;AAC7B,QAAA,OAAO,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE;AACzB,YAAA,cAAc,EAAE,oBAAoB;AACpC,YAAA,YAAY,EAAE,IAAI;AACnB,SAAA,CAAC;IACJ;AAEA,IAAA,MAAM,gBAAgB,GAAG,MAAMC,+BAAe,CAAC;QAC7C,QAAQ,EAAE,QAAQ,CAAC,IAAI,CAAC,QAAQ,EAAE,EAAE,CAAC;QACrC,WAAW;AACZ,KAAA,CAAC;AACF,IAAA,MAAM,YAAY,GAChB,gBAAgB,IAAI,gBAAgB,CAAC,KAAK;AACxC,UAAE,gBAAgB,CAAC,KAAK;UACtB,IAAI;AAEV,IAAA,OAAO,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE;AACzB,QAAA,cAAc,EAAE,oBAAoB;QACpC,YAAY;AACb,KAAA,CAAC;AACJ;;;;"}
1
+ {"version":3,"file":"session.js","sources":["../../../../../src/lib/enrichUser/session.ts"],"sourcesContent":[null],"names":["debug","getManagedSellers","getEntitlements"],"mappings":";;;;;;;;;;;;AAOA,MAAM,GAAG,GAAGA,sBAAK,CAAC,2BAA2B,CAAC;AAEvC,MAAM,UAAU,GAAG,OAAO,EAC/B,IAAI,EACJ,WAAW,EACX,KAAK,GAKN,KAAkC;AACjC,IAAA,IAAI,IAAI,CAAC,iBAAiB,EAAE;QAC1B,GAAG,CAAC,mCAAmC,CAAC;IAC1C;AACA,IAAA,MAAM,sBAAsB,GAAG,IAAI,CAAC;UAChC,MAAMC,mCAAiB,CAAC;YACtB,MAAM,EAAE,IAAI,CAAC,MAAM;YACnB,WAAW;SACZ;UACD,IAAI;AACR,IAAA,MAAM,EAAE,OAAO,EAAE,cAAc,EAAE,GAAG;AAClC,UAAE;AACF,UAAE,EAAE,OAAO,EAAE,EAA0B,EAAE;IAC3C,MAAM,oBAAoB,GAAG,cAAc,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,KAAI;AACxD,QAAA,OAAO,CAAC,CAAC,CAAC,WAAW,IAAI,EAAE,EAAE,aAAa,CAAC,CAAC,CAAC,WAAW,IAAI,EAAE,CAAC;AACjE,IAAA,CAAC,CAAC;;AAGF,IAAA,IAAI,IAAI,CAAC,oBAAoB,EAAE;QAC7B,GAAG,CAAC,qEAAqE,CAAC;AAE1E,QAAA,OAAO,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE;AACzB,YAAA,cAAc,EAAE,oBAAoB;AACpC,YAAA,YAAY,EAAE,IAAI;AACnB,SAAA,CAAC;IACJ;IAEA,GAAG,CAAC,gCAAgC,CAAC;AACrC,IAAA,MAAM,gBAAgB,GAAG,MAAMC,+BAAe,CAAC;QAC7C,QAAQ,EAAE,QAAQ,CAAC,IAAI,CAAC,QAAQ,EAAE,EAAE,CAAC;QACrC,WAAW;AACZ,KAAA,CAAC;AACF,IAAA,MAAM,YAAY,GAChB,gBAAgB,IAAI,gBAAgB,CAAC,KAAK;AACxC,UAAE,gBAAgB,CAAC,KAAK;UACtB,IAAI;IAEV,GAAG,CAAC,yBAAyB,CAAC;AAC9B,IAAA,OAAO,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE;AACzB,QAAA,cAAc,EAAE,oBAAoB;QACpC,YAAY;AACb,KAAA,CAAC;AACJ;;;;"}
@@ -10,29 +10,40 @@ const crossApplicationStateSynchronization = async ({ request, language, auth0In
10
10
  }
11
11
  const impersonatedSellerIdFromCookie = request.cookies.get(auth0Config.impersonatedSellerIdCookie.name)?.value;
12
12
  console.log('impersonatedSellerIdFromCookie', impersonatedSellerIdFromCookie);
13
- console.log('!session?.user', session?.user);
13
+ console.log('typeof impersonatedSellerIdFromCookie', typeof impersonatedSellerIdFromCookie);
14
+ console.log('user.sellerId', typeof session?.user.sellerId);
15
+ console.log('typeof user.sellerId', typeof session?.user.sellerId);
16
+ console.log('session?.user.isMultiTenantUser', session?.user.isMultiTenantUser);
17
+ console.log('user: ', session?.user);
14
18
  if (!session?.user.isMultiTenantUser && !impersonatedSellerIdFromCookie) {
15
19
  console.log('User is not multi-tenant and no impersonation, no action needed');
16
20
  return null;
17
21
  }
18
22
  let impersonateSellerId;
19
- if (session.user.sellerId !== impersonatedSellerIdFromCookie) {
23
+ if (impersonatedSellerIdFromCookie &&
24
+ session.user.sellerId !== impersonatedSellerIdFromCookie) {
20
25
  console.log('Impersonated seller ID out of sync, redirecting to login to resync');
21
26
  impersonateSellerId = impersonatedSellerIdFromCookie;
22
27
  }
23
- console.log('!session?.user', session?.user);
24
28
  const sellerIdFromCookie = request.cookies.get(auth0Config.selectedSellerIdCookie.name)?.value;
29
+ console.log('sellerIdFromCookie', sellerIdFromCookie);
30
+ console.log('typeof sellerIdFromCookie', typeof sellerIdFromCookie);
25
31
  let selectedSellerId;
26
- if (session.user.sellerId !== sellerIdFromCookie && !impersonateSellerId) {
32
+ if (sellerIdFromCookie &&
33
+ session.user.sellerId !== sellerIdFromCookie &&
34
+ !impersonateSellerId) {
27
35
  console.log('Selected seller ID out of sync, redirecting to login to resync');
28
36
  selectedSellerId = sellerIdFromCookie;
29
37
  }
30
- console.log('!sellerIdFromCookie', sellerIdFromCookie);
31
38
  if (!selectedSellerId && !impersonateSellerId) {
32
39
  console.log('All in sync, no action needed');
33
40
  return null;
34
41
  }
35
- console.log('Redirecting to login for resynchronization');
42
+ console.log('Redirecting to login for resynchronization', {
43
+ impersonateSellerId,
44
+ selectedSellerId,
45
+ currentSellerId: session.user.sellerId,
46
+ });
36
47
  console.log(redirectToLogin.redirectToLogin);
37
48
  return redirectToLogin.redirectToLogin({
38
49
  auth0Config,
@@ -1 +1 @@
1
- {"version":3,"file":"crossApplicationStateSynchronization.js","sources":["../../../../../src/server/middleware/crossApplicationStateSynchronization.ts"],"sourcesContent":[null],"names":["redirectToLogin"],"mappings":";;;;AASO,MAAM,oCAAoC,GAAG,OAAO,EACzD,OAAO,EACP,QAAQ,EACR,aAAa,EACb,WAAW,GAMZ,KAAkC;IACjC,MAAM,OAAO,GAAG,MAAM,aAAa,CAAC,UAAU,CAAC,OAAO,CAAC;IACvD,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,OAAO;AAEpD,IAAA,IAAI,CAAC,OAAO,EAAE,IAAI,EAAE;AAClB,QAAA,OAAO,IAAI;IACb;AAEA,IAAA,MAAM,8BAA8B,GAAG,OAAO,CAAC,OAAO,CAAC,GAAG,CACxD,WAAW,CAAC,0BAA0B,CAAC,IAAI,CAC5C,EAAE,KAAK;AAER,IAAA,OAAO,CAAC,GAAG,CAAC,gCAAgC,EAAE,8BAA8B,CAAC;IAC7E,OAAO,CAAC,GAAG,CAAC,gBAAgB,EAAE,OAAO,EAAE,IAAI,CAAC;IAE5C,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,iBAAiB,IAAI,CAAC,8BAA8B,EAAE;AACvE,QAAA,OAAO,CAAC,GAAG,CACT,iEAAiE,CAClE;AACD,QAAA,OAAO,IAAI;IACb;AAEA,IAAA,IAAI,mBAAuC;IAC3C,IAAI,OAAO,CAAC,IAAI,CAAC,QAAQ,KAAK,8BAA8B,EAAE;AAC5D,QAAA,OAAO,CAAC,GAAG,CACT,oEAAoE,CACrE;QACD,mBAAmB,GAAG,8BAA8B;IACtD;IAEA,OAAO,CAAC,GAAG,CAAC,gBAAgB,EAAE,OAAO,EAAE,IAAI,CAAC;AAE5C,IAAA,MAAM,kBAAkB,GAAG,OAAO,CAAC,OAAO,CAAC,GAAG,CAC5C,WAAW,CAAC,sBAAsB,CAAC,IAAI,CACxC,EAAE,KAAK;AACR,IAAA,IAAI,gBAAoC;IACxC,IAAI,OAAO,CAAC,IAAI,CAAC,QAAQ,KAAK,kBAAkB,IAAI,CAAC,mBAAmB,EAAE;AACxE,QAAA,OAAO,CAAC,GAAG,CACT,gEAAgE,CACjE;QACD,gBAAgB,GAAG,kBAAkB;IACvC;AAEA,IAAA,OAAO,CAAC,GAAG,CAAC,qBAAqB,EAAE,kBAAkB,CAAC;AAEtD,IAAA,IAAI,CAAC,gBAAgB,IAAI,CAAC,mBAAmB,EAAE;AAC7C,QAAA,OAAO,CAAC,GAAG,CAAC,+BAA+B,CAAC;AAC5C,QAAA,OAAO,IAAI;IACb;AAEA,IAAA,OAAO,CAAC,GAAG,CAAC,4CAA4C,CAAC;AAEzD,IAAA,OAAO,CAAC,GAAG,CAACA,+BAAe,CAAC;AAC5B,IAAA,OAAOA,+BAAe,CAAC;QACrB,WAAW;QACX,QAAQ;AACR,QAAA,QAAQ,EAAE,CAAA,EAAG,QAAQ,CAAA,EAAG,MAAM,CAAA,CAAE;QAChC,MAAM;QACN,mBAAmB;QACnB,gBAAgB;AACjB,KAAA,CAAC;AACJ;;;;"}
1
+ {"version":3,"file":"crossApplicationStateSynchronization.js","sources":["../../../../../src/server/middleware/crossApplicationStateSynchronization.ts"],"sourcesContent":[null],"names":["redirectToLogin"],"mappings":";;;;AASO,MAAM,oCAAoC,GAAG,OAAO,EACzD,OAAO,EACP,QAAQ,EACR,aAAa,EACb,WAAW,GAMZ,KAAkC;IACjC,MAAM,OAAO,GAAG,MAAM,aAAa,CAAC,UAAU,CAAC,OAAO,CAAC;IACvD,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,OAAO;AAEpD,IAAA,IAAI,CAAC,OAAO,EAAE,IAAI,EAAE;AAClB,QAAA,OAAO,IAAI;IACb;AAEA,IAAA,MAAM,8BAA8B,GAAG,OAAO,CAAC,OAAO,CAAC,GAAG,CACxD,WAAW,CAAC,0BAA0B,CAAC,IAAI,CAC5C,EAAE,KAAK;AAER,IAAA,OAAO,CAAC,GAAG,CAAC,gCAAgC,EAAE,8BAA8B,CAAC;IAC7E,OAAO,CAAC,GAAG,CACT,uCAAuC,EACvC,OAAO,8BAA8B,CACtC;AACD,IAAA,OAAO,CAAC,GAAG,CAAC,eAAe,EAAE,OAAO,OAAO,EAAE,IAAI,CAAC,QAAQ,CAAC;AAC3D,IAAA,OAAO,CAAC,GAAG,CAAC,sBAAsB,EAAE,OAAO,OAAO,EAAE,IAAI,CAAC,QAAQ,CAAC;IAClE,OAAO,CAAC,GAAG,CACT,iCAAiC,EACjC,OAAO,EAAE,IAAI,CAAC,iBAAiB,CAChC;IACD,OAAO,CAAC,GAAG,CAAC,QAAQ,EAAE,OAAO,EAAE,IAAI,CAAC;IAEpC,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,iBAAiB,IAAI,CAAC,8BAA8B,EAAE;AACvE,QAAA,OAAO,CAAC,GAAG,CACT,iEAAiE,CAClE;AACD,QAAA,OAAO,IAAI;IACb;AAEA,IAAA,IAAI,mBAAuC;AAC3C,IAAA,IACE,8BAA8B;AAC9B,QAAA,OAAO,CAAC,IAAI,CAAC,QAAQ,KAAK,8BAA8B,EACxD;AACA,QAAA,OAAO,CAAC,GAAG,CACT,oEAAoE,CACrE;QACD,mBAAmB,GAAG,8BAA8B;IACtD;AAEA,IAAA,MAAM,kBAAkB,GAAG,OAAO,CAAC,OAAO,CAAC,GAAG,CAC5C,WAAW,CAAC,sBAAsB,CAAC,IAAI,CACxC,EAAE,KAAK;AACR,IAAA,OAAO,CAAC,GAAG,CAAC,oBAAoB,EAAE,kBAAkB,CAAC;IACrD,OAAO,CAAC,GAAG,CAAC,2BAA2B,EAAE,OAAO,kBAAkB,CAAC;AAEnE,IAAA,IAAI,gBAAoC;AACxC,IAAA,IACE,kBAAkB;AAClB,QAAA,OAAO,CAAC,IAAI,CAAC,QAAQ,KAAK,kBAAkB;QAC5C,CAAC,mBAAmB,EACpB;AACA,QAAA,OAAO,CAAC,GAAG,CACT,gEAAgE,CACjE;QACD,gBAAgB,GAAG,kBAAkB;IACvC;AAEA,IAAA,IAAI,CAAC,gBAAgB,IAAI,CAAC,mBAAmB,EAAE;AAC7C,QAAA,OAAO,CAAC,GAAG,CAAC,+BAA+B,CAAC;AAC5C,QAAA,OAAO,IAAI;IACb;AAEA,IAAA,OAAO,CAAC,GAAG,CAAC,4CAA4C,EAAE;QACxD,mBAAmB;QACnB,gBAAgB;AAChB,QAAA,eAAe,EAAE,OAAO,CAAC,IAAI,CAAC,QAAQ;AACvC,KAAA,CAAC;AAEF,IAAA,OAAO,CAAC,GAAG,CAACA,+BAAe,CAAC;AAC5B,IAAA,OAAOA,+BAAe,CAAC;QACrB,WAAW;QACX,QAAQ;AACR,QAAA,QAAQ,EAAE,CAAA,EAAG,QAAQ,CAAA,EAAG,MAAM,CAAA,CAAE;QAChC,MAAM;QACN,mBAAmB;QACnB,gBAAgB;AACjB,KAAA,CAAC;AACJ;;;;"}
@@ -1,9 +1,14 @@
1
+ import debug from 'debug';
1
2
  import { getManagedSellers } from '../../api/user/getManagedSellers.js';
2
3
  import '../../api/user/client.js';
3
4
  import { getEntitlements } from '../../api/entitlements/getEntitlements.js';
4
5
  import '../../api/entitlements/client.js';
5
6
 
7
+ const log = debug('@smg-automotive/auth:user');
6
8
  const enrichUser = async ({ user, accessToken, brand, }) => {
9
+ if (user.isMultiTenantUser) {
10
+ log('Fetching managed sellers for user');
11
+ }
7
12
  const managedSellersResponse = user.isMultiTenantUser
8
13
  ? await getManagedSellers({
9
14
  userId: user.userId,
@@ -18,11 +23,13 @@ const enrichUser = async ({ user, accessToken, brand, }) => {
18
23
  });
19
24
  // We can not load entitlements without a selected sellerId
20
25
  if (user.forceTenantSelection) {
26
+ log('Returning user to force multi-tenant selection without entitlements');
21
27
  return Object.assign(user, {
22
28
  managedSellers: sortedManagedSellers,
23
29
  entitlements: null,
24
30
  });
25
31
  }
32
+ log('Fetching entitlements for user');
26
33
  const fullEntitlements = await getEntitlements({
27
34
  sellerId: parseInt(user.sellerId, 10),
28
35
  accessToken,
@@ -30,6 +37,7 @@ const enrichUser = async ({ user, accessToken, brand, }) => {
30
37
  const entitlements = fullEntitlements && fullEntitlements[brand]
31
38
  ? fullEntitlements[brand]
32
39
  : null;
40
+ log('Returning enriched user');
33
41
  return Object.assign(user, {
34
42
  managedSellers: sortedManagedSellers,
35
43
  entitlements,
@@ -1 +1 @@
1
- {"version":3,"file":"session.js","sources":["../../../../../src/lib/enrichUser/session.ts"],"sourcesContent":[null],"names":[],"mappings":";;;;;AAKO,MAAM,UAAU,GAAG,OAAO,EAC/B,IAAI,EACJ,WAAW,EACX,KAAK,GAKN,KAAkC;AACjC,IAAA,MAAM,sBAAsB,GAAG,IAAI,CAAC;UAChC,MAAM,iBAAiB,CAAC;YACtB,MAAM,EAAE,IAAI,CAAC,MAAM;YACnB,WAAW;SACZ;UACD,IAAI;AACR,IAAA,MAAM,EAAE,OAAO,EAAE,cAAc,EAAE,GAAG;AAClC,UAAE;AACF,UAAE,EAAE,OAAO,EAAE,EAA0B,EAAE;IAC3C,MAAM,oBAAoB,GAAG,cAAc,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,KAAI;AACxD,QAAA,OAAO,CAAC,CAAC,CAAC,WAAW,IAAI,EAAE,EAAE,aAAa,CAAC,CAAC,CAAC,WAAW,IAAI,EAAE,CAAC;AACjE,IAAA,CAAC,CAAC;;AAGF,IAAA,IAAI,IAAI,CAAC,oBAAoB,EAAE;AAC7B,QAAA,OAAO,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE;AACzB,YAAA,cAAc,EAAE,oBAAoB;AACpC,YAAA,YAAY,EAAE,IAAI;AACnB,SAAA,CAAC;IACJ;AAEA,IAAA,MAAM,gBAAgB,GAAG,MAAM,eAAe,CAAC;QAC7C,QAAQ,EAAE,QAAQ,CAAC,IAAI,CAAC,QAAQ,EAAE,EAAE,CAAC;QACrC,WAAW;AACZ,KAAA,CAAC;AACF,IAAA,MAAM,YAAY,GAChB,gBAAgB,IAAI,gBAAgB,CAAC,KAAK;AACxC,UAAE,gBAAgB,CAAC,KAAK;UACtB,IAAI;AAEV,IAAA,OAAO,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE;AACzB,QAAA,cAAc,EAAE,oBAAoB;QACpC,YAAY;AACb,KAAA,CAAC;AACJ;;;;"}
1
+ {"version":3,"file":"session.js","sources":["../../../../../src/lib/enrichUser/session.ts"],"sourcesContent":[null],"names":[],"mappings":";;;;;;AAOA,MAAM,GAAG,GAAG,KAAK,CAAC,2BAA2B,CAAC;AAEvC,MAAM,UAAU,GAAG,OAAO,EAC/B,IAAI,EACJ,WAAW,EACX,KAAK,GAKN,KAAkC;AACjC,IAAA,IAAI,IAAI,CAAC,iBAAiB,EAAE;QAC1B,GAAG,CAAC,mCAAmC,CAAC;IAC1C;AACA,IAAA,MAAM,sBAAsB,GAAG,IAAI,CAAC;UAChC,MAAM,iBAAiB,CAAC;YACtB,MAAM,EAAE,IAAI,CAAC,MAAM;YACnB,WAAW;SACZ;UACD,IAAI;AACR,IAAA,MAAM,EAAE,OAAO,EAAE,cAAc,EAAE,GAAG;AAClC,UAAE;AACF,UAAE,EAAE,OAAO,EAAE,EAA0B,EAAE;IAC3C,MAAM,oBAAoB,GAAG,cAAc,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,KAAI;AACxD,QAAA,OAAO,CAAC,CAAC,CAAC,WAAW,IAAI,EAAE,EAAE,aAAa,CAAC,CAAC,CAAC,WAAW,IAAI,EAAE,CAAC;AACjE,IAAA,CAAC,CAAC;;AAGF,IAAA,IAAI,IAAI,CAAC,oBAAoB,EAAE;QAC7B,GAAG,CAAC,qEAAqE,CAAC;AAE1E,QAAA,OAAO,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE;AACzB,YAAA,cAAc,EAAE,oBAAoB;AACpC,YAAA,YAAY,EAAE,IAAI;AACnB,SAAA,CAAC;IACJ;IAEA,GAAG,CAAC,gCAAgC,CAAC;AACrC,IAAA,MAAM,gBAAgB,GAAG,MAAM,eAAe,CAAC;QAC7C,QAAQ,EAAE,QAAQ,CAAC,IAAI,CAAC,QAAQ,EAAE,EAAE,CAAC;QACrC,WAAW;AACZ,KAAA,CAAC;AACF,IAAA,MAAM,YAAY,GAChB,gBAAgB,IAAI,gBAAgB,CAAC,KAAK;AACxC,UAAE,gBAAgB,CAAC,KAAK;UACtB,IAAI;IAEV,GAAG,CAAC,yBAAyB,CAAC;AAC9B,IAAA,OAAO,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE;AACzB,QAAA,cAAc,EAAE,oBAAoB;QACpC,YAAY;AACb,KAAA,CAAC;AACJ;;;;"}
@@ -8,29 +8,40 @@ const crossApplicationStateSynchronization = async ({ request, language, auth0In
8
8
  }
9
9
  const impersonatedSellerIdFromCookie = request.cookies.get(auth0Config.impersonatedSellerIdCookie.name)?.value;
10
10
  console.log('impersonatedSellerIdFromCookie', impersonatedSellerIdFromCookie);
11
- console.log('!session?.user', session?.user);
11
+ console.log('typeof impersonatedSellerIdFromCookie', typeof impersonatedSellerIdFromCookie);
12
+ console.log('user.sellerId', typeof session?.user.sellerId);
13
+ console.log('typeof user.sellerId', typeof session?.user.sellerId);
14
+ console.log('session?.user.isMultiTenantUser', session?.user.isMultiTenantUser);
15
+ console.log('user: ', session?.user);
12
16
  if (!session?.user.isMultiTenantUser && !impersonatedSellerIdFromCookie) {
13
17
  console.log('User is not multi-tenant and no impersonation, no action needed');
14
18
  return null;
15
19
  }
16
20
  let impersonateSellerId;
17
- if (session.user.sellerId !== impersonatedSellerIdFromCookie) {
21
+ if (impersonatedSellerIdFromCookie &&
22
+ session.user.sellerId !== impersonatedSellerIdFromCookie) {
18
23
  console.log('Impersonated seller ID out of sync, redirecting to login to resync');
19
24
  impersonateSellerId = impersonatedSellerIdFromCookie;
20
25
  }
21
- console.log('!session?.user', session?.user);
22
26
  const sellerIdFromCookie = request.cookies.get(auth0Config.selectedSellerIdCookie.name)?.value;
27
+ console.log('sellerIdFromCookie', sellerIdFromCookie);
28
+ console.log('typeof sellerIdFromCookie', typeof sellerIdFromCookie);
23
29
  let selectedSellerId;
24
- if (session.user.sellerId !== sellerIdFromCookie && !impersonateSellerId) {
30
+ if (sellerIdFromCookie &&
31
+ session.user.sellerId !== sellerIdFromCookie &&
32
+ !impersonateSellerId) {
25
33
  console.log('Selected seller ID out of sync, redirecting to login to resync');
26
34
  selectedSellerId = sellerIdFromCookie;
27
35
  }
28
- console.log('!sellerIdFromCookie', sellerIdFromCookie);
29
36
  if (!selectedSellerId && !impersonateSellerId) {
30
37
  console.log('All in sync, no action needed');
31
38
  return null;
32
39
  }
33
- console.log('Redirecting to login for resynchronization');
40
+ console.log('Redirecting to login for resynchronization', {
41
+ impersonateSellerId,
42
+ selectedSellerId,
43
+ currentSellerId: session.user.sellerId,
44
+ });
34
45
  console.log(redirectToLogin);
35
46
  return redirectToLogin({
36
47
  auth0Config,
@@ -1 +1 @@
1
- {"version":3,"file":"crossApplicationStateSynchronization.js","sources":["../../../../../src/server/middleware/crossApplicationStateSynchronization.ts"],"sourcesContent":[null],"names":[],"mappings":";;AASO,MAAM,oCAAoC,GAAG,OAAO,EACzD,OAAO,EACP,QAAQ,EACR,aAAa,EACb,WAAW,GAMZ,KAAkC;IACjC,MAAM,OAAO,GAAG,MAAM,aAAa,CAAC,UAAU,CAAC,OAAO,CAAC;IACvD,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,OAAO;AAEpD,IAAA,IAAI,CAAC,OAAO,EAAE,IAAI,EAAE;AAClB,QAAA,OAAO,IAAI;IACb;AAEA,IAAA,MAAM,8BAA8B,GAAG,OAAO,CAAC,OAAO,CAAC,GAAG,CACxD,WAAW,CAAC,0BAA0B,CAAC,IAAI,CAC5C,EAAE,KAAK;AAER,IAAA,OAAO,CAAC,GAAG,CAAC,gCAAgC,EAAE,8BAA8B,CAAC;IAC7E,OAAO,CAAC,GAAG,CAAC,gBAAgB,EAAE,OAAO,EAAE,IAAI,CAAC;IAE5C,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,iBAAiB,IAAI,CAAC,8BAA8B,EAAE;AACvE,QAAA,OAAO,CAAC,GAAG,CACT,iEAAiE,CAClE;AACD,QAAA,OAAO,IAAI;IACb;AAEA,IAAA,IAAI,mBAAuC;IAC3C,IAAI,OAAO,CAAC,IAAI,CAAC,QAAQ,KAAK,8BAA8B,EAAE;AAC5D,QAAA,OAAO,CAAC,GAAG,CACT,oEAAoE,CACrE;QACD,mBAAmB,GAAG,8BAA8B;IACtD;IAEA,OAAO,CAAC,GAAG,CAAC,gBAAgB,EAAE,OAAO,EAAE,IAAI,CAAC;AAE5C,IAAA,MAAM,kBAAkB,GAAG,OAAO,CAAC,OAAO,CAAC,GAAG,CAC5C,WAAW,CAAC,sBAAsB,CAAC,IAAI,CACxC,EAAE,KAAK;AACR,IAAA,IAAI,gBAAoC;IACxC,IAAI,OAAO,CAAC,IAAI,CAAC,QAAQ,KAAK,kBAAkB,IAAI,CAAC,mBAAmB,EAAE;AACxE,QAAA,OAAO,CAAC,GAAG,CACT,gEAAgE,CACjE;QACD,gBAAgB,GAAG,kBAAkB;IACvC;AAEA,IAAA,OAAO,CAAC,GAAG,CAAC,qBAAqB,EAAE,kBAAkB,CAAC;AAEtD,IAAA,IAAI,CAAC,gBAAgB,IAAI,CAAC,mBAAmB,EAAE;AAC7C,QAAA,OAAO,CAAC,GAAG,CAAC,+BAA+B,CAAC;AAC5C,QAAA,OAAO,IAAI;IACb;AAEA,IAAA,OAAO,CAAC,GAAG,CAAC,4CAA4C,CAAC;AAEzD,IAAA,OAAO,CAAC,GAAG,CAAC,eAAe,CAAC;AAC5B,IAAA,OAAO,eAAe,CAAC;QACrB,WAAW;QACX,QAAQ;AACR,QAAA,QAAQ,EAAE,CAAA,EAAG,QAAQ,CAAA,EAAG,MAAM,CAAA,CAAE;QAChC,MAAM;QACN,mBAAmB;QACnB,gBAAgB;AACjB,KAAA,CAAC;AACJ;;;;"}
1
+ {"version":3,"file":"crossApplicationStateSynchronization.js","sources":["../../../../../src/server/middleware/crossApplicationStateSynchronization.ts"],"sourcesContent":[null],"names":[],"mappings":";;AASO,MAAM,oCAAoC,GAAG,OAAO,EACzD,OAAO,EACP,QAAQ,EACR,aAAa,EACb,WAAW,GAMZ,KAAkC;IACjC,MAAM,OAAO,GAAG,MAAM,aAAa,CAAC,UAAU,CAAC,OAAO,CAAC;IACvD,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,OAAO;AAEpD,IAAA,IAAI,CAAC,OAAO,EAAE,IAAI,EAAE;AAClB,QAAA,OAAO,IAAI;IACb;AAEA,IAAA,MAAM,8BAA8B,GAAG,OAAO,CAAC,OAAO,CAAC,GAAG,CACxD,WAAW,CAAC,0BAA0B,CAAC,IAAI,CAC5C,EAAE,KAAK;AAER,IAAA,OAAO,CAAC,GAAG,CAAC,gCAAgC,EAAE,8BAA8B,CAAC;IAC7E,OAAO,CAAC,GAAG,CACT,uCAAuC,EACvC,OAAO,8BAA8B,CACtC;AACD,IAAA,OAAO,CAAC,GAAG,CAAC,eAAe,EAAE,OAAO,OAAO,EAAE,IAAI,CAAC,QAAQ,CAAC;AAC3D,IAAA,OAAO,CAAC,GAAG,CAAC,sBAAsB,EAAE,OAAO,OAAO,EAAE,IAAI,CAAC,QAAQ,CAAC;IAClE,OAAO,CAAC,GAAG,CACT,iCAAiC,EACjC,OAAO,EAAE,IAAI,CAAC,iBAAiB,CAChC;IACD,OAAO,CAAC,GAAG,CAAC,QAAQ,EAAE,OAAO,EAAE,IAAI,CAAC;IAEpC,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,iBAAiB,IAAI,CAAC,8BAA8B,EAAE;AACvE,QAAA,OAAO,CAAC,GAAG,CACT,iEAAiE,CAClE;AACD,QAAA,OAAO,IAAI;IACb;AAEA,IAAA,IAAI,mBAAuC;AAC3C,IAAA,IACE,8BAA8B;AAC9B,QAAA,OAAO,CAAC,IAAI,CAAC,QAAQ,KAAK,8BAA8B,EACxD;AACA,QAAA,OAAO,CAAC,GAAG,CACT,oEAAoE,CACrE;QACD,mBAAmB,GAAG,8BAA8B;IACtD;AAEA,IAAA,MAAM,kBAAkB,GAAG,OAAO,CAAC,OAAO,CAAC,GAAG,CAC5C,WAAW,CAAC,sBAAsB,CAAC,IAAI,CACxC,EAAE,KAAK;AACR,IAAA,OAAO,CAAC,GAAG,CAAC,oBAAoB,EAAE,kBAAkB,CAAC;IACrD,OAAO,CAAC,GAAG,CAAC,2BAA2B,EAAE,OAAO,kBAAkB,CAAC;AAEnE,IAAA,IAAI,gBAAoC;AACxC,IAAA,IACE,kBAAkB;AAClB,QAAA,OAAO,CAAC,IAAI,CAAC,QAAQ,KAAK,kBAAkB;QAC5C,CAAC,mBAAmB,EACpB;AACA,QAAA,OAAO,CAAC,GAAG,CACT,gEAAgE,CACjE;QACD,gBAAgB,GAAG,kBAAkB;IACvC;AAEA,IAAA,IAAI,CAAC,gBAAgB,IAAI,CAAC,mBAAmB,EAAE;AAC7C,QAAA,OAAO,CAAC,GAAG,CAAC,+BAA+B,CAAC;AAC5C,QAAA,OAAO,IAAI;IACb;AAEA,IAAA,OAAO,CAAC,GAAG,CAAC,4CAA4C,EAAE;QACxD,mBAAmB;QACnB,gBAAgB;AAChB,QAAA,eAAe,EAAE,OAAO,CAAC,IAAI,CAAC,QAAQ;AACvC,KAAA,CAAC;AAEF,IAAA,OAAO,CAAC,GAAG,CAAC,eAAe,CAAC;AAC5B,IAAA,OAAO,eAAe,CAAC;QACrB,WAAW;QACX,QAAQ;AACR,QAAA,QAAQ,EAAE,CAAA,EAAG,QAAQ,CAAA,EAAG,MAAM,CAAA,CAAE;QAChC,MAAM;QACN,mBAAmB;QACnB,gBAAgB;AACjB,KAAA,CAAC;AACJ;;;;"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@smg-automotive/auth",
3
- "version": "8.3.0-lschuerch-FED-782-sync-tenant.2",
3
+ "version": "8.3.0-lschuerch-FED-782-sync-tenant.3",
4
4
  "description": "SMG Automotive auth package",
5
5
  "exports": {
6
6
  ".": {