@itphx/synth-backend 0.2.0 → 0.4.4
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/agents/definitions/definitions/explore.json +1 -1
- package/dist/agents/definitions/definitions/general.json +1 -1
- package/dist/app.d.ts +47 -0
- package/dist/app.d.ts.map +1 -0
- package/dist/app.js +737 -0
- package/dist/app.js.map +1 -0
- package/dist/auth/middleware.d.ts +1 -1
- package/dist/auth/middleware.d.ts.map +1 -1
- package/dist/auth/middleware.js +27 -4
- package/dist/auth/middleware.js.map +1 -1
- package/dist/auth/oidc.d.ts +87 -0
- package/dist/auth/oidc.d.ts.map +1 -0
- package/dist/auth/oidc.js +210 -0
- package/dist/auth/oidc.js.map +1 -0
- package/dist/auth/oidc.test.d.ts +2 -0
- package/dist/auth/oidc.test.d.ts.map +1 -0
- package/dist/auth/oidc.test.js +39 -0
- package/dist/auth/oidc.test.js.map +1 -0
- package/dist/integration/hybrid.integration.test.d.ts +2 -0
- package/dist/integration/hybrid.integration.test.d.ts.map +1 -0
- package/dist/integration/hybrid.integration.test.js +289 -0
- package/dist/integration/hybrid.integration.test.js.map +1 -0
- package/dist/lib/app-config.d.ts.map +1 -1
- package/dist/lib/app-config.js +1 -0
- package/dist/lib/app-config.js.map +1 -1
- package/dist/lib/i18n.d.ts.map +1 -1
- package/dist/lib/i18n.js +12 -0
- package/dist/lib/i18n.js.map +1 -1
- package/dist/lib/orchestrator-workspace.test.js +2 -2
- package/dist/lib/orchestrator-workspace.test.js.map +1 -1
- package/dist/lib/serialize.d.ts +9 -2
- package/dist/lib/serialize.d.ts.map +1 -1
- package/dist/lib/serialize.js +9 -2
- package/dist/lib/serialize.js.map +1 -1
- package/dist/lib/serialize.test.js +4 -5
- package/dist/lib/serialize.test.js.map +1 -1
- package/dist/main.js +16 -524
- package/dist/main.js.map +1 -1
- package/dist/routes/agents.d.ts.map +1 -1
- package/dist/routes/agents.js +42 -55
- package/dist/routes/agents.js.map +1 -1
- package/dist/routes/agents.test.js +43 -0
- package/dist/routes/agents.test.js.map +1 -1
- package/dist/routes/audit.js +1 -1
- package/dist/routes/audit.js.map +1 -1
- package/dist/routes/auth.d.ts.map +1 -1
- package/dist/routes/auth.js +99 -12
- package/dist/routes/auth.js.map +1 -1
- package/dist/routes/auth.test.d.ts +2 -0
- package/dist/routes/auth.test.d.ts.map +1 -0
- package/dist/routes/auth.test.js +63 -0
- package/dist/routes/auth.test.js.map +1 -0
- package/dist/routes/context.js +1 -1
- package/dist/routes/context.js.map +1 -1
- package/dist/routes/gateway-patterns.test.js +2 -2
- package/dist/routes/gateway-patterns.test.js.map +1 -1
- package/dist/routes/llm.d.ts +25 -0
- package/dist/routes/llm.d.ts.map +1 -0
- package/dist/routes/llm.js +332 -0
- package/dist/routes/llm.js.map +1 -0
- package/dist/routes/llm.test.d.ts +2 -0
- package/dist/routes/llm.test.d.ts.map +1 -0
- package/dist/routes/llm.test.js +552 -0
- package/dist/routes/llm.test.js.map +1 -0
- package/dist/routes/models.d.ts +1 -1
- package/dist/routes/models.d.ts.map +1 -1
- package/dist/routes/models.js +41 -8
- package/dist/routes/models.js.map +1 -1
- package/dist/routes/models.test.d.ts +2 -0
- package/dist/routes/models.test.d.ts.map +1 -0
- package/dist/routes/models.test.js +203 -0
- package/dist/routes/models.test.js.map +1 -0
- package/dist/routes/projects.d.ts.map +1 -1
- package/dist/routes/projects.js +17 -2
- package/dist/routes/projects.js.map +1 -1
- package/dist/routes/projects.test.js +40 -0
- package/dist/routes/projects.test.js.map +1 -1
- package/dist/routes/providers.d.ts +1 -1
- package/dist/routes/providers.d.ts.map +1 -1
- package/dist/routes/providers.js +3 -1
- package/dist/routes/providers.js.map +1 -1
- package/dist/routes/providers.test.d.ts +2 -0
- package/dist/routes/providers.test.d.ts.map +1 -0
- package/dist/routes/providers.test.js +83 -0
- package/dist/routes/providers.test.js.map +1 -0
- package/dist/routes/queue.d.ts.map +1 -1
- package/dist/routes/queue.js +95 -37
- package/dist/routes/queue.js.map +1 -1
- package/dist/routes/queue.test.d.ts +2 -0
- package/dist/routes/queue.test.d.ts.map +1 -0
- package/dist/routes/queue.test.js +224 -0
- package/dist/routes/queue.test.js.map +1 -0
- package/dist/routes/sessions.d.ts +2 -1
- package/dist/routes/sessions.d.ts.map +1 -1
- package/dist/routes/sessions.js +159 -17
- package/dist/routes/sessions.js.map +1 -1
- package/dist/routes/sessions.test.js +220 -2
- package/dist/routes/sessions.test.js.map +1 -1
- package/dist/storage/project-store.d.ts.map +1 -1
- package/dist/storage/project-store.js +12 -0
- package/dist/storage/project-store.js.map +1 -1
- package/package.json +4 -3
package/dist/app.js.map
ADDED
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"app.js","sourceRoot":"","sources":["../src/app.ts"],"names":[],"mappings":"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"}
|
|
@@ -5,7 +5,7 @@ export declare function createAuthMiddleware(config: AuthConfig): {
|
|
|
5
5
|
req: {
|
|
6
6
|
header(name: string): string | undefined;
|
|
7
7
|
};
|
|
8
|
-
}) => User | null
|
|
8
|
+
}) => Promise<User | null>;
|
|
9
9
|
attachUser: import("hono").MiddlewareHandler<any, string, {}, Response>;
|
|
10
10
|
requireAuth: import("hono").MiddlewareHandler<any, string, {}, Response | (Response & import("hono").TypedResponse<{
|
|
11
11
|
error: {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"middleware.d.ts","sourceRoot":"","sources":["../../src/auth/middleware.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,IAAI,EAAE,MAAM,qBAAqB,CAAC;AAE5D,OAAO,EAAa,SAAS,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;
|
|
1
|
+
{"version":3,"file":"middleware.d.ts","sourceRoot":"","sources":["../../src/auth/middleware.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,IAAI,EAAE,MAAM,qBAAqB,CAAC;AAE5D,OAAO,EAAa,SAAS,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAyBjE,wBAAgB,oBAAoB,CAAC,MAAM,EAAE,UAAU;wBAKpB;QAAE,GAAG,EAAE;YAAE,MAAM,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAAA;SAAE,CAAA;KAAE,KAAG,OAAO,CAAC,IAAI,GAAG,IAAI,CAAC;;;;;;;;;;;;;;kCAyGxE,MAAM,EAAE;;;;;;0BAShB,IAAI,KAAG,MAAM;0BAgBb,UAAU,CAAC,OAAO,SAAS,CAAC,CAAC,CAAC,CAAC,aAAa,MAAM,KAAG,IAAI;6BANtD,UAAU,CAAC,OAAO,YAAY,CAAC,CAAC,CAAC,CAAC,aAAa,MAAM,KAAG,IAAI;EA0B7F;AAED,MAAM,MAAM,OAAO,GAAG,UAAU,CAAC,OAAO,oBAAoB,CAAC,CAAC"}
|
package/dist/auth/middleware.js
CHANGED
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import { createMiddleware } from 'hono/factory';
|
|
2
2
|
import { getCookie, setCookie, deleteCookie } from 'hono/cookie';
|
|
3
3
|
import { t } from '../lib/i18n.js';
|
|
4
|
+
import { createLazyOidcClient } from './oidc.js';
|
|
4
5
|
const SESSION_COOKIE = 'user_session';
|
|
5
6
|
// In-memory хранилище сессий (для debug mode)
|
|
6
7
|
const sessions = new Map();
|
|
@@ -21,8 +22,10 @@ function extractBearerToken(h) {
|
|
|
21
22
|
return null;
|
|
22
23
|
}
|
|
23
24
|
export function createAuthMiddleware(config) {
|
|
25
|
+
// Ленивый OIDC-клиент (мемоизация, безопасно при отсутствии oidc — null)
|
|
26
|
+
const getOidcClient = createLazyOidcClient(config.oidc);
|
|
24
27
|
// Определить пользователя из запроса
|
|
25
|
-
const getCurrentUser = (c) => {
|
|
28
|
+
const getCurrentUser = async (c) => {
|
|
26
29
|
// 1. Cookie-сессия
|
|
27
30
|
const sessionId = typeof getCookie === 'function'
|
|
28
31
|
? getCookie(c, SESSION_COOKIE)
|
|
@@ -56,7 +59,27 @@ export function createAuthMiddleware(config) {
|
|
|
56
59
|
if (config.oidc?.enabled) {
|
|
57
60
|
const token = extractBearerToken(c.req.header('Authorization'));
|
|
58
61
|
if (token) {
|
|
59
|
-
|
|
62
|
+
const client = getOidcClient();
|
|
63
|
+
if (client) {
|
|
64
|
+
try {
|
|
65
|
+
const oidcUser = await client.verifyToken(token);
|
|
66
|
+
return {
|
|
67
|
+
id: oidcUser.id,
|
|
68
|
+
username: oidcUser.username,
|
|
69
|
+
email: oidcUser.email,
|
|
70
|
+
roles: oidcUser.roles,
|
|
71
|
+
preferredLanguage: 'ru',
|
|
72
|
+
createdAt: new Date().toISOString(),
|
|
73
|
+
teamRole: oidcUser.roles[0] || 'USER',
|
|
74
|
+
notes: '',
|
|
75
|
+
interviewCompleted: false,
|
|
76
|
+
};
|
|
77
|
+
}
|
|
78
|
+
catch {
|
|
79
|
+
// Некорректный/истёкший JWT — пользователь не аутентифицирован
|
|
80
|
+
return null;
|
|
81
|
+
}
|
|
82
|
+
}
|
|
60
83
|
}
|
|
61
84
|
}
|
|
62
85
|
// 4. API Key mode (продакшен без OIDC)
|
|
@@ -79,14 +102,14 @@ export function createAuthMiddleware(config) {
|
|
|
79
102
|
};
|
|
80
103
|
// Middleware: прикрепить пользователя к контексту (без ошибки)
|
|
81
104
|
const attachUser = createMiddleware(async (c, next) => {
|
|
82
|
-
const user = getCurrentUser(c);
|
|
105
|
+
const user = await getCurrentUser(c);
|
|
83
106
|
if (user)
|
|
84
107
|
c.set('user', user);
|
|
85
108
|
await next();
|
|
86
109
|
});
|
|
87
110
|
// Middleware: требовать аутентификации
|
|
88
111
|
const requireAuth = createMiddleware(async (c, next) => {
|
|
89
|
-
const user = getCurrentUser(c);
|
|
112
|
+
const user = await getCurrentUser(c);
|
|
90
113
|
if (!user) {
|
|
91
114
|
return c.json({ error: { code: 'UNAUTHORIZED', message: t('auth.unauthorized', undefined, c) } }, 401);
|
|
92
115
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"middleware.js","sourceRoot":"","sources":["../../src/auth/middleware.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,gBAAgB,EAAE,MAAM,cAAc,CAAC;AAChD,OAAO,EAAE,SAAS,EAAE,SAAS,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AACjE,OAAO,EAAE,CAAC,EAAE,MAAM,gBAAgB,CAAC;
|
|
1
|
+
{"version":3,"file":"middleware.js","sourceRoot":"","sources":["../../src/auth/middleware.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,87 @@
|
|
|
1
|
+
import type { User } from '@itphx/synth-shared';
|
|
2
|
+
/**
|
|
3
|
+
* Конфигурация OIDC-клиента (Keycloak, confidential client).
|
|
4
|
+
* Схема Authorization Code + PKCE не обязателен — используем client_secret.
|
|
5
|
+
*/
|
|
6
|
+
export interface OidcConfig {
|
|
7
|
+
issuer: string;
|
|
8
|
+
clientId: string;
|
|
9
|
+
clientSecret: string;
|
|
10
|
+
redirectUri: string;
|
|
11
|
+
}
|
|
12
|
+
/** Подмножество документа discovery OpenID Connect. */
|
|
13
|
+
export interface OidcDiscovery {
|
|
14
|
+
authorization_endpoint: string;
|
|
15
|
+
token_endpoint: string;
|
|
16
|
+
jwks_uri: string;
|
|
17
|
+
}
|
|
18
|
+
/** Результат обмена authorization code на токены. */
|
|
19
|
+
export interface OidcTokenResult {
|
|
20
|
+
id_token: string;
|
|
21
|
+
access_token: string;
|
|
22
|
+
}
|
|
23
|
+
/**
|
|
24
|
+
* OIDC-клиент: discovery, authorize URL, обмен кода, верификация JWT.
|
|
25
|
+
*/
|
|
26
|
+
export declare class OidcClient {
|
|
27
|
+
private readonly config;
|
|
28
|
+
private _discovery;
|
|
29
|
+
constructor(config: OidcConfig);
|
|
30
|
+
/**
|
|
31
|
+
* GET ${issuer}/.well-known/openid-configuration.
|
|
32
|
+
* Результат кэшируется на время жизни инстанса.
|
|
33
|
+
*/
|
|
34
|
+
getDiscovery(): Promise<OidcDiscovery>;
|
|
35
|
+
/**
|
|
36
|
+
* URL для редиректа пользователя на authorize endpoint.
|
|
37
|
+
*/
|
|
38
|
+
authorizeUrl(state: string): Promise<string>;
|
|
39
|
+
/**
|
|
40
|
+
* POST token_endpoint (form-urlencoded) — обмен authorization code на токены.
|
|
41
|
+
*/
|
|
42
|
+
exchangeCode(code: string): Promise<OidcTokenResult>;
|
|
43
|
+
/**
|
|
44
|
+
* POST token_endpoint — вход по логину/паролю (ROPC, Resource Owner Password Credentials).
|
|
45
|
+
* scope: 'openid' обязателен — без него Keycloak не возвращает id_token (только access_token).
|
|
46
|
+
*/
|
|
47
|
+
exchangePassword(username: string, password: string): Promise<OidcTokenResult>;
|
|
48
|
+
/**
|
|
49
|
+
* Проверка JWT (id_token или access_token) через JWKS провайдера.
|
|
50
|
+
* Возвращает User-подобный объект: id, username, email, roles.
|
|
51
|
+
*/
|
|
52
|
+
verifyToken(token: string): Promise<OidcUser>;
|
|
53
|
+
/**
|
|
54
|
+
* Проверка пары id_token + access_token через JWKS провайдера.
|
|
55
|
+
* Роли: из id_token, если пусто — из access_token (client roles учитываются).
|
|
56
|
+
*/
|
|
57
|
+
verifyTokens(idToken: string, accessToken: string): Promise<OidcUser>;
|
|
58
|
+
}
|
|
59
|
+
/** User-подобный объект, извлечённый из OIDC-токена. */
|
|
60
|
+
export interface OidcUser {
|
|
61
|
+
id: string;
|
|
62
|
+
username: string;
|
|
63
|
+
email?: string;
|
|
64
|
+
roles: string[];
|
|
65
|
+
}
|
|
66
|
+
/**
|
|
67
|
+
* Извлечь пользователя из payload id_token Keycloak:
|
|
68
|
+
* - username = preferred_username (fallback email, sub)
|
|
69
|
+
* - roles = realm_access.roles + resource_access.<clientId>.roles → ВЕРХНИЙ РЕГИСТР + фильтр известных (ADMIN/USER/LEAD/AUDITOR)
|
|
70
|
+
* - если ролей нет — дефолт ['USER']
|
|
71
|
+
*/
|
|
72
|
+
export declare function extractUser(payload: Record<string, unknown>, clientId?: string): OidcUser;
|
|
73
|
+
/**
|
|
74
|
+
* Объединить роли из id_token и access_token: роли из id_token, если пусто — из access_token.
|
|
75
|
+
* Поля id/username/email берутся из id_token.
|
|
76
|
+
*/
|
|
77
|
+
export declare function extractUserFromTokens(idPayload: Record<string, unknown>, accessPayload: Record<string, unknown>, clientId?: string): OidcUser;
|
|
78
|
+
/**
|
|
79
|
+
* Собрать полноценный User из OIDC-пользователя (объект User требует служебные поля).
|
|
80
|
+
*/
|
|
81
|
+
export declare function oidcUserToUser(o: OidcUser): User;
|
|
82
|
+
/**
|
|
83
|
+
* Лениво создать OIDC-клиент из конфига (мемоизация).
|
|
84
|
+
* Безопасно при отсутствии oidc-конфига: возвращает null вместо выбрасывания ошибки.
|
|
85
|
+
*/
|
|
86
|
+
export declare function createLazyOidcClient(oidc?: OidcConfig): () => OidcClient | null;
|
|
87
|
+
//# sourceMappingURL=oidc.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"oidc.d.ts","sourceRoot":"","sources":["../../src/auth/oidc.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,qBAAqB,CAAC;AAEhD;;;GAGG;AACH,MAAM,WAAW,UAAU;IACzB,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,EAAE,MAAM,CAAC;IACjB,YAAY,EAAE,MAAM,CAAC;IACrB,WAAW,EAAE,MAAM,CAAC;CACrB;AAED,uDAAuD;AACvD,MAAM,WAAW,aAAa;IAC5B,sBAAsB,EAAE,MAAM,CAAC;IAC/B,cAAc,EAAE,MAAM,CAAC;IACvB,QAAQ,EAAE,MAAM,CAAC;CAClB;AAED,qDAAqD;AACrD,MAAM,WAAW,eAAe;IAC9B,QAAQ,EAAE,MAAM,CAAC;IACjB,YAAY,EAAE,MAAM,CAAC;CACtB;AAKD;;GAEG;AACH,qBAAa,UAAU;IAGT,OAAO,CAAC,QAAQ,CAAC,MAAM;IAFnC,OAAO,CAAC,UAAU,CAA8B;gBAEnB,MAAM,EAAE,UAAU;IAE/C;;;OAGG;IACG,YAAY,IAAI,OAAO,CAAC,aAAa,CAAC;IAe5C;;OAEG;IACG,YAAY,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAYlD;;OAEG;IACG,YAAY,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,eAAe,CAAC;IA0B1D;;;OAGG;IACG,gBAAgB,CAAC,QAAQ,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,eAAe,CAAC;IA0BpF;;;OAGG;IACG,WAAW,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,QAAQ,CAAC;IAOnD;;;OAGG;IACG,YAAY,CAAC,OAAO,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,QAAQ,CAAC;CAO5E;AAED,wDAAwD;AACxD,MAAM,WAAW,QAAQ;IACvB,EAAE,EAAE,MAAM,CAAC;IACX,QAAQ,EAAE,MAAM,CAAC;IACjB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,KAAK,EAAE,MAAM,EAAE,CAAC;CACjB;AA4BD;;;;;GAKG;AACH,wBAAgB,WAAW,CAAC,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,QAAQ,CAAC,EAAE,MAAM,GAAG,QAAQ,CAgBzF;AAED;;;GAGG;AACH,wBAAgB,qBAAqB,CACnC,SAAS,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAClC,aAAa,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EACtC,QAAQ,CAAC,EAAE,MAAM,GAChB,QAAQ,CAMV;AAED;;GAEG;AACH,wBAAgB,cAAc,CAAC,CAAC,EAAE,QAAQ,GAAG,IAAI,CAYhD;AAED;;;GAGG;AACH,wBAAgB,oBAAoB,CAAC,IAAI,CAAC,EAAE,UAAU,GAAG,MAAM,UAAU,GAAG,IAAI,CAY/E"}
|
|
@@ -0,0 +1,210 @@
|
|
|
1
|
+
import { jwtVerify, createRemoteJWKSet } from 'jose';
|
|
2
|
+
/** Известные роли Synth (в realm роли записаны в нижнем регистре). */
|
|
3
|
+
const KNOWN_ROLES = ['ADMIN', 'USER', 'LEAD', 'AUDITOR'];
|
|
4
|
+
/**
|
|
5
|
+
* OIDC-клиент: discovery, authorize URL, обмен кода, верификация JWT.
|
|
6
|
+
*/
|
|
7
|
+
export class OidcClient {
|
|
8
|
+
config;
|
|
9
|
+
_discovery = null;
|
|
10
|
+
constructor(config) {
|
|
11
|
+
this.config = config;
|
|
12
|
+
}
|
|
13
|
+
/**
|
|
14
|
+
* GET ${issuer}/.well-known/openid-configuration.
|
|
15
|
+
* Результат кэшируется на время жизни инстанса.
|
|
16
|
+
*/
|
|
17
|
+
async getDiscovery() {
|
|
18
|
+
if (this._discovery)
|
|
19
|
+
return this._discovery;
|
|
20
|
+
const url = `${this.config.issuer}/.well-known/openid-configuration`;
|
|
21
|
+
const res = await fetch(url);
|
|
22
|
+
if (!res.ok) {
|
|
23
|
+
throw new Error(`OIDC discovery failed: ${res.status} ${url}`);
|
|
24
|
+
}
|
|
25
|
+
const doc = (await res.json());
|
|
26
|
+
if (!doc.authorization_endpoint || !doc.token_endpoint || !doc.jwks_uri) {
|
|
27
|
+
throw new Error('OIDC discovery не содержит обязательных endpoint-ов');
|
|
28
|
+
}
|
|
29
|
+
this._discovery = doc;
|
|
30
|
+
return doc;
|
|
31
|
+
}
|
|
32
|
+
/**
|
|
33
|
+
* URL для редиректа пользователя на authorize endpoint.
|
|
34
|
+
*/
|
|
35
|
+
async authorizeUrl(state) {
|
|
36
|
+
const discovery = await this.getDiscovery();
|
|
37
|
+
const params = new URLSearchParams({
|
|
38
|
+
response_type: 'code',
|
|
39
|
+
client_id: this.config.clientId,
|
|
40
|
+
redirect_uri: this.config.redirectUri,
|
|
41
|
+
scope: 'openid profile email',
|
|
42
|
+
state,
|
|
43
|
+
});
|
|
44
|
+
return `${discovery.authorization_endpoint}?${params.toString()}`;
|
|
45
|
+
}
|
|
46
|
+
/**
|
|
47
|
+
* POST token_endpoint (form-urlencoded) — обмен authorization code на токены.
|
|
48
|
+
*/
|
|
49
|
+
async exchangeCode(code) {
|
|
50
|
+
const discovery = await this.getDiscovery();
|
|
51
|
+
const body = new URLSearchParams({
|
|
52
|
+
grant_type: 'authorization_code',
|
|
53
|
+
code,
|
|
54
|
+
redirect_uri: this.config.redirectUri,
|
|
55
|
+
client_id: this.config.clientId,
|
|
56
|
+
client_secret: this.config.clientSecret,
|
|
57
|
+
});
|
|
58
|
+
const res = await fetch(discovery.token_endpoint, {
|
|
59
|
+
method: 'POST',
|
|
60
|
+
headers: { 'Content-Type': 'application/x-www-form-urlencoded' },
|
|
61
|
+
body: body.toString(),
|
|
62
|
+
});
|
|
63
|
+
if (!res.ok) {
|
|
64
|
+
throw new Error(`OIDC token exchange failed: ${res.status}`);
|
|
65
|
+
}
|
|
66
|
+
const data = (await res.json());
|
|
67
|
+
if (!data.id_token || !data.access_token) {
|
|
68
|
+
throw new Error('OIDC token exchange не вернул id_token/access_token');
|
|
69
|
+
}
|
|
70
|
+
return { id_token: data.id_token, access_token: data.access_token };
|
|
71
|
+
}
|
|
72
|
+
/**
|
|
73
|
+
* POST token_endpoint — вход по логину/паролю (ROPC, Resource Owner Password Credentials).
|
|
74
|
+
* scope: 'openid' обязателен — без него Keycloak не возвращает id_token (только access_token).
|
|
75
|
+
*/
|
|
76
|
+
async exchangePassword(username, password) {
|
|
77
|
+
const discovery = await this.getDiscovery();
|
|
78
|
+
const body = new URLSearchParams({
|
|
79
|
+
grant_type: 'password',
|
|
80
|
+
client_id: this.config.clientId,
|
|
81
|
+
client_secret: this.config.clientSecret,
|
|
82
|
+
username,
|
|
83
|
+
password,
|
|
84
|
+
scope: 'openid',
|
|
85
|
+
});
|
|
86
|
+
const res = await fetch(discovery.token_endpoint, {
|
|
87
|
+
method: 'POST',
|
|
88
|
+
headers: { 'Content-Type': 'application/x-www-form-urlencoded' },
|
|
89
|
+
body: body.toString(),
|
|
90
|
+
});
|
|
91
|
+
if (!res.ok) {
|
|
92
|
+
const text = await res.text().catch(() => '');
|
|
93
|
+
throw new Error(`OIDC ROPC failed: ${res.status} ${text}`);
|
|
94
|
+
}
|
|
95
|
+
const data = (await res.json());
|
|
96
|
+
if (!data.id_token || !data.access_token) {
|
|
97
|
+
throw new Error('OIDC ROPC не вернул id_token/access_token');
|
|
98
|
+
}
|
|
99
|
+
return { id_token: data.id_token, access_token: data.access_token };
|
|
100
|
+
}
|
|
101
|
+
/**
|
|
102
|
+
* Проверка JWT (id_token или access_token) через JWKS провайдера.
|
|
103
|
+
* Возвращает User-подобный объект: id, username, email, roles.
|
|
104
|
+
*/
|
|
105
|
+
async verifyToken(token) {
|
|
106
|
+
const discovery = await this.getDiscovery();
|
|
107
|
+
const jwks = createRemoteJWKSet(new URL(discovery.jwks_uri));
|
|
108
|
+
const { payload } = await jwtVerify(token, jwks);
|
|
109
|
+
return extractUser(payload, this.config.clientId);
|
|
110
|
+
}
|
|
111
|
+
/**
|
|
112
|
+
* Проверка пары id_token + access_token через JWKS провайдера.
|
|
113
|
+
* Роли: из id_token, если пусто — из access_token (client roles учитываются).
|
|
114
|
+
*/
|
|
115
|
+
async verifyTokens(idToken, accessToken) {
|
|
116
|
+
const discovery = await this.getDiscovery();
|
|
117
|
+
const jwks = createRemoteJWKSet(new URL(discovery.jwks_uri));
|
|
118
|
+
const { payload: idPayload } = await jwtVerify(idToken, jwks);
|
|
119
|
+
const { payload: accessPayload } = await jwtVerify(accessToken, jwks);
|
|
120
|
+
return extractUserFromTokens(idPayload, accessPayload, this.config.clientId);
|
|
121
|
+
}
|
|
122
|
+
}
|
|
123
|
+
/**
|
|
124
|
+
* Извлечь известные роли из payload токена Keycloak:
|
|
125
|
+
* realm_access.roles + resource_access.<clientId>.roles (client roles).
|
|
126
|
+
* Нормализация в ВЕРХНИЙ РЕГИСТР + фильтр KNOWN_ROLES, без дубликатов. Дефолт не применяется.
|
|
127
|
+
*/
|
|
128
|
+
function extractKnownRoles(payload, clientId) {
|
|
129
|
+
const realmAccess = (payload.realm_access ?? {});
|
|
130
|
+
const rawRoles = Array.isArray(realmAccess.roles)
|
|
131
|
+
? realmAccess.roles.filter((r) => typeof r === 'string')
|
|
132
|
+
: [];
|
|
133
|
+
if (clientId) {
|
|
134
|
+
const resourceAccess = (payload.resource_access ?? {});
|
|
135
|
+
const clientAccess = (resourceAccess[clientId] ?? {});
|
|
136
|
+
if (Array.isArray(clientAccess.roles)) {
|
|
137
|
+
rawRoles.push(...clientAccess.roles.filter((r) => typeof r === 'string'));
|
|
138
|
+
}
|
|
139
|
+
}
|
|
140
|
+
const roles = rawRoles
|
|
141
|
+
.map((r) => r.toUpperCase())
|
|
142
|
+
.filter((r) => KNOWN_ROLES.includes(r));
|
|
143
|
+
return [...new Set(roles)];
|
|
144
|
+
}
|
|
145
|
+
/**
|
|
146
|
+
* Извлечь пользователя из payload id_token Keycloak:
|
|
147
|
+
* - username = preferred_username (fallback email, sub)
|
|
148
|
+
* - roles = realm_access.roles + resource_access.<clientId>.roles → ВЕРХНИЙ РЕГИСТР + фильтр известных (ADMIN/USER/LEAD/AUDITOR)
|
|
149
|
+
* - если ролей нет — дефолт ['USER']
|
|
150
|
+
*/
|
|
151
|
+
export function extractUser(payload, clientId) {
|
|
152
|
+
const sub = typeof payload.sub === 'string' ? payload.sub : '';
|
|
153
|
+
const email = typeof payload.email === 'string' ? payload.email : undefined;
|
|
154
|
+
const preferredUsername = typeof payload.preferred_username === 'string'
|
|
155
|
+
? payload.preferred_username
|
|
156
|
+
: undefined;
|
|
157
|
+
const username = preferredUsername || email || sub || '';
|
|
158
|
+
const roles = extractKnownRoles(payload, clientId);
|
|
159
|
+
return {
|
|
160
|
+
id: sub || username || 'oidc-user',
|
|
161
|
+
username: username || 'oidc-user',
|
|
162
|
+
email,
|
|
163
|
+
roles: roles.length > 0 ? roles : ['USER'],
|
|
164
|
+
};
|
|
165
|
+
}
|
|
166
|
+
/**
|
|
167
|
+
* Объединить роли из id_token и access_token: роли из id_token, если пусто — из access_token.
|
|
168
|
+
* Поля id/username/email берутся из id_token.
|
|
169
|
+
*/
|
|
170
|
+
export function extractUserFromTokens(idPayload, accessPayload, clientId) {
|
|
171
|
+
const idRoles = extractKnownRoles(idPayload, clientId);
|
|
172
|
+
const accessRoles = extractKnownRoles(accessPayload, clientId);
|
|
173
|
+
const roles = idRoles.length > 0 ? idRoles : accessRoles;
|
|
174
|
+
const user = extractUser(idPayload, clientId);
|
|
175
|
+
return { ...user, roles: roles.length > 0 ? roles : ['USER'] };
|
|
176
|
+
}
|
|
177
|
+
/**
|
|
178
|
+
* Собрать полноценный User из OIDC-пользователя (объект User требует служебные поля).
|
|
179
|
+
*/
|
|
180
|
+
export function oidcUserToUser(o) {
|
|
181
|
+
return {
|
|
182
|
+
id: o.id,
|
|
183
|
+
username: o.username,
|
|
184
|
+
email: o.email,
|
|
185
|
+
roles: o.roles,
|
|
186
|
+
preferredLanguage: 'ru',
|
|
187
|
+
createdAt: new Date().toISOString(),
|
|
188
|
+
teamRole: o.roles[0] || 'USER',
|
|
189
|
+
notes: '',
|
|
190
|
+
interviewCompleted: false,
|
|
191
|
+
};
|
|
192
|
+
}
|
|
193
|
+
/**
|
|
194
|
+
* Лениво создать OIDC-клиент из конфига (мемоизация).
|
|
195
|
+
* Безопасно при отсутствии oidc-конфига: возвращает null вместо выбрасывания ошибки.
|
|
196
|
+
*/
|
|
197
|
+
export function createLazyOidcClient(oidc) {
|
|
198
|
+
let client;
|
|
199
|
+
return () => {
|
|
200
|
+
if (client !== undefined)
|
|
201
|
+
return client;
|
|
202
|
+
if (!oidc || !oidc.issuer || !oidc.clientId || !oidc.clientSecret) {
|
|
203
|
+
client = null;
|
|
204
|
+
return null;
|
|
205
|
+
}
|
|
206
|
+
client = new OidcClient(oidc);
|
|
207
|
+
return client;
|
|
208
|
+
};
|
|
209
|
+
}
|
|
210
|
+
//# sourceMappingURL=oidc.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"oidc.js","sourceRoot":"","sources":["../../src/auth/oidc.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,kBAAkB,EAAE,MAAM,MAAM,CAAC;AA2BrD,sEAAsE;AACtE,MAAM,WAAW,GAAG,CAAC,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,SAAS,CAAU,CAAC;AAElE;;GAEG;AACH,MAAM,OAAO,UAAU;IAGQ;IAFrB,UAAU,GAAyB,IAAI,CAAC;IAEhD,YAA6B,MAAkB;QAAlB,WAAM,GAAN,MAAM,CAAY;IAAG,CAAC;IAEnD;;;OAGG;IACH,KAAK,CAAC,YAAY;QAChB,IAAI,IAAI,CAAC,UAAU;YAAE,OAAO,IAAI,CAAC,UAAU,CAAC;QAC5C,MAAM,GAAG,GAAG,GAAG,IAAI,CAAC,MAAM,CAAC,MAAM,mCAAmC,CAAC;QACrE,MAAM,GAAG,GAAG,MAAM,KAAK,CAAC,GAAG,CAAC,CAAC;QAC7B,IAAI,CAAC,GAAG,CAAC,EAAE,EAAE,CAAC;YACZ,MAAM,IAAI,KAAK,CAAC,0BAA0B,GAAG,CAAC,MAAM,IAAI,GAAG,EAAE,CAAC,CAAC;QACjE,CAAC;QACD,MAAM,GAAG,GAAG,CAAC,MAAM,GAAG,CAAC,IAAI,EAAE,CAAkB,CAAC;QAChD,IAAI,CAAC,GAAG,CAAC,sBAAsB,IAAI,CAAC,GAAG,CAAC,cAAc,IAAI,CAAC,GAAG,CAAC,QAAQ,EAAE,CAAC;YACxE,MAAM,IAAI,KAAK,CAAC,qDAAqD,CAAC,CAAC;QACzE,CAAC;QACD,IAAI,CAAC,UAAU,GAAG,GAAG,CAAC;QACtB,OAAO,GAAG,CAAC;IACb,CAAC;IAED;;OAEG;IACH,KAAK,CAAC,YAAY,CAAC,KAAa;QAC9B,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,YAAY,EAAE,CAAC;QAC5C,MAAM,MAAM,GAAG,IAAI,eAAe,CAAC;YACjC,aAAa,EAAE,MAAM;YACrB,SAAS,EAAE,IAAI,CAAC,MAAM,CAAC,QAAQ;YAC/B,YAAY,EAAE,IAAI,CAAC,MAAM,CAAC,WAAW;YACrC,KAAK,EAAE,sBAAsB;YAC7B,KAAK;SACN,CAAC,CAAC;QACH,OAAO,GAAG,SAAS,CAAC,sBAAsB,IAAI,MAAM,CAAC,QAAQ,EAAE,EAAE,CAAC;IACpE,CAAC;IAED;;OAEG;IACH,KAAK,CAAC,YAAY,CAAC,IAAY;QAC7B,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,YAAY,EAAE,CAAC;QAC5C,MAAM,IAAI,GAAG,IAAI,eAAe,CAAC;YAC/B,UAAU,EAAE,oBAAoB;YAChC,IAAI;YACJ,YAAY,EAAE,IAAI,CAAC,MAAM,CAAC,WAAW;YACrC,SAAS,EAAE,IAAI,CAAC,MAAM,CAAC,QAAQ;YAC/B,aAAa,EAAE,IAAI,CAAC,MAAM,CAAC,YAAY;SACxC,CAAC,CAAC;QAEH,MAAM,GAAG,GAAG,MAAM,KAAK,CAAC,SAAS,CAAC,cAAc,EAAE;YAChD,MAAM,EAAE,MAAM;YACd,OAAO,EAAE,EAAE,cAAc,EAAE,mCAAmC,EAAE;YAChE,IAAI,EAAE,IAAI,CAAC,QAAQ,EAAE;SACtB,CAAC,CAAC;QAEH,IAAI,CAAC,GAAG,CAAC,EAAE,EAAE,CAAC;YACZ,MAAM,IAAI,KAAK,CAAC,+BAA+B,GAAG,CAAC,MAAM,EAAE,CAAC,CAAC;QAC/D,CAAC;QACD,MAAM,IAAI,GAAG,CAAC,MAAM,GAAG,CAAC,IAAI,EAAE,CAA6B,CAAC;QAC5D,IAAI,CAAC,IAAI,CAAC,QAAQ,IAAI,CAAC,IAAI,CAAC,YAAY,EAAE,CAAC;YACzC,MAAM,IAAI,KAAK,CAAC,qDAAqD,CAAC,CAAC;QACzE,CAAC;QACD,OAAO,EAAE,QAAQ,EAAE,IAAI,CAAC,QAAQ,EAAE,YAAY,EAAE,IAAI,CAAC,YAAY,EAAE,CAAC;IACtE,CAAC;IAED;;;OAGG;IACH,KAAK,CAAC,gBAAgB,CAAC,QAAgB,EAAE,QAAgB;QACvD,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,YAAY,EAAE,CAAC;QAC5C,MAAM,IAAI,GAAG,IAAI,eAAe,CAAC;YAC/B,UAAU,EAAE,UAAU;YACtB,SAAS,EAAE,IAAI,CAAC,MAAM,CAAC,QAAQ;YAC/B,aAAa,EAAE,IAAI,CAAC,MAAM,CAAC,YAAY;YACvC,QAAQ;YACR,QAAQ;YACR,KAAK,EAAE,QAAQ;SAChB,CAAC,CAAC;QACH,MAAM,GAAG,GAAG,MAAM,KAAK,CAAC,SAAS,CAAC,cAAc,EAAE;YAChD,MAAM,EAAE,MAAM;YACd,OAAO,EAAE,EAAE,cAAc,EAAE,mCAAmC,EAAE;YAChE,IAAI,EAAE,IAAI,CAAC,QAAQ,EAAE;SACtB,CAAC,CAAC;QACH,IAAI,CAAC,GAAG,CAAC,EAAE,EAAE,CAAC;YACZ,MAAM,IAAI,GAAG,MAAM,GAAG,CAAC,IAAI,EAAE,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,EAAE,CAAC,CAAC;YAC9C,MAAM,IAAI,KAAK,CAAC,qBAAqB,GAAG,CAAC,MAAM,IAAI,IAAI,EAAE,CAAC,CAAC;QAC7D,CAAC;QACD,MAAM,IAAI,GAAG,CAAC,MAAM,GAAG,CAAC,IAAI,EAAE,CAA6B,CAAC;QAC5D,IAAI,CAAC,IAAI,CAAC,QAAQ,IAAI,CAAC,IAAI,CAAC,YAAY,EAAE,CAAC;YACzC,MAAM,IAAI,KAAK,CAAC,2CAA2C,CAAC,CAAC;QAC/D,CAAC;QACD,OAAO,EAAE,QAAQ,EAAE,IAAI,CAAC,QAAQ,EAAE,YAAY,EAAE,IAAI,CAAC,YAAY,EAAE,CAAC;IACtE,CAAC;IAED;;;OAGG;IACH,KAAK,CAAC,WAAW,CAAC,KAAa;QAC7B,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,YAAY,EAAE,CAAC;QAC5C,MAAM,IAAI,GAAG,kBAAkB,CAAC,IAAI,GAAG,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAC,CAAC;QAC7D,MAAM,EAAE,OAAO,EAAE,GAAG,MAAM,SAAS,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC;QACjD,OAAO,WAAW,CAAC,OAAO,EAAE,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;IACpD,CAAC;IAED;;;OAGG;IACH,KAAK,CAAC,YAAY,CAAC,OAAe,EAAE,WAAmB;QACrD,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,YAAY,EAAE,CAAC;QAC5C,MAAM,IAAI,GAAG,kBAAkB,CAAC,IAAI,GAAG,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAC,CAAC;QAC7D,MAAM,EAAE,OAAO,EAAE,SAAS,EAAE,GAAG,MAAM,SAAS,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;QAC9D,MAAM,EAAE,OAAO,EAAE,aAAa,EAAE,GAAG,MAAM,SAAS,CAAC,WAAW,EAAE,IAAI,CAAC,CAAC;QACtE,OAAO,qBAAqB,CAAC,SAAS,EAAE,aAAa,EAAE,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;IAC/E,CAAC;CACF;AAUD;;;;GAIG;AACH,SAAS,iBAAiB,CAAC,OAAgC,EAAE,QAAiB;IAC5E,MAAM,WAAW,GAAG,CAAC,OAAO,CAAC,YAAY,IAAI,EAAE,CAA4B,CAAC;IAC5E,MAAM,QAAQ,GAAG,KAAK,CAAC,OAAO,CAAC,WAAW,CAAC,KAAK,CAAC;QAC/C,CAAC,CAAE,WAAW,CAAC,KAAmB,CAAC,MAAM,CAAC,CAAC,CAAC,EAAe,EAAE,CAAC,OAAO,CAAC,KAAK,QAAQ,CAAC;QACpF,CAAC,CAAC,EAAE,CAAC;IAEP,IAAI,QAAQ,EAAE,CAAC;QACb,MAAM,cAAc,GAAG,CAAC,OAAO,CAAC,eAAe,IAAI,EAAE,CAA4B,CAAC;QAClF,MAAM,YAAY,GAAG,CAAC,cAAc,CAAC,QAAQ,CAAC,IAAI,EAAE,CAA4B,CAAC;QACjF,IAAI,KAAK,CAAC,OAAO,CAAC,YAAY,CAAC,KAAK,CAAC,EAAE,CAAC;YACtC,QAAQ,CAAC,IAAI,CAAC,GAAG,YAAY,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,EAAe,EAAE,CAAC,OAAO,CAAC,KAAK,QAAQ,CAAC,CAAC,CAAC;QACzF,CAAC;IACH,CAAC;IAED,MAAM,KAAK,GAAG,QAAQ;SACnB,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,WAAW,EAAE,CAAC;SAC3B,MAAM,CAAC,CAAC,CAAC,EAAe,EAAE,CAAE,WAAiC,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC;IAE9E,OAAO,CAAC,GAAG,IAAI,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC;AAC7B,CAAC;AAED;;;;;GAKG;AACH,MAAM,UAAU,WAAW,CAAC,OAAgC,EAAE,QAAiB;IAC7E,MAAM,GAAG,GAAG,OAAO,OAAO,CAAC,GAAG,KAAK,QAAQ,CAAC,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC;IAC/D,MAAM,KAAK,GAAG,OAAO,OAAO,CAAC,KAAK,KAAK,QAAQ,CAAC,CAAC,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,SAAS,CAAC;IAC5E,MAAM,iBAAiB,GAAG,OAAO,OAAO,CAAC,kBAAkB,KAAK,QAAQ;QACtE,CAAC,CAAC,OAAO,CAAC,kBAAkB;QAC5B,CAAC,CAAC,SAAS,CAAC;IACd,MAAM,QAAQ,GAAG,iBAAiB,IAAI,KAAK,IAAI,GAAG,IAAI,EAAE,CAAC;IAEzD,MAAM,KAAK,GAAG,iBAAiB,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC;IAEnD,OAAO;QACL,EAAE,EAAE,GAAG,IAAI,QAAQ,IAAI,WAAW;QAClC,QAAQ,EAAE,QAAQ,IAAI,WAAW;QACjC,KAAK;QACL,KAAK,EAAE,KAAK,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC;KAC3C,CAAC;AACJ,CAAC;AAED;;;GAGG;AACH,MAAM,UAAU,qBAAqB,CACnC,SAAkC,EAClC,aAAsC,EACtC,QAAiB;IAEjB,MAAM,OAAO,GAAG,iBAAiB,CAAC,SAAS,EAAE,QAAQ,CAAC,CAAC;IACvD,MAAM,WAAW,GAAG,iBAAiB,CAAC,aAAa,EAAE,QAAQ,CAAC,CAAC;IAC/D,MAAM,KAAK,GAAG,OAAO,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,WAAW,CAAC;IACzD,MAAM,IAAI,GAAG,WAAW,CAAC,SAAS,EAAE,QAAQ,CAAC,CAAC;IAC9C,OAAO,EAAE,GAAG,IAAI,EAAE,KAAK,EAAE,KAAK,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,EAAE,CAAC;AACjE,CAAC;AAED;;GAEG;AACH,MAAM,UAAU,cAAc,CAAC,CAAW;IACxC,OAAO;QACL,EAAE,EAAE,CAAC,CAAC,EAAE;QACR,QAAQ,EAAE,CAAC,CAAC,QAAQ;QACpB,KAAK,EAAE,CAAC,CAAC,KAAK;QACd,KAAK,EAAE,CAAC,CAAC,KAAK;QACd,iBAAiB,EAAE,IAAI;QACvB,SAAS,EAAE,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE;QACnC,QAAQ,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,MAAM;QAC9B,KAAK,EAAE,EAAE;QACT,kBAAkB,EAAE,KAAK;KAC1B,CAAC;AACJ,CAAC;AAED;;;GAGG;AACH,MAAM,UAAU,oBAAoB,CAAC,IAAiB;IACpD,IAAI,MAAqC,CAAC;IAE1C,OAAO,GAAG,EAAE;QACV,IAAI,MAAM,KAAK,SAAS;YAAE,OAAO,MAAM,CAAC;QACxC,IAAI,CAAC,IAAI,IAAI,CAAC,IAAI,CAAC,MAAM,IAAI,CAAC,IAAI,CAAC,QAAQ,IAAI,CAAC,IAAI,CAAC,YAAY,EAAE,CAAC;YAClE,MAAM,GAAG,IAAI,CAAC;YACd,OAAO,IAAI,CAAC;QACd,CAAC;QACD,MAAM,GAAG,IAAI,UAAU,CAAC,IAAI,CAAC,CAAC;QAC9B,OAAO,MAAM,CAAC;IAChB,CAAC,CAAC;AACJ,CAAC"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"oidc.test.d.ts","sourceRoot":"","sources":["../../src/auth/oidc.test.ts"],"names":[],"mappings":""}
|
|
@@ -0,0 +1,39 @@
|
|
|
1
|
+
import { describe, it, expect } from 'vitest';
|
|
2
|
+
import { extractUser, extractUserFromTokens } from './oidc.js';
|
|
3
|
+
describe('oidc extractUser', () => {
|
|
4
|
+
it('берёт роли из realm_access id_token (ADMIN)', () => {
|
|
5
|
+
const user = extractUser({ realm_access: { roles: ['admin'] } });
|
|
6
|
+
expect(user.roles).toEqual(['ADMIN']);
|
|
7
|
+
});
|
|
8
|
+
it('нормализует регистр и отбрасывает неизвестные роли', () => {
|
|
9
|
+
const user = extractUser({ realm_access: { roles: ['Admin', 'superadmin', 'user'] } });
|
|
10
|
+
expect(user.roles).toEqual(['ADMIN', 'USER']);
|
|
11
|
+
});
|
|
12
|
+
it('учитывает client roles из resource_access.<clientId>.roles', () => {
|
|
13
|
+
const user = extractUser({ resource_access: { synth: { roles: ['lead'] } } }, 'synth');
|
|
14
|
+
expect(user.roles).toEqual(['LEAD']);
|
|
15
|
+
});
|
|
16
|
+
it('объединяет realm и client роли без дубликатов', () => {
|
|
17
|
+
const user = extractUser({ realm_access: { roles: ['admin'] }, resource_access: { synth: { roles: ['admin', 'user'] } } }, 'synth');
|
|
18
|
+
expect(user.roles).toEqual(['ADMIN', 'USER']);
|
|
19
|
+
});
|
|
20
|
+
it('возвращает дефолт USER при отсутствии известных ролей', () => {
|
|
21
|
+
const user = extractUser({ sub: 'x', preferred_username: 'ivan' });
|
|
22
|
+
expect(user.roles).toEqual(['USER']);
|
|
23
|
+
});
|
|
24
|
+
});
|
|
25
|
+
describe('oidc extractUserFromTokens', () => {
|
|
26
|
+
it('берёт роли из access_token, если в id_token их нет', () => {
|
|
27
|
+
const user = extractUserFromTokens({ sub: 'x', preferred_username: 'ivan' }, { realm_access: { roles: ['admin'] } });
|
|
28
|
+
expect(user.roles).toEqual(['ADMIN']);
|
|
29
|
+
});
|
|
30
|
+
it('приоритет отдаёт ролям из id_token', () => {
|
|
31
|
+
const user = extractUserFromTokens({ realm_access: { roles: ['user'] } }, { realm_access: { roles: ['admin'] } });
|
|
32
|
+
expect(user.roles).toEqual(['USER']);
|
|
33
|
+
});
|
|
34
|
+
it('возвращает дефолт USER, когда ролей нет ни в одном токене', () => {
|
|
35
|
+
const user = extractUserFromTokens({}, {});
|
|
36
|
+
expect(user.roles).toEqual(['USER']);
|
|
37
|
+
});
|
|
38
|
+
});
|
|
39
|
+
//# sourceMappingURL=oidc.test.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"oidc.test.js","sourceRoot":"","sources":["../../src/auth/oidc.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"hybrid.integration.test.d.ts","sourceRoot":"","sources":["../../src/integration/hybrid.integration.test.ts"],"names":[],"mappings":""}
|