@gauts/auth 0.2.2 → 0.3.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/README.md +465 -438
- package/SECURITY.md +44 -1
- package/dist/adapters/hono/index.d.ts +33 -19
- package/dist/adapters/hono/index.d.ts.map +1 -1
- package/dist/adapters/hono/index.js +134 -55
- package/dist/adapters/hono/index.js.map +1 -1
- package/dist/adapters/next/index.d.ts +24 -0
- package/dist/adapters/next/index.d.ts.map +1 -0
- package/dist/adapters/next/index.js +93 -0
- package/dist/adapters/next/index.js.map +1 -0
- package/dist/adapters/prisma/index.d.ts +12 -4
- package/dist/adapters/prisma/index.d.ts.map +1 -1
- package/dist/adapters/prisma/index.js +95 -9
- package/dist/adapters/prisma/index.js.map +1 -1
- package/dist/auth.d.ts +8 -6
- package/dist/auth.d.ts.map +1 -1
- package/dist/auth.js +7 -9
- package/dist/auth.js.map +1 -1
- package/dist/client/index.d.ts +5 -0
- package/dist/client/index.d.ts.map +1 -1
- package/dist/client/index.js +6 -1
- package/dist/client/index.js.map +1 -1
- package/dist/config.d.ts +2 -2
- package/dist/config.d.ts.map +1 -1
- package/dist/config.js +8 -7
- package/dist/config.js.map +1 -1
- package/dist/errors.d.ts +1 -1
- package/dist/errors.d.ts.map +1 -1
- package/dist/errors.js.map +1 -1
- package/dist/index.d.ts +2 -1
- package/dist/index.d.ts.map +1 -1
- package/dist/session/cache.d.ts +32 -0
- package/dist/session/cache.d.ts.map +1 -0
- package/dist/session/cache.js +136 -0
- package/dist/session/cache.js.map +1 -0
- package/dist/session/cookie.d.ts +15 -0
- package/dist/session/cookie.d.ts.map +1 -0
- package/dist/session/cookie.js +31 -0
- package/dist/session/cookie.js.map +1 -0
- package/dist/session/guards.d.ts +6 -0
- package/dist/session/guards.d.ts.map +1 -0
- package/dist/session/guards.js +23 -0
- package/dist/session/guards.js.map +1 -0
- package/dist/session/service.d.ts +2 -3
- package/dist/session/service.d.ts.map +1 -1
- package/dist/session/service.js +117 -162
- package/dist/session/service.js.map +1 -1
- package/dist/session/types.d.ts +47 -58
- package/dist/session/types.d.ts.map +1 -1
- package/package.json +9 -10
- package/dist/adapters/redis/index.d.ts +0 -11
- package/dist/adapters/redis/index.d.ts.map +0 -1
- package/dist/adapters/redis/index.js +0 -62
- package/dist/adapters/redis/index.js.map +0 -1
- package/dist/session/schema.d.ts +0 -5
- package/dist/session/schema.d.ts.map +0 -1
- package/dist/session/schema.js +0 -56
- package/dist/session/schema.js.map +0 -1
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import { createError } from "../../errors.js";
|
|
2
|
-
|
|
2
|
+
import { isAuthAccount, isNullableString, isRecord } from "../../session/guards.js";
|
|
3
|
+
const DEFAULT_TABLE = "account_sessions";
|
|
3
4
|
const select = {
|
|
4
5
|
account_id: true,
|
|
5
6
|
agent: true,
|
|
@@ -12,20 +13,39 @@ const select = {
|
|
|
12
13
|
token_hash: true,
|
|
13
14
|
updated_at: true,
|
|
14
15
|
};
|
|
15
|
-
const
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
16
|
+
const authSelect = {
|
|
17
|
+
...select,
|
|
18
|
+
account: {
|
|
19
|
+
select: {
|
|
20
|
+
email: true,
|
|
21
|
+
id: true,
|
|
22
|
+
name: true,
|
|
23
|
+
role: true,
|
|
24
|
+
status: true,
|
|
25
|
+
timezone: true,
|
|
26
|
+
user: {
|
|
27
|
+
select: {
|
|
28
|
+
id: true,
|
|
29
|
+
role: true,
|
|
30
|
+
status: true,
|
|
31
|
+
},
|
|
32
|
+
},
|
|
33
|
+
},
|
|
34
|
+
},
|
|
20
35
|
};
|
|
21
36
|
const isNullableDate = (value) => {
|
|
22
37
|
return value instanceof Date || value === null;
|
|
23
38
|
};
|
|
39
|
+
const isStringArray = (value) => {
|
|
40
|
+
return (Array.isArray(value) &&
|
|
41
|
+
value.every((item) => typeof item === "string" && item.length > 0));
|
|
42
|
+
};
|
|
24
43
|
const isDelegate = (value) => {
|
|
25
44
|
return (isRecord(value) &&
|
|
26
45
|
typeof value.create === "function" &&
|
|
27
46
|
typeof value.findFirst === "function" &&
|
|
28
47
|
typeof value.findMany === "function" &&
|
|
48
|
+
typeof value.findUnique === "function" &&
|
|
29
49
|
typeof value.update === "function" &&
|
|
30
50
|
typeof value.updateMany === "function");
|
|
31
51
|
};
|
|
@@ -42,6 +62,52 @@ const isSessionRecord = (value) => {
|
|
|
42
62
|
typeof value.token_hash === "string" &&
|
|
43
63
|
isNullableDate(value.updated_at));
|
|
44
64
|
};
|
|
65
|
+
const resolveValues = ({ input, name }) => {
|
|
66
|
+
if (!isStringArray(input) || input.length === 0 || new Set(input).size !== input.length) {
|
|
67
|
+
throw createError({
|
|
68
|
+
code: "AUTH_CONFIG_INVALID",
|
|
69
|
+
message: `${name} must contain unique non-empty strings.`,
|
|
70
|
+
});
|
|
71
|
+
}
|
|
72
|
+
return input;
|
|
73
|
+
};
|
|
74
|
+
const resolveAccess = (config) => {
|
|
75
|
+
if (!isRecord(config) || !isRecord(config.account) || !isRecord(config.user)) {
|
|
76
|
+
throw createError({
|
|
77
|
+
code: "AUTH_CONFIG_INVALID",
|
|
78
|
+
message: "Prisma account and user access rules are required.",
|
|
79
|
+
});
|
|
80
|
+
}
|
|
81
|
+
return {
|
|
82
|
+
account: {
|
|
83
|
+
role: config.account.role === undefined
|
|
84
|
+
? null
|
|
85
|
+
: resolveValues({ input: config.account.role, name: "account.role" }),
|
|
86
|
+
status: resolveValues({ input: config.account.status, name: "account.status" }),
|
|
87
|
+
},
|
|
88
|
+
user: {
|
|
89
|
+
role: config.user.role === undefined
|
|
90
|
+
? null
|
|
91
|
+
: resolveValues({ input: config.user.role, name: "user.role" }),
|
|
92
|
+
status: resolveValues({ input: config.user.status, name: "user.status" }),
|
|
93
|
+
},
|
|
94
|
+
};
|
|
95
|
+
};
|
|
96
|
+
const resolveTable = (config) => {
|
|
97
|
+
if (!isRecord(config) || config.table === undefined) {
|
|
98
|
+
return DEFAULT_TABLE;
|
|
99
|
+
}
|
|
100
|
+
if (typeof config.table !== "string" || !config.table) {
|
|
101
|
+
throw createError({
|
|
102
|
+
code: "AUTH_CONFIG_INVALID",
|
|
103
|
+
message: "Prisma session table name is invalid.",
|
|
104
|
+
});
|
|
105
|
+
}
|
|
106
|
+
return config.table;
|
|
107
|
+
};
|
|
108
|
+
const matchesAccess = (value, rule) => {
|
|
109
|
+
return rule.status.includes(value.status) && (!rule.role || rule.role.includes(value.role));
|
|
110
|
+
};
|
|
45
111
|
const requireRow = (value) => {
|
|
46
112
|
if (!isSessionRecord(value)) {
|
|
47
113
|
throw new Error("Prisma session table returned invalid data.");
|
|
@@ -54,10 +120,23 @@ const requireRows = (value) => {
|
|
|
54
120
|
}
|
|
55
121
|
return value.map(requireRow);
|
|
56
122
|
};
|
|
57
|
-
|
|
58
|
-
const
|
|
59
|
-
|
|
123
|
+
const requireAuthRow = (value, access) => {
|
|
124
|
+
const row = requireRow(value);
|
|
125
|
+
if (!isRecord(value) || !isAuthAccount(value.account)) {
|
|
126
|
+
throw new Error("Prisma account relation returned invalid data.");
|
|
127
|
+
}
|
|
128
|
+
return {
|
|
129
|
+
...row,
|
|
130
|
+
account: value.account,
|
|
131
|
+
allowed: matchesAccess(value.account, access.account) &&
|
|
132
|
+
matchesAccess(value.account.user, access.user),
|
|
133
|
+
};
|
|
134
|
+
};
|
|
135
|
+
export const createPrismaAdapter = (input) => {
|
|
136
|
+
const config = input.config;
|
|
137
|
+
const table_name = resolveTable(config);
|
|
60
138
|
const table = isRecord(input.client) ? input.client[table_name] : undefined;
|
|
139
|
+
const access = resolveAccess(config);
|
|
61
140
|
if (!isDelegate(table)) {
|
|
62
141
|
throw createError({
|
|
63
142
|
code: "AUTH_CONFIG_INVALID",
|
|
@@ -90,6 +169,13 @@ export const createDbAdapter = (input) => {
|
|
|
90
169
|
});
|
|
91
170
|
return requireRows(rows);
|
|
92
171
|
},
|
|
172
|
+
findToken: async (token_hash) => {
|
|
173
|
+
const row = await table.findUnique({
|
|
174
|
+
select: authSelect,
|
|
175
|
+
where: { token_hash },
|
|
176
|
+
});
|
|
177
|
+
return row === null ? null : requireAuthRow(row, access);
|
|
178
|
+
},
|
|
93
179
|
revoke: async ({ revoked_at, session_ids }) => {
|
|
94
180
|
if (session_ids.length === 0) {
|
|
95
181
|
return;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/adapters/prisma/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/adapters/prisma/index.ts"],"names":[],"mappings":"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"}
|
package/dist/auth.d.ts
CHANGED
|
@@ -1,17 +1,19 @@
|
|
|
1
|
-
import type { PasswordConfig, SessionConfig } from "./config.js";
|
|
1
|
+
import type { PasswordConfig, ResolvedSessionConfig, SessionConfig } from "./config.js";
|
|
2
2
|
import { type PasswordService } from "./password/index.js";
|
|
3
|
-
import type { DbAdapter,
|
|
3
|
+
import type { DbAdapter, SessionService } from "./session/types.js";
|
|
4
4
|
export type AuthConfig = {
|
|
5
5
|
password?: PasswordConfig;
|
|
6
6
|
session?: SessionConfig;
|
|
7
7
|
};
|
|
8
8
|
export type AuthDeps = AuthConfig & {
|
|
9
9
|
db: DbAdapter;
|
|
10
|
-
redis: RedisAdapter;
|
|
11
10
|
};
|
|
12
|
-
export type Auth
|
|
11
|
+
export type Auth = {
|
|
12
|
+
readonly config: {
|
|
13
|
+
readonly session: Readonly<ResolvedSessionConfig>;
|
|
14
|
+
};
|
|
13
15
|
password: PasswordService;
|
|
14
|
-
session: SessionService
|
|
16
|
+
session: SessionService;
|
|
15
17
|
};
|
|
16
|
-
export declare const createAuth:
|
|
18
|
+
export declare const createAuth: ({ db, password, session }: AuthDeps) => Auth;
|
|
17
19
|
//# sourceMappingURL=auth.d.ts.map
|
package/dist/auth.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"auth.d.ts","sourceRoot":"","sources":["../src/auth.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;
|
|
1
|
+
{"version":3,"file":"auth.d.ts","sourceRoot":"","sources":["../src/auth.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,qBAAqB,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAGxF,OAAO,EAAkB,KAAK,eAAe,EAAE,MAAM,qBAAqB,CAAC;AAE3E,OAAO,KAAK,EAAE,SAAS,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AAEpE,MAAM,MAAM,UAAU,GAAG;IACrB,QAAQ,CAAC,EAAE,cAAc,CAAC;IAC1B,OAAO,CAAC,EAAE,aAAa,CAAC;CAC3B,CAAC;AAEF,MAAM,MAAM,QAAQ,GAAG,UAAU,GAAG;IAChC,EAAE,EAAE,SAAS,CAAC;CACjB,CAAC;AAEF,MAAM,MAAM,IAAI,GAAG;IACf,QAAQ,CAAC,MAAM,EAAE;QACb,QAAQ,CAAC,OAAO,EAAE,QAAQ,CAAC,qBAAqB,CAAC,CAAC;KACrD,CAAC;IACF,QAAQ,EAAE,eAAe,CAAC;IAC1B,OAAO,EAAE,cAAc,CAAC;CAC3B,CAAC;AA0BF,eAAO,MAAM,UAAU,GAAI,2BAA2B,QAAQ,KAAG,IAmBhE,CAAC"}
|
package/dist/auth.js
CHANGED
|
@@ -17,23 +17,21 @@ const requireMethods = ({ methods, name, value }) => {
|
|
|
17
17
|
});
|
|
18
18
|
}
|
|
19
19
|
};
|
|
20
|
-
export const createAuth = ({ db, password,
|
|
20
|
+
export const createAuth = ({ db, password, session }) => {
|
|
21
21
|
requireMethods({
|
|
22
|
-
methods: ["create", "
|
|
23
|
-
name: "Redis",
|
|
24
|
-
value: redis,
|
|
25
|
-
});
|
|
26
|
-
requireMethods({
|
|
27
|
-
methods: ["create", "find", "findActive", "revoke", "updateExpiry"],
|
|
22
|
+
methods: ["create", "find", "findActive", "findToken", "revoke", "updateExpiry"],
|
|
28
23
|
name: "DB",
|
|
29
24
|
value: db,
|
|
30
25
|
});
|
|
26
|
+
const sessionConfig = resolveSessionConfig(session);
|
|
31
27
|
return {
|
|
28
|
+
config: {
|
|
29
|
+
session: sessionConfig,
|
|
30
|
+
},
|
|
32
31
|
password: createPassword(resolvePasswordConfig(password)),
|
|
33
32
|
session: createSessionService({
|
|
34
|
-
config:
|
|
33
|
+
config: sessionConfig,
|
|
35
34
|
db,
|
|
36
|
-
redis,
|
|
37
35
|
}),
|
|
38
36
|
};
|
|
39
37
|
};
|
package/dist/auth.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"auth.js","sourceRoot":"","sources":["../src/auth.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,qBAAqB,EAAE,oBAAoB,EAAE,MAAM,aAAa,CAAC;AAC1E,OAAO,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAC1C,OAAO,EAAE,cAAc,EAAwB,MAAM,qBAAqB,CAAC;AAC3E,OAAO,EAAE,oBAAoB,EAAE,MAAM,sBAAsB,CAAC;
|
|
1
|
+
{"version":3,"file":"auth.js","sourceRoot":"","sources":["../src/auth.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,qBAAqB,EAAE,oBAAoB,EAAE,MAAM,aAAa,CAAC;AAC1E,OAAO,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAC1C,OAAO,EAAE,cAAc,EAAwB,MAAM,qBAAqB,CAAC;AAC3E,OAAO,EAAE,oBAAoB,EAAE,MAAM,sBAAsB,CAAC;AA0B5D,MAAM,cAAc,GAAG,CAAC,EAAE,OAAO,EAAE,IAAI,EAAE,KAAK,EAAuB,EAAQ,EAAE;IAC3E,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,KAAK,IAAI,EAAE,CAAC;QAC9C,MAAM,WAAW,CAAC;YACd,IAAI,EAAE,qBAAqB;YAC3B,OAAO,EAAE,GAAG,IAAI,sBAAsB;SACzC,CAAC,CAAC;IACP,CAAC;IAED,MAAM,OAAO,GAAG,KAAgC,CAAC;IAEjD,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,OAAO,OAAO,CAAC,MAAM,CAAC,KAAK,UAAU,CAAC,EAAE,CAAC;QAClE,MAAM,WAAW,CAAC;YACd,IAAI,EAAE,qBAAqB;YAC3B,OAAO,EAAE,GAAG,IAAI,sBAAsB;SACzC,CAAC,CAAC;IACP,CAAC;AACL,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,UAAU,GAAG,CAAC,EAAE,EAAE,EAAE,QAAQ,EAAE,OAAO,EAAY,EAAQ,EAAE;IACpE,cAAc,CAAC;QACX,OAAO,EAAE,CAAC,QAAQ,EAAE,MAAM,EAAE,YAAY,EAAE,WAAW,EAAE,QAAQ,EAAE,cAAc,CAAC;QAChF,IAAI,EAAE,IAAI;QACV,KAAK,EAAE,EAAE;KACZ,CAAC,CAAC;IAEH,MAAM,aAAa,GAAG,oBAAoB,CAAC,OAAO,CAAC,CAAC;IAEpD,OAAO;QACH,MAAM,EAAE;YACJ,OAAO,EAAE,aAAa;SACzB;QACD,QAAQ,EAAE,cAAc,CAAC,qBAAqB,CAAC,QAAQ,CAAC,CAAC;QACzD,OAAO,EAAE,oBAAoB,CAAC;YAC1B,MAAM,EAAE,aAAa;YACrB,EAAE;SACL,CAAC;KACL,CAAC;AACN,CAAC,CAAC"}
|
package/dist/client/index.d.ts
CHANGED
|
@@ -14,8 +14,13 @@ type MatchesClientProps = {
|
|
|
14
14
|
stored: SessionClient;
|
|
15
15
|
validation: readonly SessionValidation[];
|
|
16
16
|
};
|
|
17
|
+
type HasClientFieldsProps = {
|
|
18
|
+
client: SessionClient;
|
|
19
|
+
validation: readonly SessionValidation[];
|
|
20
|
+
};
|
|
17
21
|
export declare const normalizeIp: (input?: string | null) => string | null;
|
|
18
22
|
export declare const normalizeClient: (input: SessionClientInput) => SessionClient;
|
|
23
|
+
export declare const hasClientFields: ({ client, validation }: HasClientFieldsProps) => boolean;
|
|
19
24
|
export declare const matchesClient: ({ current, stored, validation }: MatchesClientProps) => boolean;
|
|
20
25
|
export {};
|
|
21
26
|
//# sourceMappingURL=index.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/client/index.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,cAAc,CAAC;AAEtD,MAAM,MAAM,kBAAkB,GAAG;IAC7B,KAAK,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACtB,EAAE,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACnB,QAAQ,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;CAC5B,CAAC;AAEF,MAAM,MAAM,aAAa,GAAG;IACxB,KAAK,EAAE,MAAM,GAAG,IAAI,CAAC;IACrB,EAAE,EAAE,MAAM,GAAG,IAAI,CAAC;IAClB,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAC;CAC3B,CAAC;AAEF,KAAK,kBAAkB,GAAG;IACtB,OAAO,EAAE,aAAa,CAAC;IACvB,MAAM,EAAE,aAAa,CAAC;IACtB,UAAU,EAAE,SAAS,iBAAiB,EAAE,CAAC;CAC5C,CAAC;AAEF,eAAO,MAAM,WAAW,GAAI,QAAQ,MAAM,GAAG,IAAI,KAAG,MAAM,GAAG,IAgC5D,CAAC;AASF,eAAO,MAAM,eAAe,GAAI,OAAO,kBAAkB,KAAG,aAI1D,CAAC;AAEH,eAAO,MAAM,aAAa,GAAI,iCAAiC,kBAAkB,KAAG,
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/client/index.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,cAAc,CAAC;AAEtD,MAAM,MAAM,kBAAkB,GAAG;IAC7B,KAAK,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACtB,EAAE,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACnB,QAAQ,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;CAC5B,CAAC;AAEF,MAAM,MAAM,aAAa,GAAG;IACxB,KAAK,EAAE,MAAM,GAAG,IAAI,CAAC;IACrB,EAAE,EAAE,MAAM,GAAG,IAAI,CAAC;IAClB,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAC;CAC3B,CAAC;AAEF,KAAK,kBAAkB,GAAG;IACtB,OAAO,EAAE,aAAa,CAAC;IACvB,MAAM,EAAE,aAAa,CAAC;IACtB,UAAU,EAAE,SAAS,iBAAiB,EAAE,CAAC;CAC5C,CAAC;AAEF,KAAK,oBAAoB,GAAG;IACxB,MAAM,EAAE,aAAa,CAAC;IACtB,UAAU,EAAE,SAAS,iBAAiB,EAAE,CAAC;CAC5C,CAAC;AAEF,eAAO,MAAM,WAAW,GAAI,QAAQ,MAAM,GAAG,IAAI,KAAG,MAAM,GAAG,IAgC5D,CAAC;AASF,eAAO,MAAM,eAAe,GAAI,OAAO,kBAAkB,KAAG,aAI1D,CAAC;AAEH,eAAO,MAAM,eAAe,GAAI,wBAAwB,oBAAoB,KAAG,OAE9E,CAAC;AAEF,eAAO,MAAM,aAAa,GAAI,iCAAiC,kBAAkB,KAAG,OAMnF,CAAC"}
|
package/dist/client/index.js
CHANGED
|
@@ -34,7 +34,12 @@ export const normalizeClient = (input) => ({
|
|
|
34
34
|
ip: normalizeIp(input.ip),
|
|
35
35
|
platform: normalizePlatform(input.platform),
|
|
36
36
|
});
|
|
37
|
+
export const hasClientFields = ({ client, validation }) => {
|
|
38
|
+
return validation.every((field) => client[field] !== null);
|
|
39
|
+
};
|
|
37
40
|
export const matchesClient = ({ current, stored, validation }) => {
|
|
38
|
-
return
|
|
41
|
+
return (hasClientFields({ client: current, validation }) &&
|
|
42
|
+
hasClientFields({ client: stored, validation }) &&
|
|
43
|
+
validation.every((field) => stored[field] === current[field]));
|
|
39
44
|
};
|
|
40
45
|
//# sourceMappingURL=index.js.map
|
package/dist/client/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/client/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/client/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;AA0B/C,MAAM,CAAC,MAAM,WAAW,GAAG,CAAC,KAAqB,EAAiB,EAAE;IAChE,IAAI,KAAK,GAAG,KAAK,EAAE,IAAI,EAAE,CAAC;IAE1B,IAAI,CAAC,KAAK,EAAE,CAAC;QACT,OAAO,IAAI,CAAC;IAChB,CAAC;IAED,IAAI,KAAK,CAAC,UAAU,CAAC,GAAG,CAAC,IAAI,KAAK,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC;QAC/C,KAAK,GAAG,KAAK,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;IAC/B,CAAC;IAED,MAAM,OAAO,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC;IAE5B,IAAI,OAAO,KAAK,CAAC,EAAE,CAAC;QAChB,OAAO,KAAK,CAAC;IACjB,CAAC;IAED,IAAI,OAAO,KAAK,CAAC,IAAI,KAAK,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC;QACvC,OAAO,IAAI,CAAC;IAChB,CAAC;IAED,MAAM,UAAU,GAAG,IAAI,aAAa,CAAC;QACjC,OAAO,EAAE,KAAK;QACd,MAAM,EAAE,MAAM;QACd,IAAI,EAAE,CAAC;KACV,CAAC,CAAC,OAAO,CAAC;IAEX,IAAI,UAAU,CAAC,UAAU,CAAC,SAAS,CAAC,EAAE,CAAC;QACnC,OAAO,UAAU,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;IAC/B,CAAC;IAED,OAAO,UAAU,KAAK,KAAK,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,UAAU,CAAC;AAC3D,CAAC,CAAC;AAEF,MAAM,iBAAiB,GAAG,CAAC,KAAqB,EAAiB,EAAE;IAC/D,MAAM,KAAK,GAAG,KAAK,EAAE,OAAO,CAAC,UAAU,EAAE,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC;IACpD,OAAO,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;AAC9C,CAAC,CAAC;AAEF,MAAM,cAAc,GAAG,CAAC,KAAqB,EAAiB,EAAE,CAAC,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;AAEhG,MAAM,CAAC,MAAM,eAAe,GAAG,CAAC,KAAyB,EAAiB,EAAE,CAAC,CAAC;IAC1E,KAAK,EAAE,cAAc,CAAC,KAAK,CAAC,KAAK,CAAC;IAClC,EAAE,EAAE,WAAW,CAAC,KAAK,CAAC,EAAE,CAAC;IACzB,QAAQ,EAAE,iBAAiB,CAAC,KAAK,CAAC,QAAQ,CAAC;CAC9C,CAAC,CAAC;AAEH,MAAM,CAAC,MAAM,eAAe,GAAG,CAAC,EAAE,MAAM,EAAE,UAAU,EAAwB,EAAW,EAAE;IACrF,OAAO,UAAU,CAAC,KAAK,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,MAAM,CAAC,KAAK,CAAC,KAAK,IAAI,CAAC,CAAC;AAC/D,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,aAAa,GAAG,CAAC,EAAE,OAAO,EAAE,MAAM,EAAE,UAAU,EAAsB,EAAW,EAAE;IAC1F,OAAO,CACH,eAAe,CAAC,EAAE,MAAM,EAAE,OAAO,EAAE,UAAU,EAAE,CAAC;QAChD,eAAe,CAAC,EAAE,MAAM,EAAE,MAAM,EAAE,UAAU,EAAE,CAAC;QAC/C,UAAU,CAAC,KAAK,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,MAAM,CAAC,KAAK,CAAC,KAAK,OAAO,CAAC,KAAK,CAAC,CAAC,CAChE,CAAC;AACN,CAAC,CAAC"}
|
package/dist/config.d.ts
CHANGED
|
@@ -15,7 +15,7 @@ export type BcryptConfig = {
|
|
|
15
15
|
export type PasswordConfig = Argon2idConfig | BcryptConfig;
|
|
16
16
|
export type SessionValidation = "agent" | "ip" | "platform";
|
|
17
17
|
export type SessionConfig = {
|
|
18
|
-
|
|
18
|
+
maxLifetime?: number;
|
|
19
19
|
renewInterval?: number;
|
|
20
20
|
ttl?: number;
|
|
21
21
|
validation?: readonly SessionValidation[];
|
|
@@ -36,7 +36,7 @@ type ResolvedBcryptConfig = {
|
|
|
36
36
|
};
|
|
37
37
|
export type ResolvedPasswordConfig = ResolvedArgon2idConfig | ResolvedBcryptConfig;
|
|
38
38
|
export type ResolvedSessionConfig = {
|
|
39
|
-
|
|
39
|
+
maxLifetime: number;
|
|
40
40
|
renewInterval: number;
|
|
41
41
|
ttl: number;
|
|
42
42
|
validation: readonly SessionValidation[];
|
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,
|
|
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;AA6EF,eAAO,MAAM,qBAAqB,GAAI,SAAQ,cAAmB,KAAG,sBAgFnE,CAAC;AAEF,eAAO,MAAM,oBAAoB,GAAI,SAAQ,aAAkB,KAAG,qBAuCjE,CAAC"}
|
package/dist/config.js
CHANGED
|
@@ -14,7 +14,7 @@ const BCRYPT_DEFAULTS = {
|
|
|
14
14
|
verifyMaxBytes: 72,
|
|
15
15
|
};
|
|
16
16
|
const SESSION_DEFAULTS = {
|
|
17
|
-
|
|
17
|
+
maxLifetime: 60 * 60 * 24 * 30,
|
|
18
18
|
renewInterval: 60 * 60 * 24,
|
|
19
19
|
ttl: 60 * 60 * 24 * 7,
|
|
20
20
|
validation: ["agent"],
|
|
@@ -146,13 +146,14 @@ export const resolveSessionConfig = (config = {}) => {
|
|
|
146
146
|
name: "session.renewInterval",
|
|
147
147
|
value: resolved.renewInterval,
|
|
148
148
|
});
|
|
149
|
+
const maxLifetime = requireInteger({
|
|
150
|
+
max: 60 * 60 * 24 * 365,
|
|
151
|
+
min: ttl,
|
|
152
|
+
name: "session.maxLifetime",
|
|
153
|
+
value: resolved.maxLifetime,
|
|
154
|
+
});
|
|
149
155
|
return {
|
|
150
|
-
|
|
151
|
-
max: 10_000,
|
|
152
|
-
min: 1,
|
|
153
|
-
name: "session.max",
|
|
154
|
-
value: resolved.max,
|
|
155
|
-
}),
|
|
156
|
+
maxLifetime,
|
|
156
157
|
renewInterval,
|
|
157
158
|
ttl,
|
|
158
159
|
validation: resolveSessionValidation(config.validation ?? SESSION_DEFAULTS.validation),
|
package/dist/config.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"config.js","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AA6D1C,MAAM,cAAc,GAAG;IACnB,SAAS,EAAE,UAAU;IACrB,UAAU,EAAE,EAAE;IACd,QAAQ,EAAE,IAAI;IACd,UAAU,EAAE,MAAM;IAClB,WAAW,EAAE,CAAC;IACd,QAAQ,EAAE,CAAC;CACL,CAAC;AAEX,MAAM,eAAe,GAAG;IACpB,SAAS,EAAE,QAAQ;IACnB,QAAQ,EAAE,EAAE;IACZ,MAAM,EAAE,EAAE;IACV,cAAc,EAAE,EAAE;CACZ,CAAC;AAEX,MAAM,gBAAgB,GAAG;IACrB,GAAG,EAAE,EAAE;
|
|
1
|
+
{"version":3,"file":"config.js","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":"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"}
|
package/dist/errors.d.ts
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
export type AuthErrorCode = "AUTH_CONFIG_INVALID" | "PASSWORD_INPUT_INVALID" | "SESSION_CLIENT_MISMATCH" | "SESSION_DATA_INVALID" | "SESSION_INVALID" | "
|
|
1
|
+
export type AuthErrorCode = "AUTH_CONFIG_INVALID" | "PASSWORD_INPUT_INVALID" | "SESSION_CLIENT_MISMATCH" | "SESSION_DATA_INVALID" | "SESSION_INVALID" | "SESSION_NOT_FOUND" | "DB_UNAVAILABLE";
|
|
2
2
|
export type AuthError = Error & {
|
|
3
3
|
code: AuthErrorCode;
|
|
4
4
|
};
|
package/dist/errors.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"errors.d.ts","sourceRoot":"","sources":["../src/errors.ts"],"names":[],"mappings":"AAAA,MAAM,MAAM,aAAa,GACnB,qBAAqB,GACrB,wBAAwB,GACxB,yBAAyB,GACzB,sBAAsB,GACtB,iBAAiB,GACjB,
|
|
1
|
+
{"version":3,"file":"errors.d.ts","sourceRoot":"","sources":["../src/errors.ts"],"names":[],"mappings":"AAAA,MAAM,MAAM,aAAa,GACnB,qBAAqB,GACrB,wBAAwB,GACxB,yBAAyB,GACzB,sBAAsB,GACtB,iBAAiB,GACjB,mBAAmB,GACnB,gBAAgB,CAAC;AAEvB,MAAM,MAAM,SAAS,GAAG,KAAK,GAAG;IAC5B,IAAI,EAAE,aAAa,CAAC;CACvB,CAAC;AAEF,MAAM,MAAM,cAAc,GAAG;IACzB,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,IAAI,EAAE,aAAa,CAAC;IACpB,OAAO,EAAE,MAAM,CAAC;CACnB,CAAC;AAEF,eAAO,MAAM,WAAW,GAAI,0BAA0B,cAAc,KAAG,SAOtE,CAAC;AAEF,eAAO,MAAM,WAAW,GAAI,OAAO,OAAO,KAAG,KAAK,IAAI,SAOrD,CAAC"}
|
package/dist/errors.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"errors.js","sourceRoot":"","sources":["../src/errors.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"errors.js","sourceRoot":"","sources":["../src/errors.ts"],"names":[],"mappings":"AAmBA,MAAM,CAAC,MAAM,WAAW,GAAG,CAAC,EAAE,KAAK,EAAE,IAAI,EAAE,OAAO,EAAkB,EAAa,EAAE;IAC/E,MAAM,KAAK,GAAG,IAAI,KAAK,CAAC,OAAO,EAAE,KAAK,KAAK,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,CAAc,CAAC;IAE3F,KAAK,CAAC,IAAI,GAAG,WAAW,CAAC;IACzB,KAAK,CAAC,IAAI,GAAG,IAAI,CAAC;IAElB,OAAO,KAAK,CAAC;AACjB,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,WAAW,GAAG,CAAC,KAAc,EAAsB,EAAE;IAC9D,OAAO,CACH,KAAK,YAAY,KAAK;QACtB,KAAK,CAAC,IAAI,KAAK,WAAW;QAC1B,MAAM,IAAI,KAAK;QACf,OAAO,KAAK,CAAC,IAAI,KAAK,QAAQ,CACjC,CAAC;AACN,CAAC,CAAC"}
|
package/dist/index.d.ts
CHANGED
|
@@ -4,6 +4,7 @@ export type { BcryptConfig, Argon2idConfig, PasswordConfig, SessionConfig, Sessi
|
|
|
4
4
|
export { isAuthError } from "./errors.js";
|
|
5
5
|
export type { AuthError, AuthErrorCode } from "./errors.js";
|
|
6
6
|
export type { PasswordService } from "./password/index.js";
|
|
7
|
-
export type { ActiveSession, CreateSessionRecord, CreatedSession, DbAdapter,
|
|
7
|
+
export type { ActiveSession, AuthAccount, AuthSessionRecord, AuthUser, CreateSessionRecord, CreatedSession, DbAdapter, RenewedSession, ResolvedSession, Session, SessionInput, SessionRecord, SessionService, } from "./session/types.js";
|
|
8
8
|
export type { SessionClient, SessionClientInput } from "./client/index.js";
|
|
9
|
+
export type { SessionCacheConfig } from "./session/cache.js";
|
|
9
10
|
//# sourceMappingURL=index.d.ts.map
|
package/dist/index.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,WAAW,CAAC;AACvC,YAAY,EAAE,IAAI,EAAE,UAAU,EAAE,QAAQ,EAAE,MAAM,WAAW,CAAC;AAC5D,YAAY,EACR,YAAY,EACZ,cAAc,EACd,cAAc,EACd,aAAa,EACb,iBAAiB,GACpB,MAAM,aAAa,CAAC;AACrB,OAAO,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAC1C,YAAY,EAAE,SAAS,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAC5D,YAAY,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AAC3D,YAAY,EACR,aAAa,EACb,mBAAmB,EACnB,cAAc,EACd,SAAS,EACT,
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,WAAW,CAAC;AACvC,YAAY,EAAE,IAAI,EAAE,UAAU,EAAE,QAAQ,EAAE,MAAM,WAAW,CAAC;AAC5D,YAAY,EACR,YAAY,EACZ,cAAc,EACd,cAAc,EACd,aAAa,EACb,iBAAiB,GACpB,MAAM,aAAa,CAAC;AACrB,OAAO,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAC1C,YAAY,EAAE,SAAS,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAC5D,YAAY,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AAC3D,YAAY,EACR,aAAa,EACb,WAAW,EACX,iBAAiB,EACjB,QAAQ,EACR,mBAAmB,EACnB,cAAc,EACd,SAAS,EACT,cAAc,EACd,eAAe,EACf,OAAO,EACP,YAAY,EACZ,aAAa,EACb,cAAc,GACjB,MAAM,oBAAoB,CAAC;AAC5B,YAAY,EAAE,aAAa,EAAE,kBAAkB,EAAE,MAAM,mBAAmB,CAAC;AAC3E,YAAY,EAAE,kBAAkB,EAAE,MAAM,oBAAoB,CAAC"}
|
|
@@ -0,0 +1,32 @@
|
|
|
1
|
+
import { type SessionClientInput } from "../client/index.js";
|
|
2
|
+
import type { ResolvedSessionConfig } from "../config.js";
|
|
3
|
+
import type { ResolvedSession } from "./types.js";
|
|
4
|
+
export type SessionCacheConfig = {
|
|
5
|
+
ttl: number;
|
|
6
|
+
};
|
|
7
|
+
type SessionCacheDeps = {
|
|
8
|
+
config: SessionCacheConfig;
|
|
9
|
+
now?: () => Date;
|
|
10
|
+
secret: string;
|
|
11
|
+
session: ResolvedSessionConfig;
|
|
12
|
+
};
|
|
13
|
+
type CacheInput = {
|
|
14
|
+
client: SessionClientInput;
|
|
15
|
+
token: string;
|
|
16
|
+
value: string | null | undefined;
|
|
17
|
+
};
|
|
18
|
+
type CreateCacheInput = {
|
|
19
|
+
resolved: ResolvedSession;
|
|
20
|
+
token: string;
|
|
21
|
+
};
|
|
22
|
+
type SessionCacheValue = {
|
|
23
|
+
expires_at: Date;
|
|
24
|
+
value: string;
|
|
25
|
+
};
|
|
26
|
+
export type SessionCache = {
|
|
27
|
+
create(input: CreateCacheInput): SessionCacheValue;
|
|
28
|
+
resolve(input: CacheInput): ResolvedSession | null;
|
|
29
|
+
};
|
|
30
|
+
export declare const createSessionCache: ({ config, now, secret, session: sessionConfig, }: SessionCacheDeps) => SessionCache;
|
|
31
|
+
export {};
|
|
32
|
+
//# sourceMappingURL=cache.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"cache.d.ts","sourceRoot":"","sources":["../../src/session/cache.ts"],"names":[],"mappings":"AAEA,OAAO,EAAkC,KAAK,kBAAkB,EAAE,MAAM,oBAAoB,CAAC;AAC7F,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,cAAc,CAAC;AAG1D,OAAO,KAAK,EAAE,eAAe,EAAW,MAAM,YAAY,CAAC;AAE3D,MAAM,MAAM,kBAAkB,GAAG;IAC7B,GAAG,EAAE,MAAM,CAAC;CACf,CAAC;AAEF,KAAK,gBAAgB,GAAG;IACpB,MAAM,EAAE,kBAAkB,CAAC;IAC3B,GAAG,CAAC,EAAE,MAAM,IAAI,CAAC;IACjB,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,qBAAqB,CAAC;CAClC,CAAC;AAEF,KAAK,UAAU,GAAG;IACd,MAAM,EAAE,kBAAkB,CAAC;IAC3B,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,CAAC;CACpC,CAAC;AAEF,KAAK,gBAAgB,GAAG;IACpB,QAAQ,EAAE,eAAe,CAAC;IAC1B,KAAK,EAAE,MAAM,CAAC;CACjB,CAAC;AAEF,KAAK,iBAAiB,GAAG;IACrB,UAAU,EAAE,IAAI,CAAC;IACjB,KAAK,EAAE,MAAM,CAAC;CACjB,CAAC;AAeF,MAAM,MAAM,YAAY,GAAG;IACvB,MAAM,CAAC,KAAK,EAAE,gBAAgB,GAAG,iBAAiB,CAAC;IACnD,OAAO,CAAC,KAAK,EAAE,UAAU,GAAG,eAAe,GAAG,IAAI,CAAC;CACtD,CAAC;AAuFF,eAAO,MAAM,kBAAkB,GAAI,kDAKhC,gBAAgB,KAAG,YAwFrB,CAAC"}
|
|
@@ -0,0 +1,136 @@
|
|
|
1
|
+
import { createHmac, timingSafeEqual } from "node:crypto";
|
|
2
|
+
import { matchesClient, normalizeClient } from "../client/index.js";
|
|
3
|
+
import { createError } from "../errors.js";
|
|
4
|
+
import { isAuthAccount, isNullableString, isRecord } from "./guards.js";
|
|
5
|
+
const signaturePattern = /^[A-Za-z0-9_-]{43}$/;
|
|
6
|
+
const CACHE_CONTEXT = "auth/session-cache";
|
|
7
|
+
const MIN_SECRET_BYTES = 32;
|
|
8
|
+
const getSignature = ({ body, secret, token }) => {
|
|
9
|
+
return createHmac("sha256", secret)
|
|
10
|
+
.update(CACHE_CONTEXT)
|
|
11
|
+
.update("\0")
|
|
12
|
+
.update(token)
|
|
13
|
+
.update("\0")
|
|
14
|
+
.update(body)
|
|
15
|
+
.digest("base64url");
|
|
16
|
+
};
|
|
17
|
+
const matchesSignature = ({ body, secret, signature, token }) => {
|
|
18
|
+
if (!signaturePattern.test(signature)) {
|
|
19
|
+
return false;
|
|
20
|
+
}
|
|
21
|
+
const expected = Buffer.from(getSignature({ body, secret, token }), "ascii");
|
|
22
|
+
const received = Buffer.from(signature, "ascii");
|
|
23
|
+
return expected.byteLength === received.byteLength && timingSafeEqual(expected, received);
|
|
24
|
+
};
|
|
25
|
+
const isStoredSession = (value) => {
|
|
26
|
+
return (isRecord(value) &&
|
|
27
|
+
typeof value.account_id === "string" &&
|
|
28
|
+
isRecord(value.client) &&
|
|
29
|
+
isNullableString(value.client.agent) &&
|
|
30
|
+
isNullableString(value.client.ip) &&
|
|
31
|
+
isNullableString(value.client.platform) &&
|
|
32
|
+
typeof value.created_at === "number" &&
|
|
33
|
+
Number.isSafeInteger(value.created_at) &&
|
|
34
|
+
typeof value.expires_at === "number" &&
|
|
35
|
+
Number.isSafeInteger(value.expires_at) &&
|
|
36
|
+
typeof value.id === "string" &&
|
|
37
|
+
typeof value.renew_at === "number" &&
|
|
38
|
+
Number.isSafeInteger(value.renew_at));
|
|
39
|
+
};
|
|
40
|
+
const isCachePayload = (value) => {
|
|
41
|
+
return (isRecord(value) &&
|
|
42
|
+
value.version === 1 &&
|
|
43
|
+
isAuthAccount(value.account) &&
|
|
44
|
+
typeof value.cache_expires_at === "number" &&
|
|
45
|
+
Number.isSafeInteger(value.cache_expires_at) &&
|
|
46
|
+
isStoredSession(value.session) &&
|
|
47
|
+
value.session.account_id === value.account.id);
|
|
48
|
+
};
|
|
49
|
+
const parsePayload = (body) => {
|
|
50
|
+
try {
|
|
51
|
+
const value = JSON.parse(Buffer.from(body, "base64url").toString("utf8"));
|
|
52
|
+
return isCachePayload(value) ? value : null;
|
|
53
|
+
}
|
|
54
|
+
catch {
|
|
55
|
+
return null;
|
|
56
|
+
}
|
|
57
|
+
};
|
|
58
|
+
const toSession = (stored) => ({
|
|
59
|
+
...stored,
|
|
60
|
+
created_at: new Date(stored.created_at),
|
|
61
|
+
expires_at: new Date(stored.expires_at),
|
|
62
|
+
renew_at: new Date(stored.renew_at),
|
|
63
|
+
});
|
|
64
|
+
const toStoredSession = (session) => ({
|
|
65
|
+
...session,
|
|
66
|
+
created_at: session.created_at.getTime(),
|
|
67
|
+
expires_at: session.expires_at.getTime(),
|
|
68
|
+
renew_at: session.renew_at.getTime(),
|
|
69
|
+
});
|
|
70
|
+
export const createSessionCache = ({ config, now = () => new Date(), secret, session: sessionConfig, }) => {
|
|
71
|
+
if (!Number.isInteger(config.ttl) || config.ttl < 1 || config.ttl > sessionConfig.ttl) {
|
|
72
|
+
throw createError({
|
|
73
|
+
code: "AUTH_CONFIG_INVALID",
|
|
74
|
+
message: "Session cache TTL must be an integer between 1 and the session TTL.",
|
|
75
|
+
});
|
|
76
|
+
}
|
|
77
|
+
if (Buffer.byteLength(secret, "utf8") < MIN_SECRET_BYTES) {
|
|
78
|
+
throw createError({
|
|
79
|
+
code: "AUTH_CONFIG_INVALID",
|
|
80
|
+
message: "Authentication secret must contain at least 32 bytes.",
|
|
81
|
+
});
|
|
82
|
+
}
|
|
83
|
+
return {
|
|
84
|
+
create: ({ resolved, token }) => {
|
|
85
|
+
const max_expires_at = resolved.session.created_at.getTime() + sessionConfig.maxLifetime * 1000;
|
|
86
|
+
const expires_at = new Date(Math.min(now().getTime() + config.ttl * 1000, resolved.session.expires_at.getTime(), max_expires_at));
|
|
87
|
+
const payload = {
|
|
88
|
+
account: resolved.account,
|
|
89
|
+
cache_expires_at: expires_at.getTime(),
|
|
90
|
+
session: toStoredSession(resolved.session),
|
|
91
|
+
version: 1,
|
|
92
|
+
};
|
|
93
|
+
const body = Buffer.from(JSON.stringify(payload)).toString("base64url");
|
|
94
|
+
const signature = getSignature({ body, secret, token });
|
|
95
|
+
return {
|
|
96
|
+
expires_at,
|
|
97
|
+
value: `${body}.${signature}`,
|
|
98
|
+
};
|
|
99
|
+
},
|
|
100
|
+
resolve: ({ client, token, value }) => {
|
|
101
|
+
const [body, signature, extra] = value?.trim().split(".") ?? [];
|
|
102
|
+
if (!body ||
|
|
103
|
+
!signature ||
|
|
104
|
+
extra !== undefined ||
|
|
105
|
+
!matchesSignature({ body, secret, signature, token })) {
|
|
106
|
+
return null;
|
|
107
|
+
}
|
|
108
|
+
const payload = parsePayload(body);
|
|
109
|
+
if (!payload) {
|
|
110
|
+
return null;
|
|
111
|
+
}
|
|
112
|
+
const current = now().getTime();
|
|
113
|
+
const resolvedSession = toSession(payload.session);
|
|
114
|
+
const max_expires_at = resolvedSession.created_at.getTime() + sessionConfig.maxLifetime * 1000;
|
|
115
|
+
if (payload.cache_expires_at <= current ||
|
|
116
|
+
resolvedSession.expires_at.getTime() <= current ||
|
|
117
|
+
max_expires_at <= current ||
|
|
118
|
+
payload.cache_expires_at > resolvedSession.expires_at.getTime() ||
|
|
119
|
+
payload.cache_expires_at > max_expires_at ||
|
|
120
|
+
resolvedSession.expires_at.getTime() > max_expires_at ||
|
|
121
|
+
!matchesClient({
|
|
122
|
+
current: normalizeClient(client),
|
|
123
|
+
stored: resolvedSession.client,
|
|
124
|
+
validation: sessionConfig.validation,
|
|
125
|
+
})) {
|
|
126
|
+
return null;
|
|
127
|
+
}
|
|
128
|
+
return {
|
|
129
|
+
account: payload.account,
|
|
130
|
+
session: resolvedSession,
|
|
131
|
+
user: payload.account.user,
|
|
132
|
+
};
|
|
133
|
+
},
|
|
134
|
+
};
|
|
135
|
+
};
|
|
136
|
+
//# sourceMappingURL=cache.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"cache.js","sourceRoot":"","sources":["../../src/session/cache.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,15 @@
|
|
|
1
|
+
export type SessionCookieNamesInput = {
|
|
2
|
+
cacheName?: string;
|
|
3
|
+
name?: string;
|
|
4
|
+
renewName?: string;
|
|
5
|
+
};
|
|
6
|
+
export type SessionCookieNames = {
|
|
7
|
+
cacheName: string;
|
|
8
|
+
name: string;
|
|
9
|
+
renewName: string;
|
|
10
|
+
};
|
|
11
|
+
export declare const RENEW_COOKIE_VALUE = "1";
|
|
12
|
+
export declare const resolveSessionCookieName: (input?: string) => string;
|
|
13
|
+
export declare const resolveSessionCookieNames: (input?: SessionCookieNamesInput) => SessionCookieNames;
|
|
14
|
+
export declare const parseSessionToken: (value?: string | null) => string | null;
|
|
15
|
+
//# sourceMappingURL=cookie.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"cookie.d.ts","sourceRoot":"","sources":["../../src/session/cookie.ts"],"names":[],"mappings":"AAGA,MAAM,MAAM,uBAAuB,GAAG;IAClC,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,SAAS,CAAC,EAAE,MAAM,CAAC;CACtB,CAAC;AAEF,MAAM,MAAM,kBAAkB,GAAG;IAC7B,SAAS,EAAE,MAAM,CAAC;IAClB,IAAI,EAAE,MAAM,CAAC;IACb,SAAS,EAAE,MAAM,CAAC;CACrB,CAAC;AAEF,eAAO,MAAM,kBAAkB,MAAM,CAAC;AAItC,eAAO,MAAM,wBAAwB,GAAI,QAAQ,MAAM,KAAG,MAWzD,CAAC;AAEF,eAAO,MAAM,yBAAyB,GAClC,QAAO,uBAA4B,KACpC,kBAaF,CAAC;AAEF,eAAO,MAAM,iBAAiB,GAAI,QAAQ,MAAM,GAAG,IAAI,KAAG,MAAM,GAAG,IAGlE,CAAC"}
|