@gauts/auth 0.9.0 → 0.10.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +88 -78
- package/SECURITY.md +8 -4
- package/dist/adapters/express/index.d.ts +7 -13
- package/dist/adapters/express/index.d.ts.map +1 -1
- package/dist/adapters/express/index.js +6 -6
- package/dist/adapters/express/index.js.map +1 -1
- package/dist/adapters/fastify/index.d.ts +7 -13
- package/dist/adapters/fastify/index.d.ts.map +1 -1
- package/dist/adapters/fastify/index.js +5 -5
- package/dist/adapters/fastify/index.js.map +1 -1
- package/dist/adapters/hono/index.d.ts +7 -13
- package/dist/adapters/hono/index.d.ts.map +1 -1
- package/dist/adapters/hono/index.js +5 -5
- package/dist/adapters/hono/index.js.map +1 -1
- package/dist/adapters/next/index.d.ts +1 -1
- package/dist/adapters/next/index.d.ts.map +1 -1
- package/dist/adapters/next/index.js +7 -3
- package/dist/adapters/next/index.js.map +1 -1
- package/dist/adapters/utils/session.d.ts.map +1 -1
- package/dist/adapters/utils/session.js +70 -78
- package/dist/adapters/utils/session.js.map +1 -1
- package/dist/adapters/utils/types.d.ts +3 -9
- package/dist/adapters/utils/types.d.ts.map +1 -1
- package/dist/config.d.ts +1 -2
- package/dist/config.d.ts.map +1 -1
- package/dist/config.js +1 -2
- package/dist/config.js.map +1 -1
- package/dist/index.d.ts +1 -1
- package/dist/session/cookie.d.ts +6 -8
- package/dist/session/cookie.d.ts.map +1 -1
- package/dist/session/cookie.js +7 -24
- package/dist/session/cookie.js.map +1 -1
- package/dist/session/state.d.ts +41 -0
- package/dist/session/state.d.ts.map +1 -0
- package/dist/session/state.js +192 -0
- package/dist/session/state.js.map +1 -0
- package/package.json +1 -1
- package/dist/session/cache.d.ts +0 -32
- package/dist/session/cache.d.ts.map +0 -1
- package/dist/session/cache.js +0 -138
- package/dist/session/cache.js.map +0 -1
|
@@ -14,16 +14,16 @@ export const createFastifyAdapter = ({ auth, cache, cookie, getIp, secret, }) =>
|
|
|
14
14
|
response.header("Set-Cookie", value);
|
|
15
15
|
},
|
|
16
16
|
auth,
|
|
17
|
-
|
|
18
|
-
...(cookie === undefined ? {} : { cookie }),
|
|
17
|
+
secret,
|
|
19
18
|
framework: "Fastify",
|
|
19
|
+
getMethod: (request) => request.method,
|
|
20
20
|
getHeader: ({ name, request }) => {
|
|
21
21
|
const value = request.headers[name];
|
|
22
22
|
return Array.isArray(value) ? value[0] : value;
|
|
23
23
|
},
|
|
24
24
|
...(getIp === undefined ? {} : { getIp }),
|
|
25
|
-
|
|
26
|
-
...(
|
|
25
|
+
...(cache === undefined ? {} : { cache }),
|
|
26
|
+
...(cookie === undefined ? {} : { cookie }),
|
|
27
27
|
});
|
|
28
28
|
const resolveSession = ({ reply, request, }) => {
|
|
29
29
|
return session.resolveSession({ request, response: reply });
|
|
@@ -70,10 +70,10 @@ const createFastifyAuthImpl = ({ cache, cookie, db, getIp, password, secret, ses
|
|
|
70
70
|
});
|
|
71
71
|
const adapter = createFastifyAdapter({
|
|
72
72
|
auth,
|
|
73
|
+
secret,
|
|
73
74
|
...(cache === undefined ? {} : { cache }),
|
|
74
75
|
...(cookie === undefined ? {} : { cookie }),
|
|
75
76
|
...(getIp === undefined ? {} : { getIp }),
|
|
76
|
-
...(secret === undefined ? {} : { secret }),
|
|
77
77
|
});
|
|
78
78
|
if (social === undefined) {
|
|
79
79
|
return { ...auth, ...adapter };
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/adapters/fastify/index.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAA4B,MAAM,eAAe,CAAC;AAKrE,OAAO,EAAE,iBAAiB,EAAE,MAAM,oBAAoB,CAAC;AACvD,OAAO,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAC;AACrD,OAAO,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AAExD,OAAO,EAAE,mBAAmB,EAAsB,MAAM,aAAa,CAAC;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/adapters/fastify/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,12 +1,12 @@
|
|
|
1
1
|
import type { Context, Env, MiddlewareHandler } from "hono";
|
|
2
2
|
import { type Auth, type AuthDeps } from "../../auth.js";
|
|
3
|
-
import type { SessionCacheConfig } from "../../session/cache.js";
|
|
4
3
|
import type { SessionCookieNames } from "../../session/cookie.js";
|
|
4
|
+
import type { SessionCacheConfig } from "../../session/state.js";
|
|
5
5
|
import type { AuthAccount, DbAdapter, ResolvedSession, Session } from "../../session/types.js";
|
|
6
6
|
import type { SocialConfig, SocialDbAdapter } from "../../social/types.js";
|
|
7
7
|
import type { HttpCookieConfig } from "../utils/types.js";
|
|
8
8
|
import { type HonoSocial } from "./social.js";
|
|
9
|
-
export type { SessionCacheConfig } from "../../session/
|
|
9
|
+
export type { SessionCacheConfig } from "../../session/state.js";
|
|
10
10
|
export type { HonoSocial, HonoSocialEnv, HonoSocialVariables } from "./social.js";
|
|
11
11
|
export type HonoAuthVariables<TAccount extends AuthAccount = AuthAccount> = {
|
|
12
12
|
account: TAccount;
|
|
@@ -18,35 +18,29 @@ export type HonoAuthEnv<TAccount extends AuthAccount = AuthAccount> = Env & {
|
|
|
18
18
|
};
|
|
19
19
|
export type HonoCookieConfig = HttpCookieConfig;
|
|
20
20
|
export type HonoGetIp = (c: Context) => Promise<string | null | undefined> | string | null | undefined;
|
|
21
|
-
type HonoCacheOptions = {
|
|
22
|
-
cache: SessionCacheConfig;
|
|
23
|
-
secret: string;
|
|
24
|
-
} | {
|
|
25
|
-
cache?: undefined;
|
|
26
|
-
secret?: string;
|
|
27
|
-
};
|
|
28
21
|
export type HonoAdapterConfig<TAccount extends AuthAccount = AuthAccount> = {
|
|
29
22
|
auth: Auth<TAccount>;
|
|
30
23
|
cache?: SessionCacheConfig;
|
|
31
24
|
cookie?: HonoCookieConfig;
|
|
32
25
|
getIp?: HonoGetIp;
|
|
33
|
-
secret
|
|
26
|
+
secret: string;
|
|
34
27
|
};
|
|
35
28
|
type HonoAuthBase<TAccount extends AuthAccount> = Omit<AuthDeps<TAccount>, "db"> & {
|
|
29
|
+
cache?: SessionCacheConfig;
|
|
36
30
|
cookie?: HonoCookieConfig;
|
|
37
31
|
db: DbAdapter<TAccount>;
|
|
38
32
|
getIp?: HonoGetIp;
|
|
33
|
+
secret: string;
|
|
39
34
|
};
|
|
40
35
|
type HonoSocialOptions<TAccount extends AuthAccount, TData> = {
|
|
41
36
|
db: DbAdapter<TAccount> & SocialDbAdapter<TAccount>;
|
|
42
|
-
secret: string;
|
|
43
37
|
social: SocialConfig<TData>;
|
|
44
38
|
} | {
|
|
45
39
|
db: DbAdapter<TAccount>;
|
|
46
40
|
social?: undefined;
|
|
47
41
|
};
|
|
48
|
-
export type HonoAuthConfig<TAccount extends AuthAccount = AuthAccount, TData = undefined> = Omit<HonoAuthBase<TAccount>, "db"> &
|
|
49
|
-
type HonoAuthOptions<TAccount extends AuthAccount> = Omit<HonoAuthBase<TAccount>, "db"
|
|
42
|
+
export type HonoAuthConfig<TAccount extends AuthAccount = AuthAccount, TData = undefined> = Omit<HonoAuthBase<TAccount>, "db"> & HonoSocialOptions<TAccount, TData>;
|
|
43
|
+
type HonoAuthOptions<TAccount extends AuthAccount> = Omit<HonoAuthBase<TAccount>, "db">;
|
|
50
44
|
type DbAccount<TDb> = TDb extends DbAdapter<infer TAccount> ? TAccount : never;
|
|
51
45
|
type CreateSessionInput = {
|
|
52
46
|
account_id: string;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/adapters/hono/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,GAAG,EAAE,iBAAiB,EAAE,MAAM,MAAM,CAAC;AAC5D,OAAO,EAAc,KAAK,IAAI,EAAE,KAAK,QAAQ,EAAE,MAAM,eAAe,CAAC;AACrE,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/adapters/hono/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -9,13 +9,13 @@ export const createHonoAdapter = ({ auth, cache, cookie, getIp, secret, }) => {
|
|
|
9
9
|
response.header("Set-Cookie", value, { append: true });
|
|
10
10
|
},
|
|
11
11
|
auth,
|
|
12
|
-
|
|
13
|
-
...(cookie === undefined ? {} : { cookie }),
|
|
12
|
+
secret,
|
|
14
13
|
framework: "Hono",
|
|
15
14
|
getHeader: ({ name, request }) => request.req.header(name),
|
|
16
|
-
...(getIp === undefined ? {} : { getIp }),
|
|
17
15
|
getMethod: (request) => request.req.method,
|
|
18
|
-
...(
|
|
16
|
+
...(cache === undefined ? {} : { cache }),
|
|
17
|
+
...(cookie === undefined ? {} : { cookie }),
|
|
18
|
+
...(getIp === undefined ? {} : { getIp }),
|
|
19
19
|
});
|
|
20
20
|
const clearSession = (c) => {
|
|
21
21
|
session.clearSession(c);
|
|
@@ -64,10 +64,10 @@ const createHonoAuthImpl = ({ cache, cookie, db, getIp, password, secret, sessio
|
|
|
64
64
|
});
|
|
65
65
|
const adapter = createHonoAdapter({
|
|
66
66
|
auth,
|
|
67
|
+
secret,
|
|
67
68
|
...(cache === undefined ? {} : { cache }),
|
|
68
69
|
...(cookie === undefined ? {} : { cookie }),
|
|
69
70
|
...(getIp === undefined ? {} : { getIp }),
|
|
70
|
-
...(secret === undefined ? {} : { secret }),
|
|
71
71
|
});
|
|
72
72
|
if (social === undefined) {
|
|
73
73
|
return { ...auth, ...adapter };
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/adapters/hono/index.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAA4B,MAAM,eAAe,CAAC;AAKrE,OAAO,EAAE,iBAAiB,EAAE,MAAM,oBAAoB,CAAC;AACvD,OAAO,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAC;AACrD,OAAO,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AAExD,OAAO,EAAE,gBAAgB,EAAmB,MAAM,aAAa,CAAC;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/adapters/hono/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/adapters/next/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,KAAK,WAAW,EAAE,MAAM,gBAAgB,CAAC;
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/adapters/next/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,KAAK,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAMhE,MAAM,MAAM,gBAAgB,GAAG;IAC3B,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,WAAW,CAAC,EAAE,MAAM,CAAC;CACxB,CAAC;AAEF,MAAM,MAAM,cAAc,GAAG;IACzB,MAAM,CAAC,EAAE,gBAAgB,CAAC;IAC1B,QAAQ,EAAE,MAAM,CAAC;CACpB,CAAC;AAEF,MAAM,MAAM,cAAc,GAAG;IACzB,OAAO,EAAE,WAAW,CAAC;IACrB,QAAQ,EAAE,YAAY,CAAC;IACvB,eAAe,CAAC,EAAE,MAAM,CAAC;CAC5B,CAAC;AAEF,MAAM,MAAM,eAAe,GAAG;IAC1B,SAAS,EAAE,OAAO,CAAC;IACnB,QAAQ,EAAE,YAAY,CAAC;IACvB,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC;CACzB,CAAC;AAEF,MAAM,MAAM,QAAQ,GAAG;IACnB,KAAK,CAAC,KAAK,EAAE,cAAc,GAAG,OAAO,CAAC,eAAe,CAAC,CAAC;CAC1D,CAAC;AAaF,MAAM,MAAM,wBAAwB,GAAG;IACnC,KAAK,CAAC,EAAE,SAAS,MAAM,EAAE,CAAC;IAC1B,OAAO,EAAE,OAAO,CAAC;CACpB,CAAC;AAIF,eAAO,MAAM,eAAe,mUAmBlB,CAAC;AAEX,eAAO,MAAM,mBAAmB,GAAI,+BAGjC,wBAAwB,KAAG,OAoB7B,CAAC;AA8BF,eAAO,MAAM,cAAc,GAAI,sBAAsB,cAAc,KAAG,QAsErE,CAAC"}
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import { NextResponse } from "next/server.js";
|
|
2
2
|
import { createError } from "../../errors.js";
|
|
3
|
-
import {
|
|
3
|
+
import { parseSessionToken, resolveSessionCookieNames } from "../../session/cookie.js";
|
|
4
|
+
import { parseSessionState } from "../../session/state.js";
|
|
4
5
|
const RENEW_TIMEOUT = 5_000;
|
|
5
6
|
export const FORWARD_HEADERS = [
|
|
6
7
|
"accept-language",
|
|
@@ -89,8 +90,11 @@ export const createNextAuth = ({ cookie, renewUrl }) => {
|
|
|
89
90
|
status: 401,
|
|
90
91
|
};
|
|
91
92
|
}
|
|
92
|
-
const
|
|
93
|
-
|
|
93
|
+
const state = parseSessionState(request.cookies.get(names.contextName)?.value);
|
|
94
|
+
const current = Date.now();
|
|
95
|
+
if (state &&
|
|
96
|
+
state.expires_at.getTime() > current &&
|
|
97
|
+
state.renew_at.getTime() > current) {
|
|
94
98
|
return {
|
|
95
99
|
attempted: false,
|
|
96
100
|
response,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/adapters/next/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAoB,MAAM,gBAAgB,CAAC;AAEhE,OAAO,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;AAC9C,OAAO,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/adapters/next/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"session.d.ts","sourceRoot":"","sources":["../../../src/adapters/utils/session.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"session.d.ts","sourceRoot":"","sources":["../../../src/adapters/utils/session.ts"],"names":[],"mappings":"AAQA,OAAO,KAAK,EAAE,WAAW,EAAmB,MAAM,wBAAwB,CAAC;AAE3E,OAAO,KAAK,EAAoB,kBAAkB,EAAE,iBAAiB,EAAE,MAAM,YAAY,CAAC;AAqC1F,eAAO,MAAM,iBAAiB,GAAI,QAAQ,EAAE,SAAS,EAAE,QAAQ,SAAS,WAAW,EAAE,2FAUlF,iBAAiB,CAAC,QAAQ,EAAE,SAAS,EAAE,QAAQ,CAAC,KAAG,kBAAkB,CACpE,QAAQ,EACR,SAAS,EACT,QAAQ,CAuRX,CAAC"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { createError, isAuthError } from "../../errors.js";
|
|
2
|
-
import {
|
|
3
|
-
import {
|
|
2
|
+
import { parseSessionToken } from "../../session/cookie.js";
|
|
3
|
+
import { createSessionState, } from "../../session/state.js";
|
|
4
4
|
import { createCookieHeader, getCookieValue, resolveHttpCookie } from "./cookie.js";
|
|
5
5
|
const canUseCache = (method) => method === "GET" || method === "HEAD";
|
|
6
6
|
export const createHttpSession = ({ appendSetCookie, auth, cache, cookie, framework, getHeader, getIp, getMethod, secret, }) => {
|
|
@@ -17,20 +17,11 @@ export const createHttpSession = ({ appendSetCookie, auth, cache, cookie, framew
|
|
|
17
17
|
});
|
|
18
18
|
}
|
|
19
19
|
const resolvedCookie = resolveHttpCookie(cookie);
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
message: "Authentication secret is required when session cache is configured.",
|
|
26
|
-
});
|
|
27
|
-
}
|
|
28
|
-
cacheService = createSessionCache({
|
|
29
|
-
config: cache,
|
|
30
|
-
secret,
|
|
31
|
-
session: auth.config.session,
|
|
32
|
-
});
|
|
33
|
-
}
|
|
20
|
+
const stateService = createSessionState({
|
|
21
|
+
secret,
|
|
22
|
+
session: auth.config.session,
|
|
23
|
+
...(cache === undefined ? {} : { cache }),
|
|
24
|
+
});
|
|
34
25
|
const getCookie = ({ name, request }) => {
|
|
35
26
|
const header = getHeader({ name: "cookie", request });
|
|
36
27
|
return getCookieValue({
|
|
@@ -46,6 +37,13 @@ export const createHttpSession = ({ appendSetCookie, auth, cache, cookie, framew
|
|
|
46
37
|
const getToken = (request) => {
|
|
47
38
|
return parseSessionToken(getCookie({ name: resolvedCookie.names.sessionName, request }));
|
|
48
39
|
};
|
|
40
|
+
const getState = ({ client, request, token, }) => {
|
|
41
|
+
return stateService.resolve({
|
|
42
|
+
client,
|
|
43
|
+
token,
|
|
44
|
+
value: getCookie({ name: resolvedCookie.names.contextName, request }),
|
|
45
|
+
});
|
|
46
|
+
};
|
|
49
47
|
const setCookie = ({ expires, maxAge, name, response, value, }) => {
|
|
50
48
|
appendSetCookie({
|
|
51
49
|
response,
|
|
@@ -67,41 +65,30 @@ export const createHttpSession = ({ appendSetCookie, auth, cache, cookie, framew
|
|
|
67
65
|
value: "",
|
|
68
66
|
});
|
|
69
67
|
};
|
|
70
|
-
const setSession = ({
|
|
68
|
+
const setSession = ({ expires_at, response, token }) => {
|
|
71
69
|
setCookie({
|
|
72
|
-
expires:
|
|
70
|
+
expires: expires_at,
|
|
73
71
|
name: resolvedCookie.names.sessionName,
|
|
74
72
|
response,
|
|
75
73
|
value: token,
|
|
76
74
|
});
|
|
77
|
-
setCookie({
|
|
78
|
-
expires: session.expires_at,
|
|
79
|
-
name: resolvedCookie.names.renewName,
|
|
80
|
-
response,
|
|
81
|
-
value: formatRenewAt(session.renew_at),
|
|
82
|
-
});
|
|
83
75
|
};
|
|
84
|
-
const
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
76
|
+
const setState = ({ cache: useCache, response, session, token, }) => {
|
|
77
|
+
const state = stateService.create({
|
|
78
|
+
resolved: session,
|
|
79
|
+
token,
|
|
80
|
+
...(useCache === undefined ? {} : { cache: useCache }),
|
|
81
|
+
});
|
|
89
82
|
setCookie({
|
|
90
|
-
expires:
|
|
91
|
-
name: resolvedCookie.names.
|
|
83
|
+
expires: state.expires_at,
|
|
84
|
+
name: resolvedCookie.names.contextName,
|
|
92
85
|
response,
|
|
93
|
-
value:
|
|
86
|
+
value: state.value,
|
|
94
87
|
});
|
|
95
88
|
};
|
|
96
|
-
const clearCache = (response) => {
|
|
97
|
-
if (cacheService) {
|
|
98
|
-
deleteCookie({ name: resolvedCookie.names.cacheName, response });
|
|
99
|
-
}
|
|
100
|
-
};
|
|
101
89
|
const clearSession = (response) => {
|
|
102
90
|
deleteCookie({ name: resolvedCookie.names.sessionName, response });
|
|
103
|
-
deleteCookie({ name: resolvedCookie.names.
|
|
104
|
-
deleteCookie({ name: resolvedCookie.names.renewName, response });
|
|
91
|
+
deleteCookie({ name: resolvedCookie.names.contextName, response });
|
|
105
92
|
};
|
|
106
93
|
const requireToken = ({ request, response }) => {
|
|
107
94
|
const token = getToken(request);
|
|
@@ -134,6 +121,29 @@ export const createHttpSession = ({ appendSetCookie, auth, cache, cookie, framew
|
|
|
134
121
|
}
|
|
135
122
|
return value;
|
|
136
123
|
};
|
|
124
|
+
const renewDbSession = async ({ client, response, token, }) => {
|
|
125
|
+
let value;
|
|
126
|
+
try {
|
|
127
|
+
value = await auth.session.renew({ client, token });
|
|
128
|
+
}
|
|
129
|
+
catch (error) {
|
|
130
|
+
if (isAuthError(error) && error.code === "SESSION_CLIENT_MISMATCH") {
|
|
131
|
+
clearSession(response);
|
|
132
|
+
}
|
|
133
|
+
throw error;
|
|
134
|
+
}
|
|
135
|
+
if (!value) {
|
|
136
|
+
clearSession(response);
|
|
137
|
+
throw createError({
|
|
138
|
+
code: "SESSION_INVALID",
|
|
139
|
+
message: "Authentication required.",
|
|
140
|
+
});
|
|
141
|
+
}
|
|
142
|
+
return {
|
|
143
|
+
account: value.account,
|
|
144
|
+
session: value.session,
|
|
145
|
+
};
|
|
146
|
+
};
|
|
137
147
|
const createSession = async ({ account_id, country, request, response }) => {
|
|
138
148
|
const created = await auth.session.create({
|
|
139
149
|
account_id,
|
|
@@ -144,58 +154,40 @@ export const createHttpSession = ({ appendSetCookie, auth, cache, cookie, framew
|
|
|
144
154
|
account: created.account,
|
|
145
155
|
session: created.session,
|
|
146
156
|
};
|
|
147
|
-
setSession({
|
|
148
|
-
|
|
157
|
+
setSession({ expires_at: created.session.expires_at, response, token: created.token });
|
|
158
|
+
setState({ response, session: value, token: created.token });
|
|
149
159
|
return created.session;
|
|
150
160
|
};
|
|
151
161
|
const resolveSession = async ({ request, response }) => {
|
|
152
162
|
const token = requireToken({ request, response });
|
|
153
163
|
const client = await getSessionClient(request);
|
|
154
164
|
const useCache = canUseCache(getMethod(request));
|
|
155
|
-
|
|
156
|
-
|
|
157
|
-
|
|
158
|
-
|
|
159
|
-
|
|
160
|
-
|
|
161
|
-
if (cached) {
|
|
162
|
-
return cached;
|
|
163
|
-
}
|
|
165
|
+
const state = getState({ client, request, token });
|
|
166
|
+
if (!state || state.renew_at.getTime() <= Date.now()) {
|
|
167
|
+
const value = await renewDbSession({ client, response, token });
|
|
168
|
+
setSession({ expires_at: value.session.expires_at, response, token });
|
|
169
|
+
setState({ cache: useCache, response, session: value, token });
|
|
170
|
+
return value;
|
|
164
171
|
}
|
|
165
|
-
|
|
166
|
-
|
|
167
|
-
setCache({ response, session: value, token });
|
|
172
|
+
if (useCache && state.cache) {
|
|
173
|
+
return state.cache;
|
|
168
174
|
}
|
|
169
|
-
|
|
170
|
-
|
|
175
|
+
const value = await resolveDbSession({ client, response, token });
|
|
176
|
+
if (cache !== undefined) {
|
|
177
|
+
setState({ cache: useCache, response, session: value, token });
|
|
171
178
|
}
|
|
172
179
|
return value;
|
|
173
180
|
};
|
|
174
181
|
const renewSession = async ({ request, response, }) => {
|
|
175
182
|
const token = requireToken({ request, response });
|
|
176
|
-
|
|
177
|
-
|
|
178
|
-
|
|
179
|
-
|
|
180
|
-
|
|
181
|
-
|
|
182
|
-
}
|
|
183
|
-
|
|
184
|
-
if (isAuthError(error) && error.code === "SESSION_CLIENT_MISMATCH") {
|
|
185
|
-
clearSession(response);
|
|
186
|
-
}
|
|
187
|
-
throw error;
|
|
188
|
-
}
|
|
189
|
-
if (!renewed) {
|
|
190
|
-
clearSession(response);
|
|
191
|
-
throw createError({
|
|
192
|
-
code: "SESSION_INVALID",
|
|
193
|
-
message: "Authentication required.",
|
|
194
|
-
});
|
|
195
|
-
}
|
|
196
|
-
setSession({ response, session: renewed.session, token });
|
|
197
|
-
setCache({ response, session: renewed, token });
|
|
198
|
-
return renewed.session;
|
|
183
|
+
const value = await renewDbSession({
|
|
184
|
+
client: await getSessionClient(request),
|
|
185
|
+
response,
|
|
186
|
+
token,
|
|
187
|
+
});
|
|
188
|
+
setSession({ expires_at: value.session.expires_at, response, token });
|
|
189
|
+
setState({ response, session: value, token });
|
|
190
|
+
return value.session;
|
|
199
191
|
};
|
|
200
192
|
const revokeSession = async ({ request, response }) => {
|
|
201
193
|
const token = getToken(request);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"session.js","sourceRoot":"","sources":["../../../src/adapters/utils/session.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,WAAW,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;AAC3D,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"session.js","sourceRoot":"","sources":["../../../src/adapters/utils/session.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,12 +1,11 @@
|
|
|
1
1
|
import type { Auth } from "../../auth.js";
|
|
2
|
-
import type { SessionCacheConfig } from "../../session/
|
|
2
|
+
import type { SessionCacheConfig } from "../../session/state.js";
|
|
3
3
|
import type { SessionCookieNames } from "../../session/cookie.js";
|
|
4
4
|
import type { AuthAccount, ResolvedSession, Session } from "../../session/types.js";
|
|
5
5
|
export type HttpCookieConfig = {
|
|
6
|
-
|
|
6
|
+
contextName?: string;
|
|
7
7
|
domain?: string;
|
|
8
8
|
path?: string;
|
|
9
|
-
renewName?: string;
|
|
10
9
|
sameSite?: "Strict" | "Lax" | "None";
|
|
11
10
|
secure?: boolean;
|
|
12
11
|
sessionName?: string;
|
|
@@ -38,7 +37,7 @@ export type HttpSessionConfig<TRequest, TResponse, TAccount extends AuthAccount>
|
|
|
38
37
|
}) => string | undefined;
|
|
39
38
|
getIp?: HttpGetIp<TRequest>;
|
|
40
39
|
getMethod: (request: TRequest) => string;
|
|
41
|
-
secret
|
|
40
|
+
secret: string;
|
|
42
41
|
};
|
|
43
42
|
export type HttpCreateSessionInput<TRequest, TResponse> = {
|
|
44
43
|
account_id: string;
|
|
@@ -59,9 +58,4 @@ export type HttpSessionAdapter<TRequest, TResponse, TAccount extends AuthAccount
|
|
|
59
58
|
resolveSession(input: HttpRequestInput<TRequest, TResponse>): Promise<ResolvedSession<TAccount>>;
|
|
60
59
|
revokeSession(input: HttpRequestInput<TRequest, TResponse>): Promise<string[]>;
|
|
61
60
|
};
|
|
62
|
-
export type HttpAuthContext<TAccount extends AuthAccount> = {
|
|
63
|
-
account: TAccount;
|
|
64
|
-
session: Session;
|
|
65
|
-
user: TAccount["user"];
|
|
66
|
-
};
|
|
67
61
|
//# sourceMappingURL=types.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../src/adapters/utils/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,eAAe,CAAC;AAC1C,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,wBAAwB,CAAC;AACjE,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAC;AAClE,OAAO,KAAK,EAAE,WAAW,EAAE,eAAe,EAAE,OAAO,EAAE,MAAM,wBAAwB,CAAC;AAEpF,MAAM,MAAM,gBAAgB,GAAG;IAC3B,
|
|
1
|
+
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../src/adapters/utils/types.ts"],"names":[],"mappings":"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"}
|
package/dist/config.d.ts
CHANGED
|
@@ -42,8 +42,7 @@ export type ResolvedSessionConfig = {
|
|
|
42
42
|
validation: readonly SessionValidation[];
|
|
43
43
|
};
|
|
44
44
|
export declare const COOKIE_DEFAULTS: {
|
|
45
|
-
readonly
|
|
46
|
-
readonly renewName: "__ren";
|
|
45
|
+
readonly contextName: "__ctx";
|
|
47
46
|
readonly sessionName: "__ses";
|
|
48
47
|
};
|
|
49
48
|
export declare const resolvePasswordConfig: (config?: PasswordConfig) => ResolvedPasswordConfig;
|
package/dist/config.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":"AAEA,MAAM,MAAM,cAAc,GAAG;IACzB,SAAS,CAAC,EAAE,UAAU,CAAC;IACvB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,QAAQ,CAAC,EAAE,MAAM,CAAC;CACrB,CAAC;AAEF,MAAM,MAAM,YAAY,GAAG;IACvB,SAAS,EAAE,QAAQ,CAAC;IACpB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,cAAc,CAAC,EAAE,MAAM,CAAC;CAC3B,CAAC;AAEF,MAAM,MAAM,cAAc,GAAG,cAAc,GAAG,YAAY,CAAC;AAE3D,MAAM,MAAM,iBAAiB,GAAG,OAAO,GAAG,IAAI,GAAG,UAAU,CAAC;AAE5D,MAAM,MAAM,aAAa,GAAG;IACxB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,UAAU,CAAC,EAAE,SAAS,iBAAiB,EAAE,CAAC;CAC7C,CAAC;AAEF,KAAK,sBAAsB,GAAG;IAC1B,SAAS,EAAE,UAAU,CAAC;IACtB,UAAU,EAAE,MAAM,CAAC;IACnB,QAAQ,EAAE,MAAM,CAAC;IACjB,UAAU,EAAE,MAAM,CAAC;IACnB,WAAW,EAAE,MAAM,CAAC;IACpB,QAAQ,EAAE,MAAM,CAAC;CACpB,CAAC;AAEF,KAAK,oBAAoB,GAAG;IACxB,SAAS,EAAE,QAAQ,CAAC;IACpB,QAAQ,EAAE,MAAM,CAAC;IACjB,MAAM,EAAE,MAAM,CAAC;IACf,cAAc,EAAE,MAAM,CAAC;CAC1B,CAAC;AAEF,MAAM,MAAM,sBAAsB,GAAG,sBAAsB,GAAG,oBAAoB,CAAC;AAEnF,MAAM,MAAM,qBAAqB,GAAG;IAChC,WAAW,EAAE,MAAM,CAAC;IACpB,aAAa,EAAE,MAAM,CAAC;IACtB,GAAG,EAAE,MAAM,CAAC;IACZ,UAAU,EAAE,SAAS,iBAAiB,EAAE,CAAC;CAC5C,CAAC;AAyBF,eAAO,MAAM,eAAe
|
|
1
|
+
{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":"AAEA,MAAM,MAAM,cAAc,GAAG;IACzB,SAAS,CAAC,EAAE,UAAU,CAAC;IACvB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,QAAQ,CAAC,EAAE,MAAM,CAAC;CACrB,CAAC;AAEF,MAAM,MAAM,YAAY,GAAG;IACvB,SAAS,EAAE,QAAQ,CAAC;IACpB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,cAAc,CAAC,EAAE,MAAM,CAAC;CAC3B,CAAC;AAEF,MAAM,MAAM,cAAc,GAAG,cAAc,GAAG,YAAY,CAAC;AAE3D,MAAM,MAAM,iBAAiB,GAAG,OAAO,GAAG,IAAI,GAAG,UAAU,CAAC;AAE5D,MAAM,MAAM,aAAa,GAAG;IACxB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,UAAU,CAAC,EAAE,SAAS,iBAAiB,EAAE,CAAC;CAC7C,CAAC;AAEF,KAAK,sBAAsB,GAAG;IAC1B,SAAS,EAAE,UAAU,CAAC;IACtB,UAAU,EAAE,MAAM,CAAC;IACnB,QAAQ,EAAE,MAAM,CAAC;IACjB,UAAU,EAAE,MAAM,CAAC;IACnB,WAAW,EAAE,MAAM,CAAC;IACpB,QAAQ,EAAE,MAAM,CAAC;CACpB,CAAC;AAEF,KAAK,oBAAoB,GAAG;IACxB,SAAS,EAAE,QAAQ,CAAC;IACpB,QAAQ,EAAE,MAAM,CAAC;IACjB,MAAM,EAAE,MAAM,CAAC;IACf,cAAc,EAAE,MAAM,CAAC;CAC1B,CAAC;AAEF,MAAM,MAAM,sBAAsB,GAAG,sBAAsB,GAAG,oBAAoB,CAAC;AAEnF,MAAM,MAAM,qBAAqB,GAAG;IAChC,WAAW,EAAE,MAAM,CAAC;IACpB,aAAa,EAAE,MAAM,CAAC;IACtB,GAAG,EAAE,MAAM,CAAC;IACZ,UAAU,EAAE,SAAS,iBAAiB,EAAE,CAAC;CAC5C,CAAC;AAyBF,eAAO,MAAM,eAAe;;;CAGlB,CAAC;AAsDX,eAAO,MAAM,qBAAqB,GAAI,SAAQ,cAAmB,KAAG,sBAgFnE,CAAC;AAEF,eAAO,MAAM,oBAAoB,GAAI,SAAQ,aAAkB,KAAG,qBAuCjE,CAAC"}
|