@gauts/auth 0.3.5 → 0.5.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 +510 -486
- package/dist/adapters/hono/index.d.ts +3 -3
- package/dist/adapters/hono/index.d.ts.map +1 -1
- package/dist/adapters/hono/index.js +12 -6
- 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 +4 -4
- package/dist/adapters/next/index.js.map +1 -1
- package/dist/adapters/prisma/index.d.ts +18 -8
- package/dist/adapters/prisma/index.d.ts.map +1 -1
- package/dist/adapters/prisma/index.js +127 -43
- package/dist/adapters/prisma/index.js.map +1 -1
- package/dist/config.d.ts +5 -0
- package/dist/config.d.ts.map +1 -1
- package/dist/config.js +5 -0
- package/dist/config.js.map +1 -1
- package/dist/session/cache.d.ts.map +1 -1
- package/dist/session/cache.js +60 -29
- package/dist/session/cache.js.map +1 -1
- package/dist/session/cookie.d.ts +2 -2
- package/dist/session/cookie.d.ts.map +1 -1
- package/dist/session/cookie.js +7 -6
- package/dist/session/cookie.js.map +1 -1
- package/package.json +1 -1
package/dist/session/cache.js
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { createHmac, timingSafeEqual } from "node:crypto";
|
|
2
2
|
import { matchesClient, normalizeClient } from "../client/index.js";
|
|
3
3
|
import { createError } from "../errors.js";
|
|
4
|
-
import {
|
|
4
|
+
import { isAuthUser, isNullableString, isRecord } from "./guards.js";
|
|
5
5
|
const signaturePattern = /^[A-Za-z0-9_-]{43}$/;
|
|
6
6
|
const CACHE_CONTEXT = "auth/session-cache";
|
|
7
7
|
const MIN_SECRET_BYTES = 32;
|
|
@@ -22,29 +22,36 @@ const matchesSignature = ({ body, secret, signature, token }) => {
|
|
|
22
22
|
const received = Buffer.from(signature, "ascii");
|
|
23
23
|
return expected.byteLength === received.byteLength && timingSafeEqual(expected, received);
|
|
24
24
|
};
|
|
25
|
+
const isStoredAccount = (value) => {
|
|
26
|
+
return (isRecord(value) &&
|
|
27
|
+
typeof value.email === "string" &&
|
|
28
|
+
typeof value.id === "string" &&
|
|
29
|
+
typeof value.name === "string" &&
|
|
30
|
+
typeof value.role === "string" &&
|
|
31
|
+
typeof value.status === "string" &&
|
|
32
|
+
isNullableString(value.timezone) &&
|
|
33
|
+
isAuthUser(value.usr));
|
|
34
|
+
};
|
|
25
35
|
const isStoredSession = (value) => {
|
|
26
36
|
return (isRecord(value) &&
|
|
27
|
-
typeof value.account_id === "string" &&
|
|
28
37
|
isRecord(value.client) &&
|
|
29
38
|
isNullableString(value.client.agent) &&
|
|
30
39
|
isNullableString(value.client.ip) &&
|
|
31
40
|
isNullableString(value.client.platform) &&
|
|
32
41
|
typeof value.created_at === "number" &&
|
|
33
42
|
Number.isSafeInteger(value.created_at) &&
|
|
34
|
-
typeof value.
|
|
35
|
-
Number.isSafeInteger(value.
|
|
43
|
+
typeof value.exp === "number" &&
|
|
44
|
+
Number.isSafeInteger(value.exp) &&
|
|
36
45
|
typeof value.id === "string" &&
|
|
37
|
-
typeof value.
|
|
38
|
-
Number.isSafeInteger(value.
|
|
46
|
+
typeof value.ren === "number" &&
|
|
47
|
+
Number.isSafeInteger(value.ren));
|
|
39
48
|
};
|
|
40
49
|
const isCachePayload = (value) => {
|
|
41
50
|
return (isRecord(value) &&
|
|
42
|
-
value.
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
isStoredSession(value.session) &&
|
|
47
|
-
value.session.account_id === value.account.id);
|
|
51
|
+
isStoredAccount(value.acc) &&
|
|
52
|
+
typeof value.exp === "number" &&
|
|
53
|
+
Number.isSafeInteger(value.exp) &&
|
|
54
|
+
isStoredSession(value.ses));
|
|
48
55
|
};
|
|
49
56
|
const parsePayload = (body) => {
|
|
50
57
|
try {
|
|
@@ -55,17 +62,38 @@ const parsePayload = (body) => {
|
|
|
55
62
|
return null;
|
|
56
63
|
}
|
|
57
64
|
};
|
|
58
|
-
const
|
|
59
|
-
|
|
65
|
+
const toAccount = (stored) => ({
|
|
66
|
+
email: stored.email,
|
|
67
|
+
id: stored.id,
|
|
68
|
+
name: stored.name,
|
|
69
|
+
role: stored.role,
|
|
70
|
+
status: stored.status,
|
|
71
|
+
timezone: stored.timezone,
|
|
72
|
+
user: stored.usr,
|
|
73
|
+
});
|
|
74
|
+
const toStoredAccount = (account) => ({
|
|
75
|
+
email: account.email,
|
|
76
|
+
id: account.id,
|
|
77
|
+
name: account.name,
|
|
78
|
+
role: account.role,
|
|
79
|
+
status: account.status,
|
|
80
|
+
timezone: account.timezone,
|
|
81
|
+
usr: account.user,
|
|
82
|
+
});
|
|
83
|
+
const toSession = ({ account_id, stored }) => ({
|
|
84
|
+
account_id,
|
|
85
|
+
client: stored.client,
|
|
60
86
|
created_at: new Date(stored.created_at),
|
|
61
|
-
expires_at: new Date(stored.
|
|
62
|
-
|
|
87
|
+
expires_at: new Date(stored.exp),
|
|
88
|
+
id: stored.id,
|
|
89
|
+
renew_at: new Date(stored.ren),
|
|
63
90
|
});
|
|
64
91
|
const toStoredSession = (session) => ({
|
|
65
|
-
|
|
92
|
+
client: session.client,
|
|
66
93
|
created_at: session.created_at.getTime(),
|
|
67
|
-
|
|
68
|
-
|
|
94
|
+
exp: session.expires_at.getTime(),
|
|
95
|
+
id: session.id,
|
|
96
|
+
ren: session.renew_at.getTime(),
|
|
69
97
|
});
|
|
70
98
|
export const createSessionCache = ({ config, now = () => new Date(), secret, session: sessionConfig, }) => {
|
|
71
99
|
if (!Number.isInteger(config.ttl) || config.ttl < 1 || config.ttl > sessionConfig.ttl) {
|
|
@@ -85,10 +113,9 @@ export const createSessionCache = ({ config, now = () => new Date(), secret, ses
|
|
|
85
113
|
const max_expires_at = resolved.session.created_at.getTime() + sessionConfig.maxLifetime * 1000;
|
|
86
114
|
const expires_at = new Date(Math.min(now().getTime() + config.ttl * 1000, resolved.session.expires_at.getTime(), max_expires_at));
|
|
87
115
|
const payload = {
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
version: 1,
|
|
116
|
+
acc: toStoredAccount(resolved.account),
|
|
117
|
+
exp: expires_at.getTime(),
|
|
118
|
+
ses: toStoredSession(resolved.session),
|
|
92
119
|
};
|
|
93
120
|
const body = Buffer.from(JSON.stringify(payload)).toString("base64url");
|
|
94
121
|
const signature = getSignature({ body, secret, token });
|
|
@@ -110,13 +137,17 @@ export const createSessionCache = ({ config, now = () => new Date(), secret, ses
|
|
|
110
137
|
return null;
|
|
111
138
|
}
|
|
112
139
|
const current = now().getTime();
|
|
113
|
-
const
|
|
140
|
+
const account = toAccount(payload.acc);
|
|
141
|
+
const resolvedSession = toSession({
|
|
142
|
+
account_id: account.id,
|
|
143
|
+
stored: payload.ses,
|
|
144
|
+
});
|
|
114
145
|
const max_expires_at = resolvedSession.created_at.getTime() + sessionConfig.maxLifetime * 1000;
|
|
115
|
-
if (payload.
|
|
146
|
+
if (payload.exp <= current ||
|
|
116
147
|
resolvedSession.expires_at.getTime() <= current ||
|
|
117
148
|
max_expires_at <= current ||
|
|
118
|
-
payload.
|
|
119
|
-
payload.
|
|
149
|
+
payload.exp > resolvedSession.expires_at.getTime() ||
|
|
150
|
+
payload.exp > max_expires_at ||
|
|
120
151
|
resolvedSession.expires_at.getTime() > max_expires_at ||
|
|
121
152
|
!matchesClient({
|
|
122
153
|
current: normalizeClient(client),
|
|
@@ -126,9 +157,9 @@ export const createSessionCache = ({ config, now = () => new Date(), secret, ses
|
|
|
126
157
|
return null;
|
|
127
158
|
}
|
|
128
159
|
return {
|
|
129
|
-
account
|
|
160
|
+
account,
|
|
130
161
|
session: resolvedSession,
|
|
131
|
-
user:
|
|
162
|
+
user: account.user,
|
|
132
163
|
};
|
|
133
164
|
},
|
|
134
165
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cache.js","sourceRoot":"","sources":["../../src/session/cache.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AAE1D,OAAO,EAAE,aAAa,EAAE,eAAe,EAA2B,MAAM,oBAAoB,CAAC;AAE7F,OAAO,EAAE,WAAW,EAAE,MAAM,cAAc,CAAC;AAC3C,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"cache.js","sourceRoot":"","sources":["../../src/session/cache.ts"],"names":[],"mappings":"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"}
|
package/dist/session/cookie.d.ts
CHANGED
|
@@ -1,12 +1,12 @@
|
|
|
1
1
|
export type SessionCookieNamesInput = {
|
|
2
2
|
cacheName?: string;
|
|
3
|
-
name?: string;
|
|
4
3
|
renewName?: string;
|
|
4
|
+
sessionName?: string;
|
|
5
5
|
};
|
|
6
6
|
export type SessionCookieNames = {
|
|
7
7
|
cacheName: string;
|
|
8
|
-
name: string;
|
|
9
8
|
renewName: string;
|
|
9
|
+
sessionName: string;
|
|
10
10
|
};
|
|
11
11
|
export declare const formatRenewAt: (value: Date) => string;
|
|
12
12
|
export declare const parseRenewAt: (value?: string | null) => number | null;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cookie.d.ts","sourceRoot":"","sources":["../../src/session/cookie.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"cookie.d.ts","sourceRoot":"","sources":["../../src/session/cookie.ts"],"names":[],"mappings":"AAIA,MAAM,MAAM,uBAAuB,GAAG;IAClC,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,WAAW,CAAC,EAAE,MAAM,CAAC;CACxB,CAAC;AAEF,MAAM,MAAM,kBAAkB,GAAG;IAC7B,SAAS,EAAE,MAAM,CAAC;IAClB,SAAS,EAAE,MAAM,CAAC;IAClB,WAAW,EAAE,MAAM,CAAC;CACvB,CAAC;AAKF,eAAO,MAAM,aAAa,GAAI,OAAO,IAAI,KAAG,MAW3C,CAAC;AAEF,eAAO,MAAM,YAAY,GAAI,QAAQ,MAAM,GAAG,IAAI,KAAG,MAAM,GAAG,IAS7D,CAAC;AAEF,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"}
|
package/dist/session/cookie.js
CHANGED
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { COOKIE_DEFAULTS } from "../config.js";
|
|
1
2
|
import { createError } from "../errors.js";
|
|
2
3
|
import { tokenPattern } from "./token.js";
|
|
3
4
|
const cookieNamePattern = /^[!#$%&'*+\-.^_`|~0-9A-Za-z]+$/;
|
|
@@ -21,7 +22,7 @@ export const parseRenewAt = (value) => {
|
|
|
21
22
|
return Number.isSafeInteger(seconds) ? seconds : null;
|
|
22
23
|
};
|
|
23
24
|
export const resolveSessionCookieName = (input) => {
|
|
24
|
-
const name = input ??
|
|
25
|
+
const name = input ?? COOKIE_DEFAULTS.sessionName;
|
|
25
26
|
if (!cookieNamePattern.test(name)) {
|
|
26
27
|
throw createError({
|
|
27
28
|
code: "AUTH_CONFIG_INVALID",
|
|
@@ -31,16 +32,16 @@ export const resolveSessionCookieName = (input) => {
|
|
|
31
32
|
return name;
|
|
32
33
|
};
|
|
33
34
|
export const resolveSessionCookieNames = (input = {}) => {
|
|
34
|
-
const
|
|
35
|
-
const
|
|
36
|
-
const
|
|
37
|
-
if (new Set([
|
|
35
|
+
const cacheName = resolveSessionCookieName(input.cacheName ?? COOKIE_DEFAULTS.cacheName);
|
|
36
|
+
const renewName = resolveSessionCookieName(input.renewName ?? COOKIE_DEFAULTS.renewName);
|
|
37
|
+
const sessionName = resolveSessionCookieName(input.sessionName);
|
|
38
|
+
if (new Set([sessionName, cacheName, renewName]).size !== 3) {
|
|
38
39
|
throw createError({
|
|
39
40
|
code: "AUTH_CONFIG_INVALID",
|
|
40
41
|
message: "Session cookie names must be unique.",
|
|
41
42
|
});
|
|
42
43
|
}
|
|
43
|
-
return { cacheName,
|
|
44
|
+
return { cacheName, renewName, sessionName };
|
|
44
45
|
};
|
|
45
46
|
export const parseSessionToken = (value) => {
|
|
46
47
|
const token = value?.trim();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cookie.js","sourceRoot":"","sources":["../../src/session/cookie.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,cAAc,CAAC;AAC3C,OAAO,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;AAc1C,MAAM,iBAAiB,GAAG,gCAAgC,CAAC;AAC3D,MAAM,cAAc,GAAG,YAAY,CAAC;AAEpC,MAAM,CAAC,MAAM,aAAa,GAAG,CAAC,KAAW,EAAU,EAAE;IACjD,MAAM,OAAO,GAAG,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,OAAO,EAAE,GAAG,IAAI,CAAC,CAAC;IAEnD,IAAI,CAAC,MAAM,CAAC,aAAa,CAAC,OAAO,CAAC,IAAI,OAAO,GAAG,CAAC,EAAE,CAAC;QAChD,MAAM,WAAW,CAAC;YACd,IAAI,EAAE,sBAAsB;YAC5B,OAAO,EAAE,kCAAkC;SAC9C,CAAC,CAAC;IACP,CAAC;IAED,OAAO,OAAO,CAAC,QAAQ,EAAE,CAAC;AAC9B,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,YAAY,GAAG,CAAC,KAAqB,EAAiB,EAAE;IACjE,MAAM,KAAK,GAAG,KAAK,EAAE,IAAI,EAAE,CAAC;IAE5B,IAAI,CAAC,KAAK,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC;QACxC,OAAO,IAAI,CAAC;IAChB,CAAC;IAED,MAAM,OAAO,GAAG,MAAM,CAAC,KAAK,CAAC,CAAC;IAC9B,OAAO,MAAM,CAAC,aAAa,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC;AAC1D,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,wBAAwB,GAAG,CAAC,KAAc,EAAU,EAAE;IAC/D,MAAM,IAAI,GAAG,KAAK,IAAI,
|
|
1
|
+
{"version":3,"file":"cookie.js","sourceRoot":"","sources":["../../src/session/cookie.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,cAAc,CAAC;AAC/C,OAAO,EAAE,WAAW,EAAE,MAAM,cAAc,CAAC;AAC3C,OAAO,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;AAc1C,MAAM,iBAAiB,GAAG,gCAAgC,CAAC;AAC3D,MAAM,cAAc,GAAG,YAAY,CAAC;AAEpC,MAAM,CAAC,MAAM,aAAa,GAAG,CAAC,KAAW,EAAU,EAAE;IACjD,MAAM,OAAO,GAAG,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,OAAO,EAAE,GAAG,IAAI,CAAC,CAAC;IAEnD,IAAI,CAAC,MAAM,CAAC,aAAa,CAAC,OAAO,CAAC,IAAI,OAAO,GAAG,CAAC,EAAE,CAAC;QAChD,MAAM,WAAW,CAAC;YACd,IAAI,EAAE,sBAAsB;YAC5B,OAAO,EAAE,kCAAkC;SAC9C,CAAC,CAAC;IACP,CAAC;IAED,OAAO,OAAO,CAAC,QAAQ,EAAE,CAAC;AAC9B,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,YAAY,GAAG,CAAC,KAAqB,EAAiB,EAAE;IACjE,MAAM,KAAK,GAAG,KAAK,EAAE,IAAI,EAAE,CAAC;IAE5B,IAAI,CAAC,KAAK,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC;QACxC,OAAO,IAAI,CAAC;IAChB,CAAC;IAED,MAAM,OAAO,GAAG,MAAM,CAAC,KAAK,CAAC,CAAC;IAC9B,OAAO,MAAM,CAAC,aAAa,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC;AAC1D,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,wBAAwB,GAAG,CAAC,KAAc,EAAU,EAAE;IAC/D,MAAM,IAAI,GAAG,KAAK,IAAI,eAAe,CAAC,WAAW,CAAC;IAElD,IAAI,CAAC,iBAAiB,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC;QAChC,MAAM,WAAW,CAAC;YACd,IAAI,EAAE,qBAAqB;YAC3B,OAAO,EAAE,iCAAiC;SAC7C,CAAC,CAAC;IACP,CAAC;IAED,OAAO,IAAI,CAAC;AAChB,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,yBAAyB,GAAG,CACrC,QAAiC,EAAE,EACjB,EAAE;IACpB,MAAM,SAAS,GAAG,wBAAwB,CAAC,KAAK,CAAC,SAAS,IAAI,eAAe,CAAC,SAAS,CAAC,CAAC;IACzF,MAAM,SAAS,GAAG,wBAAwB,CAAC,KAAK,CAAC,SAAS,IAAI,eAAe,CAAC,SAAS,CAAC,CAAC;IACzF,MAAM,WAAW,GAAG,wBAAwB,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC;IAEhE,IAAI,IAAI,GAAG,CAAC,CAAC,WAAW,EAAE,SAAS,EAAE,SAAS,CAAC,CAAC,CAAC,IAAI,KAAK,CAAC,EAAE,CAAC;QAC1D,MAAM,WAAW,CAAC;YACd,IAAI,EAAE,qBAAqB;YAC3B,OAAO,EAAE,sCAAsC;SAClD,CAAC,CAAC;IACP,CAAC;IAED,OAAO,EAAE,SAAS,EAAE,SAAS,EAAE,WAAW,EAAE,CAAC;AACjD,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,iBAAiB,GAAG,CAAC,KAAqB,EAAiB,EAAE;IACtE,MAAM,KAAK,GAAG,KAAK,EAAE,IAAI,EAAE,CAAC;IAC5B,OAAO,KAAK,IAAI,YAAY,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC;AAC5D,CAAC,CAAC"}
|