@aomex/auth 3.28.0 → 3.28.2

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/CHANGELOG.md CHANGED
@@ -3,6 +3,25 @@
3
3
  All notable changes to this project will be documented in this file.
4
4
  See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
5
5
 
6
+ ## [3.28.2](https://github.com/aomex/aomex/compare/v3.28.1...v3.28.2) (2025-07-09)
7
+
8
+ **Note:** Version bump only for package @aomex/auth
9
+
10
+
11
+
12
+
13
+
14
+ ## [3.28.1](https://github.com/aomex/aomex/compare/v3.28.0...v3.28.1) (2025-07-08)
15
+
16
+
17
+ ### Bug Fixes
18
+
19
+ * **auth:** 策略权限参数使用扩展符时无法获得类型提示 ([6f10710](https://github.com/aomex/aomex/commit/6f1071008b171f6d413bb36840a2a1e63dd100e7))
20
+
21
+
22
+
23
+
24
+
6
25
  # [3.28.0](https://github.com/aomex/aomex/compare/v3.27.4...v3.28.0) (2025-07-08)
7
26
 
8
27
 
package/dist/index.d.ts CHANGED
@@ -17,7 +17,7 @@ declare namespace Auth {
17
17
  }
18
18
  type DetermineAuthorizeArgs<S extends {
19
19
  [K: string]: Strategy<object | string | number, any[]>;
20
- }, StrategyName extends keyof S> = S[StrategyName] extends Strategy<any, infer Args> ? any[] extends Args ? [] : Args : never;
20
+ }, StrategyName extends keyof S> = S[StrategyName] extends Strategy<any, infer Args> ? unknown[] extends Args ? [] : Args : never;
21
21
  type DetermineMiddlewareProps<S extends {
22
22
  [K: string]: Strategy<object | string | number, any[]>;
23
23
  }, StrategyName extends keyof S> = {
package/dist/index.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"sources":["../src/strategy.ts","../src/auth.ts","../src/auth-error.ts"],"sourcesContent":["import { statuses, type OpenApiInjector, type WebContext } from '@aomex/web';\nimport type { AuthError } from './auth-error';\n\nexport abstract class Strategy<\n Payload extends object | string | number,\n AuthorizeArgs extends any[] = any[],\n> {\n protected abstract authenticate(\n ctx: WebContext,\n ): Payload | false | AuthError | Promise<Payload | false | AuthError>;\n\n protected abstract authorize(\n payload: Payload,\n ...args: AuthorizeArgs\n ): boolean | AuthError | Promise<boolean | AuthError>;\n\n protected openapi(): OpenApiInjector {\n return {\n postMethod(methodItem) {\n methodItem.responses[401] ||= {\n description: statuses.message[401]!,\n };\n },\n };\n }\n}\n","import type { WebContext, WebMiddleware } from '@aomex/web';\nimport { Strategy } from './strategy';\nimport { middleware } from '@aomex/common';\nimport { AuthError } from './auth-error';\n\nexport namespace Auth {\n export interface Options<\n S extends { [K: string]: Strategy<object | string | number, any[]> },\n > {\n strategies: S;\n }\n\n export type DetermineAuthorizeArgs<\n S extends { [K: string]: Strategy<object | string | number, any[]> },\n StrategyName extends keyof S,\n > =\n S[StrategyName] extends Strategy<any, infer Args>\n ? any[] extends Args\n ? []\n : Args\n : never;\n\n export type DetermineMiddlewareProps<\n S extends { [K: string]: Strategy<object | string | number, any[]> },\n StrategyName extends keyof S,\n > = {\n readonly [K in StrategyName]: S[StrategyName] extends Strategy<infer P, any>\n ? P\n : never;\n };\n}\n\nexport class Auth<S extends { [K: string]: Strategy<object | string | number, any[]> }> {\n constructor(protected readonly options: Auth.Options<S>) {}\n\n /**\n * 获取策略实例\n */\n public strategy<StrategyName extends keyof S>(name: StrategyName) {\n return this.options.strategies[name]! as S[StrategyName];\n }\n\n /**\n * 在已经身份认证(authenticate)的基础上进行访问权限认证,不满足时响应`403`状态码\n */\n public authorize<StrategyName extends keyof S>(\n name: StrategyName,\n ...args: Auth.DetermineAuthorizeArgs<S, StrategyName>\n ): WebMiddleware<object /* 身份认证时已经给过类型,仅授权不需要返回类型 */> {\n const strategy = this.strategy(name);\n\n return middleware.web<Auth.DetermineMiddlewareProps<S, StrategyName>>({\n fn: async (ctx, next) => {\n const payload = ctx[name];\n await this.internalAuthorize(ctx, strategy, payload, args);\n return next();\n },\n });\n }\n\n /**\n * 对访问凭证(token,cookie,session等)进行身份确认,不满足时响应`401`状态码\n */\n public authenticate<StrategyName extends keyof S>(\n name: StrategyName,\n ): WebMiddleware<Auth.DetermineMiddlewareProps<S, StrategyName>> & {\n authorize: (\n ...args: Auth.DetermineAuthorizeArgs<S, StrategyName>\n ) => WebMiddleware<Auth.DetermineMiddlewareProps<S, StrategyName>>;\n } {\n const strategy = this.strategy(name);\n let withAuthorize = false;\n const authorizeArgs: any[] = [];\n\n const md = middleware.web({\n fn: async (ctx, next) => {\n let payload: string | number | false | object | AuthError = false;\n try {\n payload = await strategy['authenticate'](ctx);\n } catch (e) {\n if (e instanceof AuthError) {\n return ctx.throw(401, e);\n } else {\n throw e;\n }\n }\n if (payload instanceof AuthError) {\n return ctx.throw(401, payload.message);\n }\n if (payload === false) {\n return ctx.throw(401);\n }\n if (withAuthorize) {\n await this.internalAuthorize(ctx, strategy, payload, authorizeArgs);\n }\n Object.defineProperty(ctx, name, {\n get: () => payload,\n });\n return next();\n },\n openapi: strategy['openapi'](),\n });\n\n // @ts-expect-error\n md.authorize = (...args: any[]) => {\n withAuthorize = true;\n authorizeArgs.push(...args);\n return md;\n };\n\n // @ts-expect-error\n return md;\n }\n\n protected async internalAuthorize(\n ctx: WebContext,\n strategy: Strategy<any>,\n payload: any,\n authorizeArgs: any[],\n ) {\n let authorized: AuthError | boolean = false;\n try {\n authorized = await strategy['authorize'](payload, ...authorizeArgs);\n } catch (e) {\n if (e instanceof AuthError) {\n return ctx.throw(403, e);\n } else {\n throw e;\n }\n }\n if (authorized instanceof AuthError) {\n return ctx.throw(403, authorized.message);\n }\n if (!authorized) {\n return ctx.throw(403);\n }\n }\n}\n","export class AuthError extends Error {}\n"],"mappings":";AAAA,SAAS,gBAAuD;AAGzD,IAAe,WAAf,MAGL;AAAA,EAUU,UAA2B;AACnC,WAAO;AAAA,MACL,WAAW,YAAY;AACrB,mBAAW,UAAU,GAAG,MAAM;AAAA,UAC5B,aAAa,SAAS,QAAQ,GAAG;AAAA,QACnC;AAAA,MACF;AAAA,IACF;AAAA,EACF;AACF;;;ACvBA,SAAS,kBAAkB;;;ACFpB,IAAM,YAAN,cAAwB,MAAM;AAAC;;;ADgC/B,IAAM,OAAN,MAAiF;AAAA,EACtF,YAA+B,SAA0B;AAA1B;AAAA,EAA2B;AAAA;AAAA;AAAA;AAAA,EAKnD,SAAuC,MAAoB;AAChE,WAAO,KAAK,QAAQ,WAAW,IAAI;AAAA,EACrC;AAAA;AAAA;AAAA;AAAA,EAKO,UACL,SACG,MACiD;AACpD,UAAM,WAAW,KAAK,SAAS,IAAI;AAEnC,WAAO,WAAW,IAAoD;AAAA,MACpE,IAAI,OAAO,KAAK,SAAS;AACvB,cAAM,UAAU,IAAI,IAAI;AACxB,cAAM,KAAK,kBAAkB,KAAK,UAAU,SAAS,IAAI;AACzD,eAAO,KAAK;AAAA,MACd;AAAA,IACF,CAAC;AAAA,EACH;AAAA;AAAA;AAAA;AAAA,EAKO,aACL,MAKA;AACA,UAAM,WAAW,KAAK,SAAS,IAAI;AACnC,QAAI,gBAAgB;AACpB,UAAM,gBAAuB,CAAC;AAE9B,UAAM,KAAK,WAAW,IAAI;AAAA,MACxB,IAAI,OAAO,KAAK,SAAS;AACvB,YAAI,UAAwD;AAC5D,YAAI;AACF,oBAAU,MAAM,SAAS,cAAc,EAAE,GAAG;AAAA,QAC9C,SAAS,GAAG;AACV,cAAI,aAAa,WAAW;AAC1B,mBAAO,IAAI,MAAM,KAAK,CAAC;AAAA,UACzB,OAAO;AACL,kBAAM;AAAA,UACR;AAAA,QACF;AACA,YAAI,mBAAmB,WAAW;AAChC,iBAAO,IAAI,MAAM,KAAK,QAAQ,OAAO;AAAA,QACvC;AACA,YAAI,YAAY,OAAO;AACrB,iBAAO,IAAI,MAAM,GAAG;AAAA,QACtB;AACA,YAAI,eAAe;AACjB,gBAAM,KAAK,kBAAkB,KAAK,UAAU,SAAS,aAAa;AAAA,QACpE;AACA,eAAO,eAAe,KAAK,MAAM;AAAA,UAC/B,KAAK,MAAM;AAAA,QACb,CAAC;AACD,eAAO,KAAK;AAAA,MACd;AAAA,MACA,SAAS,SAAS,SAAS,EAAE;AAAA,IAC/B,CAAC;AAGD,OAAG,YAAY,IAAI,SAAgB;AACjC,sBAAgB;AAChB,oBAAc,KAAK,GAAG,IAAI;AAC1B,aAAO;AAAA,IACT;AAGA,WAAO;AAAA,EACT;AAAA,EAEA,MAAgB,kBACd,KACA,UACA,SACA,eACA;AACA,QAAI,aAAkC;AACtC,QAAI;AACF,mBAAa,MAAM,SAAS,WAAW,EAAE,SAAS,GAAG,aAAa;AAAA,IACpE,SAAS,GAAG;AACV,UAAI,aAAa,WAAW;AAC1B,eAAO,IAAI,MAAM,KAAK,CAAC;AAAA,MACzB,OAAO;AACL,cAAM;AAAA,MACR;AAAA,IACF;AACA,QAAI,sBAAsB,WAAW;AACnC,aAAO,IAAI,MAAM,KAAK,WAAW,OAAO;AAAA,IAC1C;AACA,QAAI,CAAC,YAAY;AACf,aAAO,IAAI,MAAM,GAAG;AAAA,IACtB;AAAA,EACF;AACF;","names":[]}
1
+ {"version":3,"sources":["../src/strategy.ts","../src/auth.ts","../src/auth-error.ts"],"sourcesContent":["import { statuses, type OpenApiInjector, type WebContext } from '@aomex/web';\nimport type { AuthError } from './auth-error';\n\nexport abstract class Strategy<\n Payload extends object | string | number,\n AuthorizeArgs extends any[] = any[],\n> {\n protected abstract authenticate(\n ctx: WebContext,\n ): Payload | false | AuthError | Promise<Payload | false | AuthError>;\n\n protected abstract authorize(\n payload: Payload,\n ...args: AuthorizeArgs\n ): boolean | AuthError | Promise<boolean | AuthError>;\n\n protected openapi(): OpenApiInjector {\n return {\n postMethod(methodItem) {\n methodItem.responses[401] ||= {\n description: statuses.message[401]!,\n };\n },\n };\n }\n}\n","import type { WebContext, WebMiddleware } from '@aomex/web';\nimport { Strategy } from './strategy';\nimport { middleware } from '@aomex/common';\nimport { AuthError } from './auth-error';\n\nexport namespace Auth {\n export interface Options<\n S extends { [K: string]: Strategy<object | string | number, any[]> },\n > {\n strategies: S;\n }\n\n export type DetermineAuthorizeArgs<\n S extends { [K: string]: Strategy<object | string | number, any[]> },\n StrategyName extends keyof S,\n > =\n S[StrategyName] extends Strategy<any, infer Args>\n ? unknown[] extends Args\n ? []\n : Args\n : never;\n\n export type DetermineMiddlewareProps<\n S extends { [K: string]: Strategy<object | string | number, any[]> },\n StrategyName extends keyof S,\n > = {\n readonly [K in StrategyName]: S[StrategyName] extends Strategy<infer P, any>\n ? P\n : never;\n };\n}\n\nexport class Auth<S extends { [K: string]: Strategy<object | string | number, any[]> }> {\n constructor(protected readonly options: Auth.Options<S>) {}\n\n /**\n * 获取策略实例\n */\n public strategy<StrategyName extends keyof S>(name: StrategyName) {\n return this.options.strategies[name]! as S[StrategyName];\n }\n\n /**\n * 在已经身份认证(authenticate)的基础上进行访问权限认证,不满足时响应`403`状态码\n */\n public authorize<StrategyName extends keyof S>(\n name: StrategyName,\n ...args: Auth.DetermineAuthorizeArgs<S, StrategyName>\n ): WebMiddleware<object /* 身份认证时已经给过类型,仅授权不需要返回类型 */> {\n const strategy = this.strategy(name);\n\n return middleware.web<Auth.DetermineMiddlewareProps<S, StrategyName>>({\n fn: async (ctx, next) => {\n const payload = ctx[name];\n await this.internalAuthorize(ctx, strategy, payload, args);\n return next();\n },\n });\n }\n\n /**\n * 对访问凭证(token,cookie,session等)进行身份确认,不满足时响应`401`状态码\n */\n public authenticate<StrategyName extends keyof S>(\n name: StrategyName,\n ): WebMiddleware<Auth.DetermineMiddlewareProps<S, StrategyName>> & {\n authorize: (\n ...args: Auth.DetermineAuthorizeArgs<S, StrategyName>\n ) => WebMiddleware<Auth.DetermineMiddlewareProps<S, StrategyName>>;\n } {\n const strategy = this.strategy(name);\n let withAuthorize = false;\n const authorizeArgs: any[] = [];\n\n const md = middleware.web({\n fn: async (ctx, next) => {\n let payload: string | number | false | object | AuthError = false;\n try {\n payload = await strategy['authenticate'](ctx);\n } catch (e) {\n if (e instanceof AuthError) {\n return ctx.throw(401, e);\n } else {\n throw e;\n }\n }\n if (payload instanceof AuthError) {\n return ctx.throw(401, payload.message);\n }\n if (payload === false) {\n return ctx.throw(401);\n }\n if (withAuthorize) {\n await this.internalAuthorize(ctx, strategy, payload, authorizeArgs);\n }\n Object.defineProperty(ctx, name, {\n get: () => payload,\n });\n return next();\n },\n openapi: strategy['openapi'](),\n });\n\n // @ts-expect-error\n md.authorize = (...args: any[]) => {\n withAuthorize = true;\n authorizeArgs.push(...args);\n return md;\n };\n\n // @ts-expect-error\n return md;\n }\n\n protected async internalAuthorize(\n ctx: WebContext,\n strategy: Strategy<any>,\n payload: any,\n authorizeArgs: any[],\n ) {\n let authorized: AuthError | boolean = false;\n try {\n authorized = await strategy['authorize'](payload, ...authorizeArgs);\n } catch (e) {\n if (e instanceof AuthError) {\n return ctx.throw(403, e);\n } else {\n throw e;\n }\n }\n if (authorized instanceof AuthError) {\n return ctx.throw(403, authorized.message);\n }\n if (!authorized) {\n return ctx.throw(403);\n }\n }\n}\n","export class AuthError extends Error {}\n"],"mappings":";AAAA,SAAS,gBAAuD;AAGzD,IAAe,WAAf,MAGL;AAAA,EAUU,UAA2B;AACnC,WAAO;AAAA,MACL,WAAW,YAAY;AACrB,mBAAW,UAAU,GAAG,MAAM;AAAA,UAC5B,aAAa,SAAS,QAAQ,GAAG;AAAA,QACnC;AAAA,MACF;AAAA,IACF;AAAA,EACF;AACF;;;ACvBA,SAAS,kBAAkB;;;ACFpB,IAAM,YAAN,cAAwB,MAAM;AAAC;;;ADgC/B,IAAM,OAAN,MAAiF;AAAA,EACtF,YAA+B,SAA0B;AAA1B;AAAA,EAA2B;AAAA;AAAA;AAAA;AAAA,EAKnD,SAAuC,MAAoB;AAChE,WAAO,KAAK,QAAQ,WAAW,IAAI;AAAA,EACrC;AAAA;AAAA;AAAA;AAAA,EAKO,UACL,SACG,MACiD;AACpD,UAAM,WAAW,KAAK,SAAS,IAAI;AAEnC,WAAO,WAAW,IAAoD;AAAA,MACpE,IAAI,OAAO,KAAK,SAAS;AACvB,cAAM,UAAU,IAAI,IAAI;AACxB,cAAM,KAAK,kBAAkB,KAAK,UAAU,SAAS,IAAI;AACzD,eAAO,KAAK;AAAA,MACd;AAAA,IACF,CAAC;AAAA,EACH;AAAA;AAAA;AAAA;AAAA,EAKO,aACL,MAKA;AACA,UAAM,WAAW,KAAK,SAAS,IAAI;AACnC,QAAI,gBAAgB;AACpB,UAAM,gBAAuB,CAAC;AAE9B,UAAM,KAAK,WAAW,IAAI;AAAA,MACxB,IAAI,OAAO,KAAK,SAAS;AACvB,YAAI,UAAwD;AAC5D,YAAI;AACF,oBAAU,MAAM,SAAS,cAAc,EAAE,GAAG;AAAA,QAC9C,SAAS,GAAG;AACV,cAAI,aAAa,WAAW;AAC1B,mBAAO,IAAI,MAAM,KAAK,CAAC;AAAA,UACzB,OAAO;AACL,kBAAM;AAAA,UACR;AAAA,QACF;AACA,YAAI,mBAAmB,WAAW;AAChC,iBAAO,IAAI,MAAM,KAAK,QAAQ,OAAO;AAAA,QACvC;AACA,YAAI,YAAY,OAAO;AACrB,iBAAO,IAAI,MAAM,GAAG;AAAA,QACtB;AACA,YAAI,eAAe;AACjB,gBAAM,KAAK,kBAAkB,KAAK,UAAU,SAAS,aAAa;AAAA,QACpE;AACA,eAAO,eAAe,KAAK,MAAM;AAAA,UAC/B,KAAK,MAAM;AAAA,QACb,CAAC;AACD,eAAO,KAAK;AAAA,MACd;AAAA,MACA,SAAS,SAAS,SAAS,EAAE;AAAA,IAC/B,CAAC;AAGD,OAAG,YAAY,IAAI,SAAgB;AACjC,sBAAgB;AAChB,oBAAc,KAAK,GAAG,IAAI;AAC1B,aAAO;AAAA,IACT;AAGA,WAAO;AAAA,EACT;AAAA,EAEA,MAAgB,kBACd,KACA,UACA,SACA,eACA;AACA,QAAI,aAAkC;AACtC,QAAI;AACF,mBAAa,MAAM,SAAS,WAAW,EAAE,SAAS,GAAG,aAAa;AAAA,IACpE,SAAS,GAAG;AACV,UAAI,aAAa,WAAW;AAC1B,eAAO,IAAI,MAAM,KAAK,CAAC;AAAA,MACzB,OAAO;AACL,cAAM;AAAA,MACR;AAAA,IACF;AACA,QAAI,sBAAsB,WAAW;AACnC,aAAO,IAAI,MAAM,KAAK,WAAW,OAAO;AAAA,IAC1C;AACA,QAAI,CAAC,YAAY;AACf,aAAO,IAAI,MAAM,GAAG;AAAA,IACtB;AAAA,EACF;AACF;","names":[]}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@aomex/auth",
3
- "version": "3.28.0",
3
+ "version": "3.28.2",
4
4
  "description": "身份认证统一入口",
5
5
  "type": "module",
6
6
  "types": "dist/index.d.ts",