fa-mcp-sdk 0.2.120 → 0.2.125

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.
Files changed (97) hide show
  1. package/bin/fa-mcp.js +84 -24
  2. package/cli-template/config/_local.yaml +21 -1
  3. package/cli-template/config/custom-environment-variables.yaml +11 -1
  4. package/cli-template/config/default.yaml +11 -1
  5. package/cli-template/fa-mcp-sdk-spec.md +385 -2
  6. package/cli-template/package.json +72 -73
  7. package/cli-template/src/_examples/custom-basic-auth-example.ts +252 -0
  8. package/cli-template/src/_examples/multi-auth-examples.ts +333 -0
  9. package/cli-template/src/custom-resources.ts +1 -0
  10. package/cli-template/yarn.lock +6375 -0
  11. package/dist/core/_types_/TNtlm.d.ts +5 -0
  12. package/dist/core/_types_/TNtlm.d.ts.map +1 -0
  13. package/dist/core/_types_/TNtlm.js +2 -0
  14. package/dist/core/_types_/TNtlm.js.map +1 -0
  15. package/dist/core/_types_/config.d.ts +88 -0
  16. package/dist/core/_types_/config.d.ts.map +1 -0
  17. package/dist/core/_types_/config.js +2 -0
  18. package/dist/core/_types_/config.js.map +1 -0
  19. package/dist/core/_types_/types.d.ts +8 -0
  20. package/dist/core/_types_/types.d.ts.map +1 -1
  21. package/dist/core/{token/token-core.d.ts → auth/jwt-validation.d.ts} +2 -2
  22. package/dist/core/auth/jwt-validation.d.ts.map +1 -0
  23. package/dist/core/{token/token-core.js → auth/jwt-validation.js} +4 -4
  24. package/dist/core/auth/jwt-validation.js.map +1 -0
  25. package/dist/core/auth/middleware.d.ts +47 -0
  26. package/dist/core/auth/middleware.d.ts.map +1 -0
  27. package/dist/core/{token/token-auth.js → auth/middleware.js} +114 -2
  28. package/dist/core/auth/middleware.js.map +1 -0
  29. package/dist/core/auth/multi-auth.d.ts +27 -0
  30. package/dist/core/auth/multi-auth.d.ts.map +1 -0
  31. package/dist/core/auth/multi-auth.js +300 -0
  32. package/dist/core/auth/multi-auth.js.map +1 -0
  33. package/dist/core/auth/token-generator/html.d.ts.map +1 -0
  34. package/dist/core/{token/gen-token-app → auth/token-generator}/html.js +2 -2
  35. package/dist/core/auth/token-generator/html.js.map +1 -0
  36. package/dist/core/auth/token-generator/ntlm-auth-options.d.ts.map +1 -0
  37. package/dist/core/{token/gen-token-app → auth/token-generator}/ntlm-auth-options.js +1 -1
  38. package/dist/core/auth/token-generator/ntlm-auth-options.js.map +1 -0
  39. package/dist/core/auth/token-generator/ntlm-domain-config.d.ts.map +1 -0
  40. package/dist/core/auth/token-generator/ntlm-domain-config.js.map +1 -0
  41. package/dist/core/auth/token-generator/ntlm-integration.d.ts.map +1 -0
  42. package/dist/core/{token/gen-token-app → auth/token-generator}/ntlm-integration.js +4 -4
  43. package/dist/core/auth/token-generator/ntlm-integration.js.map +1 -0
  44. package/dist/core/auth/token-generator/ntlm-session-storage.d.ts.map +1 -0
  45. package/dist/core/{token/gen-token-app → auth/token-generator}/ntlm-session-storage.js +1 -1
  46. package/dist/core/auth/token-generator/ntlm-session-storage.js.map +1 -0
  47. package/dist/core/auth/token-generator/ntlm-templates.d.ts.map +1 -0
  48. package/dist/core/auth/token-generator/ntlm-templates.js.map +1 -0
  49. package/dist/core/{token/gen-token-app/gen-token-server.d.ts → auth/token-generator/server.d.ts} +1 -1
  50. package/dist/core/auth/token-generator/server.d.ts.map +1 -0
  51. package/dist/core/{token/gen-token-app/gen-token-server.js → auth/token-generator/server.js} +3 -3
  52. package/dist/core/auth/token-generator/server.js.map +1 -0
  53. package/dist/core/auth/types.d.ts +35 -0
  54. package/dist/core/auth/types.d.ts.map +1 -0
  55. package/dist/core/auth/types.js +14 -0
  56. package/dist/core/auth/types.js.map +1 -0
  57. package/dist/core/cache/cache.d.ts.map +1 -1
  58. package/dist/core/cache/cache.js +3 -2
  59. package/dist/core/cache/cache.js.map +1 -1
  60. package/dist/core/index.d.ts +5 -3
  61. package/dist/core/index.d.ts.map +1 -1
  62. package/dist/core/index.js +4 -2
  63. package/dist/core/index.js.map +1 -1
  64. package/dist/core/web/server-http.js +1 -1
  65. package/dist/core/web/server-http.js.map +1 -1
  66. package/package.json +4 -2
  67. package/dist/core/token/gen-token-app/gen-token-server.d.ts.map +0 -1
  68. package/dist/core/token/gen-token-app/gen-token-server.js.map +0 -1
  69. package/dist/core/token/gen-token-app/html.d.ts.map +0 -1
  70. package/dist/core/token/gen-token-app/html.js.map +0 -1
  71. package/dist/core/token/gen-token-app/ntlm-auth-options.d.ts.map +0 -1
  72. package/dist/core/token/gen-token-app/ntlm-auth-options.js.map +0 -1
  73. package/dist/core/token/gen-token-app/ntlm-domain-config.d.ts.map +0 -1
  74. package/dist/core/token/gen-token-app/ntlm-domain-config.js.map +0 -1
  75. package/dist/core/token/gen-token-app/ntlm-integration.d.ts.map +0 -1
  76. package/dist/core/token/gen-token-app/ntlm-integration.js.map +0 -1
  77. package/dist/core/token/gen-token-app/ntlm-session-storage.d.ts.map +0 -1
  78. package/dist/core/token/gen-token-app/ntlm-session-storage.js.map +0 -1
  79. package/dist/core/token/gen-token-app/ntlm-templates.d.ts.map +0 -1
  80. package/dist/core/token/gen-token-app/ntlm-templates.js.map +0 -1
  81. package/dist/core/token/i-token.d.ts +0 -13
  82. package/dist/core/token/i-token.d.ts.map +0 -1
  83. package/dist/core/token/i-token.js +0 -2
  84. package/dist/core/token/i-token.js.map +0 -1
  85. package/dist/core/token/token-auth.d.ts +0 -17
  86. package/dist/core/token/token-auth.d.ts.map +0 -1
  87. package/dist/core/token/token-auth.js.map +0 -1
  88. package/dist/core/token/token-core.d.ts.map +0 -1
  89. package/dist/core/token/token-core.js.map +0 -1
  90. /package/dist/core/{token/gen-token-app → auth/token-generator}/html.d.ts +0 -0
  91. /package/dist/core/{token/gen-token-app → auth/token-generator}/ntlm-auth-options.d.ts +0 -0
  92. /package/dist/core/{token/gen-token-app → auth/token-generator}/ntlm-domain-config.d.ts +0 -0
  93. /package/dist/core/{token/gen-token-app → auth/token-generator}/ntlm-domain-config.js +0 -0
  94. /package/dist/core/{token/gen-token-app → auth/token-generator}/ntlm-integration.d.ts +0 -0
  95. /package/dist/core/{token/gen-token-app → auth/token-generator}/ntlm-session-storage.d.ts +0 -0
  96. /package/dist/core/{token/gen-token-app → auth/token-generator}/ntlm-templates.d.ts +0 -0
  97. /package/dist/core/{token/gen-token-app → auth/token-generator}/ntlm-templates.js +0 -0
@@ -0,0 +1,5 @@
1
+ import { IUserData } from 'ya-express-ntlm';
2
+ export type TNtlm = Partial<IUserData> & {
3
+ uri?: string;
4
+ };
5
+ //# sourceMappingURL=TNtlm.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"TNtlm.d.ts","sourceRoot":"","sources":["../../../src/core/_types_/TNtlm.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAE5C,MAAM,MAAM,KAAK,GAAG,OAAO,CAAC,SAAS,CAAC,GAAG;IACvC,GAAG,CAAC,EAAE,MAAM,CAAC;CACd,CAAA"}
@@ -0,0 +1,2 @@
1
+ export {};
2
+ //# sourceMappingURL=TNtlm.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"TNtlm.js","sourceRoot":"","sources":["../../../src/core/_types_/TNtlm.ts"],"names":[],"mappings":""}
@@ -0,0 +1,88 @@
1
+ import { TFileLogLevel } from 'af-logger-ts';
2
+ import { IAFDatabasesConfig } from 'af-db-ts';
3
+ import { IAFConsulConfig, IAccessPoints } from 'af-consul-ts';
4
+ import { IADConfig } from './active-directory-config.js';
5
+ export interface IBasicAuth {
6
+ type: 'basic';
7
+ username: string;
8
+ password: string;
9
+ }
10
+ export interface IOAuth2Auth {
11
+ type: 'oauth2';
12
+ clientId: string;
13
+ clientSecret: string;
14
+ accessToken: string;
15
+ refreshToken?: string;
16
+ redirectUri?: string;
17
+ tokenEndpoint?: string;
18
+ }
19
+ interface IWebServerConfig {
20
+ webServer: {
21
+ host: string;
22
+ port: number;
23
+ originHosts: string[];
24
+ auth: {
25
+ enabled: boolean;
26
+ basic?: IBasicAuth;
27
+ pat?: string;
28
+ oauth2?: IOAuth2Auth;
29
+ jwtToken: {
30
+ encryptKey: string;
31
+ checkMCPName: boolean;
32
+ };
33
+ permanentServerTokens: string[];
34
+ };
35
+ };
36
+ }
37
+ interface ILoggerConfig {
38
+ logger: {
39
+ level: TFileLogLevel;
40
+ useFileLogger: boolean;
41
+ dir?: string;
42
+ };
43
+ }
44
+ interface IMCPConfig {
45
+ mcp: {
46
+ rateLimit: {
47
+ maxRequests: number;
48
+ windowMs: number;
49
+ };
50
+ toolAnswerAs: 'text' | 'structuredContent';
51
+ transportType: 'stdio' | 'http';
52
+ };
53
+ }
54
+ interface ISwaggerConfig {
55
+ swagger: {
56
+ servers?: {
57
+ url: string;
58
+ description: string;
59
+ }[];
60
+ };
61
+ }
62
+ interface ICacheConfig {
63
+ cache: {
64
+ ttlSeconds: 300;
65
+ maxItems: 1000;
66
+ };
67
+ }
68
+ export interface AppConfig extends IADConfig, ICacheConfig, ILoggerConfig, IAFDatabasesConfig, IWebServerConfig, IMCPConfig, ISwaggerConfig {
69
+ isMainDBUsed: boolean;
70
+ name: string;
71
+ shortName: string;
72
+ repo: string;
73
+ version: string;
74
+ productName: string;
75
+ description: string;
76
+ accessPoints: IAccessPoints;
77
+ consul: IAFConsulConfig & {
78
+ envCode: {
79
+ prod: string;
80
+ dev: string;
81
+ };
82
+ };
83
+ uiColor: {
84
+ primary: string;
85
+ };
86
+ }
87
+ export {};
88
+ //# sourceMappingURL=config.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../../../src/core/_types_/config.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;AAC7C,OAAO,EAAE,kBAAkB,EAAE,MAAM,UAAU,CAAC;AAC9C,OAAO,EAAE,eAAe,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;AAC9D,OAAO,EAAE,SAAS,EAAE,MAAM,8BAA8B,CAAC;AAGzD,MAAM,WAAW,UAAU;IACzB,IAAI,EAAE,OAAO,CAAC;IACd,QAAQ,EAAE,MAAM,CAAC;IACjB,QAAQ,EAAE,MAAM,CAAC;CAClB;AAED,MAAM,WAAW,WAAW;IAC1B,IAAI,EAAE,QAAQ,CAAC;IACf,QAAQ,EAAE,MAAM,CAAC;IACjB,YAAY,EAAE,MAAM,CAAC;IACrB,WAAW,EAAE,MAAM,CAAC;IACpB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,aAAa,CAAC,EAAE,MAAM,CAAC;CACxB;AAED,UAAU,gBAAgB;IACxB,SAAS,EAAE;QACT,IAAI,EAAE,MAAM,CAAC;QACb,IAAI,EAAE,MAAM,CAAC;QACb,WAAW,EAAE,MAAM,EAAE,CAAC;QACtB,IAAI,EAAE;YACJ,OAAO,EAAE,OAAO,CAAC;YACjB,KAAK,CAAC,EAAE,UAAU,CAAC;YACnB,GAAG,CAAC,EAAE,MAAM,CAAC;YACb,MAAM,CAAC,EAAE,WAAW,CAAC;YACrB,QAAQ,EAAE;gBACR,UAAU,EAAE,MAAM,CAAC;gBACnB,YAAY,EAAE,OAAO,CAAC;aACvB,CAAA;YACD,qBAAqB,EAAE,MAAM,EAAE,CAAC;SACjC,CAAC;KACH,CAAA;CACF;AAGD,UAAU,aAAa;IACrB,MAAM,EAAE;QACN,KAAK,EAAE,aAAa,CAAC;QACrB,aAAa,EAAE,OAAO,CAAC;QACvB,GAAG,CAAC,EAAE,MAAM,CAAC;KACd,CAAA;CACF;AAED,UAAU,UAAU;IAClB,GAAG,EAAE;QACH,SAAS,EAAE;YACT,WAAW,EAAE,MAAM,CAAC;YACpB,QAAQ,EAAE,MAAM,CAAC;SAClB,CAAC;QACF,YAAY,EAAE,MAAM,GAAG,mBAAmB,CAAA;QAC1C,aAAa,EAAE,OAAO,GAAG,MAAM,CAAC;KACjC,CAAA;CACF;AAED,UAAU,cAAc;IACtB,OAAO,EAAE;QACP,OAAO,CAAC,EAAE;YACR,GAAG,EAAE,MAAM,CAAC;YACZ,WAAW,EAAE,MAAM,CAAC;SACrB,EAAE,CAAC;KACL,CAAA;CACF;AAED,UAAU,YAAY;IACpB,KAAK,EAAE;QACL,UAAU,EAAE,GAAG,CAAC;QAChB,QAAQ,EAAE,IAAI,CAAC;KAChB,CAAA;CACF;AAED,MAAM,WAAW,SAAU,SAAQ,SAAS,EAC1C,YAAY,EACZ,aAAa,EACb,kBAAkB,EAClB,gBAAgB,EAChB,UAAU,EACV,cAAc;IAEd,YAAY,EAAE,OAAO,CAAC;IAEtB,IAAI,EAAE,MAAM,CAAC;IACb,SAAS,EAAE,MAAM,CAAC;IAClB,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,CAAC;IAChB,WAAW,EAAE,MAAM,CAAC;IACpB,WAAW,EAAE,MAAM,CAAC;IAEpB,YAAY,EAAE,aAAa,CAAC;IAC5B,MAAM,EAAE,eAAe,GAAG;QACxB,OAAO,EAAE;YACP,IAAI,EAAE,MAAM,CAAC;YACb,GAAG,EAAE,MAAM,CAAC;SACb,CAAC;KACH,CAAC;IACF,OAAO,EAAE;QACP,OAAO,EAAE,MAAM,CAAC;KACjB,CAAA;CACF"}
@@ -0,0 +1,2 @@
1
+ export {};
2
+ //# sourceMappingURL=config.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"config.js","sourceRoot":"","sources":["../../../src/core/_types_/config.ts"],"names":[],"mappings":""}
@@ -43,6 +43,13 @@ export interface ISwaggerData {
43
43
  swaggerSpecs: any;
44
44
  swaggerUi: any;
45
45
  }
46
+ /**
47
+ * Custom Basic Authentication validation function
48
+ * @param username - The username to validate
49
+ * @param password - The password to validate
50
+ * @returns Promise<boolean> or boolean indicating if credentials are valid
51
+ */
52
+ export type CustomBasicAuthValidator = (username: string, password: string) => Promise<boolean> | boolean;
46
53
  /**
47
54
  * All data that needs to be passed to initialize the MCP server
48
55
  */
@@ -57,6 +64,7 @@ export interface McpServerData {
57
64
  customPrompts?: IPromptData[];
58
65
  requiredHttpHeaders?: IRequiredHttpHeader[] | null;
59
66
  customResources?: IResourceData[] | null;
67
+ customBasicAuthValidator?: CustomBasicAuthValidator;
60
68
  httpComponents?: {
61
69
  apiRouter?: Router | null;
62
70
  endpointsOn404?: IEndpointsOn404;
@@ -1 +1 @@
1
- {"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../src/core/_types_/types.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../src/core/_types_/types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,oCAAoC,CAAC;AAC1D,OAAO,EAAE,MAAM,EAAE,MAAM,SAAS,CAAC;AAEjC,MAAM,WAAW,WAAW;IAC1B,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,EAAE,MAAM,CAAC;IACpB,SAAS,EAAE,EAAE,CAAC;IACd,OAAO,EAAE,cAAc,CAAC;IACxB,WAAW,CAAC,EAAE,OAAO,CAAC;CACvB;AAED,MAAM,WAAW,mBAAmB;IAClC,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,EAAE,MAAM,CAAC;IACpB,UAAU,CAAC,EAAE,OAAO,CAAC;CACtB;AAED,MAAM,WAAW,aAAa;IAC5B,GAAG,EAAE,MAAM,CAAC;IACZ,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,EAAE,MAAM,CAAC;IACpB,QAAQ,EAAE,MAAM,CAAC;CAClB;AAED,MAAM,MAAM,wBAAwB,GAAG,CAAC,GAAG,EAAE,MAAM,KAAK,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;AACjF,MAAM,MAAM,gBAAgB,GAAG,MAAM,GAAG,MAAM,GAAG,wBAAwB,CAAC;AAE1E,MAAM,WAAW,aAAa;IAC5B,GAAG,EAAE,MAAM,CAAC;IACZ,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,WAAW,EAAE,MAAM,CAAC;IACpB,QAAQ,EAAE,MAAM,CAAC;IACjB,OAAO,EAAE,gBAAgB,CAAC;IAC1B,WAAW,CAAC,EAAE,OAAO,CAAC;CACvB;AAED,MAAM,WAAW,SAAS;IACxB,QAAQ,EAAE;QACR;YACE,GAAG,EAAE,MAAM,CAAC;YACZ,QAAQ,EAAE,MAAM,CAAC;YACjB,IAAI,EAAE,MAAM,GAAG,MAAM,CAAC;SACvB;KACF,CAAC;CACH;AAED,MAAM,MAAM,eAAe,GAAG,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC,CAAA;AAE/D,MAAM,WAAW,YAAY;IAC3B,YAAY,EAAE,GAAG,CAAC;IAClB,SAAS,EAAE,GAAG,CAAC;CAChB;AAED;;;;;GAKG;AACH,MAAM,MAAM,wBAAwB,GAAG,CAAC,QAAQ,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,KAAK,OAAO,CAAC,OAAO,CAAC,GAAG,OAAO,CAAC;AAE1G;;GAEG;AACH,MAAM,WAAW,aAAa;IAE5B,KAAK,EAAE,IAAI,EAAE,CAAC;IACd,WAAW,EAAE,CAAC,MAAM,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,SAAS,CAAC,EAAE,GAAG,CAAA;KAAE,KAAK,OAAO,CAAC,GAAG,CAAC,CAAC;IAGzE,UAAU,EAAE,MAAM,CAAC;IACnB,WAAW,EAAE,MAAM,CAAC;IACpB,aAAa,CAAC,EAAE,WAAW,EAAE,CAAC;IAG9B,mBAAmB,CAAC,EAAE,mBAAmB,EAAE,GAAG,IAAI,CAAC;IACnD,eAAe,CAAC,EAAE,aAAa,EAAE,GAAG,IAAI,CAAC;IAGzC,wBAAwB,CAAC,EAAE,wBAAwB,CAAC;IAEpD,cAAc,CAAC,EAAE;QACf,SAAS,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;QAC1B,cAAc,CAAC,EAAE,eAAe,CAAC;QACjC,OAAO,CAAC,EAAE,YAAY,GAAG,IAAI,CAAC;KAC/B,CAAC;IAEF,MAAM,CAAC,EAAE;QACP,OAAO,CAAC,EAAE,MAAM,CAAC;QAEjB,cAAc,CAAC,EAAE,MAAM,CAAC;KACzB,CAAC;IAGF,kBAAkB,CAAC,EAAE,CAAC,SAAS,EAAE,MAAM,KAAK,MAAM,CAAC;CACpD;AAGD,MAAM,WAAW,iBAAiB;IAChC,EAAE,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;IACrB,MAAM,EAAE,aAAa,GAAG,iBAAiB,CAAC;IAC1C,MAAM,EAAE,gBAAgB,CAAC;CAC1B;AAED,MAAM,MAAM,sBAAsB,GAAG,CAAC,OAAO,EAAE,iBAAiB,KAAK,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAAA;AAC7F,MAAM,MAAM,cAAc,GAAG,MAAM,GAAG,sBAAsB,CAAC;AAE7D,MAAM,WAAW,gBAAgB;IAC/B,IAAI,EAAE,MAAM,CAAC;IACb,SAAS,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CACpC;AAED,MAAM,WAAW,oBAAoB;IACnC,MAAM,EAAE,gBAAgB,CAAC;IACzB,MAAM,EAAE;QACN,GAAG,EAAE,MAAM,CAAC;KACb,CAAC;IACF,EAAE,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;CACtB;AAED,MAAM,WAAW,eAAe;IAC9B,CAAC,CAAC,EAAE,MAAM,GAAG;QACX,IAAI,EAAE,MAAM,CAAC;QACb,WAAW,CAAC,EAAE,MAAM,CAAC;QACrB,OAAO,CAAC,EAAE,MAAM,CAAC;QACjB,OAAO,CAAC,EAAE,MAAM,CAAC;QACjB,CAAC,CAAC,EAAE,MAAM,GAAG,GAAG,CAAC;KAClB,CAAC;CACH;AAED,MAAM,WAAW,gBAAgB;IAC/B,IAAI,EAAE,QAAQ,CAAC;IACf,UAAU,CAAC,EAAE,eAAe,GAAG,SAAS,CAAC;IACzC,QAAQ,CAAC,EAAE,MAAM,EAAE,GAAG,SAAS,CAAC;IAChC,CAAC,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC;CACtB"}
@@ -1,4 +1,4 @@
1
- import { ICheckTokenResult } from './i-token.js';
1
+ import { ICheckTokenResult } from './types.js';
2
2
  export declare const tokenRE: RegExp;
3
3
  /**
4
4
  * Encrypts the transmitted text with a symmetric key taken from the config
@@ -25,4 +25,4 @@ export declare const checkToken: (arg: {
25
25
  expectedUser?: string;
26
26
  expectedService?: string;
27
27
  }) => ICheckTokenResult;
28
- //# sourceMappingURL=token-core.d.ts.map
28
+ //# sourceMappingURL=jwt-validation.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"jwt-validation.d.ts","sourceRoot":"","sources":["../../../src/core/auth/jwt-validation.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,iBAAiB,EAAiB,MAAM,YAAY,CAAC;AAmB9D,eAAO,MAAM,OAAO,QAAmC,CAAC;AAExD;;GAEG;AACH,eAAO,MAAM,OAAO,GAAI,MAAM,MAAM,KAAG,MAStC,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,OAAO,GAAI,cAAc,MAAM,WAW3C,CAAC;AAEF;;;;GAIG;AACH,eAAO,MAAM,aAAa,GAAI,MAAM,MAAM,EAAE,aAAa,MAAM,EAAE,UAAU,GAAG,KAAG,MAYhF,CAAC;AAGF;;;;;GAKG;AACH,eAAO,MAAM,UAAU,GAAI,KAAK;IAC9B,KAAK,EAAE,MAAM,CAAC;IACd,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,eAAe,CAAC,EAAE,MAAM,CAAC;CAC1B,KAAG,iBA2EH,CAAC"}
@@ -5,13 +5,13 @@ import { logger as lgr } from '../logger.js';
5
5
  import { isObject, trim } from '../utils/utils.js';
6
6
  import chalk from 'chalk';
7
7
  const logger = lgr.getSubLogger({ name: chalk.cyan('token-auth') });
8
- const pt = appConfig.webServer?.auth?.permanentServerTokens || [];
8
+ const { jwtToken, permanentServerTokens: pt = [] } = appConfig.webServer?.auth || {};
9
+ const checkMCPName = jwtToken?.checkMCPName || false;
9
10
  const permanentServerTokensSet = new Set(Array.isArray(pt) ? pt : [pt]);
10
- const checkMCPName = appConfig.webServer?.auth?.token?.checkMCPName || false;
11
11
  const ALGORITHM = 'aes-256-ctr';
12
12
  const KEY = crypto
13
13
  .createHash('sha256')
14
- .update(String(appConfig.webServer?.auth?.token?.encryptKey || 'secret'))
14
+ .update(String(jwtToken?.encryptKey || 'secret'))
15
15
  .digest('base64')
16
16
  .substring(0, 32);
17
17
  export const tokenRE = /^(\d{13,})\.([\da-fA-F]{32,})$/;
@@ -138,4 +138,4 @@ export const checkToken = (arg) => {
138
138
  // OK!
139
139
  return { inTokenType: 'JWT', payload };
140
140
  };
141
- //# sourceMappingURL=token-core.js.map
141
+ //# sourceMappingURL=jwt-validation.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"jwt-validation.js","sourceRoot":"","sources":["../../../src/core/auth/jwt-validation.ts"],"names":[],"mappings":"AAAA,0CAA0C;AAC1C,OAAO,MAAM,MAAM,QAAQ,CAAC;AAC5B,OAAO,EAAE,SAAS,EAAE,MAAM,6BAA6B,CAAC;AAExD,OAAO,EAAE,MAAM,IAAI,GAAG,EAAE,MAAM,cAAc,CAAC;AAC7C,OAAO,EAAE,QAAQ,EAAE,IAAI,EAAE,MAAM,mBAAmB,CAAC;AACnD,OAAO,KAAK,MAAM,OAAO,CAAC;AAE1B,MAAM,MAAM,GAAG,GAAG,CAAC,YAAY,CAAC,EAAE,IAAI,EAAE,KAAK,CAAC,IAAI,CAAC,YAAY,CAAC,EAAE,CAAC,CAAC;AAEpE,MAAM,EAAE,QAAQ,EAAE,qBAAqB,EAAE,EAAE,GAAG,EAAE,EAAE,GAAG,SAAS,CAAC,SAAS,EAAE,IAAI,IAAI,EAAE,CAAC;AACrF,MAAM,YAAY,GAAG,QAAQ,EAAE,YAAY,IAAI,KAAK,CAAC;AACrD,MAAM,wBAAwB,GAAgB,IAAI,GAAG,CAAC,KAAK,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;AAGrF,MAAM,SAAS,GAAG,aAAa,CAAC;AAChC,MAAM,GAAG,GAAG,MAAM;KACf,UAAU,CAAC,QAAQ,CAAC;KACpB,MAAM,CAAC,MAAM,CAAC,QAAQ,EAAE,UAAU,IAAI,QAAQ,CAAC,CAAC;KAChD,MAAM,CAAC,QAAQ,CAAC;KAChB,SAAS,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;AAEpB,MAAM,CAAC,MAAM,OAAO,GAAG,gCAAgC,CAAC;AAExD;;GAEG;AACH,MAAM,CAAC,MAAM,OAAO,GAAG,CAAC,IAAY,EAAU,EAAE;IAC9C,MAAM,MAAM,GAAG,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IACjC,kCAAkC;IAClC,MAAM,EAAE,GAAG,MAAM,CAAC,WAAW,CAAC,EAAE,CAAC,CAAC;IAClC,uDAAuD;IACvD,MAAM,MAAM,GAAG,MAAM,CAAC,cAAc,CAAC,SAAS,EAAE,GAAG,EAAE,EAAE,CAAC,CAAC;IACzD,oCAAoC;IACpC,MAAM,YAAY,GAAG,MAAM,CAAC,MAAM,CAAC,CAAC,EAAE,EAAE,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,EAAE,MAAM,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC;IAChF,OAAO,YAAY,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;AACtC,CAAC,CAAC;AAEF;;GAEG;AACH,MAAM,CAAC,MAAM,OAAO,GAAG,CAAC,YAAoB,EAAE,EAAE;IAC9C,MAAM,YAAY,GAAG,MAAM,CAAC,IAAI,CAAC,YAAY,EAAE,KAAK,CAAC,CAAC;IACtD,iCAAiC;IACjC,MAAM,GAAG,GAAG,YAAY,CAAC,QAAQ,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;IACzC,eAAe;IACf,MAAM,OAAO,GAAG,YAAY,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC;IAC1C,kBAAkB;IAClB,MAAM,QAAQ,GAAG,MAAM,CAAC,gBAAgB,CAAC,SAAS,EAAE,GAAG,EAAE,GAAG,CAAC,CAAC;IAC9D,sBAAsB;IACtB,MAAM,YAAY,GAAG,MAAM,CAAC,MAAM,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC,OAAO,CAAC,EAAE,QAAQ,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC;IACjF,OAAO,YAAY,CAAC,QAAQ,EAAE,CAAC;AACjC,CAAC,CAAC;AAEF;;;;GAIG;AACH,MAAM,CAAC,MAAM,aAAa,GAAG,CAAC,IAAY,EAAE,WAAmB,EAAE,OAAa,EAAU,EAAE;IACxF,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC,CAAC,WAAW,EAAE,CAAC;IAChC,IAAI,CAAC,IAAI,EAAE,CAAC;QACV,MAAM,IAAI,KAAK,CAAC,kCAAkC,CAAC,CAAC;IACtD,CAAC;IACD,MAAM,MAAM,GAAG,IAAI,CAAC,GAAG,EAAE,GAAG,CAAC,WAAW,GAAG,IAAI,CAAC,CAAC;IACjD,MAAM,QAAQ,GAAG,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE,CAAC;IAC1C,OAAO,GAAG,QAAQ,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC;IAC3C,OAAO,CAAC,IAAI,GAAG,IAAI,CAAC;IACpB,OAAO,CAAC,MAAM,GAAG,MAAM,CAAC;IACxB,OAAO,CAAC,GAAG,GAAG,QAAQ,CAAC;IACvB,OAAO,GAAG,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC,EAAE,CAAC;AACzD,CAAC,CAAC;AAGF;;;;;GAKG;AACH,MAAM,CAAC,MAAM,UAAU,GAAG,CAAC,GAI1B,EAAqB,EAAE;IACtB,IAAI,EAAE,KAAK,EAAE,YAAY,EAAE,eAAe,GAAG,SAAS,CAAC,IAAI,EAAE,GAAG,GAAG,CAAC;IACpE,KAAK,GAAG,CAAC,KAAK,IAAI,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC;IAC7B,IAAI,CAAC,KAAK,EAAE,CAAC;QACX,OAAO;YACL,WAAW,EAAE,kBAAkB;SAChC,CAAC;IACJ,CAAC;IAED,IAAI,wBAAwB,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE,CAAC;QACxC,OAAO;YACL,WAAW,EAAE,WAAW;SACzB,CAAC;IACJ,CAAC;IAED,MAAM,CAAC,EAAE,aAAa,EAAE,gBAAgB,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC;IAEtE,IAAI,CAAC,aAAa,IAAI,CAAC,gBAAgB,EAAE,CAAC;QACxC,OAAO;YACL,WAAW,EAAE,WAAW;YACxB,WAAW,EAAE,2EAA2E;SACzF,CAAC;IACJ,CAAC;IAED,IAAI,UAAU,GAAW,EAAE,CAAC;IAC5B,IAAI,CAAC;QACH,UAAU,GAAG,OAAO,CAAC,gBAAgB,CAAC,CAAC;IACzC,CAAC;IAAC,OAAO,GAAgB,EAAE,CAAC;QAC1B,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QAClB,OAAO;YACL,WAAW,EAAE,iCAAiC,GAAG,CAAC,OAAO,EAAE;SAC5D,CAAC;IACJ,CAAC;IACD,IAAI,OAAsB,CAAC;IAC3B,IAAI,CAAC;QACH,OAAO,GAAG,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC;IACnC,CAAC;IAAC,OAAO,GAAgB,EAAE,CAAC;QAC1B,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QAClB,OAAO;YACL,WAAW,EAAE,KAAK;YAClB,WAAW,EAAE,+CAA+C,GAAG,CAAC,OAAO,EAAE;SAC1E,CAAC;IACJ,CAAC;IAED,YAAY,GAAG,IAAI,CAAC,YAAY,CAAC,CAAC,WAAW,EAAE,CAAC;IAChD,IAAI,YAAY,IAAI,OAAO,CAAC,IAAI,KAAK,YAAY,EAAE,CAAC;QAClD,OAAO;YACL,gBAAgB,EAAE,IAAI;YACtB,WAAW,EAAE,KAAK;YAClB,WAAW,EAAE,2CAA2C,YAAY,iCAAiC,OAAO,CAAC,IAAI,GAAG;SACrH,CAAC;IACJ,CAAC;IAED,IAAI,YAAY,EAAE,CAAC;QACjB,IAAI,eAAe,IAAI,OAAO,CAAC,OAAO,KAAK,eAAe,EAAE,CAAC;YAC3D,OAAO;gBACL,gBAAgB,EAAE,IAAI;gBACtB,WAAW,EAAE,KAAK;gBAClB,WAAW,EAAE,8CAA8C,eAAe,iCAAiC,OAAO,CAAC,OAAO,GAAG;aAC9H,CAAC;QACJ,CAAC;IACH,CAAC;IACD,IAAI,MAAM,GAAG,MAAM,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC;IAExC,MAAM,SAAS,GAAG,IAAI,CAAC,GAAG,EAAE,GAAG,MAAM,CAAC;IACtC,IAAI,SAAS,GAAG,CAAC,EAAE,CAAC;QAClB,mBAAmB;QACnB,OAAO;YACL,gBAAgB,EAAE,IAAI;YACtB,WAAW,EAAE,KAAK;YAClB,WAAW,EAAE,2BAA2B,SAAS,KAAK;SACvD,CAAC;IACJ,CAAC;IACD,MAAM;IACN,OAAO,EAAE,WAAW,EAAE,KAAK,EAAE,OAAO,EAAE,CAAC;AACzC,CAAC,CAAC"}
@@ -0,0 +1,47 @@
1
+ import { NextFunction, Request, Response } from 'express';
2
+ /**
3
+ * Checks token authorization.
4
+ * If everything is OK, it will return undefined.
5
+ * Otherwise, it will return the object with an error
6
+ */
7
+ export declare const getAuthByTokenError: (req: Request) => {
8
+ code: number;
9
+ message: string;
10
+ } | undefined;
11
+ export declare const authByToken: (req: Request, res: Response) => boolean;
12
+ /**
13
+ * Create conditional auth middleware that checks for public MCP requests
14
+ */
15
+ export declare const createConditionalAuthMiddleware: () => (req: Request, res: Response, next: NextFunction) => void;
16
+ export declare const authTokenMW: (req: Request, res: Response, next: NextFunction) => void;
17
+ /**
18
+ * Checks token authorization using all configured methods
19
+ * in ascending CPU load order
20
+ */
21
+ export declare const getMultiAuthError: (req: Request) => Promise<{
22
+ code: number;
23
+ message: string;
24
+ } | undefined>;
25
+ /**
26
+ * Enhanced middleware with multi-authentication support
27
+ * Automatically determines which system to use
28
+ */
29
+ export declare const enhancedAuthTokenMW: (req: Request, res: Response, next: NextFunction) => Promise<void>;
30
+ /**
31
+ * Middleware configurator - creates middleware with specified options
32
+ */
33
+ export declare function createConfigurableAuthMiddleware(options?: {
34
+ forceMultiAuth?: boolean;
35
+ logConfiguration?: boolean;
36
+ }): (req: Request, res: Response, next: NextFunction) => Promise<void>;
37
+ /**
38
+ * Utility to get current authentication configuration information
39
+ */
40
+ export declare function getAuthInfo(): {
41
+ enabled: boolean;
42
+ configured: import("./types.js").AuthType[];
43
+ valid: import("./types.js").AuthType[];
44
+ errors: Record<string, string[]>;
45
+ usingMultiAuth: boolean;
46
+ };
47
+ //# sourceMappingURL=middleware.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"middleware.d.ts","sourceRoot":"","sources":["../../../src/core/auth/middleware.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AAiC1D;;;;GAIG;AACH,eAAO,MAAM,mBAAmB,GAAI,KAAK,OAAO,KAAG;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,MAAM,CAAA;CAAE,GAAG,SAatF,CAAC;AAEF,eAAO,MAAM,WAAW,GAAI,KAAK,OAAO,EAAE,KAAK,QAAQ,YAOtD,CAAC;AAiEF;;GAEG;AACH,eAAO,MAAM,+BAA+B,SAClC,KAAK,OAAO,EAAE,KAAK,QAAQ,EAAE,MAAM,YAAY,SAexD,CAAC;AAEF,eAAO,MAAM,WAAW,GAAI,KAAK,OAAO,EAAE,KAAK,QAAQ,EAAE,MAAM,YAAY,SAY1E,CAAC;AAQF;;;GAGG;AACH,eAAO,MAAM,iBAAiB,GAAU,KAAK,OAAO,KAAG,OAAO,CAAC;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,MAAM,CAAA;CAAE,GAAG,SAAS,CA0B3G,CAAC;AASF;;;GAGG;AACH,eAAO,MAAM,mBAAmB,GAAU,KAAK,OAAO,EAAE,KAAK,QAAQ,EAAE,MAAM,YAAY,kBAuBxF,CAAC;AAEF;;GAEG;AACH,wBAAgB,gCAAgC,CAAE,OAAO,GAAE;IACzD,cAAc,CAAC,EAAE,OAAO,CAAC;IACzB,gBAAgB,CAAC,EAAE,OAAO,CAAC;CACvB,IACU,KAAK,OAAO,EAAE,KAAK,QAAQ,EAAE,MAAM,YAAY,mBA+B9D;AAKD;;GAEG;AACH,wBAAgB,WAAW;;;;;;EAW1B"}
@@ -1,5 +1,5 @@
1
1
  import { cyan, lBlue, magenta, red, reset } from 'af-color';
2
- import { checkToken } from './token-core.js';
2
+ import { checkToken } from './jwt-validation.js';
3
3
  import { debugTokenAuth } from '../debug.js';
4
4
  import { appConfig } from '../bootstrap/init-config.js';
5
5
  import { getResourcesList } from '../mcp/resources.js';
@@ -132,4 +132,116 @@ export const authTokenMW = (req, res, next) => {
132
132
  }
133
133
  next();
134
134
  };
135
- //# sourceMappingURL=token-auth.js.map
135
+ // ========================================================================
136
+ // MULTI-AUTHENTICATION - NEW FUNCTIONALITY
137
+ // ========================================================================
138
+ import { checkMultiAuth, detectAuthConfiguration, logAuthConfiguration } from './multi-auth.js';
139
+ /**
140
+ * Checks token authorization using all configured methods
141
+ * in ascending CPU load order
142
+ */
143
+ export const getMultiAuthError = async (req) => {
144
+ const { auth } = appConfig.webServer;
145
+ if (!auth.enabled) {
146
+ return undefined;
147
+ }
148
+ const token = getTokenFromHttpHeader(req);
149
+ if (!token) {
150
+ return debugAuth(req, 400, 'Missing authorization header');
151
+ }
152
+ const authResult = await checkMultiAuth(token, auth);
153
+ if (!authResult.success) {
154
+ return debugAuth(req, 401, authResult.error || 'Authentication failed');
155
+ }
156
+ // Add authentication information to request for use in application
157
+ req.authInfo = {
158
+ authType: authResult.authType,
159
+ tokenType: authResult.tokenType,
160
+ username: authResult.username,
161
+ accessToken: authResult.accessToken,
162
+ payload: authResult.payload,
163
+ };
164
+ return undefined;
165
+ };
166
+ /**
167
+ * Determines whether to use multi-authentication or basic JWT is sufficient
168
+ */
169
+ function shouldUseMultiAuth(auth) {
170
+ return !!(auth.pat || auth.basic || auth.oauth2);
171
+ }
172
+ /**
173
+ * Enhanced middleware with multi-authentication support
174
+ * Automatically determines which system to use
175
+ */
176
+ export const enhancedAuthTokenMW = async (req, res, next) => {
177
+ // Check if this is a public MCP request
178
+ if (req.path === '/mcp' && isPublicMcpRequest(req)) {
179
+ return next();
180
+ }
181
+ const auth = appConfig.webServer.auth;
182
+ try {
183
+ // If additional authentication types are configured - use multi-auth
184
+ const authError = shouldUseMultiAuth(auth)
185
+ ? await getMultiAuthError(req) // 🆕 New system
186
+ : getAuthByTokenError(req); // ✅ Existing system
187
+ if (authError) {
188
+ res.status(authError.code).send(authError.message);
189
+ return;
190
+ }
191
+ next();
192
+ }
193
+ catch {
194
+ res.status(500).send('Authentication error');
195
+ return;
196
+ }
197
+ };
198
+ /**
199
+ * Middleware configurator - creates middleware with specified options
200
+ */
201
+ export function createConfigurableAuthMiddleware(options = {}) {
202
+ return async (req, res, next) => {
203
+ const auth = appConfig.webServer.auth;
204
+ // Log configuration on first request
205
+ if (options.logConfiguration && !createConfigurableAuthMiddleware._logged) {
206
+ logAuthConfiguration(auth);
207
+ createConfigurableAuthMiddleware._logged = true;
208
+ }
209
+ // Check if this is a public MCP request
210
+ if (req.path === '/mcp' && isPublicMcpRequest(req)) {
211
+ return next();
212
+ }
213
+ try {
214
+ // Choose authentication system
215
+ const useMultiAuth = options.forceMultiAuth || shouldUseMultiAuth(auth);
216
+ const authError = useMultiAuth
217
+ ? await getMultiAuthError(req)
218
+ : getAuthByTokenError(req);
219
+ if (authError) {
220
+ res.status(authError.code).send(authError.message);
221
+ return;
222
+ }
223
+ next();
224
+ }
225
+ catch {
226
+ res.status(500).send('Authentication error');
227
+ return;
228
+ }
229
+ };
230
+ }
231
+ // Static property for logging tracking
232
+ createConfigurableAuthMiddleware._logged = false;
233
+ /**
234
+ * Utility to get current authentication configuration information
235
+ */
236
+ export function getAuthInfo() {
237
+ const auth = appConfig.webServer.auth;
238
+ const detection = detectAuthConfiguration(auth);
239
+ return {
240
+ enabled: auth.enabled,
241
+ configured: detection.configured,
242
+ valid: detection.valid,
243
+ errors: detection.errors,
244
+ usingMultiAuth: shouldUseMultiAuth(auth),
245
+ };
246
+ }
247
+ //# sourceMappingURL=middleware.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"middleware.js","sourceRoot":"","sources":["../../../src/core/auth/middleware.ts"],"names":[],"mappings":"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"}
@@ -0,0 +1,27 @@
1
+ /**
2
+ * Multi-authentication system core
3
+ */
4
+ import { AppConfig } from '../_types_/config.js';
5
+ import { AuthDetectionResult, AuthResult, AuthType } from './types.js';
6
+ /**
7
+ * Detects configured authentication types
8
+ */
9
+ export declare function detectAuthConfiguration(authConfig: AppConfig['webServer']['auth']): AuthDetectionResult;
10
+ /**
11
+ * Gets list of valid authorization types in priority order (ascending CPU load)
12
+ */
13
+ export declare function getValidAuthTypes(authConfig: AppConfig['webServer']['auth']): AuthType[];
14
+ /**
15
+ * Checks token for specific authentication type
16
+ */
17
+ export declare function checkAuthType(authType: AuthType, token: string, authConfig: AppConfig['webServer']['auth']): Promise<AuthResult>;
18
+ /**
19
+ * Checks token using all configured authentication methods
20
+ * in ascending CPU load order
21
+ */
22
+ export declare function checkMultiAuth(token: string, authConfig: AppConfig['webServer']['auth']): Promise<AuthResult>;
23
+ /**
24
+ * Logs authentication configuration (for debugging)
25
+ */
26
+ export declare function logAuthConfiguration(authConfig: AppConfig['webServer']['auth']): void;
27
+ //# sourceMappingURL=multi-auth.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"multi-auth.d.ts","sourceRoot":"","sources":["../../../src/core/auth/multi-auth.ts"],"names":[],"mappings":"AAAA;;GAEG;AAGH,OAAO,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAC;AAEjD,OAAO,EAAE,mBAAmB,EAAE,UAAU,EAAE,QAAQ,EAAuB,MAAM,YAAY,CAAC;AAe5F;;GAEG;AACH,wBAAgB,uBAAuB,CAAE,UAAU,EAAE,SAAS,CAAC,WAAW,CAAC,CAAC,MAAM,CAAC,GAAG,mBAAmB,CAwFxG;AAED;;GAEG;AACH,wBAAgB,iBAAiB,CAAE,UAAU,EAAE,SAAS,CAAC,WAAW,CAAC,CAAC,MAAM,CAAC,GAAG,QAAQ,EAAE,CAMzF;AAED;;GAEG;AACH,wBAAsB,aAAa,CACjC,QAAQ,EAAE,QAAQ,EAClB,KAAK,EAAE,MAAM,EACb,UAAU,EAAE,SAAS,CAAC,WAAW,CAAC,CAAC,MAAM,CAAC,GACzC,OAAO,CAAC,UAAU,CAAC,CAgCrB;AAsHD;;;GAGG;AACH,wBAAsB,cAAc,CAClC,KAAK,EAAE,MAAM,EACb,UAAU,EAAE,SAAS,CAAC,WAAW,CAAC,CAAC,MAAM,CAAC,GACzC,OAAO,CAAC,UAAU,CAAC,CA8BrB;AAED;;GAEG;AACH,wBAAgB,oBAAoB,CAAE,UAAU,EAAE,SAAS,CAAC,WAAW,CAAC,CAAC,MAAM,CAAC,GAAG,IAAI,CActF"}