@smg-automotive/auth 7.1.0-auth0-update-root.2 → 7.1.0-lkappeler-fix-get-access-token.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/client/contexts/Auth.js +6 -2
- package/dist/cjs/client/contexts/Auth.js.map +1 -1
- package/dist/cjs/client/hooks/useUser.js +5 -1
- package/dist/cjs/client/hooks/useUser.js.map +1 -1
- package/dist/cjs/server/helpers/getAccessToken.d.ts +2 -1
- package/dist/cjs/server/helpers/getAccessToken.js +5 -3
- package/dist/cjs/server/helpers/getAccessToken.js.map +1 -1
- package/dist/cjs/server/helpers/getAuthProps.js.map +1 -1
- package/dist/cjs/server/helpers/getUser.d.ts +4 -9
- package/dist/cjs/server/helpers/getUser.js +19 -15
- package/dist/cjs/server/helpers/getUser.js.map +1 -1
- package/dist/cjs/server/helpers/isLoggedIn.d.ts +2 -1
- package/dist/cjs/server/helpers/isLoggedIn.js.map +1 -1
- package/dist/cjs/types/serverRequestContext.d.ts +8 -0
- package/dist/esm/server/helpers/getAccessToken.d.ts +2 -1
- package/dist/esm/server/helpers/getAccessToken.js +5 -3
- package/dist/esm/server/helpers/getAccessToken.js.map +1 -1
- package/dist/esm/server/helpers/getAuthProps.js.map +1 -1
- package/dist/esm/server/helpers/getUser.d.ts +4 -9
- package/dist/esm/server/helpers/getUser.js +19 -15
- package/dist/esm/server/helpers/getUser.js.map +1 -1
- package/dist/esm/server/helpers/isLoggedIn.d.ts +2 -1
- package/dist/esm/server/helpers/isLoggedIn.js.map +1 -1
- package/dist/esm/types/serverRequestContext.d.ts +8 -0
- package/dist/server.d.ts +10 -3
- package/package.json +6 -6
|
@@ -4,6 +4,10 @@
|
|
|
4
4
|
var useSWR = require('swr');
|
|
5
5
|
var React = require('react');
|
|
6
6
|
|
|
7
|
+
function _interopDefaultCompat (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; }
|
|
8
|
+
|
|
9
|
+
var React__default = /*#__PURE__*/_interopDefaultCompat(React);
|
|
10
|
+
|
|
7
11
|
const AuthContext = React.createContext(null);
|
|
8
12
|
const AuthProvider = ({ children, auth0Config, user, }) => {
|
|
9
13
|
const memoizedContext = React.useMemo(() => {
|
|
@@ -11,14 +15,14 @@ const AuthProvider = ({ children, auth0Config, user, }) => {
|
|
|
11
15
|
auth0Config,
|
|
12
16
|
};
|
|
13
17
|
}, [auth0Config]);
|
|
14
|
-
return (
|
|
18
|
+
return (React__default.default.createElement(useSWR.SWRConfig, { value: {
|
|
15
19
|
fallback: user
|
|
16
20
|
? {
|
|
17
21
|
[auth0Config.userProfileEndpoint]: user,
|
|
18
22
|
}
|
|
19
23
|
: {},
|
|
20
24
|
} },
|
|
21
|
-
|
|
25
|
+
React__default.default.createElement(AuthContext.Provider, { value: memoizedContext }, children)));
|
|
22
26
|
};
|
|
23
27
|
|
|
24
28
|
exports.AuthContext = AuthContext;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Auth.js","sources":["../../../../../src/client/contexts/Auth.tsx"],"sourcesContent":[null],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"Auth.js","sources":["../../../../../src/client/contexts/Auth.tsx"],"sourcesContent":[null],"names":[],"mappings":";;;;;;;;;;;AAkBO;AAKL;;;;AAIA;AAEA;AAGM;AACE;AACI;AACD;AACH;AACH;AAED;AAKN;;;"}
|
|
@@ -5,6 +5,10 @@ var useSWR = require('swr');
|
|
|
5
5
|
var React = require('react');
|
|
6
6
|
var useAuthConfig = require('./useAuthConfig.js');
|
|
7
7
|
|
|
8
|
+
function _interopDefaultCompat (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; }
|
|
9
|
+
|
|
10
|
+
var useSWR__default = /*#__PURE__*/_interopDefaultCompat(useSWR);
|
|
11
|
+
|
|
8
12
|
const userFetcher = async (url) => {
|
|
9
13
|
const response = await fetch(url);
|
|
10
14
|
if (!response.ok) {
|
|
@@ -14,7 +18,7 @@ const userFetcher = async (url) => {
|
|
|
14
18
|
};
|
|
15
19
|
const useUser = () => {
|
|
16
20
|
const config = useAuthConfig.useAuthConfig();
|
|
17
|
-
const { data, error, isLoading, mutate } =
|
|
21
|
+
const { data, error, isLoading, mutate } = useSWR__default.default(config.userProfileEndpoint, userFetcher);
|
|
18
22
|
const invalidate = React.useCallback(() => mutate(), [mutate]);
|
|
19
23
|
return {
|
|
20
24
|
user: data ?? null,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"useUser.js","sources":["../../../../../src/client/hooks/useUser.ts"],"sourcesContent":[null],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"useUser.js","sources":["../../../../../src/client/hooks/useUser.ts"],"sourcesContent":[null],"names":[],"mappings":";;;;;;;;;;;AASA;AACE;AACA;AACE;;AAGF;AACF;AAEO;AACL;AAEA;AAMA;;;;;;;AAQF;;"}
|
|
@@ -1,2 +1,3 @@
|
|
|
1
|
+
import { ServerRequestContext } from 'src/types/serverRequestContext';
|
|
1
2
|
import { GetAuth0InstanceContext } from '../getAuth0Instance';
|
|
2
|
-
export declare const getAccessToken: (context: GetAuth0InstanceContext) => Promise<string>;
|
|
3
|
+
export declare const getAccessToken: ({ protocol, host, context, }: GetAuth0InstanceContext & ServerRequestContext) => Promise<string>;
|
|
@@ -2,9 +2,11 @@
|
|
|
2
2
|
|
|
3
3
|
var getAuth0Instance = require('../getAuth0Instance.js');
|
|
4
4
|
|
|
5
|
-
const getAccessToken = async (context) => {
|
|
6
|
-
const auth0Instance = getAuth0Instance.getAuth0Instance(
|
|
7
|
-
const { token } =
|
|
5
|
+
const getAccessToken = async ({ protocol, host, context, }) => {
|
|
6
|
+
const auth0Instance = getAuth0Instance.getAuth0Instance({ protocol, host });
|
|
7
|
+
const { token } = context?.request
|
|
8
|
+
? await auth0Instance.getAccessToken(context.request, context.response)
|
|
9
|
+
: await auth0Instance.getAccessToken();
|
|
8
10
|
return token;
|
|
9
11
|
};
|
|
10
12
|
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getAccessToken.js","sources":["../../../../../src/server/helpers/getAccessToken.ts"],"sourcesContent":[null],"names":["getAuth0Instance"],"mappings":";;;;
|
|
1
|
+
{"version":3,"file":"getAccessToken.js","sources":["../../../../../src/server/helpers/getAccessToken.ts"],"sourcesContent":[null],"names":["getAuth0Instance"],"mappings":";;;;AAIO,MAAM,cAAc,GAAG,OAAO,EACnC,QAAQ,EACR,IAAI,EACJ,OAAO,GACwC,KAAI;IACnD,MAAM,aAAa,GAAGA,iCAAgB,CAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;AAC1D,IAAA,MAAM,EAAE,KAAK,EAAE,GAAG,OAAO,EAAE;AACzB,UAAE,MAAM,aAAa,CAAC,cAAc,CAAC,OAAO,CAAC,OAAO,EAAE,OAAO,CAAC,QAAQ;AACtE,UAAE,MAAM,aAAa,CAAC,cAAc,EAAE;AACxC,IAAA,OAAO,KAAK;AACd;;;;"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getAuthProps.js","sources":["../../../../../src/server/helpers/getAuthProps.ts"],"sourcesContent":[null],"names":["getAuth0Config","getEnrichedUser"],"mappings":";;;;;
|
|
1
|
+
{"version":3,"file":"getAuthProps.js","sources":["../../../../../src/server/helpers/getAuthProps.ts"],"sourcesContent":[null],"names":["getAuth0Config","getEnrichedUser"],"mappings":";;;;;MAUa,YAAY,GAAG,OAC1B,OAMC,KAC6B;AAC9B,IAAA,MAAM,WAAW,GAAGA,oBAAc,EAAE;AACpC,IAAA,MAAM,IAAI,GAAG,MAAMC,uBAAe,CAAC,OAAO,CAAC;AAE3C,IAAA,OAAO,EAAE,WAAW,EAAE,IAAI,EAAE;AAC9B;;;;"}
|
|
@@ -1,13 +1,8 @@
|
|
|
1
|
-
import {
|
|
2
|
-
import { IncomingMessage, ServerResponse } from 'http';
|
|
1
|
+
import { ServerRequestContext } from 'src/types/serverRequestContext';
|
|
3
2
|
import { Brand } from 'src/types/brand';
|
|
4
3
|
import { EnrichedSessionUser, SessionUser } from 'src/types';
|
|
5
|
-
import { GetAuth0InstanceContext } from '
|
|
6
|
-
export declare const getUser: (context: GetAuth0InstanceContext) => Promise<SessionUser | null>;
|
|
7
|
-
export declare const getEnrichedUser: ({ brand, context,
|
|
4
|
+
import { GetAuth0InstanceContext } from 'src/server/getAuth0Instance';
|
|
5
|
+
export declare const getUser: ({ context, host, protocol, }: GetAuth0InstanceContext & ServerRequestContext) => Promise<SessionUser | null>;
|
|
6
|
+
export declare const getEnrichedUser: ({ brand, context, host, protocol, }: GetAuth0InstanceContext & ServerRequestContext & {
|
|
8
7
|
brand: Brand;
|
|
9
|
-
context?: {
|
|
10
|
-
request: NextApiRequest | IncomingMessage;
|
|
11
|
-
response: NextApiResponse | ServerResponse<IncomingMessage>;
|
|
12
|
-
};
|
|
13
8
|
}) => Promise<EnrichedSessionUser | null>;
|
|
@@ -1,29 +1,33 @@
|
|
|
1
1
|
'use strict';
|
|
2
2
|
|
|
3
|
-
var
|
|
3
|
+
var getAccessToken = require('./getAccessToken.js');
|
|
4
4
|
var getAuth0Instance = require('../getAuth0Instance.js');
|
|
5
|
+
var session = require('../../lib/enrichUser/session.js');
|
|
5
6
|
|
|
6
|
-
const
|
|
7
|
-
const auth0Instance = getAuth0Instance.getAuth0Instance(
|
|
8
|
-
|
|
7
|
+
const getSessionData = async ({ protocol, host, context, }) => {
|
|
8
|
+
const auth0Instance = getAuth0Instance.getAuth0Instance({ host, protocol });
|
|
9
|
+
return context?.request
|
|
10
|
+
? auth0Instance.getSession(context.request)
|
|
11
|
+
: auth0Instance.getSession();
|
|
12
|
+
};
|
|
13
|
+
const getUser = async ({ context, host, protocol, }) => {
|
|
14
|
+
const sessionData = await getSessionData({ host, protocol, context });
|
|
9
15
|
if (!sessionData || !sessionData.user)
|
|
10
16
|
return null;
|
|
11
17
|
return sessionData.user;
|
|
12
18
|
};
|
|
13
|
-
const getEnrichedUser = async ({ brand, context,
|
|
14
|
-
const
|
|
15
|
-
|
|
16
|
-
? await auth0Instance.getSession(context.request)
|
|
17
|
-
: await auth0Instance.getSession();
|
|
18
|
-
if (!sessionData || !sessionData.user)
|
|
19
|
+
const getEnrichedUser = async ({ brand, context, host, protocol, }) => {
|
|
20
|
+
const user = await getUser({ host, protocol, context });
|
|
21
|
+
if (!user)
|
|
19
22
|
return null;
|
|
20
|
-
const
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
23
|
+
const accessToken = await getAccessToken.getAccessToken({
|
|
24
|
+
host,
|
|
25
|
+
protocol,
|
|
26
|
+
context,
|
|
27
|
+
});
|
|
24
28
|
return session.enrichUser({
|
|
25
29
|
user,
|
|
26
|
-
accessToken
|
|
30
|
+
accessToken,
|
|
27
31
|
brand,
|
|
28
32
|
});
|
|
29
33
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getUser.js","sources":["../../../../../src/server/helpers/getUser.ts"],"sourcesContent":[null],"names":["getAuth0Instance","enrichUser"],"mappings":"
|
|
1
|
+
{"version":3,"file":"getUser.js","sources":["../../../../../src/server/helpers/getUser.ts"],"sourcesContent":[null],"names":["getAuth0Instance","getAccessToken","enrichUser"],"mappings":";;;;;;AAUA,MAAM,cAAc,GAAG,OAAO,EAC5B,QAAQ,EACR,IAAI,EACJ,OAAO,GACwC,KAAI;IACnD,MAAM,aAAa,GAAGA,iCAAgB,CAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,CAAC;IAE1D,OAAO,OAAO,EAAE;UACZ,aAAa,CAAC,UAAU,CAAC,OAAO,CAAC,OAAO;AAC1C,UAAE,aAAa,CAAC,UAAU,EAAE;AAChC,CAAC;AAEM,MAAM,OAAO,GAAG,OAAO,EAC5B,OAAO,EACP,IAAI,EACJ,QAAQ,GAEY,KAAiC;AACrD,IAAA,MAAM,WAAW,GAAG,MAAM,cAAc,CAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,OAAO,EAAE,CAAC;AACrE,IAAA,IAAI,CAAC,WAAW,IAAI,CAAC,WAAW,CAAC,IAAI;AAAE,QAAA,OAAO,IAAI;IAElD,OAAO,WAAW,CAAC,IAAmB;AACxC;AAEO,MAAM,eAAe,GAAG,OAAO,EACpC,KAAK,EACL,OAAO,EACP,IAAI,EACJ,QAAQ,GAIP,KAAyC;AAC1C,IAAA,MAAM,IAAI,GAAG,MAAM,OAAO,CAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,OAAO,EAAE,CAAC;AACvD,IAAA,IAAI,CAAC,IAAI;AAAE,QAAA,OAAO,IAAI;AAEtB,IAAA,MAAM,WAAW,GAAG,MAAMC,6BAAc,CAAC;QACvC,IAAI;QACJ,QAAQ;QACR,OAAO;AACR,KAAA,CAAC;AACF,IAAA,OAAOC,kBAAU,CAAC;QAChB,IAAI;QACJ,WAAW;QACX,KAAK;AACN,KAAA,CAAC;AACJ;;;;;"}
|
|
@@ -1,2 +1,3 @@
|
|
|
1
|
+
import { ServerRequestContext } from 'src/types/serverRequestContext';
|
|
1
2
|
import { GetAuth0InstanceContext } from '../getAuth0Instance';
|
|
2
|
-
export declare const isLoggedIn: (context: GetAuth0InstanceContext) => Promise<boolean>;
|
|
3
|
+
export declare const isLoggedIn: (context: GetAuth0InstanceContext & ServerRequestContext) => Promise<boolean>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"isLoggedIn.js","sources":["../../../../../src/server/helpers/isLoggedIn.ts"],"sourcesContent":[null],"names":["getUser"],"mappings":";;;;
|
|
1
|
+
{"version":3,"file":"isLoggedIn.js","sources":["../../../../../src/server/helpers/isLoggedIn.ts"],"sourcesContent":[null],"names":["getUser"],"mappings":";;;;MAKa,UAAU,GAAG,OACxB,OAAuD,KACrD;AACF,IAAA,MAAM,IAAI,GAAG,MAAMA,eAAO,CAAC,OAAO,CAAC;IACnC,OAAO,CAAC,CAAC,IAAI;AACf;;;;"}
|
|
@@ -0,0 +1,8 @@
|
|
|
1
|
+
import { NextApiRequest, NextApiResponse } from 'next';
|
|
2
|
+
import { IncomingMessage, ServerResponse } from 'http';
|
|
3
|
+
export type ServerRequestContext = {
|
|
4
|
+
context?: {
|
|
5
|
+
request: NextApiRequest | IncomingMessage;
|
|
6
|
+
response: NextApiResponse | ServerResponse<IncomingMessage>;
|
|
7
|
+
};
|
|
8
|
+
};
|
|
@@ -1,2 +1,3 @@
|
|
|
1
|
+
import { ServerRequestContext } from 'src/types/serverRequestContext';
|
|
1
2
|
import { GetAuth0InstanceContext } from '../getAuth0Instance';
|
|
2
|
-
export declare const getAccessToken: (context: GetAuth0InstanceContext) => Promise<string>;
|
|
3
|
+
export declare const getAccessToken: ({ protocol, host, context, }: GetAuth0InstanceContext & ServerRequestContext) => Promise<string>;
|
|
@@ -1,8 +1,10 @@
|
|
|
1
1
|
import { getAuth0Instance } from '../getAuth0Instance.js';
|
|
2
2
|
|
|
3
|
-
const getAccessToken = async (context) => {
|
|
4
|
-
const auth0Instance = getAuth0Instance(
|
|
5
|
-
const { token } =
|
|
3
|
+
const getAccessToken = async ({ protocol, host, context, }) => {
|
|
4
|
+
const auth0Instance = getAuth0Instance({ protocol, host });
|
|
5
|
+
const { token } = context?.request
|
|
6
|
+
? await auth0Instance.getAccessToken(context.request, context.response)
|
|
7
|
+
: await auth0Instance.getAccessToken();
|
|
6
8
|
return token;
|
|
7
9
|
};
|
|
8
10
|
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getAccessToken.js","sources":["../../../../../src/server/helpers/getAccessToken.ts"],"sourcesContent":[null],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"getAccessToken.js","sources":["../../../../../src/server/helpers/getAccessToken.ts"],"sourcesContent":[null],"names":[],"mappings":";;AAIO,MAAM,cAAc,GAAG,OAAO,EACnC,QAAQ,EACR,IAAI,EACJ,OAAO,GACwC,KAAI;IACnD,MAAM,aAAa,GAAG,gBAAgB,CAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;AAC1D,IAAA,MAAM,EAAE,KAAK,EAAE,GAAG,OAAO,EAAE;AACzB,UAAE,MAAM,aAAa,CAAC,cAAc,CAAC,OAAO,CAAC,OAAO,EAAE,OAAO,CAAC,QAAQ;AACtE,UAAE,MAAM,aAAa,CAAC,cAAc,EAAE;AACxC,IAAA,OAAO,KAAK;AACd;;;;"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getAuthProps.js","sources":["../../../../../src/server/helpers/getAuthProps.ts"],"sourcesContent":[null],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"getAuthProps.js","sources":["../../../../../src/server/helpers/getAuthProps.ts"],"sourcesContent":[null],"names":[],"mappings":";;;MAUa,YAAY,GAAG,OAC1B,OAMC,KAC6B;AAC9B,IAAA,MAAM,WAAW,GAAG,cAAc,EAAE;AACpC,IAAA,MAAM,IAAI,GAAG,MAAM,eAAe,CAAC,OAAO,CAAC;AAE3C,IAAA,OAAO,EAAE,WAAW,EAAE,IAAI,EAAE;AAC9B;;;;"}
|
|
@@ -1,13 +1,8 @@
|
|
|
1
|
-
import {
|
|
2
|
-
import { IncomingMessage, ServerResponse } from 'http';
|
|
1
|
+
import { ServerRequestContext } from 'src/types/serverRequestContext';
|
|
3
2
|
import { Brand } from 'src/types/brand';
|
|
4
3
|
import { EnrichedSessionUser, SessionUser } from 'src/types';
|
|
5
|
-
import { GetAuth0InstanceContext } from '
|
|
6
|
-
export declare const getUser: (context: GetAuth0InstanceContext) => Promise<SessionUser | null>;
|
|
7
|
-
export declare const getEnrichedUser: ({ brand, context,
|
|
4
|
+
import { GetAuth0InstanceContext } from 'src/server/getAuth0Instance';
|
|
5
|
+
export declare const getUser: ({ context, host, protocol, }: GetAuth0InstanceContext & ServerRequestContext) => Promise<SessionUser | null>;
|
|
6
|
+
export declare const getEnrichedUser: ({ brand, context, host, protocol, }: GetAuth0InstanceContext & ServerRequestContext & {
|
|
8
7
|
brand: Brand;
|
|
9
|
-
context?: {
|
|
10
|
-
request: NextApiRequest | IncomingMessage;
|
|
11
|
-
response: NextApiResponse | ServerResponse<IncomingMessage>;
|
|
12
|
-
};
|
|
13
8
|
}) => Promise<EnrichedSessionUser | null>;
|
|
@@ -1,27 +1,31 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { getAccessToken } from './getAccessToken.js';
|
|
2
2
|
import { getAuth0Instance } from '../getAuth0Instance.js';
|
|
3
|
+
import { enrichUser } from '../../lib/enrichUser/session.js';
|
|
3
4
|
|
|
4
|
-
const
|
|
5
|
-
const auth0Instance = getAuth0Instance(
|
|
6
|
-
|
|
5
|
+
const getSessionData = async ({ protocol, host, context, }) => {
|
|
6
|
+
const auth0Instance = getAuth0Instance({ host, protocol });
|
|
7
|
+
return context?.request
|
|
8
|
+
? auth0Instance.getSession(context.request)
|
|
9
|
+
: auth0Instance.getSession();
|
|
10
|
+
};
|
|
11
|
+
const getUser = async ({ context, host, protocol, }) => {
|
|
12
|
+
const sessionData = await getSessionData({ host, protocol, context });
|
|
7
13
|
if (!sessionData || !sessionData.user)
|
|
8
14
|
return null;
|
|
9
15
|
return sessionData.user;
|
|
10
16
|
};
|
|
11
|
-
const getEnrichedUser = async ({ brand, context,
|
|
12
|
-
const
|
|
13
|
-
|
|
14
|
-
? await auth0Instance.getSession(context.request)
|
|
15
|
-
: await auth0Instance.getSession();
|
|
16
|
-
if (!sessionData || !sessionData.user)
|
|
17
|
+
const getEnrichedUser = async ({ brand, context, host, protocol, }) => {
|
|
18
|
+
const user = await getUser({ host, protocol, context });
|
|
19
|
+
if (!user)
|
|
17
20
|
return null;
|
|
18
|
-
const
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
21
|
+
const accessToken = await getAccessToken({
|
|
22
|
+
host,
|
|
23
|
+
protocol,
|
|
24
|
+
context,
|
|
25
|
+
});
|
|
22
26
|
return enrichUser({
|
|
23
27
|
user,
|
|
24
|
-
accessToken
|
|
28
|
+
accessToken,
|
|
25
29
|
brand,
|
|
26
30
|
});
|
|
27
31
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getUser.js","sources":["../../../../../src/server/helpers/getUser.ts"],"sourcesContent":[null],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"getUser.js","sources":["../../../../../src/server/helpers/getUser.ts"],"sourcesContent":[null],"names":[],"mappings":";;;;AAUA,MAAM,cAAc,GAAG,OAAO,EAC5B,QAAQ,EACR,IAAI,EACJ,OAAO,GACwC,KAAI;IACnD,MAAM,aAAa,GAAG,gBAAgB,CAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,CAAC;IAE1D,OAAO,OAAO,EAAE;UACZ,aAAa,CAAC,UAAU,CAAC,OAAO,CAAC,OAAO;AAC1C,UAAE,aAAa,CAAC,UAAU,EAAE;AAChC,CAAC;AAEM,MAAM,OAAO,GAAG,OAAO,EAC5B,OAAO,EACP,IAAI,EACJ,QAAQ,GAEY,KAAiC;AACrD,IAAA,MAAM,WAAW,GAAG,MAAM,cAAc,CAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,OAAO,EAAE,CAAC;AACrE,IAAA,IAAI,CAAC,WAAW,IAAI,CAAC,WAAW,CAAC,IAAI;AAAE,QAAA,OAAO,IAAI;IAElD,OAAO,WAAW,CAAC,IAAmB;AACxC;AAEO,MAAM,eAAe,GAAG,OAAO,EACpC,KAAK,EACL,OAAO,EACP,IAAI,EACJ,QAAQ,GAIP,KAAyC;AAC1C,IAAA,MAAM,IAAI,GAAG,MAAM,OAAO,CAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,OAAO,EAAE,CAAC;AACvD,IAAA,IAAI,CAAC,IAAI;AAAE,QAAA,OAAO,IAAI;AAEtB,IAAA,MAAM,WAAW,GAAG,MAAM,cAAc,CAAC;QACvC,IAAI;QACJ,QAAQ;QACR,OAAO;AACR,KAAA,CAAC;AACF,IAAA,OAAO,UAAU,CAAC;QAChB,IAAI;QACJ,WAAW;QACX,KAAK;AACN,KAAA,CAAC;AACJ;;;;"}
|
|
@@ -1,2 +1,3 @@
|
|
|
1
|
+
import { ServerRequestContext } from 'src/types/serverRequestContext';
|
|
1
2
|
import { GetAuth0InstanceContext } from '../getAuth0Instance';
|
|
2
|
-
export declare const isLoggedIn: (context: GetAuth0InstanceContext) => Promise<boolean>;
|
|
3
|
+
export declare const isLoggedIn: (context: GetAuth0InstanceContext & ServerRequestContext) => Promise<boolean>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"isLoggedIn.js","sources":["../../../../../src/server/helpers/isLoggedIn.ts"],"sourcesContent":[null],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"isLoggedIn.js","sources":["../../../../../src/server/helpers/isLoggedIn.ts"],"sourcesContent":[null],"names":[],"mappings":";;MAKa,UAAU,GAAG,OACxB,OAAuD,KACrD;AACF,IAAA,MAAM,IAAI,GAAG,MAAM,OAAO,CAAC,OAAO,CAAC;IACnC,OAAO,CAAC,CAAC,IAAI;AACf;;;;"}
|
|
@@ -0,0 +1,8 @@
|
|
|
1
|
+
import { NextApiRequest, NextApiResponse } from 'next';
|
|
2
|
+
import { IncomingMessage, ServerResponse } from 'http';
|
|
3
|
+
export type ServerRequestContext = {
|
|
4
|
+
context?: {
|
|
5
|
+
request: NextApiRequest | IncomingMessage;
|
|
6
|
+
response: NextApiResponse | ServerResponse<IncomingMessage>;
|
|
7
|
+
};
|
|
8
|
+
};
|
package/dist/server.d.ts
CHANGED
|
@@ -21,12 +21,19 @@ declare const authMiddleware: ({ request, isProtectedRoute, language, host, prot
|
|
|
21
21
|
brand: Brand;
|
|
22
22
|
}) => Promise<NextResponse>;
|
|
23
23
|
|
|
24
|
+
type ServerRequestContext = {
|
|
25
|
+
context?: {
|
|
26
|
+
request: NextApiRequest | IncomingMessage;
|
|
27
|
+
response: NextApiResponse | ServerResponse<IncomingMessage>;
|
|
28
|
+
};
|
|
29
|
+
};
|
|
30
|
+
|
|
24
31
|
type GetAuth0InstanceContext = {
|
|
25
32
|
protocol: string;
|
|
26
33
|
host: string;
|
|
27
34
|
};
|
|
28
35
|
|
|
29
|
-
declare const getAccessToken: (context: GetAuth0InstanceContext) => Promise<string>;
|
|
36
|
+
declare const getAccessToken: ({ protocol, host, context, }: GetAuth0InstanceContext & ServerRequestContext) => Promise<string>;
|
|
30
37
|
|
|
31
38
|
declare const getAuthProps: (context: GetAuth0InstanceContext & {
|
|
32
39
|
brand: Brand;
|
|
@@ -36,8 +43,8 @@ declare const getAuthProps: (context: GetAuth0InstanceContext & {
|
|
|
36
43
|
};
|
|
37
44
|
}) => Promise<AuthProviderProps>;
|
|
38
45
|
|
|
39
|
-
declare const getUser: (context: GetAuth0InstanceContext) => Promise<SessionUser | null>;
|
|
46
|
+
declare const getUser: ({ context, host, protocol, }: GetAuth0InstanceContext & ServerRequestContext) => Promise<SessionUser | null>;
|
|
40
47
|
|
|
41
|
-
declare const isLoggedIn: (context: GetAuth0InstanceContext) => Promise<boolean>;
|
|
48
|
+
declare const isLoggedIn: (context: GetAuth0InstanceContext & ServerRequestContext) => Promise<boolean>;
|
|
42
49
|
|
|
43
50
|
export { authMiddleware, getAccessToken, getAuthProps, getUser, isLoggedIn };
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@smg-automotive/auth",
|
|
3
|
-
"version": "7.1.0-
|
|
3
|
+
"version": "7.1.0-lkappeler-fix-get-access-token.1",
|
|
4
4
|
"description": "SMG Automotive auth package",
|
|
5
5
|
"exports": {
|
|
6
6
|
".": {
|
|
@@ -63,12 +63,12 @@
|
|
|
63
63
|
"@rollup/plugin-commonjs": "28.0.6",
|
|
64
64
|
"@rollup/plugin-node-resolve": "16.0.1",
|
|
65
65
|
"@rollup/plugin-typescript": "12.1.4",
|
|
66
|
-
"@smg-automotive/eslint-config": "5.1.
|
|
66
|
+
"@smg-automotive/eslint-config": "5.1.7",
|
|
67
67
|
"@testing-library/dom": "10.4.1",
|
|
68
68
|
"@testing-library/jest-dom": "6.8.0",
|
|
69
69
|
"@testing-library/react": "16.3.0",
|
|
70
70
|
"@testing-library/user-event": "14.6.1",
|
|
71
|
-
"@types/react": "19.1.
|
|
71
|
+
"@types/react": "19.1.13",
|
|
72
72
|
"dotenv": "17.2.2",
|
|
73
73
|
"jest": "30.0.5",
|
|
74
74
|
"jest-environment-jsdom": "30.0.5",
|
|
@@ -77,13 +77,13 @@
|
|
|
77
77
|
"react": "19.1.1",
|
|
78
78
|
"react-dom": "19.1.1",
|
|
79
79
|
"rimraf": "6.0.1",
|
|
80
|
-
"rollup": "4.
|
|
80
|
+
"rollup": "4.52.2",
|
|
81
81
|
"rollup-plugin-dts": "6.2.3",
|
|
82
82
|
"rollup-plugin-peer-deps-external": "2.2.4",
|
|
83
83
|
"rollup-plugin-preserve-directives": "0.4.0",
|
|
84
|
-
"semantic-release": "24.2.
|
|
84
|
+
"semantic-release": "24.2.9",
|
|
85
85
|
"swr": "2.3.6",
|
|
86
|
-
"ts-jest": "29.4.
|
|
86
|
+
"ts-jest": "29.4.4",
|
|
87
87
|
"ts-node": "10.9.2",
|
|
88
88
|
"typescript": "5.9.2",
|
|
89
89
|
"whatwg-fetch": "3.6.20"
|