@smg-automotive/auth 6.8.0-lkappeler-FED-788-dev-tenant-setup.1 → 6.8.0-lkappeler-FED-803-react-upgrade.1
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/dist/cjs/getServerAuthProps/app.d.ts +1 -2
- package/dist/cjs/getServerAuthProps/app.js +7 -8
- package/dist/cjs/getServerAuthProps/app.js.map +1 -1
- package/dist/cjs/getServerAuthProps/getAuthProps.d.ts +1 -2
- package/dist/cjs/getServerAuthProps/getAuthProps.js +1 -9
- package/dist/cjs/getServerAuthProps/getAuthProps.js.map +1 -1
- package/dist/cjs/getServerAuthProps/pages.d.ts +1 -2
- package/dist/cjs/getServerAuthProps/pages.js +7 -8
- package/dist/cjs/getServerAuthProps/pages.js.map +1 -1
- package/dist/esm/getServerAuthProps/app.d.ts +1 -2
- package/dist/esm/getServerAuthProps/app.js +7 -8
- package/dist/esm/getServerAuthProps/app.js.map +1 -1
- package/dist/esm/getServerAuthProps/getAuthProps.d.ts +1 -2
- package/dist/esm/getServerAuthProps/getAuthProps.js +1 -9
- package/dist/esm/getServerAuthProps/getAuthProps.js.map +1 -1
- package/dist/esm/getServerAuthProps/pages.d.ts +1 -2
- package/dist/esm/getServerAuthProps/pages.js +7 -8
- package/dist/esm/getServerAuthProps/pages.js.map +1 -1
- package/dist/server.d.ts +2 -4
- package/package.json +10 -10
|
@@ -9,7 +9,6 @@ type GetServerAuthPropsArgs = {
|
|
|
9
9
|
language?: Language;
|
|
10
10
|
url?: string;
|
|
11
11
|
onError?: (error: Error) => void;
|
|
12
|
-
skipUserEnhancement?: boolean;
|
|
13
12
|
};
|
|
14
|
-
export declare const getServerAuthProps: ({ protocol, host, isProxied, brand, language, url, onError,
|
|
13
|
+
export declare const getServerAuthProps: ({ protocol, host, isProxied, brand, language, url, onError, }: GetServerAuthPropsArgs) => Promise<AuthProps>;
|
|
15
14
|
export {};
|
|
@@ -9,9 +9,9 @@ var getAuthProps = require('./getAuthProps.js');
|
|
|
9
9
|
|
|
10
10
|
var getServerAuthProps = function (_a) { return tslib_es6.__awaiter(void 0, [_a], void 0, function (_b) {
|
|
11
11
|
var auth0Instance, config, authProps, shouldRedirect, _c, error_1, authError, loginLink;
|
|
12
|
-
var protocol = _b.protocol, host = _b.host, isProxied = _b.isProxied, brand = _b.brand, language = _b.language, url = _b.url, onError = _b.onError
|
|
13
|
-
return tslib_es6.__generator(this, function (
|
|
14
|
-
switch (
|
|
12
|
+
var protocol = _b.protocol, host = _b.host, isProxied = _b.isProxied, brand = _b.brand, language = _b.language, url = _b.url, onError = _b.onError;
|
|
13
|
+
return tslib_es6.__generator(this, function (_d) {
|
|
14
|
+
switch (_d.label) {
|
|
15
15
|
case 0:
|
|
16
16
|
auth0Instance = getAuth0Instance.getAuth0Instance({
|
|
17
17
|
protocol: protocol,
|
|
@@ -26,21 +26,20 @@ var getServerAuthProps = function (_a) { return tslib_es6.__awaiter(void 0, [_a]
|
|
|
26
26
|
accessTokenExpiresAt: null,
|
|
27
27
|
};
|
|
28
28
|
shouldRedirect = false;
|
|
29
|
-
|
|
29
|
+
_d.label = 1;
|
|
30
30
|
case 1:
|
|
31
|
-
|
|
31
|
+
_d.trys.push([1, 3, , 4]);
|
|
32
32
|
_c = [tslib_es6.__assign({}, authProps)];
|
|
33
33
|
return [4 /*yield*/, getAuthProps.getAuthProps({
|
|
34
34
|
auth0Instance: auth0Instance,
|
|
35
35
|
brand: brand,
|
|
36
36
|
isProxied: isProxied,
|
|
37
|
-
skipUserEnhancement: skipUserEnhancement,
|
|
38
37
|
})];
|
|
39
38
|
case 2:
|
|
40
|
-
authProps = tslib_es6.__assign.apply(void 0, _c.concat([(
|
|
39
|
+
authProps = tslib_es6.__assign.apply(void 0, _c.concat([(_d.sent())]));
|
|
41
40
|
return [3 /*break*/, 4];
|
|
42
41
|
case 3:
|
|
43
|
-
error_1 =
|
|
42
|
+
error_1 = _d.sent();
|
|
44
43
|
authError = error_1;
|
|
45
44
|
onError === null || onError === void 0 ? void 0 : onError(authError);
|
|
46
45
|
shouldRedirect = true;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"app.js","sources":["../../../../src/getServerAuthProps/app.ts"],"sourcesContent":[null],"names":["getAuth0Instance","getAuth0Config","getAuthProps","__assign","getLoginLink","redirect"],"mappings":";;;;;;;;;
|
|
1
|
+
{"version":3,"file":"app.js","sources":["../../../../src/getServerAuthProps/app.ts"],"sourcesContent":[null],"names":["getAuth0Instance","getAuth0Config","getAuthProps","__assign","getLoginLink","redirect"],"mappings":";;;;;;;;;AAsBO,IAAM,kBAAkB,GAAG,2EAAO,EAQhB,EAAA;;AAPvB,IAAA,IAAA,QAAQ,cAAA,EACR,IAAI,UAAA,EACJ,SAAS,eAAA,EACT,KAAK,GAAA,EAAA,CAAA,KAAA,EACL,QAAQ,GAAA,EAAA,CAAA,QAAA,EACR,GAAG,GAAA,EAAA,CAAA,GAAA,EACH,OAAO,GAAA,EAAA,CAAA,OAAA;;;;gBAED,aAAa,GAAGA,iCAAgB,CAAC;AACrC,oBAAA,QAAQ,EAAA,QAAA;AACR,oBAAA,IAAI,EAAA,IAAA;AACJ,oBAAA,SAAS,EAAA,SAAA;AACV,iBAAA,CAAC;gBACI,MAAM,GAAGC,oBAAc,CAAC,EAAE,SAAS,EAAA,SAAA,EAAE,CAAC;AACxC,gBAAA,SAAS,GAAc;AACzB,oBAAA,MAAM,EAAA,MAAA;AACN,oBAAA,IAAI,EAAE,IAAI;AACV,oBAAA,WAAW,EAAE,IAAI;AACjB,oBAAA,oBAAoB,EAAE,IAAI;iBAC3B;gBACG,cAAc,GAAG,KAAK;;;;6CAInB,SAAS,CAAA,CAAA;AACR,gBAAA,OAAA,CAAA,CAAA,YAAMC,yBAAY,CAAC;AACrB,wBAAA,aAAa,EAAA,aAAA;AACb,wBAAA,KAAK,EAAA,KAAA;AACL,wBAAA,SAAS,EAAA,SAAA;AACV,qBAAA,CAAC,CAAA;;AANJ,gBAAA,SAAS,GAAAC,kBAAA,CAAA,KAAA,CAAA,MAAA,EAAA,EAAA,CAAA,MAAA,CAAA,EAEH,EAAA,CAAA,IAAA,EAIF,IACH;;;;gBAEK,SAAS,GAAG,OAAkB;AAEpC,gBAAA,OAAO,aAAP,OAAO,KAAA,MAAA,GAAA,MAAA,GAAP,OAAO,CAAG,SAAS,CAAC;gBACpB,cAAc,GAAG,IAAI;;;gBAGvB,IAAI,cAAc,EAAE;oBACZ,SAAS,GAAGC,sBAAY,CAAC;AAC7B,wBAAA,QAAQ,EAAE,GAAG,IAAI,GAAA,CAAA,MAAA,CAAI,QAAQ,CAAE;wBAC/B,WAAW,EAAE,SAAS,CAAC,MAAM;AAC7B,wBAAA,QAAQ,EAAA,QAAA;AACT,qBAAA,CAAC;;;oBAIFC,mBAAQ,CAAC,SAAS,CAAC;gBACrB;AAEA,gBAAA,OAAA,CAAA,CAAA,aAAO,SAAS,CAAA;;;;;;;"}
|
|
@@ -2,7 +2,7 @@ import { IncomingMessage, ServerResponse } from 'http';
|
|
|
2
2
|
import { initAuth0 } from '@auth0/nextjs-auth0';
|
|
3
3
|
import { Brand } from 'src/types/brand';
|
|
4
4
|
import { AuthProps } from './types';
|
|
5
|
-
export declare const getAuthProps: ({ auth0Instance, brand, context, isProxied,
|
|
5
|
+
export declare const getAuthProps: ({ auth0Instance, brand, context, isProxied, }: {
|
|
6
6
|
auth0Instance: ReturnType<typeof initAuth0>;
|
|
7
7
|
brand: Brand;
|
|
8
8
|
isProxied: boolean;
|
|
@@ -10,5 +10,4 @@ export declare const getAuthProps: ({ auth0Instance, brand, context, isProxied,
|
|
|
10
10
|
request: IncomingMessage;
|
|
11
11
|
response: ServerResponse;
|
|
12
12
|
};
|
|
13
|
-
skipUserEnhancement?: boolean;
|
|
14
13
|
}) => Promise<Omit<AuthProps, "config">>;
|
|
@@ -5,7 +5,7 @@ var getAccessToken = require('../lib/request/getAccessToken.js');
|
|
|
5
5
|
|
|
6
6
|
var getAuthProps = function (_a) { return tslib_es6.__awaiter(void 0, [_a], void 0, function (_b) {
|
|
7
7
|
var session, isLoggedIn, user, accessTokenExpiresAt, accessToken, enrichUser, enrichedUser, _c;
|
|
8
|
-
var auth0Instance = _b.auth0Instance, brand = _b.brand, context = _b.context, isProxied = _b.isProxied
|
|
8
|
+
var auth0Instance = _b.auth0Instance, brand = _b.brand, context = _b.context, isProxied = _b.isProxied;
|
|
9
9
|
return tslib_es6.__generator(this, function (_d) {
|
|
10
10
|
switch (_d.label) {
|
|
11
11
|
case 0: return [4 /*yield*/, auth0Instance.getSession.apply(auth0Instance, (context ? [context.request, context.response] : []))];
|
|
@@ -28,14 +28,6 @@ var getAuthProps = function (_a) { return tslib_es6.__awaiter(void 0, [_a], void
|
|
|
28
28
|
})];
|
|
29
29
|
case 2:
|
|
30
30
|
accessToken = _d.sent();
|
|
31
|
-
if (skipUserEnhancement) {
|
|
32
|
-
return [2 /*return*/, {
|
|
33
|
-
// @ts-expect-error test case for dev tenant integration without permissions for preprod
|
|
34
|
-
user: user,
|
|
35
|
-
accessToken: accessToken,
|
|
36
|
-
accessTokenExpiresAt: accessTokenExpiresAt,
|
|
37
|
-
}];
|
|
38
|
-
}
|
|
39
31
|
return [4 /*yield*/, Promise.resolve().then(function () { return require('../lib/enrichUser/session.js'); })];
|
|
40
32
|
case 3:
|
|
41
33
|
enrichUser = (_d.sent()).enrichUser;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getAuthProps.js","sources":["../../../../src/getServerAuthProps/getAuthProps.ts"],"sourcesContent":[null],"names":["getAccessToken"],"mappings":";;;;;AAUO,IAAM,YAAY,GAAG,2EAAO,
|
|
1
|
+
{"version":3,"file":"getAuthProps.js","sources":["../../../../src/getServerAuthProps/getAuthProps.ts"],"sourcesContent":[null],"names":["getAccessToken"],"mappings":";;;;;AAUO,IAAM,YAAY,GAAG,2EAAO,EAalC,EAAA;;QAZC,aAAa,GAAA,EAAA,CAAA,aAAA,EACb,KAAK,GAAA,EAAA,CAAA,KAAA,EACL,OAAO,GAAA,EAAA,CAAA,OAAA,EACP,SAAS,GAAA,EAAA,CAAA,SAAA;;;oBAUO,OAAA,CAAA,CAAA,YAAM,aAAa,CAAC,UAAU,CAAA,KAAA,CAAxB,aAAa,GAC7B,OAAO,GAAG,CAAC,OAAO,CAAC,OAAO,EAAE,OAAO,CAAC,QAAQ,CAAC,GAAG,EAAE,EAAC,CAAA;;AADnD,gBAAA,OAAO,GAAG,EAAA,CAAA,IAAA,EAEf;gBAEK,UAAU,GAAG,CAAC,CAAC,OAAO,IAAI,CAAC,CAAC,OAAO,CAAC,IAAI;gBAE9C,IAAI,CAAC,UAAU,EAAE;oBACf,OAAA,CAAA,CAAA,aAAO;AACL,4BAAA,IAAI,EAAE,IAAI;AACV,4BAAA,WAAW,EAAE,IAAI;AACjB,4BAAA,oBAAoB,EAAE,IAAI;yBAC3B,CAAA;gBACH;AAEM,gBAAA,IAAI,GAAG,OAAO,CAAC,IAAoB;AACnC,gBAAA,oBAAoB,GAAG,OAAO,CAAC,oBAAqB;AACtC,gBAAA,OAAA,CAAA,CAAA,YAAMA,6BAAc,CAAC;AACvC,wBAAA,aAAa,EAAA,aAAA;AACb,wBAAA,OAAO,EAAA,OAAA;AACP,wBAAA,SAAS,EAAA,SAAA;AACV,qBAAA,CAAC,CAAA;;AAJI,gBAAA,WAAW,GAAG,EAAA,CAAA,IAAA,EAIlB;AAEqB,gBAAA,OAAA,CAAA,CAAA,YAAM,oDAAO,8BAA4B,KAAC,CAAA;;AAAzD,gBAAA,UAAU,GAAK,CAAA,EAAA,CAAA,IAAA,EAA0C,EAAA,UAA/C;AACG,gBAAA,IAAA,CAAA,WAAW,EAAX,OAAA,CAAA,CAAA,YAAA,CAAA,CAAA;AACjB,gBAAA,OAAA,CAAA,CAAA,YAAM,UAAU,CAAC,EAAE,IAAI,EAAA,IAAA,EAAE,WAAW,EAAA,WAAA,EAAE,KAAK,EAAA,KAAA,EAAE,CAAC,CAAA;;AAA9C,gBAAA,EAAA,GAAA,SAA8C;;;AAC9C,gBAAA,EAAA,GAAA,IAAI;;;AAFF,gBAAA,YAAY,GAAA,EAEV;gBAER,OAAA,CAAA,CAAA,aAAO;AACL,wBAAA,IAAI,EAAE,YAAY;AAClB,wBAAA,WAAW,EAAA,WAAA;AACX,wBAAA,oBAAoB,EAAA,oBAAA;qBACrB,CAAA;;;;;;;"}
|
|
@@ -17,7 +17,6 @@ type GetServerAuthPropsArgs<PageProps extends object = Record<string, never>> =
|
|
|
17
17
|
protocol: string;
|
|
18
18
|
isProxied: boolean;
|
|
19
19
|
onError?: (error: Error) => void;
|
|
20
|
-
skipUserEnhancement?: boolean;
|
|
21
20
|
};
|
|
22
|
-
export declare const getServerAuthProps: <PageProps extends object = Record<string, never>>({ request, response, appProps, brand, language, pageProps, onError, host, protocol, isProxied,
|
|
21
|
+
export declare const getServerAuthProps: <PageProps extends object = Record<string, never>>({ request, response, appProps, brand, language, pageProps, onError, host, protocol, isProxied, }: GetServerAuthPropsArgs<PageProps>) => Promise<AppInitialProps<PagePropsWithAuthProps<PageProps>>>;
|
|
23
22
|
export {};
|
|
@@ -8,9 +8,9 @@ var getAuthProps = require('./getAuthProps.js');
|
|
|
8
8
|
|
|
9
9
|
var getServerAuthProps = function (_a) { return tslib_es6.__awaiter(void 0, [_a], void 0, function (_b) {
|
|
10
10
|
var auth0Instance, config, authProps, _c, error_1, authError, loginLink, pagePropsWithAuthProps;
|
|
11
|
-
var request = _b.request, response = _b.response, appProps = _b.appProps, brand = _b.brand, language = _b.language, _d = _b.pageProps, pageProps = _d === void 0 ? {} : _d, onError = _b.onError, host = _b.host, protocol = _b.protocol, isProxied = _b.isProxied
|
|
12
|
-
return tslib_es6.__generator(this, function (
|
|
13
|
-
switch (
|
|
11
|
+
var request = _b.request, response = _b.response, appProps = _b.appProps, brand = _b.brand, language = _b.language, _d = _b.pageProps, pageProps = _d === void 0 ? {} : _d, onError = _b.onError, host = _b.host, protocol = _b.protocol, isProxied = _b.isProxied;
|
|
12
|
+
return tslib_es6.__generator(this, function (_e) {
|
|
13
|
+
switch (_e.label) {
|
|
14
14
|
case 0:
|
|
15
15
|
auth0Instance = getAuth0Instance.getAuth0Instance({
|
|
16
16
|
host: host,
|
|
@@ -24,22 +24,21 @@ var getServerAuthProps = function (_a) { return tslib_es6.__awaiter(void 0, [_a]
|
|
|
24
24
|
accessToken: null,
|
|
25
25
|
accessTokenExpiresAt: null,
|
|
26
26
|
};
|
|
27
|
-
|
|
27
|
+
_e.label = 1;
|
|
28
28
|
case 1:
|
|
29
|
-
|
|
29
|
+
_e.trys.push([1, 3, , 4]);
|
|
30
30
|
_c = [tslib_es6.__assign({}, authProps)];
|
|
31
31
|
return [4 /*yield*/, getAuthProps.getAuthProps({
|
|
32
32
|
auth0Instance: auth0Instance,
|
|
33
33
|
brand: brand,
|
|
34
34
|
isProxied: isProxied,
|
|
35
35
|
context: { request: request, response: response },
|
|
36
|
-
skipUserEnhancement: skipUserEnhancement,
|
|
37
36
|
})];
|
|
38
37
|
case 2:
|
|
39
|
-
authProps = tslib_es6.__assign.apply(void 0, _c.concat([(
|
|
38
|
+
authProps = tslib_es6.__assign.apply(void 0, _c.concat([(_e.sent())]));
|
|
40
39
|
return [3 /*break*/, 4];
|
|
41
40
|
case 3:
|
|
42
|
-
error_1 =
|
|
41
|
+
error_1 = _e.sent();
|
|
43
42
|
authError = error_1;
|
|
44
43
|
onError === null || onError === void 0 ? void 0 : onError(authError);
|
|
45
44
|
loginLink = authLinks.getLoginLink({
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"pages.js","sources":["../../../../src/getServerAuthProps/pages.ts"],"sourcesContent":[null],"names":["getAuth0Instance","getAuth0Config","getAuthProps","__assign","getLoginLink"],"mappings":";;;;;;;;
|
|
1
|
+
{"version":3,"file":"pages.js","sources":["../../../../src/getServerAuthProps/pages.ts"],"sourcesContent":[null],"names":["getAuth0Instance","getAuth0Config","getAuthProps","__assign","getLoginLink"],"mappings":";;;;;;;;AAgCO,IAAM,kBAAkB,GAAG,2EAEhC,EAWkC,EAAA;;AAVlC,IAAA,IAAA,OAAO,GAAA,EAAA,CAAA,OAAA,EACP,QAAQ,GAAA,EAAA,CAAA,QAAA,EACR,QAAQ,GAAA,EAAA,CAAA,QAAA,EACR,KAAK,GAAA,EAAA,CAAA,KAAA,EACL,QAAQ,cAAA,EACR,EAAA,GAAA,EAAA,CAAA,SAA2B,EAA3B,SAAS,GAAA,EAAA,KAAA,MAAA,GAAG,EAAe,GAAA,EAAA,EAC3B,OAAO,GAAA,EAAA,CAAA,OAAA,EACP,IAAI,GAAA,EAAA,CAAA,IAAA,EACJ,QAAQ,GAAA,EAAA,CAAA,QAAA,EACR,SAAS,GAAA,EAAA,CAAA,SAAA;;;;gBAIH,aAAa,GAAGA,iCAAgB,CAAC;AACrC,oBAAA,IAAI,EAAA,IAAA;AACJ,oBAAA,QAAQ,EAAA,QAAA;AACR,oBAAA,SAAS,EAAA,SAAA;AACV,iBAAA,CAAC;gBACI,MAAM,GAAGC,oBAAc,CAAC,EAAE,SAAS,EAAA,SAAA,EAAE,CAAC;AACxC,gBAAA,SAAS,GAAc;AACzB,oBAAA,MAAM,EAAA,MAAA;AACN,oBAAA,IAAI,EAAE,IAAI;AACV,oBAAA,WAAW,EAAE,IAAI;AACjB,oBAAA,oBAAoB,EAAE,IAAI;iBAC3B;;;;6CAIM,SAAS,CAAA,CAAA;AACR,gBAAA,OAAA,CAAA,CAAA,YAAMC,yBAAY,CAAC;AACrB,wBAAA,aAAa,EAAA,aAAA;AACb,wBAAA,KAAK,EAAA,KAAA;AACL,wBAAA,SAAS,EAAA,SAAA;AACT,wBAAA,OAAO,EAAE,EAAE,OAAO,SAAA,EAAE,QAAQ,UAAA,EAAE;AAC/B,qBAAA,CAAC,CAAA;;AAPJ,gBAAA,SAAS,GAAAC,kBAAA,CAAA,KAAA,CAAA,MAAA,EAAA,EAAA,CAAA,MAAA,CAAA,EAEH,EAAA,CAAA,IAAA,EAKF,IACH;;;;gBAEK,SAAS,GAAG,OAAkB;AAEpC,gBAAA,OAAO,aAAP,OAAO,KAAA,MAAA,GAAA,MAAA,GAAP,OAAO,CAAG,SAAS,CAAC;gBACd,SAAS,GAAGC,sBAAY,CAAC;AAC7B,oBAAA,QAAQ,EAAE,OAAO,CAAC,GAAG,IAAI,GAAA,CAAA,MAAA,CAAI,QAAQ,CAAE;oBACvC,WAAW,EAAE,SAAS,CAAC,MAAM;AAC7B,oBAAA,QAAQ,EAAA,QAAA;AACT,iBAAA,CAAC;AAEF,gBAAA,QAAQ,CAAC,SAAS,CAAC,GAAG,EAAE;AACtB,oBAAA,QAAQ,EAAE,SAAS;AACpB,iBAAA,CAAC;gBACF,QAAQ,CAAC,GAAG,EAAE;;;AAGV,gBAAA,sBAAsB,6CACvB,SAAS,CAAA,EAAA,EACZ,SAAS,EAAA,SAAA,GACV;gBACD,MAAM,CAAC,MAAM,CAAC,QAAQ,CAAC,SAAS,EAAE,sBAAsB,CAAC;AACzD,gBAAA,OAAA,CAAA,CAAA,aAAO,QAAQ,CAAA;;;;;;;"}
|
|
@@ -9,7 +9,6 @@ type GetServerAuthPropsArgs = {
|
|
|
9
9
|
language?: Language;
|
|
10
10
|
url?: string;
|
|
11
11
|
onError?: (error: Error) => void;
|
|
12
|
-
skipUserEnhancement?: boolean;
|
|
13
12
|
};
|
|
14
|
-
export declare const getServerAuthProps: ({ protocol, host, isProxied, brand, language, url, onError,
|
|
13
|
+
export declare const getServerAuthProps: ({ protocol, host, isProxied, brand, language, url, onError, }: GetServerAuthPropsArgs) => Promise<AuthProps>;
|
|
15
14
|
export {};
|
|
@@ -7,9 +7,9 @@ import { getAuthProps } from './getAuthProps.js';
|
|
|
7
7
|
|
|
8
8
|
var getServerAuthProps = function (_a) { return __awaiter(void 0, [_a], void 0, function (_b) {
|
|
9
9
|
var auth0Instance, config, authProps, shouldRedirect, _c, error_1, authError, loginLink;
|
|
10
|
-
var protocol = _b.protocol, host = _b.host, isProxied = _b.isProxied, brand = _b.brand, language = _b.language, url = _b.url, onError = _b.onError
|
|
11
|
-
return __generator(this, function (
|
|
12
|
-
switch (
|
|
10
|
+
var protocol = _b.protocol, host = _b.host, isProxied = _b.isProxied, brand = _b.brand, language = _b.language, url = _b.url, onError = _b.onError;
|
|
11
|
+
return __generator(this, function (_d) {
|
|
12
|
+
switch (_d.label) {
|
|
13
13
|
case 0:
|
|
14
14
|
auth0Instance = getAuth0Instance({
|
|
15
15
|
protocol: protocol,
|
|
@@ -24,21 +24,20 @@ var getServerAuthProps = function (_a) { return __awaiter(void 0, [_a], void 0,
|
|
|
24
24
|
accessTokenExpiresAt: null,
|
|
25
25
|
};
|
|
26
26
|
shouldRedirect = false;
|
|
27
|
-
|
|
27
|
+
_d.label = 1;
|
|
28
28
|
case 1:
|
|
29
|
-
|
|
29
|
+
_d.trys.push([1, 3, , 4]);
|
|
30
30
|
_c = [__assign({}, authProps)];
|
|
31
31
|
return [4 /*yield*/, getAuthProps({
|
|
32
32
|
auth0Instance: auth0Instance,
|
|
33
33
|
brand: brand,
|
|
34
34
|
isProxied: isProxied,
|
|
35
|
-
skipUserEnhancement: skipUserEnhancement,
|
|
36
35
|
})];
|
|
37
36
|
case 2:
|
|
38
|
-
authProps = __assign.apply(void 0, _c.concat([(
|
|
37
|
+
authProps = __assign.apply(void 0, _c.concat([(_d.sent())]));
|
|
39
38
|
return [3 /*break*/, 4];
|
|
40
39
|
case 3:
|
|
41
|
-
error_1 =
|
|
40
|
+
error_1 = _d.sent();
|
|
42
41
|
authError = error_1;
|
|
43
42
|
onError === null || onError === void 0 ? void 0 : onError(authError);
|
|
44
43
|
shouldRedirect = true;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"app.js","sources":["../../../../src/getServerAuthProps/app.ts"],"sourcesContent":[null],"names":[],"mappings":";;;;;;;
|
|
1
|
+
{"version":3,"file":"app.js","sources":["../../../../src/getServerAuthProps/app.ts"],"sourcesContent":[null],"names":[],"mappings":";;;;;;;AAsBO,IAAM,kBAAkB,GAAG,iEAAO,EAQhB,EAAA;;AAPvB,IAAA,IAAA,QAAQ,cAAA,EACR,IAAI,UAAA,EACJ,SAAS,eAAA,EACT,KAAK,GAAA,EAAA,CAAA,KAAA,EACL,QAAQ,GAAA,EAAA,CAAA,QAAA,EACR,GAAG,GAAA,EAAA,CAAA,GAAA,EACH,OAAO,GAAA,EAAA,CAAA,OAAA;;;;gBAED,aAAa,GAAG,gBAAgB,CAAC;AACrC,oBAAA,QAAQ,EAAA,QAAA;AACR,oBAAA,IAAI,EAAA,IAAA;AACJ,oBAAA,SAAS,EAAA,SAAA;AACV,iBAAA,CAAC;gBACI,MAAM,GAAG,cAAc,CAAC,EAAE,SAAS,EAAA,SAAA,EAAE,CAAC;AACxC,gBAAA,SAAS,GAAc;AACzB,oBAAA,MAAM,EAAA,MAAA;AACN,oBAAA,IAAI,EAAE,IAAI;AACV,oBAAA,WAAW,EAAE,IAAI;AACjB,oBAAA,oBAAoB,EAAE,IAAI;iBAC3B;gBACG,cAAc,GAAG,KAAK;;;;mCAInB,SAAS,CAAA,CAAA;AACR,gBAAA,OAAA,CAAA,CAAA,YAAM,YAAY,CAAC;AACrB,wBAAA,aAAa,EAAA,aAAA;AACb,wBAAA,KAAK,EAAA,KAAA;AACL,wBAAA,SAAS,EAAA,SAAA;AACV,qBAAA,CAAC,CAAA;;AANJ,gBAAA,SAAS,GAAA,QAAA,CAAA,KAAA,CAAA,MAAA,EAAA,EAAA,CAAA,MAAA,CAAA,EAEH,EAAA,CAAA,IAAA,EAIF,IACH;;;;gBAEK,SAAS,GAAG,OAAkB;AAEpC,gBAAA,OAAO,aAAP,OAAO,KAAA,MAAA,GAAA,MAAA,GAAP,OAAO,CAAG,SAAS,CAAC;gBACpB,cAAc,GAAG,IAAI;;;gBAGvB,IAAI,cAAc,EAAE;oBACZ,SAAS,GAAG,YAAY,CAAC;AAC7B,wBAAA,QAAQ,EAAE,GAAG,IAAI,GAAA,CAAA,MAAA,CAAI,QAAQ,CAAE;wBAC/B,WAAW,EAAE,SAAS,CAAC,MAAM;AAC7B,wBAAA,QAAQ,EAAA,QAAA;AACT,qBAAA,CAAC;;;oBAIF,QAAQ,CAAC,SAAS,CAAC;gBACrB;AAEA,gBAAA,OAAA,CAAA,CAAA,aAAO,SAAS,CAAA;;;;;;;"}
|
|
@@ -2,7 +2,7 @@ import { IncomingMessage, ServerResponse } from 'http';
|
|
|
2
2
|
import { initAuth0 } from '@auth0/nextjs-auth0';
|
|
3
3
|
import { Brand } from 'src/types/brand';
|
|
4
4
|
import { AuthProps } from './types';
|
|
5
|
-
export declare const getAuthProps: ({ auth0Instance, brand, context, isProxied,
|
|
5
|
+
export declare const getAuthProps: ({ auth0Instance, brand, context, isProxied, }: {
|
|
6
6
|
auth0Instance: ReturnType<typeof initAuth0>;
|
|
7
7
|
brand: Brand;
|
|
8
8
|
isProxied: boolean;
|
|
@@ -10,5 +10,4 @@ export declare const getAuthProps: ({ auth0Instance, brand, context, isProxied,
|
|
|
10
10
|
request: IncomingMessage;
|
|
11
11
|
response: ServerResponse;
|
|
12
12
|
};
|
|
13
|
-
skipUserEnhancement?: boolean;
|
|
14
13
|
}) => Promise<Omit<AuthProps, "config">>;
|
|
@@ -3,7 +3,7 @@ import { getAccessToken } from '../lib/request/getAccessToken.js';
|
|
|
3
3
|
|
|
4
4
|
var getAuthProps = function (_a) { return __awaiter(void 0, [_a], void 0, function (_b) {
|
|
5
5
|
var session, isLoggedIn, user, accessTokenExpiresAt, accessToken, enrichUser, enrichedUser, _c;
|
|
6
|
-
var auth0Instance = _b.auth0Instance, brand = _b.brand, context = _b.context, isProxied = _b.isProxied
|
|
6
|
+
var auth0Instance = _b.auth0Instance, brand = _b.brand, context = _b.context, isProxied = _b.isProxied;
|
|
7
7
|
return __generator(this, function (_d) {
|
|
8
8
|
switch (_d.label) {
|
|
9
9
|
case 0: return [4 /*yield*/, auth0Instance.getSession.apply(auth0Instance, (context ? [context.request, context.response] : []))];
|
|
@@ -26,14 +26,6 @@ var getAuthProps = function (_a) { return __awaiter(void 0, [_a], void 0, functi
|
|
|
26
26
|
})];
|
|
27
27
|
case 2:
|
|
28
28
|
accessToken = _d.sent();
|
|
29
|
-
if (skipUserEnhancement) {
|
|
30
|
-
return [2 /*return*/, {
|
|
31
|
-
// @ts-expect-error test case for dev tenant integration without permissions for preprod
|
|
32
|
-
user: user,
|
|
33
|
-
accessToken: accessToken,
|
|
34
|
-
accessTokenExpiresAt: accessTokenExpiresAt,
|
|
35
|
-
}];
|
|
36
|
-
}
|
|
37
29
|
return [4 /*yield*/, import('../lib/enrichUser/session.js')];
|
|
38
30
|
case 3:
|
|
39
31
|
enrichUser = (_d.sent()).enrichUser;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getAuthProps.js","sources":["../../../../src/getServerAuthProps/getAuthProps.ts"],"sourcesContent":[null],"names":[],"mappings":";;;AAUO,IAAM,YAAY,GAAG,iEAAO,
|
|
1
|
+
{"version":3,"file":"getAuthProps.js","sources":["../../../../src/getServerAuthProps/getAuthProps.ts"],"sourcesContent":[null],"names":[],"mappings":";;;AAUO,IAAM,YAAY,GAAG,iEAAO,EAalC,EAAA;;QAZC,aAAa,GAAA,EAAA,CAAA,aAAA,EACb,KAAK,GAAA,EAAA,CAAA,KAAA,EACL,OAAO,GAAA,EAAA,CAAA,OAAA,EACP,SAAS,GAAA,EAAA,CAAA,SAAA;;;oBAUO,OAAA,CAAA,CAAA,YAAM,aAAa,CAAC,UAAU,CAAA,KAAA,CAAxB,aAAa,GAC7B,OAAO,GAAG,CAAC,OAAO,CAAC,OAAO,EAAE,OAAO,CAAC,QAAQ,CAAC,GAAG,EAAE,EAAC,CAAA;;AADnD,gBAAA,OAAO,GAAG,EAAA,CAAA,IAAA,EAEf;gBAEK,UAAU,GAAG,CAAC,CAAC,OAAO,IAAI,CAAC,CAAC,OAAO,CAAC,IAAI;gBAE9C,IAAI,CAAC,UAAU,EAAE;oBACf,OAAA,CAAA,CAAA,aAAO;AACL,4BAAA,IAAI,EAAE,IAAI;AACV,4BAAA,WAAW,EAAE,IAAI;AACjB,4BAAA,oBAAoB,EAAE,IAAI;yBAC3B,CAAA;gBACH;AAEM,gBAAA,IAAI,GAAG,OAAO,CAAC,IAAoB;AACnC,gBAAA,oBAAoB,GAAG,OAAO,CAAC,oBAAqB;AACtC,gBAAA,OAAA,CAAA,CAAA,YAAM,cAAc,CAAC;AACvC,wBAAA,aAAa,EAAA,aAAA;AACb,wBAAA,OAAO,EAAA,OAAA;AACP,wBAAA,SAAS,EAAA,SAAA;AACV,qBAAA,CAAC,CAAA;;AAJI,gBAAA,WAAW,GAAG,EAAA,CAAA,IAAA,EAIlB;AAEqB,gBAAA,OAAA,CAAA,CAAA,YAAM,OAAO,8BAA4B,CAAC,CAAA;;AAAzD,gBAAA,UAAU,GAAK,CAAA,EAAA,CAAA,IAAA,EAA0C,EAAA,UAA/C;AACG,gBAAA,IAAA,CAAA,WAAW,EAAX,OAAA,CAAA,CAAA,YAAA,CAAA,CAAA;AACjB,gBAAA,OAAA,CAAA,CAAA,YAAM,UAAU,CAAC,EAAE,IAAI,EAAA,IAAA,EAAE,WAAW,EAAA,WAAA,EAAE,KAAK,EAAA,KAAA,EAAE,CAAC,CAAA;;AAA9C,gBAAA,EAAA,GAAA,SAA8C;;;AAC9C,gBAAA,EAAA,GAAA,IAAI;;;AAFF,gBAAA,YAAY,GAAA,EAEV;gBAER,OAAA,CAAA,CAAA,aAAO;AACL,wBAAA,IAAI,EAAE,YAAY;AAClB,wBAAA,WAAW,EAAA,WAAA;AACX,wBAAA,oBAAoB,EAAA,oBAAA;qBACrB,CAAA;;;;;;;"}
|
|
@@ -17,7 +17,6 @@ type GetServerAuthPropsArgs<PageProps extends object = Record<string, never>> =
|
|
|
17
17
|
protocol: string;
|
|
18
18
|
isProxied: boolean;
|
|
19
19
|
onError?: (error: Error) => void;
|
|
20
|
-
skipUserEnhancement?: boolean;
|
|
21
20
|
};
|
|
22
|
-
export declare const getServerAuthProps: <PageProps extends object = Record<string, never>>({ request, response, appProps, brand, language, pageProps, onError, host, protocol, isProxied,
|
|
21
|
+
export declare const getServerAuthProps: <PageProps extends object = Record<string, never>>({ request, response, appProps, brand, language, pageProps, onError, host, protocol, isProxied, }: GetServerAuthPropsArgs<PageProps>) => Promise<AppInitialProps<PagePropsWithAuthProps<PageProps>>>;
|
|
23
22
|
export {};
|
|
@@ -6,9 +6,9 @@ import { getAuthProps } from './getAuthProps.js';
|
|
|
6
6
|
|
|
7
7
|
var getServerAuthProps = function (_a) { return __awaiter(void 0, [_a], void 0, function (_b) {
|
|
8
8
|
var auth0Instance, config, authProps, _c, error_1, authError, loginLink, pagePropsWithAuthProps;
|
|
9
|
-
var request = _b.request, response = _b.response, appProps = _b.appProps, brand = _b.brand, language = _b.language, _d = _b.pageProps, pageProps = _d === void 0 ? {} : _d, onError = _b.onError, host = _b.host, protocol = _b.protocol, isProxied = _b.isProxied
|
|
10
|
-
return __generator(this, function (
|
|
11
|
-
switch (
|
|
9
|
+
var request = _b.request, response = _b.response, appProps = _b.appProps, brand = _b.brand, language = _b.language, _d = _b.pageProps, pageProps = _d === void 0 ? {} : _d, onError = _b.onError, host = _b.host, protocol = _b.protocol, isProxied = _b.isProxied;
|
|
10
|
+
return __generator(this, function (_e) {
|
|
11
|
+
switch (_e.label) {
|
|
12
12
|
case 0:
|
|
13
13
|
auth0Instance = getAuth0Instance({
|
|
14
14
|
host: host,
|
|
@@ -22,22 +22,21 @@ var getServerAuthProps = function (_a) { return __awaiter(void 0, [_a], void 0,
|
|
|
22
22
|
accessToken: null,
|
|
23
23
|
accessTokenExpiresAt: null,
|
|
24
24
|
};
|
|
25
|
-
|
|
25
|
+
_e.label = 1;
|
|
26
26
|
case 1:
|
|
27
|
-
|
|
27
|
+
_e.trys.push([1, 3, , 4]);
|
|
28
28
|
_c = [__assign({}, authProps)];
|
|
29
29
|
return [4 /*yield*/, getAuthProps({
|
|
30
30
|
auth0Instance: auth0Instance,
|
|
31
31
|
brand: brand,
|
|
32
32
|
isProxied: isProxied,
|
|
33
33
|
context: { request: request, response: response },
|
|
34
|
-
skipUserEnhancement: skipUserEnhancement,
|
|
35
34
|
})];
|
|
36
35
|
case 2:
|
|
37
|
-
authProps = __assign.apply(void 0, _c.concat([(
|
|
36
|
+
authProps = __assign.apply(void 0, _c.concat([(_e.sent())]));
|
|
38
37
|
return [3 /*break*/, 4];
|
|
39
38
|
case 3:
|
|
40
|
-
error_1 =
|
|
39
|
+
error_1 = _e.sent();
|
|
41
40
|
authError = error_1;
|
|
42
41
|
onError === null || onError === void 0 ? void 0 : onError(authError);
|
|
43
42
|
loginLink = getLoginLink({
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"pages.js","sources":["../../../../src/getServerAuthProps/pages.ts"],"sourcesContent":[null],"names":[],"mappings":";;;;;;
|
|
1
|
+
{"version":3,"file":"pages.js","sources":["../../../../src/getServerAuthProps/pages.ts"],"sourcesContent":[null],"names":[],"mappings":";;;;;;AAgCO,IAAM,kBAAkB,GAAG,iEAEhC,EAWkC,EAAA;;AAVlC,IAAA,IAAA,OAAO,GAAA,EAAA,CAAA,OAAA,EACP,QAAQ,GAAA,EAAA,CAAA,QAAA,EACR,QAAQ,GAAA,EAAA,CAAA,QAAA,EACR,KAAK,GAAA,EAAA,CAAA,KAAA,EACL,QAAQ,cAAA,EACR,EAAA,GAAA,EAAA,CAAA,SAA2B,EAA3B,SAAS,GAAA,EAAA,KAAA,MAAA,GAAG,EAAe,GAAA,EAAA,EAC3B,OAAO,GAAA,EAAA,CAAA,OAAA,EACP,IAAI,GAAA,EAAA,CAAA,IAAA,EACJ,QAAQ,GAAA,EAAA,CAAA,QAAA,EACR,SAAS,GAAA,EAAA,CAAA,SAAA;;;;gBAIH,aAAa,GAAG,gBAAgB,CAAC;AACrC,oBAAA,IAAI,EAAA,IAAA;AACJ,oBAAA,QAAQ,EAAA,QAAA;AACR,oBAAA,SAAS,EAAA,SAAA;AACV,iBAAA,CAAC;gBACI,MAAM,GAAG,cAAc,CAAC,EAAE,SAAS,EAAA,SAAA,EAAE,CAAC;AACxC,gBAAA,SAAS,GAAc;AACzB,oBAAA,MAAM,EAAA,MAAA;AACN,oBAAA,IAAI,EAAE,IAAI;AACV,oBAAA,WAAW,EAAE,IAAI;AACjB,oBAAA,oBAAoB,EAAE,IAAI;iBAC3B;;;;mCAIM,SAAS,CAAA,CAAA;AACR,gBAAA,OAAA,CAAA,CAAA,YAAM,YAAY,CAAC;AACrB,wBAAA,aAAa,EAAA,aAAA;AACb,wBAAA,KAAK,EAAA,KAAA;AACL,wBAAA,SAAS,EAAA,SAAA;AACT,wBAAA,OAAO,EAAE,EAAE,OAAO,SAAA,EAAE,QAAQ,UAAA,EAAE;AAC/B,qBAAA,CAAC,CAAA;;AAPJ,gBAAA,SAAS,GAAA,QAAA,CAAA,KAAA,CAAA,MAAA,EAAA,EAAA,CAAA,MAAA,CAAA,EAEH,EAAA,CAAA,IAAA,EAKF,IACH;;;;gBAEK,SAAS,GAAG,OAAkB;AAEpC,gBAAA,OAAO,aAAP,OAAO,KAAA,MAAA,GAAA,MAAA,GAAP,OAAO,CAAG,SAAS,CAAC;gBACd,SAAS,GAAG,YAAY,CAAC;AAC7B,oBAAA,QAAQ,EAAE,OAAO,CAAC,GAAG,IAAI,GAAA,CAAA,MAAA,CAAI,QAAQ,CAAE;oBACvC,WAAW,EAAE,SAAS,CAAC,MAAM;AAC7B,oBAAA,QAAQ,EAAA,QAAA;AACT,iBAAA,CAAC;AAEF,gBAAA,QAAQ,CAAC,SAAS,CAAC,GAAG,EAAE;AACtB,oBAAA,QAAQ,EAAE,SAAS;AACpB,iBAAA,CAAC;gBACF,QAAQ,CAAC,GAAG,EAAE;;;AAGV,gBAAA,sBAAsB,yBACvB,SAAS,CAAA,EAAA,EACZ,SAAS,EAAA,SAAA,GACV;gBACD,MAAM,CAAC,MAAM,CAAC,QAAQ,CAAC,SAAS,EAAE,sBAAsB,CAAC;AACzD,gBAAA,OAAA,CAAA,CAAA,aAAO,QAAQ,CAAA;;;;;;;"}
|
package/dist/server.d.ts
CHANGED
|
@@ -20,9 +20,8 @@ type GetServerAuthPropsArgs$1<PageProps extends object = Record<string, never>>
|
|
|
20
20
|
protocol: string;
|
|
21
21
|
isProxied: boolean;
|
|
22
22
|
onError?: (error: Error) => void;
|
|
23
|
-
skipUserEnhancement?: boolean;
|
|
24
23
|
};
|
|
25
|
-
declare const getServerAuthProps$1: <PageProps extends object = Record<string, never>>({ request, response, appProps, brand, language, pageProps, onError, host, protocol, isProxied,
|
|
24
|
+
declare const getServerAuthProps$1: <PageProps extends object = Record<string, never>>({ request, response, appProps, brand, language, pageProps, onError, host, protocol, isProxied, }: GetServerAuthPropsArgs$1<PageProps>) => Promise<AppInitialProps<PagePropsWithAuthProps<PageProps>>>;
|
|
26
25
|
|
|
27
26
|
type GetServerAuthPropsArgs = {
|
|
28
27
|
protocol: string;
|
|
@@ -32,9 +31,8 @@ type GetServerAuthPropsArgs = {
|
|
|
32
31
|
language?: Language;
|
|
33
32
|
url?: string;
|
|
34
33
|
onError?: (error: Error) => void;
|
|
35
|
-
skipUserEnhancement?: boolean;
|
|
36
34
|
};
|
|
37
|
-
declare const getServerAuthProps: ({ protocol, host, isProxied, brand, language, url, onError,
|
|
35
|
+
declare const getServerAuthProps: ({ protocol, host, isProxied, brand, language, url, onError, }: GetServerAuthPropsArgs) => Promise<AuthProps>;
|
|
38
36
|
|
|
39
37
|
type HandlerCreatorParams = {
|
|
40
38
|
brand: Brand;
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@smg-automotive/auth",
|
|
3
|
-
"version": "6.8.0-lkappeler-FED-
|
|
3
|
+
"version": "6.8.0-lkappeler-FED-803-react-upgrade.1",
|
|
4
4
|
"description": "SMG Automotive auth package",
|
|
5
5
|
"exports": {
|
|
6
6
|
".": {
|
|
@@ -62,19 +62,19 @@
|
|
|
62
62
|
"@rollup/plugin-commonjs": "28.0.6",
|
|
63
63
|
"@rollup/plugin-node-resolve": "16.0.1",
|
|
64
64
|
"@rollup/plugin-typescript": "12.1.4",
|
|
65
|
-
"@smg-automotive/eslint-config": "5.1.
|
|
65
|
+
"@smg-automotive/eslint-config": "5.1.2",
|
|
66
66
|
"@testing-library/dom": "10.4.1",
|
|
67
67
|
"@testing-library/jest-dom": "6.6.4",
|
|
68
68
|
"@testing-library/react": "16.3.0",
|
|
69
69
|
"@testing-library/user-event": "14.6.1",
|
|
70
70
|
"@types/jest": "29.5.14",
|
|
71
|
-
"@types/react": "19.1.
|
|
71
|
+
"@types/react": "19.1.10",
|
|
72
72
|
"dotenv": "17.2.1",
|
|
73
73
|
"jest": "29.7.0",
|
|
74
74
|
"jest-environment-jsdom": "29.7.0",
|
|
75
|
-
"next": "
|
|
76
|
-
"react": "
|
|
77
|
-
"react-dom": "
|
|
75
|
+
"next": "15.4.6",
|
|
76
|
+
"react": "19.1.1",
|
|
77
|
+
"react-dom": "19.1.1",
|
|
78
78
|
"rimraf": "6.0.1",
|
|
79
79
|
"rollup": "4.46.2",
|
|
80
80
|
"rollup-plugin-dts": "6.2.1",
|
|
@@ -89,12 +89,12 @@
|
|
|
89
89
|
"dependencies": {
|
|
90
90
|
"@auth0/nextjs-auth0": "3.8.0",
|
|
91
91
|
"@smg-automotive/api-client-pkg": "4.4.1",
|
|
92
|
-
"@smg-automotive/i18n-pkg": "1.
|
|
92
|
+
"@smg-automotive/i18n-pkg": "1.8.0-lkappeler-FED-801-upgrade-react-6cd08439f1a1fb6bd6914b521a472b69ec845925.1",
|
|
93
93
|
"jose": "5.10.0"
|
|
94
94
|
},
|
|
95
95
|
"peerDependencies": {
|
|
96
|
-
"next": "
|
|
97
|
-
"react": "
|
|
98
|
-
"react-dom": "
|
|
96
|
+
"next": "^15.0.0",
|
|
97
|
+
"react": "^19.0.0",
|
|
98
|
+
"react-dom": "^19.0.0"
|
|
99
99
|
}
|
|
100
100
|
}
|