@smg-automotive/auth 7.1.0-auth0-update-tweaks.8 → 7.1.0-auth0-update-tweaks.9
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.
- package/README.md +78 -170
- package/dist/{Auth-BsB5_z7V.d.ts → Auth-C40nODjM.d.ts} +2 -2
- package/dist/cjs/client/contexts/Auth.d.ts +2 -2
- package/dist/cjs/client/contexts/Auth.js +4 -4
- package/dist/cjs/client/helpers/getAccessToken.js +1 -1
- package/dist/cjs/client/helpers/getAccessToken.js.map +1 -1
- package/dist/cjs/client/helpers/switchSelectedTenant.d.ts +2 -2
- package/dist/cjs/client/helpers/switchSelectedTenant.js +2 -2
- package/dist/cjs/client/helpers/switchSelectedTenant.js.map +1 -1
- package/dist/cjs/client/hooks/useAuthConfig.js +1 -1
- package/dist/cjs/client/hooks/useAuthConfig.js.map +1 -1
- package/dist/cjs/client/hooks/useUser.js +1 -1
- package/dist/cjs/client/hooks/useUser.js.map +1 -1
- package/dist/cjs/config/auth0.js +16 -50
- package/dist/cjs/config/auth0.js.map +1 -1
- package/dist/cjs/fixtures/authConfig.js +5 -23
- package/dist/cjs/fixtures/authConfig.js.map +1 -1
- package/dist/cjs/lib/authLinks.js +2 -2
- package/dist/cjs/lib/authLinks.js.map +1 -1
- package/dist/cjs/server/getAuth0Instance.js +3 -3
- package/dist/cjs/server/getAuth0Instance.js.map +1 -1
- package/dist/cjs/server/helpers/getAuthProps.js +2 -2
- package/dist/cjs/server/helpers/getAuthProps.js.map +1 -1
- package/dist/cjs/server/hooks/onCallbackFactory.js +8 -4
- package/dist/cjs/server/hooks/onCallbackFactory.js.map +1 -1
- package/dist/cjs/server/middleware/index.js +5 -14
- package/dist/cjs/server/middleware/index.js.map +1 -1
- package/dist/cjs/server/middleware/login.js +2 -2
- package/dist/cjs/server/middleware/login.js.map +1 -1
- package/dist/cjs/server/middleware/logout.js +4 -4
- package/dist/cjs/server/middleware/logout.js.map +1 -1
- package/dist/cjs/server/middleware/proactivelyRefreshAccessToken.d.ts +3 -1
- package/dist/cjs/server/middleware/proactivelyRefreshAccessToken.js +3 -2
- package/dist/cjs/server/middleware/proactivelyRefreshAccessToken.js.map +1 -1
- package/dist/cjs/server/middleware/profile.js +1 -1
- package/dist/cjs/server/middleware/profile.js.map +1 -1
- package/dist/cjs/server/middleware/protectRoute.js +1 -0
- package/dist/cjs/server/middleware/protectRoute.js.map +1 -1
- package/dist/cjs/server/middleware/token.js +2 -1
- package/dist/cjs/server/middleware/token.js.map +1 -1
- package/dist/cjs/test/mocks.js +5 -0
- package/dist/cjs/test/mocks.js.map +1 -1
- package/dist/cjs/types/auth0/config.d.ts +5 -13
- package/dist/esm/client/contexts/Auth.d.ts +2 -2
- package/dist/esm/client/contexts/Auth.js +4 -4
- package/dist/esm/client/helpers/getAccessToken.js +1 -1
- package/dist/esm/client/helpers/getAccessToken.js.map +1 -1
- package/dist/esm/client/helpers/switchSelectedTenant.d.ts +2 -2
- package/dist/esm/client/helpers/switchSelectedTenant.js +2 -2
- package/dist/esm/client/helpers/switchSelectedTenant.js.map +1 -1
- package/dist/esm/client/hooks/useAuthConfig.js +1 -1
- package/dist/esm/client/hooks/useAuthConfig.js.map +1 -1
- package/dist/esm/client/hooks/useUser.js +1 -1
- package/dist/esm/client/hooks/useUser.js.map +1 -1
- package/dist/esm/config/auth0.js +16 -50
- package/dist/esm/config/auth0.js.map +1 -1
- package/dist/esm/fixtures/authConfig.js +5 -23
- package/dist/esm/fixtures/authConfig.js.map +1 -1
- package/dist/esm/lib/authLinks.js +2 -2
- package/dist/esm/lib/authLinks.js.map +1 -1
- package/dist/esm/server/getAuth0Instance.js +3 -3
- package/dist/esm/server/getAuth0Instance.js.map +1 -1
- package/dist/esm/server/helpers/getAuthProps.js +2 -2
- package/dist/esm/server/helpers/getAuthProps.js.map +1 -1
- package/dist/esm/server/hooks/onCallbackFactory.js +8 -4
- package/dist/esm/server/hooks/onCallbackFactory.js.map +1 -1
- package/dist/esm/server/middleware/index.js +5 -14
- package/dist/esm/server/middleware/index.js.map +1 -1
- package/dist/esm/server/middleware/login.js +2 -2
- package/dist/esm/server/middleware/login.js.map +1 -1
- package/dist/esm/server/middleware/logout.js +4 -4
- package/dist/esm/server/middleware/logout.js.map +1 -1
- package/dist/esm/server/middleware/proactivelyRefreshAccessToken.d.ts +3 -1
- package/dist/esm/server/middleware/proactivelyRefreshAccessToken.js +3 -2
- package/dist/esm/server/middleware/proactivelyRefreshAccessToken.js.map +1 -1
- package/dist/esm/server/middleware/profile.js +1 -1
- package/dist/esm/server/middleware/profile.js.map +1 -1
- package/dist/esm/server/middleware/protectRoute.js +1 -0
- package/dist/esm/server/middleware/protectRoute.js.map +1 -1
- package/dist/esm/server/middleware/token.js +2 -1
- package/dist/esm/server/middleware/token.js.map +1 -1
- package/dist/esm/test/mocks.js +6 -0
- package/dist/esm/test/mocks.js.map +1 -1
- package/dist/esm/types/auth0/config.d.ts +5 -13
- package/dist/fixtures.d.ts +1 -1
- package/dist/index.d.ts +5 -5
- package/dist/server.d.ts +2 -2
- package/dist/{sessionUser-CR7DckP5.d.ts → sessionUser-wavMinWI.d.ts} +5 -12
- package/package.json +2 -2
package/dist/esm/config/auth0.js
CHANGED
|
@@ -13,6 +13,7 @@ const audience = ensureString(process.env.AUTH0_AUDIENCE);
|
|
|
13
13
|
const authCookieNames = ensureString(process.env.AUTH0_CUSTOM_AUTH_COOKIE_NAMES)
|
|
14
14
|
.split(',')
|
|
15
15
|
.filter(Boolean);
|
|
16
|
+
const debugForceTokenRefresh = process.env.AUTH0_DEBUG_FORCE_TOKEN_REFRESH === 'true';
|
|
16
17
|
if (!defaultLocale) {
|
|
17
18
|
throw new Error('[Auth-package] DEFAULT_LOCALE is not set');
|
|
18
19
|
}
|
|
@@ -22,37 +23,21 @@ if (supportedLocales.length === 0) {
|
|
|
22
23
|
const sessionDuration = 30 * 24 * 60 * 60; // 30 days
|
|
23
24
|
const auth0Config = {
|
|
24
25
|
// Endpoint where the user gets redirected to auth0 universal login
|
|
25
|
-
loginEndpoint:
|
|
26
|
-
mountPath: '/api/auth/login',
|
|
27
|
-
},
|
|
26
|
+
loginEndpoint: '/api/auth/login',
|
|
28
27
|
// Endpoint where the user gets redirected to auth0 universal logout
|
|
29
|
-
logoutEndpoint:
|
|
30
|
-
mountPath: '/api/auth/logout',
|
|
31
|
-
},
|
|
28
|
+
logoutEndpoint: '/api/auth/logout',
|
|
32
29
|
// Endpoint to fetch and refresh token
|
|
33
|
-
tokenEndpoint:
|
|
34
|
-
mountPath: '/api/auth/access-token',
|
|
35
|
-
},
|
|
30
|
+
tokenEndpoint: '/api/auth/access-token',
|
|
36
31
|
// Endpoint to fetch and refresh token
|
|
37
|
-
callbackEndpoint:
|
|
38
|
-
mountPath: '/api/auth/callback',
|
|
39
|
-
},
|
|
32
|
+
callbackEndpoint: '/api/auth/callback',
|
|
40
33
|
// Endpoint to fetch user profile
|
|
41
|
-
userProfileEndpoint:
|
|
42
|
-
mountPath: '/api/auth/profile',
|
|
43
|
-
},
|
|
44
|
-
// Interval delay to check if the token needs to be refreshed
|
|
45
|
-
intervalDelayInMs: 10000,
|
|
46
|
-
// If the token is valid for less than the specified time to app will rotate the token
|
|
47
|
-
refreshThresholdInMs: 300000,
|
|
34
|
+
userProfileEndpoint: '/api/auth/profile',
|
|
48
35
|
// Segment to prefix on request when run in environments with a reverse proxy
|
|
49
36
|
proxyPathSegment: '',
|
|
50
37
|
// Legacy access token name
|
|
51
38
|
legacyAccessTokenName: '',
|
|
52
39
|
// Legacy refresh token name
|
|
53
40
|
legacyRefreshTokenName: '',
|
|
54
|
-
// Interval in MS to call function that checks if the token needs to be refreshed
|
|
55
|
-
providerInterval: 10000,
|
|
56
41
|
// Debug flag to force a token refresh on every interval
|
|
57
42
|
debugForceTokenRefresh: false,
|
|
58
43
|
// Language configuration
|
|
@@ -94,42 +79,23 @@ const auth0Config = {
|
|
|
94
79
|
audience,
|
|
95
80
|
};
|
|
96
81
|
const getAuth0Config = ({ isProxied, }) => {
|
|
97
|
-
const runtimeConfig = {
|
|
98
|
-
...auth0Config,
|
|
99
|
-
loginEndpoint: {
|
|
100
|
-
...auth0Config.loginEndpoint,
|
|
101
|
-
accessPath: auth0Config.loginEndpoint.mountPath,
|
|
102
|
-
},
|
|
103
|
-
logoutEndpoint: {
|
|
104
|
-
...auth0Config.logoutEndpoint,
|
|
105
|
-
accessPath: auth0Config.logoutEndpoint.mountPath,
|
|
106
|
-
},
|
|
107
|
-
tokenEndpoint: {
|
|
108
|
-
...auth0Config.tokenEndpoint,
|
|
109
|
-
accessPath: auth0Config.tokenEndpoint.mountPath,
|
|
110
|
-
},
|
|
111
|
-
userProfileEndpoint: {
|
|
112
|
-
...auth0Config.userProfileEndpoint,
|
|
113
|
-
accessPath: auth0Config.userProfileEndpoint.mountPath,
|
|
114
|
-
},
|
|
115
|
-
callbackEndpoint: {
|
|
116
|
-
...auth0Config.callbackEndpoint,
|
|
117
|
-
accessPath: auth0Config.callbackEndpoint.mountPath,
|
|
118
|
-
},
|
|
119
|
-
};
|
|
82
|
+
const runtimeConfig = { ...auth0Config };
|
|
120
83
|
runtimeConfig.proxyPathSegment = ensureSlash(proxyPathSegment);
|
|
121
84
|
runtimeConfig.legacyAccessTokenName = legacyAccessTokenName;
|
|
122
85
|
runtimeConfig.legacyRefreshTokenName = legacyRefreshTokenName;
|
|
123
86
|
runtimeConfig.selectedSellerIdCookie.secure = !isDevelopmentEnvironment;
|
|
87
|
+
runtimeConfig.debugForceTokenRefresh = debugForceTokenRefresh;
|
|
124
88
|
if (!isProxied) {
|
|
125
89
|
return runtimeConfig;
|
|
126
90
|
}
|
|
127
|
-
|
|
128
|
-
|
|
129
|
-
|
|
130
|
-
|
|
131
|
-
|
|
132
|
-
|
|
91
|
+
return {
|
|
92
|
+
...runtimeConfig,
|
|
93
|
+
loginEndpoint: `${runtimeConfig.proxyPathSegment}${runtimeConfig.loginEndpoint}`,
|
|
94
|
+
logoutEndpoint: `${runtimeConfig.proxyPathSegment}${runtimeConfig.logoutEndpoint}`,
|
|
95
|
+
tokenEndpoint: `${runtimeConfig.proxyPathSegment}${runtimeConfig.tokenEndpoint}`,
|
|
96
|
+
userProfileEndpoint: `${runtimeConfig.proxyPathSegment}${runtimeConfig.userProfileEndpoint}`,
|
|
97
|
+
callbackEndpoint: `${runtimeConfig.proxyPathSegment}${runtimeConfig.callbackEndpoint}`,
|
|
98
|
+
};
|
|
133
99
|
};
|
|
134
100
|
|
|
135
101
|
export { getAuth0Config };
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"auth0.js","sources":["../../../../src/config/auth0.ts"],"sourcesContent":[null],"names":[],"mappings":";;AAKA,MAAM,wBAAwB,GAAG,OAAO,CAAC,GAAG,CAAC,UAAU,KAAK,aAAa;AACzE,MAAM,gBAAgB,GAAG,YAAY,CAAC,OAAO,CAAC,GAAG,CAAC,0BAA0B,CAAC;AAE7E,MAAM,qBAAqB,GAAG,YAAY,CACxC,OAAO,CAAC,GAAG,CAAC,qCAAqC,CAClD;AACD,MAAM,sBAAsB,GAAG,YAAY,CACzC,OAAO,CAAC,GAAG,CAAC,sCAAsC,CACnD;AAED,MAAM,aAAa,GAAG,YAAY,CAAC,OAAO,CAAC,GAAG,CAAC,cAAc,CAAa;AAC1E,MAAM,gBAAgB,GAAG,YAAY,CAAC,OAAO,CAAC,GAAG,CAAC,iBAAiB;KAChE,KAAK,CAAC,GAAG;KACT,MAAM,CAAC,OAAO,CAAe;AAEhC,MAAM,iBAAiB,GAAG,YAAY,CAAC,OAAO,CAAC,GAAG,CAAC,kBAAkB,CAAC;AACtE,MAAM,QAAQ,GAAG,YAAY,CAAC,OAAO,CAAC,GAAG,CAAC,cAAc,CAAC;AAEzD,MAAM,eAAe,GAAG,YAAY,CAAC,OAAO,CAAC,GAAG,CAAC,8BAA8B;KAC5E,KAAK,CAAC,GAAG;KACT,MAAM,CAAC,OAAO,CAAC;AAElB,IAAI,CAAC,aAAa,EAAE;AAClB,IAAA,MAAM,IAAI,KAAK,CAAC,0CAA0C,CAAC;AAC7D;AAEA,IAAI,gBAAgB,CAAC,MAAM,KAAK,CAAC,EAAE;AACjC,IAAA,MAAM,IAAI,KAAK,CAAC,6CAA6C,CAAC;AAChE;AAEA,MAAM,eAAe,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,CAAC;AAE1C,MAAM,WAAW,
|
|
1
|
+
{"version":3,"file":"auth0.js","sources":["../../../../src/config/auth0.ts"],"sourcesContent":[null],"names":[],"mappings":"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"}
|
|
@@ -1,27 +1,10 @@
|
|
|
1
1
|
const sessionDuration = 30 * 24 * 60 * 60; // 30 Days
|
|
2
2
|
const authConfig = (args = {}) => ({
|
|
3
|
-
loginEndpoint:
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
mountPath: '/api/auth/logout',
|
|
9
|
-
accessPath: '/api/auth/logout',
|
|
10
|
-
},
|
|
11
|
-
tokenEndpoint: {
|
|
12
|
-
mountPath: '/api/auth/token',
|
|
13
|
-
accessPath: '/api/auth/token',
|
|
14
|
-
},
|
|
15
|
-
callbackEndpoint: {
|
|
16
|
-
mountPath: '/api/auth/callback',
|
|
17
|
-
accessPath: '/api/auth/callback',
|
|
18
|
-
},
|
|
19
|
-
userProfileEndpoint: {
|
|
20
|
-
mountPath: '/api/auth/me',
|
|
21
|
-
accessPath: '/api/auth/me',
|
|
22
|
-
},
|
|
23
|
-
intervalDelayInMs: 10000,
|
|
24
|
-
refreshThresholdInMs: 300000,
|
|
3
|
+
loginEndpoint: '/api/auth/login',
|
|
4
|
+
logoutEndpoint: '/api/auth/logout',
|
|
5
|
+
tokenEndpoint: '/api/auth/token',
|
|
6
|
+
callbackEndpoint: '/api/auth/callback',
|
|
7
|
+
userProfileEndpoint: '/api/auth/me',
|
|
25
8
|
sessionDuration,
|
|
26
9
|
selectedSellerIdCookie: {
|
|
27
10
|
name: 'selectedSellerId',
|
|
@@ -42,7 +25,6 @@ const authConfig = (args = {}) => ({
|
|
|
42
25
|
proxyPathSegment: '/testproxypath',
|
|
43
26
|
legacyAccessTokenName: 'dummy_at_int',
|
|
44
27
|
legacyRefreshTokenName: 'dummy_rt_int',
|
|
45
|
-
providerInterval: 10000,
|
|
46
28
|
debugForceTokenRefresh: false,
|
|
47
29
|
languageConfig: {
|
|
48
30
|
default: 'de',
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"authConfig.js","sources":["../../../../src/fixtures/authConfig.ts"],"sourcesContent":[null],"names":[],"mappings":"AAEA,MAAM,eAAe,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,CAAC;AAEnC,MAAM,UAAU,GAAG,CAAC,OAA6B,EAAE,MAAmB;AAC3E,IAAA,aAAa,EAAE
|
|
1
|
+
{"version":3,"file":"authConfig.js","sources":["../../../../src/fixtures/authConfig.ts"],"sourcesContent":[null],"names":[],"mappings":"AAEA,MAAM,eAAe,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,CAAC;AAEnC,MAAM,UAAU,GAAG,CAAC,OAA6B,EAAE,MAAmB;AAC3E,IAAA,aAAa,EAAE,iBAAiB;AAChC,IAAA,cAAc,EAAE,kBAAkB;AAClC,IAAA,aAAa,EAAE,iBAAiB;AAChC,IAAA,gBAAgB,EAAE,oBAAoB;AACtC,IAAA,mBAAmB,EAAE,cAAc;IACnC,eAAe;AACf,IAAA,sBAAsB,EAAE;AACtB,QAAA,IAAI,EAAE,kBAAkB;AACxB,QAAA,QAAQ,EAAE,IAAI;AACd,QAAA,MAAM,EAAE,eAAe;AACvB,QAAA,MAAM,EAAE,IAAI;AACZ,QAAA,QAAQ,EAAE,KAAK;AACf,QAAA,IAAI,EAAE,GAAG;AACV,KAAA;AACD,IAAA,0BAA0B,EAAE;AAC1B,QAAA,IAAI,EAAE,sBAAsB;AAC5B,QAAA,QAAQ,EAAE,IAAI;AACd,QAAA,MAAM,EAAE,CAAC,GAAG,EAAE,GAAG,EAAE;AACnB,QAAA,MAAM,EAAE,IAAI;AACZ,QAAA,QAAQ,EAAE,KAAK;AACf,QAAA,IAAI,EAAE,GAAG;AACV,KAAA;AACD,IAAA,gBAAgB,EAAE,gBAAgB;AAClC,IAAA,qBAAqB,EAAE,cAAc;AACrC,IAAA,sBAAsB,EAAE,cAAc;AACtC,IAAA,sBAAsB,EAAE,KAAK;AAC7B,IAAA,cAAc,EAAE;AACd,QAAA,OAAO,EAAE,IAAI;QACb,SAAS,EAAE,CAAC,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,CAAC;AACpC,KAAA;AACD,IAAA,MAAM,EAAE,mDAAmD;AAC3D,IAAA,mBAAmB,EAAE,cAAc;AACnC,IAAA,eAAe,EAAE,EAAE;AACnB,IAAA,iBAAiB,EAAE,SAAS;AAC5B,IAAA,QAAQ,EAAE,iDAAiD;AAC3D,IAAA,GAAG,IAAI;AACR,CAAA;;;;"}
|
|
@@ -7,7 +7,7 @@ const getLogoutLink = ({ returnTo, language = defaultLanguage, auth0Config, }) =
|
|
|
7
7
|
const encodedReturnTo = returnTo
|
|
8
8
|
? `&returnTo=${encodeURIComponent(returnTo)}`
|
|
9
9
|
: '';
|
|
10
|
-
return `${auth0Config.logoutEndpoint
|
|
10
|
+
return `${auth0Config.logoutEndpoint}?locale=${language}${encodedReturnTo}`;
|
|
11
11
|
};
|
|
12
12
|
const getLoginLink = ({ returnTo, language = defaultLanguage, auth0Config, selectedSellerId, impersonateSellerId, }) => {
|
|
13
13
|
if (!auth0Config) {
|
|
@@ -21,7 +21,7 @@ const getLoginLink = ({ returnTo, language = defaultLanguage, auth0Config, selec
|
|
|
21
21
|
: {}),
|
|
22
22
|
...(returnTo ? { returnTo: returnTo } : {}),
|
|
23
23
|
});
|
|
24
|
-
return `${auth0Config.loginEndpoint
|
|
24
|
+
return `${auth0Config.loginEndpoint}?${searchParams.toString()}`;
|
|
25
25
|
};
|
|
26
26
|
|
|
27
27
|
export { getLoginLink, getLogoutLink };
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"authLinks.js","sources":["../../../../src/lib/authLinks.ts"],"sourcesContent":[null],"names":[],"mappings":";;AAIO,MAAM,aAAa,GAAG,CAAC,EAC5B,QAAQ,EACR,QAAQ,GAAG,eAAe,EAC1B,WAAW,GAKZ,KAAI;IACH,IAAI,CAAC,WAAW,EAAE;AAChB,QAAA,MAAM,IAAI,KAAK,CAAC,qBAAqB,CAAC;IACxC;IAEA,MAAM,eAAe,GAAG;AACtB,UAAE,CAAA,UAAA,EAAa,kBAAkB,CAAC,QAAQ,CAAC,CAAA;UACzC,EAAE;IAEN,OAAO,CAAA,EAAG,WAAW,CAAC,cAAc,
|
|
1
|
+
{"version":3,"file":"authLinks.js","sources":["../../../../src/lib/authLinks.ts"],"sourcesContent":[null],"names":[],"mappings":";;AAIO,MAAM,aAAa,GAAG,CAAC,EAC5B,QAAQ,EACR,QAAQ,GAAG,eAAe,EAC1B,WAAW,GAKZ,KAAI;IACH,IAAI,CAAC,WAAW,EAAE;AAChB,QAAA,MAAM,IAAI,KAAK,CAAC,qBAAqB,CAAC;IACxC;IAEA,MAAM,eAAe,GAAG;AACtB,UAAE,CAAA,UAAA,EAAa,kBAAkB,CAAC,QAAQ,CAAC,CAAA;UACzC,EAAE;IAEN,OAAO,CAAA,EAAG,WAAW,CAAC,cAAc,WAAW,QAAQ,CAAA,EAAG,eAAe,CAAA,CAAE;AAC7E;AAEO,MAAM,YAAY,GAAG,CAAC,EAC3B,QAAQ,EACR,QAAQ,GAAG,eAAe,EAC1B,WAAW,EACX,gBAAgB,EAChB,mBAAmB,GAOpB,KAAI;IACH,IAAI,CAAC,WAAW,EAAE;AAChB,QAAA,MAAM,IAAI,KAAK,CAAC,qBAAqB,CAAC;IACxC;AAEA,IAAA,MAAM,YAAY,GAAG,IAAI,eAAe,CAAC;AACvC,QAAA,MAAM,EAAE,QAAQ;AAChB,QAAA,IAAI,gBAAgB,GAAG,EAAE,SAAS,EAAE,gBAAgB,EAAE,GAAG,EAAE,CAAC;AAC5D,QAAA,IAAI;AACF,cAAE,EAAE,qBAAqB,EAAE,mBAAmB;cAC5C,EAAE,CAAC;AACP,QAAA,IAAI,QAAQ,GAAG,EAAE,QAAQ,EAAE,QAAQ,EAAE,GAAG,EAAE,CAAC;AAC5C,KAAA,CAAC;IAEF,OAAO,CAAA,EAAG,WAAW,CAAC,aAAa,CAAA,CAAA,EAAI,YAAY,CAAC,QAAQ,EAAE,CAAA,CAAE;AAClE;;;;"}
|
|
@@ -32,9 +32,9 @@ const getAuth0Instance = ({ protocol, host, isProxied, onError, }) => {
|
|
|
32
32
|
// sessionStore,
|
|
33
33
|
appBaseUrl,
|
|
34
34
|
routes: {
|
|
35
|
-
login: auth0Config.loginEndpoint
|
|
36
|
-
logout: auth0Config.logoutEndpoint
|
|
37
|
-
callback: auth0Config.callbackEndpoint
|
|
35
|
+
login: auth0Config.loginEndpoint,
|
|
36
|
+
logout: auth0Config.logoutEndpoint,
|
|
37
|
+
callback: auth0Config.callbackEndpoint,
|
|
38
38
|
},
|
|
39
39
|
session: {
|
|
40
40
|
cookie: {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getAuth0Instance.js","sources":["../../../../src/server/getAuth0Instance.ts"],"sourcesContent":[null],"names":[],"mappings":";;;;;AAQA,MAAM,SAAS,GAAmB,EAAE;AAQpC,MAAM,gBAAgB,GAAG,CAAC,EACxB,IAAI,EACJ,SAAS,EACT,QAAQ,GACgB,KAAI;AAC5B,IAAA,OAAO,GAAG,QAAQ,CAAA,CAAA,EAAI,IAAI,CAAA,WAAA,EAAc,SAAS,EAAE;AACrD,CAAC;AAEM,MAAM,gBAAgB,GAAG,CAAC,EAC/B,QAAQ,EACR,IAAI,EACJ,SAAS,EACT,OAAO,GAGR,KAAiB;AAChB,IAAA,MAAM,GAAG,GAAG,gBAAgB,CAAC,EAAE,IAAI,EAAE,SAAS,EAAE,QAAQ,EAAE,CAAC;AAC3D,IAAA,MAAM,QAAQ,GAAG,SAAS,CAAC,GAAG,CAAC;IAC/B,IAAI,QAAQ,EAAE;AACZ,QAAA,OAAO,QAAQ;IACjB;IAEA,MAAM,WAAW,GAAG,cAAc,CAAC,EAAE,SAAS,EAAE,CAAC;AACjD,IAAA,MAAM,UAAU,GAAG,CAAA,EAAG,QAAQ,CAAA,GAAA,EAAM,IAAI,EAAE;;;;;;;;;;;;;;AAe1C,IAAA,MAAM,WAAW,GAAG,IAAI,WAAW,CAAC;;QAElC,UAAU;AACV,QAAA,MAAM,EAAE;
|
|
1
|
+
{"version":3,"file":"getAuth0Instance.js","sources":["../../../../src/server/getAuth0Instance.ts"],"sourcesContent":[null],"names":[],"mappings":";;;;;AAQA,MAAM,SAAS,GAAmB,EAAE;AAQpC,MAAM,gBAAgB,GAAG,CAAC,EACxB,IAAI,EACJ,SAAS,EACT,QAAQ,GACgB,KAAI;AAC5B,IAAA,OAAO,GAAG,QAAQ,CAAA,CAAA,EAAI,IAAI,CAAA,WAAA,EAAc,SAAS,EAAE;AACrD,CAAC;AAEM,MAAM,gBAAgB,GAAG,CAAC,EAC/B,QAAQ,EACR,IAAI,EACJ,SAAS,EACT,OAAO,GAGR,KAAiB;AAChB,IAAA,MAAM,GAAG,GAAG,gBAAgB,CAAC,EAAE,IAAI,EAAE,SAAS,EAAE,QAAQ,EAAE,CAAC;AAC3D,IAAA,MAAM,QAAQ,GAAG,SAAS,CAAC,GAAG,CAAC;IAC/B,IAAI,QAAQ,EAAE;AACZ,QAAA,OAAO,QAAQ;IACjB;IAEA,MAAM,WAAW,GAAG,cAAc,CAAC,EAAE,SAAS,EAAE,CAAC;AACjD,IAAA,MAAM,UAAU,GAAG,CAAA,EAAG,QAAQ,CAAA,GAAA,EAAM,IAAI,EAAE;;;;;;;;;;;;;;AAe1C,IAAA,MAAM,WAAW,GAAG,IAAI,WAAW,CAAC;;QAElC,UAAU;AACV,QAAA,MAAM,EAAE;YACN,KAAK,EAAE,WAAW,CAAC,aAAa;YAChC,MAAM,EAAE,WAAW,CAAC,cAAc;YAClC,QAAQ,EAAE,WAAW,CAAC,gBAAgB;AACvC,SAAA;AACD,QAAA,OAAO,EAAE;AACP,YAAA,MAAM,EAAE;gBACN,IAAI,EAAE,WAAW,CAAC,iBAAiB;AACpC,aAAA;AACF,SAAA;AACD,QAAA,uBAAuB,EAAE;YACvB,KAAK,EAAE,WAAW,CAAC,MAAM;YACzB,QAAQ,EAAE,WAAW,CAAC,QAAQ;AAC/B,SAAA;AACD,QAAA,yBAAyB,EAAE,KAAK;AAChC,QAAA,kBAAkB,EAAE,yBAAyB,CAAC,WAAW,CAAC;QAC1D,UAAU,EAAE,iBAAiB,CAAC,EAAE,WAAW,EAAE,UAAU,EAAE,OAAO,EAAE,CAAC;AACpE,KAAA,CAAC;AACF,IAAA,SAAS,CAAC,GAAG,CAAC,GAAG,WAAW;AAC5B,IAAA,OAAO,WAAW;AACpB;;;;"}
|
|
@@ -2,9 +2,9 @@ import { getAuth0Config } from '../../config/auth0.js';
|
|
|
2
2
|
import { getEnrichedUser } from './getUser.js';
|
|
3
3
|
|
|
4
4
|
const getAuthProps = async (context) => {
|
|
5
|
-
const
|
|
5
|
+
const auth0Config = getAuth0Config({ isProxied: context.isProxied });
|
|
6
6
|
const user = await getEnrichedUser(context);
|
|
7
|
-
return {
|
|
7
|
+
return { auth0Config, user };
|
|
8
8
|
};
|
|
9
9
|
|
|
10
10
|
export { getAuthProps };
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getAuthProps.js","sources":["../../../../../src/server/helpers/getAuthProps.ts"],"sourcesContent":[null],"names":[],"mappings":";;;MAWa,YAAY,GAAG,OAC1B,OAMC,KAC6B;AAC9B,IAAA,MAAM,
|
|
1
|
+
{"version":3,"file":"getAuthProps.js","sources":["../../../../../src/server/helpers/getAuthProps.ts"],"sourcesContent":[null],"names":[],"mappings":";;;MAWa,YAAY,GAAG,OAC1B,OAMC,KAC6B;AAC9B,IAAA,MAAM,WAAW,GAAG,cAAc,CAAC,EAAE,SAAS,EAAE,OAAO,CAAC,SAAS,EAAE,CAAC;AACpE,IAAA,MAAM,IAAI,GAAG,MAAM,eAAe,CAAC,OAAO,CAAC;AAE3C,IAAA,OAAO,EAAE,WAAW,EAAE,IAAI,EAAE;AAC9B;;;;"}
|
|
@@ -17,8 +17,8 @@ const getLocaleFromContext = ({ returnTo }, appBaseUrl) => {
|
|
|
17
17
|
}
|
|
18
18
|
return '';
|
|
19
19
|
};
|
|
20
|
-
const errorCodeRegex = /\(([^)(]+)\)/;
|
|
21
20
|
const incompleteTokenErrorCode = 'ERR_INCOMPLETE_TOKEN';
|
|
21
|
+
const errorCodeRegex = /\b([A-Z][A-Z0-9_]*[A-Z0-9])\b/g;
|
|
22
22
|
const handleAuth0Error = ({ error, auth0Config, appBaseUrl, localeFromUrl, onError, }) => {
|
|
23
23
|
const authorizedLocales = auth0Config.languageConfig.supported;
|
|
24
24
|
const locale = authorizedLocales.includes(localeFromUrl)
|
|
@@ -29,12 +29,16 @@ const handleAuth0Error = ({ error, auth0Config, appBaseUrl, localeFromUrl, onErr
|
|
|
29
29
|
'INITIAL_UNVERIFIED_EMAIL',
|
|
30
30
|
incompleteTokenErrorCode,
|
|
31
31
|
];
|
|
32
|
-
|
|
33
|
-
|
|
32
|
+
let extractedErrorCode = '';
|
|
33
|
+
if (error.cause) {
|
|
34
|
+
const cause = error.cause;
|
|
35
|
+
const matchedErrorCode = cause.message.match(errorCodeRegex);
|
|
36
|
+
extractedErrorCode = matchedErrorCode ? matchedErrorCode[0] : '';
|
|
37
|
+
}
|
|
34
38
|
if (extractedErrorCode === incompleteTokenErrorCode) {
|
|
35
39
|
// eslint-disable-next-line no-console
|
|
36
40
|
console.info('[Auth-package] logging out user CAUSE: ERR_INCOMPLETE_TOKEN');
|
|
37
|
-
return NextResponse.redirect(new URL(auth0Config.logoutEndpoint
|
|
41
|
+
return NextResponse.redirect(new URL(auth0Config.logoutEndpoint, appBaseUrl));
|
|
38
42
|
}
|
|
39
43
|
if (!expectedErrors.includes(extractedErrorCode)) {
|
|
40
44
|
onError?.(error);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"onCallbackFactory.js","sources":["../../../../../src/server/hooks/onCallbackFactory.ts"],"sourcesContent":[null],"names":[],"mappings":";;;;AASA,MAAM,sBAAsB,GAAG,CAC7B,OAA0B,EAC1B,UAAkB,KACf,YAAY,CAAC,QAAQ,CAAC,IAAI,GAAG,CAAC,OAAO,CAAC,QAAQ,IAAI,GAAG,EAAE,UAAU,CAAC,CAAC;AAExE,MAAM,oBAAoB,GAAG,CAC3B,EAAE,QAAQ,EAAqB,EAC/B,UAAkB,KAChB;IACF,IAAI,CAAC,QAAQ,EAAE;AACb,QAAA,OAAO,EAAE;IACX;AAEA,IAAA,IAAI;QACF,MAAM,GAAG,GAAG,IAAI,GAAG,CAAC,QAAQ,EAAE,UAAU,CAAC;QACzC,OAAO,CAAC,GAAG,CAAC,YAAY,CAAC,GAAG,CAAC,QAAQ,CAAC,IAAI,GAAG,CAAC,QAAQ,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,KAAK,EAAE;IAC7E;IAAE,OAAO,YAAY,EAAE;;AAErB,QAAA,OAAO,CAAC,IAAI,CACV,qDAAqD,EACrD,YAAY,CACb;IACH;AAEA,IAAA,OAAO,EAAE;AACX,CAAC;AAED,MAAM,
|
|
1
|
+
{"version":3,"file":"onCallbackFactory.js","sources":["../../../../../src/server/hooks/onCallbackFactory.ts"],"sourcesContent":[null],"names":[],"mappings":"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"}
|
|
@@ -11,11 +11,11 @@ import { combineHeaders } from './combineHeaders.js';
|
|
|
11
11
|
const isAuthRoute = (pathname, auth0Config) => {
|
|
12
12
|
const { loginEndpoint, logoutEndpoint, callbackEndpoint, userProfileEndpoint, tokenEndpoint, } = auth0Config;
|
|
13
13
|
return [
|
|
14
|
-
loginEndpoint
|
|
15
|
-
logoutEndpoint
|
|
16
|
-
callbackEndpoint
|
|
17
|
-
userProfileEndpoint
|
|
18
|
-
tokenEndpoint
|
|
14
|
+
loginEndpoint,
|
|
15
|
+
logoutEndpoint,
|
|
16
|
+
callbackEndpoint,
|
|
17
|
+
userProfileEndpoint,
|
|
18
|
+
tokenEndpoint,
|
|
19
19
|
].includes(pathname);
|
|
20
20
|
};
|
|
21
21
|
const authMiddleware = async ({ request, isProtectedRoute, language, host, protocol, isProxied, onError, brand, }) => {
|
|
@@ -27,15 +27,6 @@ const authMiddleware = async ({ request, isProtectedRoute, language, host, proto
|
|
|
27
27
|
});
|
|
28
28
|
const auth0Config = getAuth0Config({ isProxied });
|
|
29
29
|
const isAuthErrorRoute = pathname.endsWith(auth0Config.globalAuthErrorPath);
|
|
30
|
-
// eslint-disable-next-line no-console
|
|
31
|
-
console.log('[auth middleware]', {
|
|
32
|
-
path: pathname,
|
|
33
|
-
host,
|
|
34
|
-
isProxied,
|
|
35
|
-
isProtectedRoute: isProtectedRoute(pathname),
|
|
36
|
-
isAuthRoute: isAuthRoute(pathname, auth0Config),
|
|
37
|
-
isAuthErrorRoute,
|
|
38
|
-
});
|
|
39
30
|
const crossDomainLogoutResult = handleCrossDomainLogout({
|
|
40
31
|
host,
|
|
41
32
|
protocol,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sources":["../../../../../src/server/middleware/index.ts"],"sourcesContent":[null],"names":[],"mappings":";;;;;;;;;;AAeA,MAAM,WAAW,GAAG,CAAC,QAAgB,EAAE,WAAwB,KAAI;AACjE,IAAA,MAAM,EACJ,aAAa,EACb,cAAc,EACd,gBAAgB,EAChB,mBAAmB,EACnB,aAAa,GACd,GAAG,WAAW;IAEf,OAAO;
|
|
1
|
+
{"version":3,"file":"index.js","sources":["../../../../../src/server/middleware/index.ts"],"sourcesContent":[null],"names":[],"mappings":";;;;;;;;;;AAeA,MAAM,WAAW,GAAG,CAAC,QAAgB,EAAE,WAAwB,KAAI;AACjE,IAAA,MAAM,EACJ,aAAa,EACb,cAAc,EACd,gBAAgB,EAChB,mBAAmB,EACnB,aAAa,GACd,GAAG,WAAW;IAEf,OAAO;QACL,aAAa;QACb,cAAc;QACd,gBAAgB;QAChB,mBAAmB;QACnB,aAAa;AACd,KAAA,CAAC,QAAQ,CAAC,QAAQ,CAAC;AACtB,CAAC;AAEM,MAAM,cAAc,GAAG,OAAO,EACnC,OAAO,EACP,gBAAgB,EAChB,QAAQ,EACR,IAAI,EACJ,QAAQ,EACR,SAAS,EACT,OAAO,EACP,KAAK,GAUN,KAA2B;AAC1B,IAAA,MAAM,EAAE,QAAQ,EAAE,GAAG,OAAO,CAAC,OAAO;IACpC,MAAM,aAAa,GAAG,gBAAgB,CAAC;QACrC,IAAI;QACJ,QAAQ;QACR,SAAS;AACV,KAAA,CAAC;IAEF,MAAM,WAAW,GAAG,cAAc,CAAC,EAAE,SAAS,EAAE,CAAC;IACjD,MAAM,gBAAgB,GAAG,QAAQ,CAAC,QAAQ,CAAC,WAAW,CAAC,mBAAmB,CAAC;IAE3E,MAAM,uBAAuB,GAAG,uBAAuB,CAAC;QACtD,IAAI;QACJ,QAAQ;QACR,OAAO;QACP,WAAW;AACZ,KAAA,CAAC;IACF,IAAI,uBAAuB,EAAE;AAC3B,QAAA,OAAO,uBAAuB;IAChC;AAEA,IAAA,yBAAyB,CAAC;QACxB,OAAO;QACP,WAAW;AACZ,KAAA,CAAC;IAEF,MAAM,YAAY,GAAG,MAAM,aAAa,CAAC,UAAU,CAAC,OAAO,CAAC;AAE5D,IAAA,sBAAsB,CAAC;QACrB,OAAO;AACP,QAAA,QAAQ,EAAE,YAAY;QACtB,WAAW;AACZ,KAAA,CAAC;AAEF,IAAA,2BAA2B,CAAC;QAC1B,IAAI;QACJ,OAAO;AACP,QAAA,QAAQ,EAAE,YAAY;QACtB,WAAW;AACZ,KAAA,CAAC;AAEF,IAAA,MAAM,wBAAwB,GAAG,MAAM,wBAAwB,CAAC;QAC9D,OAAO;AACP,QAAA,QAAQ,EAAE,YAAY;QACtB,aAAa;QACb,WAAW;QACX,OAAO;AACR,KAAA,CAAC;IACF,IAAI,wBAAwB,EAAE;AAC5B,QAAA,OAAO,wBAAwB;IACjC;AAEA,IAAA,MAAM,uBAAuB,GAAG,MAAM,iBAAiB,CAAC;QACtD,OAAO;QACP,aAAa;QACb,WAAW;QACX,KAAK;AACN,KAAA,CAAC;IACF,IAAI,uBAAuB,EAAE;AAC3B,QAAA,OAAO,uBAAuB;IAChC;IAEA,IAAI,WAAW,CAAC,QAAQ,EAAE,WAAW,CAAC,IAAI,gBAAgB,EAAE;AAC1D,QAAA,OAAO,YAAY;IACrB;IAEA,MAAM,WAAW,GAAG,CAAC,gBAAgB,IAAI,gBAAgB,CAAC,QAAQ,CAAC;AACnE,IAAA,MAAM,kBAAkB,GAAG,MAAM,YAAY,CAAC;QAC5C,WAAW;QACX,aAAa;QACb,WAAW;QACX,QAAQ;QACR,OAAO;AACP,QAAA,QAAQ,EAAE,YAAY;QACtB,OAAO;AACR,KAAA,CAAC;IACF,IAAI,kBAAkB,EAAE;AACtB,QAAA,OAAO,kBAAkB;IAC3B;AAEA,IAAA,OAAO,cAAc,CAAC;AACpB,QAAA,kBAAkB,EAAE,YAAY,CAAC,IAAI,CAAC;AACpC,YAAA,OAAO,EAAE;gBACP,OAAO,EAAE,OAAO,CAAC,OAAO;AACzB,aAAA;SACF,CAAC;QACF,YAAY;AACb,KAAA,CAAC;AACJ;;;;"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
const addLoginParamsFromCookies = ({ request, auth0Config: { selectedSellerIdCookie, impersonatedSellerIdCookie, loginEndpoint, }, }) => {
|
|
2
|
-
if (request.nextUrl.pathname !== loginEndpoint
|
|
2
|
+
if (request.nextUrl.pathname !== loginEndpoint)
|
|
3
3
|
return;
|
|
4
4
|
const searchParams = new URLSearchParams(request.nextUrl.search);
|
|
5
5
|
const hasSellerId = searchParams.has('seller_id');
|
|
@@ -19,7 +19,7 @@ const addLoginParamsFromCookies = ({ request, auth0Config: { selectedSellerIdCoo
|
|
|
19
19
|
request.nextUrl.search = searchParams.toString();
|
|
20
20
|
};
|
|
21
21
|
const setLoginRelatedCookies = ({ request, response, auth0Config: { selectedSellerIdCookie, impersonatedSellerIdCookie, loginEndpoint, }, }) => {
|
|
22
|
-
if (request.nextUrl.pathname !== loginEndpoint
|
|
22
|
+
if (request.nextUrl.pathname !== loginEndpoint)
|
|
23
23
|
return;
|
|
24
24
|
const searchParams = new URLSearchParams(request.nextUrl.search);
|
|
25
25
|
if (searchParams.has('seller_id')) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"login.js","sources":["../../../../../src/server/middleware/login.ts"],"sourcesContent":[null],"names":[],"mappings":"AAIO,MAAM,yBAAyB,GAAG,CAAC,EACxC,OAAO,EACP,WAAW,EAAE,EACX,sBAAsB,EACtB,0BAA0B,EAC1B,aAAa,GACd,GAIF,KAAI;
|
|
1
|
+
{"version":3,"file":"login.js","sources":["../../../../../src/server/middleware/login.ts"],"sourcesContent":[null],"names":[],"mappings":"AAIO,MAAM,yBAAyB,GAAG,CAAC,EACxC,OAAO,EACP,WAAW,EAAE,EACX,sBAAsB,EACtB,0BAA0B,EAC1B,aAAa,GACd,GAIF,KAAI;AACH,IAAA,IAAI,OAAO,CAAC,OAAO,CAAC,QAAQ,KAAK,aAAa;QAAE;IAEhD,MAAM,YAAY,GAAG,IAAI,eAAe,CAAC,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC;IAChE,MAAM,WAAW,GAAG,YAAY,CAAC,GAAG,CAAC,WAAW,CAAC;IACjD,IAAI,CAAC,WAAW,EAAE;AAChB,QAAA,MAAM,QAAQ,GAAG,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,sBAAsB,CAAC,IAAI,CAAC,EAAE,KAAK;QACxE,IAAI,QAAQ,EAAE;AACZ,YAAA,YAAY,CAAC,GAAG,CAAC,WAAW,EAAE,QAAQ,CAAC;QACzC;IACF;IAEA,MAAM,sBAAsB,GAAG,YAAY,CAAC,GAAG,CAAC,uBAAuB,CAAC;IACxE,IAAI,CAAC,sBAAsB,EAAE;AAC3B,QAAA,MAAM,oBAAoB,GAAG,OAAO,CAAC,OAAO,CAAC,GAAG,CAC9C,0BAA0B,CAAC,IAAI,CAChC,EAAE,KAAK;QAER,IAAI,oBAAoB,EAAE;AACxB,YAAA,YAAY,CAAC,GAAG,CAAC,uBAAuB,EAAE,oBAAoB,CAAC;QACjE;IACF;IAEA,OAAO,CAAC,OAAO,CAAC,MAAM,GAAG,YAAY,CAAC,QAAQ,EAAE;AAClD;MAEa,sBAAsB,GAAG,CAAC,EACrC,OAAO,EACP,QAAQ,EACR,WAAW,EAAE,EACX,sBAAsB,EACtB,0BAA0B,EAC1B,aAAa,GACd,GAKF,KAAI;AACH,IAAA,IAAI,OAAO,CAAC,OAAO,CAAC,QAAQ,KAAK,aAAa;QAAE;IAEhD,MAAM,YAAY,GAAG,IAAI,eAAe,CAAC,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC;AAChE,IAAA,IAAI,YAAY,CAAC,GAAG,CAAC,WAAW,CAAC,EAAE;AACjC,QAAA,QAAQ,CAAC,OAAO,CAAC,GAAG,CAClB,sBAAsB,CAAC,IAAI,EAC3B,YAAY,CAAC,GAAG,CAAC,WAAW,CAAE,EAC9B,sBAAsB,CACvB;IACH;AAEA,IAAA,IAAI,YAAY,CAAC,GAAG,CAAC,uBAAuB,CAAC,EAAE;AAC7C,QAAA,QAAQ,CAAC,OAAO,CAAC,GAAG,CAClB,0BAA0B,CAAC,IAAI,EAC/B,YAAY,CAAC,GAAG,CAAC,uBAAuB,CAAE,EAC1C,0BAA0B,CAC3B;IACH;AACF;;;;"}
|
|
@@ -42,7 +42,7 @@ const getOtherDomainHost = (currentHost) => {
|
|
|
42
42
|
return currentHost;
|
|
43
43
|
};
|
|
44
44
|
const handleCrossDomainLogout = ({ host, protocol, request, auth0Config: { languageConfig, logoutEndpoint }, }) => {
|
|
45
|
-
if (request.nextUrl.pathname !== logoutEndpoint
|
|
45
|
+
if (request.nextUrl.pathname !== logoutEndpoint)
|
|
46
46
|
return;
|
|
47
47
|
const searchParams = new URLSearchParams(request.nextUrl.search);
|
|
48
48
|
const specifiedReturnTo = searchParams.get('returnTo') || '';
|
|
@@ -61,10 +61,10 @@ const handleCrossDomainLogout = ({ host, protocol, request, auth0Config: { langu
|
|
|
61
61
|
}
|
|
62
62
|
if (!crossDomainLogout && otherDomainHost && otherDomainHost !== host) {
|
|
63
63
|
const currentDomainUrl = `${protocol}://${host}`;
|
|
64
|
-
const backToCurrentDomainUrl = new URL(logoutEndpoint
|
|
64
|
+
const backToCurrentDomainUrl = new URL(logoutEndpoint, currentDomainUrl);
|
|
65
65
|
backToCurrentDomainUrl.searchParams.set('returnTo', returnTo);
|
|
66
66
|
backToCurrentDomainUrl.searchParams.set('crossDomain', 'true');
|
|
67
|
-
const otherDomainLogoutUrl = new URL(logoutEndpoint
|
|
67
|
+
const otherDomainLogoutUrl = new URL(logoutEndpoint, `${protocol}://${otherDomainHost}`);
|
|
68
68
|
otherDomainLogoutUrl.searchParams.set('crossDomain', 'true');
|
|
69
69
|
otherDomainLogoutUrl.searchParams.set('returnTo', backToCurrentDomainUrl.toString());
|
|
70
70
|
return NextResponse.redirect(otherDomainLogoutUrl, {
|
|
@@ -82,7 +82,7 @@ const getLegacyCookieDomain = (hostname) => {
|
|
|
82
82
|
return `.${base}`;
|
|
83
83
|
};
|
|
84
84
|
const deleteRelatedSessionCookies = ({ host, request, response, auth0Config: { logoutEndpoint, authCookieNames, legacyAccessTokenName, legacyRefreshTokenName, }, }) => {
|
|
85
|
-
if (request.nextUrl.pathname !== logoutEndpoint
|
|
85
|
+
if (request.nextUrl.pathname !== logoutEndpoint || !response)
|
|
86
86
|
return;
|
|
87
87
|
authCookieNames.forEach((cookieName) => {
|
|
88
88
|
response.cookies.delete({
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"logout.js","sources":["../../../../../src/server/middleware/logout.ts"],"sourcesContent":[null],"names":[],"mappings":";;AAIA,MAAM,gBAAgB,GAAG,CAAC,EACxB,SAAS,EACT,IAAI,EACJ,QAAQ,EACR,eAAe,EACf,iBAAiB,GAOlB,KAAI;IACH,IAAI,OAAO,SAAS,KAAK,QAAQ;AAAE,QAAA,OAAO,KAAK;AAC/C,IAAA,IAAI,SAAS,CAAC,MAAM,GAAG,IAAI;AAAE,QAAA,OAAO,KAAK;AAEzC,IAAA,IAAI;AACF,QAAA,MAAM,gBAAgB,GAAG,kBAAkB,CAAC,SAAS,CAAC;QACtD,MAAM,KAAK,GAAG,gBAAgB,CAAC,UAAU,CAAC,MAAM,CAAC;QACjD,MAAM,eAAe,GAAG,IAAI,GAAG,CAC7B,KAAK,GAAG,gBAAgB,GAAG,GAAG,QAAQ,CAAA,GAAA,EAAM,IAAI,CAAA,EAAG,gBAAgB,CAAA,CAAE,CACtE;AACD,QAAA,MAAM,WAAW,GAAG,eAAe,CAAC,QAAQ;AAE5C,QAAA,IACE,iBAAiB;YACjB,KAAK;AACL,YAAA,eAAe,CAAC,IAAI,KAAK,eAAe,EACxC;AACA,YAAA,OAAO,KAAK;QACd;QAEA,IAAI,CAAC,iBAAiB,IAAI,eAAe,CAAC,IAAI,KAAK,IAAI,EAAE;AACvD,YAAA,OAAO,KAAK;QACd;AAEA,QAAA,IAAI,CAAC,WAAW,CAAC,UAAU,CAAC,GAAG,CAAC,IAAI,WAAW,CAAC,UAAU,CAAC,IAAI,CAAC,EAAE;AAChE,YAAA,OAAO,KAAK;QACd;;;QAIA,MAAM,eAAe,GAAG,yBAAyB;AACjD,QAAA,OAAO,eAAe,CAAC,IAAI,CAAC,WAAW,CAAC;IAC1C;IAAE,OAAO,KAAK,EAAE;;AAEd,QAAA,OAAO,CAAC,IAAI,CAAC,4BAA4B,EAAE,KAAK,CAAC;AACjD,QAAA,OAAO,KAAK;IACd;AACF,CAAC;AAED,MAAM,kBAAkB,GAAG,CAAC,WAAmB,KAAY;AACzD,IAAA,IAAI,WAAW,CAAC,QAAQ,CAAC,aAAa,CAAC,EAAE;QACvC,OAAO,WAAW,CAAC,OAAO,CAAC,aAAa,EAAE,aAAa,CAAC;IAC1D;AACA,IAAA,IAAI,WAAW,CAAC,QAAQ,CAAC,aAAa,CAAC,EAAE;QACvC,OAAO,WAAW,CAAC,OAAO,CAAC,aAAa,EAAE,aAAa,CAAC;IAC1D;AACA,IAAA,OAAO,WAAW;AACpB,CAAC;MAEY,uBAAuB,GAAG,CAAC,EACtC,IAAI,EACJ,QAAQ,EACR,OAAO,EACP,WAAW,EAAE,EAAE,cAAc,EAAE,cAAc,EAAE,GAMhD,KAAyB;
|
|
1
|
+
{"version":3,"file":"logout.js","sources":["../../../../../src/server/middleware/logout.ts"],"sourcesContent":[null],"names":[],"mappings":"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"}
|
|
@@ -1,9 +1,11 @@
|
|
|
1
1
|
import { NextRequest, NextResponse } from 'next/server';
|
|
2
2
|
import { Auth0Client } from '@auth0/nextjs-auth0/server';
|
|
3
|
-
|
|
3
|
+
import { Auth0Config } from 'src/types/auth0/config';
|
|
4
|
+
export declare const proactivelyRefreshAccessToken: ({ request, response, auth0Instance, auth0Config, }: {
|
|
4
5
|
request: NextRequest;
|
|
5
6
|
response: NextResponse;
|
|
6
7
|
auth0Instance: Auth0Client;
|
|
8
|
+
auth0Config: Auth0Config;
|
|
7
9
|
}) => Promise<{
|
|
8
10
|
token: string;
|
|
9
11
|
expiresAt: number;
|
|
@@ -1,6 +1,7 @@
|
|
|
1
|
-
const proactivelyRefreshAccessToken = async ({ request, response, auth0Instance, }) => {
|
|
1
|
+
const proactivelyRefreshAccessToken = async ({ request, response, auth0Instance, auth0Config, }) => {
|
|
2
2
|
const session = await auth0Instance.getSession(request);
|
|
3
|
-
const shouldRefresh =
|
|
3
|
+
const shouldRefresh = auth0Config.debugForceTokenRefresh ||
|
|
4
|
+
(session?.tokenSet.expiresAt || 0) < Date.now() / 1000 + 30;
|
|
4
5
|
return auth0Instance.getAccessToken(request, response, {
|
|
5
6
|
refresh: shouldRefresh,
|
|
6
7
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"proactivelyRefreshAccessToken.js","sources":["../../../../../src/server/middleware/proactivelyRefreshAccessToken.ts"],"sourcesContent":[null],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"proactivelyRefreshAccessToken.js","sources":["../../../../../src/server/middleware/proactivelyRefreshAccessToken.ts"],"sourcesContent":[null],"names":[],"mappings":"AAKO,MAAM,6BAA6B,GAAG,OAAO,EAClD,OAAO,EACP,QAAQ,EACR,aAAa,EACb,WAAW,GAMZ,KAAmD;IAClD,MAAM,OAAO,GAAG,MAAM,aAAa,CAAC,UAAU,CAAC,OAAO,CAAC;AAEvD,IAAA,MAAM,aAAa,GACjB,WAAW,CAAC,sBAAsB;AAClC,QAAA,CAAC,OAAO,EAAE,QAAQ,CAAC,SAAS,IAAI,CAAC,IAAI,IAAI,CAAC,GAAG,EAAE,GAAG,IAAI,GAAG,EAAE;AAC7D,IAAA,OAAO,aAAa,CAAC,cAAc,CAAC,OAAO,EAAE,QAAQ,EAAE;AACrD,QAAA,OAAO,EAAE,aAAa;AACvB,KAAA,CAAC;AACJ;;;;"}
|
|
@@ -3,7 +3,7 @@ import { enrichUser } from '../../lib/enrichUser/session.js';
|
|
|
3
3
|
import { addCachingHeaders } from './addCachingHeaders.js';
|
|
4
4
|
|
|
5
5
|
const handleUserProfile = async ({ request, auth0Instance, auth0Config, brand, }) => {
|
|
6
|
-
if (request.nextUrl.pathname === auth0Config.userProfileEndpoint
|
|
6
|
+
if (request.nextUrl.pathname === auth0Config.userProfileEndpoint) {
|
|
7
7
|
const session = await auth0Instance.getSession(request);
|
|
8
8
|
if (!session) {
|
|
9
9
|
return new NextResponse(null, {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"profile.js","sources":["../../../../../src/server/middleware/profile.ts"],"sourcesContent":[null],"names":[],"mappings":";;;;AASO,MAAM,iBAAiB,GAAG,OAAO,EACtC,OAAO,EACP,aAAa,EACb,WAAW,EACX,KAAK,GAMN,KAAkC;
|
|
1
|
+
{"version":3,"file":"profile.js","sources":["../../../../../src/server/middleware/profile.ts"],"sourcesContent":[null],"names":[],"mappings":";;;;AASO,MAAM,iBAAiB,GAAG,OAAO,EACtC,OAAO,EACP,aAAa,EACb,WAAW,EACX,KAAK,GAMN,KAAkC;IACjC,IAAI,OAAO,CAAC,OAAO,CAAC,QAAQ,KAAK,WAAW,CAAC,mBAAmB,EAAE;QAChE,MAAM,OAAO,GAAG,MAAM,aAAa,CAAC,UAAU,CAAC,OAAO,CAAC;QAEvD,IAAI,CAAC,OAAO,EAAE;AACZ,YAAA,OAAO,IAAI,YAAY,CAAC,IAAI,EAAE;AAC5B,gBAAA,MAAM,EAAE,GAAG;AACZ,aAAA,CAAC;QACJ;AAEA,QAAA,MAAM,IAAI,GAAG,OAAO,CAAC,IAAmB;AAExC,QAAA,MAAM,YAAY,GAAG,MAAM,UAAU,CAAC;YACpC,IAAI;AACJ,YAAA,WAAW,EAAE,OAAO,CAAC,QAAQ,CAAC,WAAW;YACzC,KAAK;AACN,SAAA,CAAC;QAEF,MAAM,YAAY,GAAG,YAAY,CAAC,IAAI,CAAC,YAAY,CAAC;QACpD,iBAAiB,CAAC,YAAY,CAAC;AAC/B,QAAA,OAAO,YAAY;IACrB;AACF;;;;"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"protectRoute.js","sources":["../../../../../src/server/middleware/protectRoute.ts"],"sourcesContent":[null],"names":[],"mappings":";;;;AAUA,MAAM,eAAe,GAAG,CAAC,EACvB,WAAW,EACX,QAAQ,EACR,QAAQ,EACR,MAAM,GAMP,KAAkB;IACjB,MAAM,QAAQ,GAAG,YAAY,CAAC;QAC5B,WAAW;QACX,QAAQ;QACR,QAAQ;AACT,KAAA,CAAC;IAEF,OAAO,YAAY,CAAC,QAAQ,CAAC,IAAI,GAAG,CAAC,QAAQ,EAAE,MAAM,CAAC,EAAE;AACtD,QAAA,MAAM,EAAE,GAAG;AACZ,KAAA,CAAC;AACJ,CAAC;MAEY,YAAY,GAAG,OAAO,EACjC,WAAW,EACX,aAAa,EACb,WAAW,EACX,QAAQ,EACR,OAAO,EACP,QAAQ,EACR,OAAO,GASR,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;IAEpD,IAAI,CAAC,WAAW,IAAI,CAAC,OAAO,EAAE,IAAI,EAAE;AAClC,QAAA,OAAO,QAAQ;IACjB;AAEA,IAAA,IAAI,CAAC,OAAO,IAAI,WAAW,EAAE;AAC3B,QAAA,OAAO,eAAe,CAAC;YACrB,WAAW;YACX,QAAQ;AACR,YAAA,QAAQ,EAAE,CAAA,EAAG,QAAQ,CAAA,EAAG,MAAM,CAAA,CAAE;YAChC,MAAM;AACP,SAAA,CAAC;IACJ;AAEA,IAAA,IAAI;AACF,QAAA,MAAM,6BAA6B,CAAC;YAClC,OAAO;YACP,QAAQ;YACR,aAAa;
|
|
1
|
+
{"version":3,"file":"protectRoute.js","sources":["../../../../../src/server/middleware/protectRoute.ts"],"sourcesContent":[null],"names":[],"mappings":";;;;AAUA,MAAM,eAAe,GAAG,CAAC,EACvB,WAAW,EACX,QAAQ,EACR,QAAQ,EACR,MAAM,GAMP,KAAkB;IACjB,MAAM,QAAQ,GAAG,YAAY,CAAC;QAC5B,WAAW;QACX,QAAQ;QACR,QAAQ;AACT,KAAA,CAAC;IAEF,OAAO,YAAY,CAAC,QAAQ,CAAC,IAAI,GAAG,CAAC,QAAQ,EAAE,MAAM,CAAC,EAAE;AACtD,QAAA,MAAM,EAAE,GAAG;AACZ,KAAA,CAAC;AACJ,CAAC;MAEY,YAAY,GAAG,OAAO,EACjC,WAAW,EACX,aAAa,EACb,WAAW,EACX,QAAQ,EACR,OAAO,EACP,QAAQ,EACR,OAAO,GASR,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;IAEpD,IAAI,CAAC,WAAW,IAAI,CAAC,OAAO,EAAE,IAAI,EAAE;AAClC,QAAA,OAAO,QAAQ;IACjB;AAEA,IAAA,IAAI,CAAC,OAAO,IAAI,WAAW,EAAE;AAC3B,QAAA,OAAO,eAAe,CAAC;YACrB,WAAW;YACX,QAAQ;AACR,YAAA,QAAQ,EAAE,CAAA,EAAG,QAAQ,CAAA,EAAG,MAAM,CAAA,CAAE;YAChC,MAAM;AACP,SAAA,CAAC;IACJ;AAEA,IAAA,IAAI;AACF,QAAA,MAAM,6BAA6B,CAAC;YAClC,OAAO;YACP,QAAQ;YACR,aAAa;YACb,WAAW;AACZ,SAAA,CAAC;IACJ;IAAE,OAAO,KAAK,EAAE;QACd,MAAM,SAAS,GAAG,KAAiB;AACnC,QAAA,OAAO,GAAG,SAAS,CAAC;AAEpB,QAAA,OAAO,eAAe,CAAC;YACrB,WAAW;YACX,QAAQ;AACR,YAAA,QAAQ,EAAE,CAAA,EAAG,QAAQ,CAAA,EAAG,MAAM,CAAA,CAAE;YAChC,MAAM;AACP,SAAA,CAAC;IACJ;AACF;;;;"}
|
|
@@ -4,7 +4,7 @@ import { proactivelyRefreshAccessToken } from './proactivelyRefreshAccessToken.j
|
|
|
4
4
|
import { addCachingHeaders } from './addCachingHeaders.js';
|
|
5
5
|
|
|
6
6
|
const handleAccessTokenRequest = async ({ request, response, auth0Instance, auth0Config, onError, }) => {
|
|
7
|
-
if (request.nextUrl.pathname !== auth0Config.tokenEndpoint
|
|
7
|
+
if (request.nextUrl.pathname !== auth0Config.tokenEndpoint)
|
|
8
8
|
return;
|
|
9
9
|
const session = await auth0Instance.getSession(request);
|
|
10
10
|
if (!session) {
|
|
@@ -22,6 +22,7 @@ const handleAccessTokenRequest = async ({ request, response, auth0Instance, auth
|
|
|
22
22
|
request,
|
|
23
23
|
response,
|
|
24
24
|
auth0Instance,
|
|
25
|
+
auth0Config,
|
|
25
26
|
});
|
|
26
27
|
const tokenResponse = NextResponse.json({
|
|
27
28
|
token,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"token.js","sources":["../../../../../src/server/middleware/token.ts"],"sourcesContent":[null],"names":[],"mappings":";;;;;AASO,MAAM,wBAAwB,GAAG,OAAO,EAC7C,OAAO,EACP,QAAQ,EACR,aAAa,EACb,WAAW,EACX,OAAO,GAOR,KAAkC;IACjC,IAAI,OAAO,CAAC,OAAO,CAAC,QAAQ,KAAK,WAAW,CAAC,aAAa
|
|
1
|
+
{"version":3,"file":"token.js","sources":["../../../../../src/server/middleware/token.ts"],"sourcesContent":[null],"names":[],"mappings":";;;;;AASO,MAAM,wBAAwB,GAAG,OAAO,EAC7C,OAAO,EACP,QAAQ,EACR,aAAa,EACb,WAAW,EACX,OAAO,GAOR,KAAkC;IACjC,IAAI,OAAO,CAAC,OAAO,CAAC,QAAQ,KAAK,WAAW,CAAC,aAAa;QAAE;IAE5D,MAAM,OAAO,GAAG,MAAM,aAAa,CAAC,UAAU,CAAC,OAAO,CAAC;IAEvD,IAAI,CAAC,OAAO,EAAE;QACZ,OAAO,YAAY,CAAC,IAAI,CACtB;AACE,YAAA,KAAK,EAAE;AACL,gBAAA,OAAO,EAAE,2CAA2C;gBACpD,IAAI,EAAE,oBAAoB,CAAC,eAAe;AAC3C,aAAA;SACF,EACD;AACE,YAAA,MAAM,EAAE,GAAG;AACZ,SAAA,CACF;IACH;AAEA,IAAA,IAAI;QACF,MAAM,EAAE,KAAK,EAAE,SAAS,EAAE,GAAG,MAAM,6BAA6B,CAAC;YAC/D,OAAO;YACP,QAAQ;YACR,aAAa;YACb,WAAW;AACZ,SAAA,CAAC;AACF,QAAA,MAAM,aAAa,GAAG,YAAY,CAAC,IAAI,CAAC;YACtC,KAAK;YACL,SAAS;AACV,SAAA,CAAC;QACF,iBAAiB,CAAC,aAAa,CAAC;AAChC,QAAA,OAAO,aAAa;IACtB;IAAE,OAAO,KAAK,EAAE;QACd,MAAM,SAAS,GAAG,KAAiB;AACnC,QAAA,OAAO,GAAG,SAAS,CAAC;AACpB,QAAA,OAAO,YAAY,CAAC,IAAI,CACtB,EAAE,KAAK,EAAE,EAAE,OAAO,EAAE,SAAS,CAAC,OAAO,EAAE,IAAI,EAAE,SAAS,CAAC,IAAI,EAAE,EAAE,EAC/D,EAAE,MAAM,EAAE,GAAG,EAAE,CAChB;IACH;AACF;;;;"}
|
package/dist/esm/test/mocks.js
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mocks.js","sources":[],"sourcesContent":[],"names":[],"mappings":""}
|
|
1
|
+
{"version":3,"file":"mocks.js","sources":["../../../../src/test/mocks.ts"],"sourcesContent":[null],"names":["ImportedTextEncoder","ImportedTextDecoder"],"mappings":";;;AAKA,MAAM,CAAC,MAAM,CAAC,MAAM,EAAE;AACpB,IAAA,WAAW,EAAEA,WAAmB;AAChC,IAAA,WAAW,EAAEC,WAAmB;AACjC,CAAA,CAAC"}
|
|
@@ -1,23 +1,16 @@
|
|
|
1
1
|
import { Language } from '@smg-automotive/i18n-pkg';
|
|
2
2
|
import { CookieOptions } from '../cookieOptions';
|
|
3
|
-
type Auth0Endpoint = {
|
|
4
|
-
mountPath: string;
|
|
5
|
-
accessPath: string;
|
|
6
|
-
};
|
|
7
3
|
export type Auth0Config = {
|
|
8
|
-
loginEndpoint:
|
|
9
|
-
logoutEndpoint:
|
|
10
|
-
tokenEndpoint:
|
|
11
|
-
callbackEndpoint:
|
|
12
|
-
userProfileEndpoint:
|
|
13
|
-
intervalDelayInMs: number;
|
|
14
|
-
refreshThresholdInMs: number;
|
|
4
|
+
loginEndpoint: string;
|
|
5
|
+
logoutEndpoint: string;
|
|
6
|
+
tokenEndpoint: string;
|
|
7
|
+
callbackEndpoint: string;
|
|
8
|
+
userProfileEndpoint: string;
|
|
15
9
|
selectedSellerIdCookie: CookieOptions;
|
|
16
10
|
impersonatedSellerIdCookie: CookieOptions;
|
|
17
11
|
proxyPathSegment: string;
|
|
18
12
|
legacyAccessTokenName: string;
|
|
19
13
|
legacyRefreshTokenName: string;
|
|
20
|
-
providerInterval: number;
|
|
21
14
|
debugForceTokenRefresh: boolean;
|
|
22
15
|
languageConfig: {
|
|
23
16
|
default: Language;
|
|
@@ -30,4 +23,3 @@ export type Auth0Config = {
|
|
|
30
23
|
audience: string;
|
|
31
24
|
sessionDuration: number;
|
|
32
25
|
};
|
|
33
|
-
export {};
|
package/dist/fixtures.d.ts
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { A as Auth0Config, E as EnrichedSessionUser, c as Entitlements } from './sessionUser-
|
|
1
|
+
import { A as Auth0Config, E as EnrichedSessionUser, c as Entitlements } from './sessionUser-wavMinWI.js';
|
|
2
2
|
import '@smg-automotive/i18n-pkg';
|
|
3
3
|
|
|
4
4
|
declare const authConfig: (args?: Partial<Auth0Config>) => Auth0Config;
|
package/dist/index.d.ts
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
|
-
export { A as AuthProvider, a as AuthProviderProps } from './Auth-
|
|
2
|
-
import { A as Auth0Config, E as EnrichedSessionUser } from './sessionUser-
|
|
3
|
-
export { b as Auth0User, a as Auth0UserType, I as IncompleteSessionUser, S as SessionUser } from './sessionUser-
|
|
1
|
+
export { A as AuthProvider, a as AuthProviderProps } from './Auth-C40nODjM.js';
|
|
2
|
+
import { A as Auth0Config, E as EnrichedSessionUser } from './sessionUser-wavMinWI.js';
|
|
3
|
+
export { b as Auth0User, a as Auth0UserType, I as IncompleteSessionUser, S as SessionUser } from './sessionUser-wavMinWI.js';
|
|
4
4
|
import { Language } from '@smg-automotive/i18n-pkg';
|
|
5
5
|
import 'react';
|
|
6
6
|
|
|
@@ -25,8 +25,8 @@ declare const getAccessToken: ({ config }: {
|
|
|
25
25
|
config: Auth0Config;
|
|
26
26
|
}) => Promise<any>;
|
|
27
27
|
|
|
28
|
-
declare const switchSelectedTenant: ({
|
|
29
|
-
|
|
28
|
+
declare const switchSelectedTenant: ({ auth0Config, sellerId, }: {
|
|
29
|
+
auth0Config: Auth0Config;
|
|
30
30
|
sellerId: string;
|
|
31
31
|
}) => Promise<void>;
|
|
32
32
|
|
package/dist/server.d.ts
CHANGED
|
@@ -2,8 +2,8 @@ import { NextRequest, NextResponse } from 'next/server';
|
|
|
2
2
|
import { Language } from '@smg-automotive/i18n-pkg';
|
|
3
3
|
import { NextApiRequest, NextApiResponse } from 'next';
|
|
4
4
|
import { IncomingMessage, ServerResponse } from 'http';
|
|
5
|
-
import { a as AuthProviderProps } from './Auth-
|
|
6
|
-
import { S as SessionUser } from './sessionUser-
|
|
5
|
+
import { a as AuthProviderProps } from './Auth-C40nODjM.js';
|
|
6
|
+
import { S as SessionUser } from './sessionUser-wavMinWI.js';
|
|
7
7
|
import 'react';
|
|
8
8
|
|
|
9
9
|
declare enum Brand {
|