@haneinfo/m2m-api-key 8.1.28 → 8.1.29

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 ADDED
@@ -0,0 +1,3 @@
1
+ # Machine-to-machine API keys
2
+
3
+ Successful API key authentication records `lastUsedAt` asynchronously. Writes are throttled per key across processes using a conditional database update. The default interval is 60 seconds; set `M2M_API_KEY_LAST_USED_INTERVAL_SECONDS` to an integer from 0 to 86400 to change it (0 disables throttling). Invalid or absent values use 60 seconds. The timestamp can lag the latest successful authentication by up to the configured interval, plus asynchronous database delay; write failures are logged and retried on a later request. This timestamp is observational and does not determine authentication or authorization.
@@ -1 +1 @@
1
- {"version":3,"file":"api-key-machine.strategy.d.ts","sourceRoot":"","sources":["../src/api-key-machine.strategy.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AACjD,OAAO,EAAE,KAAK,gBAAgB,EAAe,KAAK,cAAc,EAAE,MAAM,sBAAsB,CAAC;AAC/F,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,4BAA4B,CAAC;AACzE,OAAO,EACL,KAAK,gBAAgB,EAQtB,MAAM,gBAAgB,CAAC;AACxB,OAAO,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAC;AAG3D;;;;;;;;GAQG;AACH,qBACa,qBAAsB,YAAW,sBAAsB;IAOzC,OAAO,CAAC,QAAQ,CAAC,MAAM;IACnB,OAAO,CAAC,QAAQ,CAAC,WAAW;IACtB,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAC;IAR/D,QAAQ,CAAC,EAAE,aAAa;IACxB,QAAQ,CAAC,IAAI,EAAG,SAAS,CAAU;IAEnC,OAAO,CAAC,QAAQ,CAAC,MAAM,CAA0C;gBAGvB,MAAM,EAAE,aAAa,EACjB,WAAW,EAAE,iBAAiB,EACxB,UAAU,CAAC,EAAE,cAAc,YAAA;IAGzE,YAAY,CAAC,OAAO,EAAE,gBAAgB,GAAG,OAAO,CAAC,gBAAgB,GAAG,IAAI,CAAC;CAyEhF"}
1
+ {"version":3,"file":"api-key-machine.strategy.d.ts","sourceRoot":"","sources":["../src/api-key-machine.strategy.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AACjD,OAAO,EAAE,KAAK,gBAAgB,EAAe,KAAK,cAAc,EAAE,MAAM,sBAAsB,CAAC;AAC/F,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,4BAA4B,CAAC;AACzE,OAAO,EACL,KAAK,gBAAgB,EAQtB,MAAM,gBAAgB,CAAC;AACxB,OAAO,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAC;AAI3D;;;;;;;;GAQG;AACH,qBACa,qBAAsB,YAAW,sBAAsB;IAOzC,OAAO,CAAC,QAAQ,CAAC,MAAM;IACnB,OAAO,CAAC,QAAQ,CAAC,WAAW;IACtB,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAC;IAR/D,QAAQ,CAAC,EAAE,aAAa;IACxB,QAAQ,CAAC,IAAI,EAAG,SAAS,CAAU;IAEnC,OAAO,CAAC,QAAQ,CAAC,MAAM,CAA0C;gBAGvB,MAAM,EAAE,aAAa,EACjB,WAAW,EAAE,iBAAiB,EACxB,UAAU,CAAC,EAAE,cAAc,YAAA;IAGzE,YAAY,CAAC,OAAO,EAAE,gBAAgB,GAAG,OAAO,CAAC,gBAAgB,GAAG,IAAI,CAAC;CAsEhF"}
@@ -20,6 +20,7 @@ const plugin_api_1 = require("@haneinfo/plugin-api");
20
20
  const common_2 = require("@nestjs/common");
21
21
  const api_key_rate_limiter_1 = require("./api-key-rate-limiter");
22
22
  const api_keys_service_1 = require("./api-keys.service");
23
+ const last_used_at_1 = require("./last-used-at");
23
24
  /**
24
25
  * Registers API keys as a machine authentication provider with the host strategy registry (051 PL4-03, PL1-11).
25
26
  *
@@ -66,7 +67,7 @@ let ApiKeyMachineStrategy = ApiKeyMachineStrategy_1 = class ApiKeyMachineStrateg
66
67
  actingUser: { select: { id: true, isActive: true, isServiceAccount: true } },
67
68
  },
68
69
  });
69
- if (!apiKey) {
70
+ if (!apiKey || !matchesHashedKey(apiKey.hashedKey, hashedKey)) {
70
71
  throw new common_2.UnauthorizedException('Invalid API key');
71
72
  }
72
73
  const { allowed, retryAfter } = this.rateLimiter.check(apiKey.id, apiKey.rateLimit);
@@ -79,10 +80,7 @@ let ApiKeyMachineStrategy = ApiKeyMachineStrategy_1 = class ApiKeyMachineStrateg
79
80
  }
80
81
  throw new common_2.HttpException('Too Many Requests', common_2.HttpStatus.TOO_MANY_REQUESTS);
81
82
  }
82
- // Fire-and-forget lastUsedAt update
83
- this.prisma.apiKey
84
- .update({ where: { id: apiKey.id }, data: { lastUsedAt: now } })
85
- .catch((e) => this.logger.error(`lastUsedAt update failed: ${errorMessage(e)}`));
83
+ (0, last_used_at_1.recordLastUsedAt)(this.prisma, this.logger, apiKey, now);
86
84
  const actingUserId = apiKey.actingUser?.isActive && apiKey.actingUser.isServiceAccount
87
85
  ? apiKey.actingUser.id
88
86
  : null;
@@ -106,7 +104,11 @@ exports.ApiKeyMachineStrategy = ApiKeyMachineStrategy = ApiKeyMachineStrategy_1
106
104
  __metadata("design:paramtypes", [common_1.PrismaService,
107
105
  api_key_rate_limiter_1.ApiKeyRateLimiter, Object])
108
106
  ], ApiKeyMachineStrategy);
109
- function errorMessage(error) {
110
- return error instanceof Error ? error.message : String(error);
107
+ function matchesHashedKey(storedHash, expectedHash) {
108
+ if (typeof storedHash !== 'string')
109
+ return false;
110
+ const left = Buffer.from(storedHash, 'utf8');
111
+ const right = Buffer.from(expectedHash, 'utf8');
112
+ return left.length === right.length && (0, node_crypto_1.timingSafeEqual)(left, right);
111
113
  }
112
114
  //# sourceMappingURL=api-key-machine.strategy.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"api-key-machine.strategy.js","sourceRoot":"","sources":["../src/api-key-machine.strategy.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"api-key-machine.strategy.js","sourceRoot":"","sources":["../src/api-key-machine.strategy.ts"],"names":[],"mappings":"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"}
@@ -1,6 +1,9 @@
1
- export declare class ApiKeyRateLimiter {
1
+ import { type OnModuleDestroy } from '@nestjs/common';
2
+ export declare class ApiKeyRateLimiter implements OnModuleDestroy {
2
3
  private readonly buckets;
4
+ private readonly evictionTimer;
3
5
  constructor();
6
+ onModuleDestroy(): void;
4
7
  check(keyId: string, limitPerMin: number | null): {
5
8
  allowed: boolean;
6
9
  retryAfter?: number;
@@ -1 +1 @@
1
- {"version":3,"file":"api-key-rate-limiter.d.ts","sourceRoot":"","sources":["../src/api-key-rate-limiter.ts"],"names":[],"mappings":"AAWA,qBACa,iBAAiB;IAC5B,OAAO,CAAC,QAAQ,CAAC,OAAO,CAA6B;;IAOrD,KAAK,CAAC,KAAK,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,GAAG,IAAI,GAAG;QAAE,OAAO,EAAE,OAAO,CAAC;QAAC,UAAU,CAAC,EAAE,MAAM,CAAA;KAAE;IAoB3F,OAAO,CAAC,KAAK;CAQd"}
1
+ {"version":3,"file":"api-key-rate-limiter.d.ts","sourceRoot":"","sources":["../src/api-key-rate-limiter.ts"],"names":[],"mappings":"AAAA,OAAO,EAAc,KAAK,eAAe,EAAE,MAAM,gBAAgB,CAAC;AAWlE,qBACa,iBAAkB,YAAW,eAAe;IACvD,OAAO,CAAC,QAAQ,CAAC,OAAO,CAA6B;IACrD,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAiC;;IAQ/D,eAAe,IAAI,IAAI;IAIvB,KAAK,CAAC,KAAK,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,GAAG,IAAI,GAAG;QAAE,OAAO,EAAE,OAAO,CAAC;QAAC,UAAU,CAAC,EAAE,MAAM,CAAA;KAAE;IAoB3F,OAAO,CAAC,KAAK;CAQd"}
@@ -18,7 +18,11 @@ let ApiKeyRateLimiter = class ApiKeyRateLimiter {
18
18
  constructor() {
19
19
  this.buckets = new Map();
20
20
  // Evict stale buckets every 5 minutes to prevent unbounded memory growth
21
- setInterval(() => this.evict(), EVICTION_INTERVAL_MS).unref();
21
+ this.evictionTimer = setInterval(() => this.evict(), EVICTION_INTERVAL_MS);
22
+ this.evictionTimer.unref();
23
+ }
24
+ onModuleDestroy() {
25
+ clearInterval(this.evictionTimer);
22
26
  }
23
27
  check(keyId, limitPerMin) {
24
28
  const limit = limitPerMin ?? DEFAULT_LIMIT;
@@ -1 +1 @@
1
- {"version":3,"file":"api-key-rate-limiter.js","sourceRoot":"","sources":["../src/api-key-rate-limiter.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAA4C;AAE5C,MAAM,aAAa,GAAG,EAAE,CAAC;AACzB,MAAM,SAAS,GAAG,MAAM,CAAC;AACzB,MAAM,oBAAoB,GAAG,CAAC,GAAG,MAAM,CAAC;AAQjC,IAAM,iBAAiB,GAAvB,MAAM,iBAAiB;IAG5B;QAFiB,YAAO,GAAG,IAAI,GAAG,EAAkB,CAAC;QAGnD,yEAAyE;QACzE,WAAW,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,KAAK,EAAE,EAAE,oBAAoB,CAAC,CAAC,KAAK,EAAE,CAAC;IAChE,CAAC;IAED,KAAK,CAAC,KAAa,EAAE,WAA0B;QAC7C,MAAM,KAAK,GAAG,WAAW,IAAI,aAAa,CAAC;QAC3C,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;QACvB,IAAI,MAAM,GAAG,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;QAErC,IAAI,CAAC,MAAM,IAAI,GAAG,GAAG,MAAM,CAAC,WAAW,IAAI,SAAS,EAAE,CAAC;YACrD,MAAM,GAAG,EAAE,KAAK,EAAE,CAAC,EAAE,WAAW,EAAE,GAAG,EAAE,CAAC;YACxC,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;YAChC,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC;QAC3B,CAAC;QAED,MAAM,CAAC,KAAK,IAAI,CAAC,CAAC;QAClB,IAAI,MAAM,CAAC,KAAK,GAAG,KAAK,EAAE,CAAC;YACzB,MAAM,UAAU,GAAG,IAAI,CAAC,IAAI,CAAC,CAAC,SAAS,GAAG,CAAC,GAAG,GAAG,MAAM,CAAC,WAAW,CAAC,CAAC,GAAG,IAAI,CAAC,CAAC;YAC9E,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,UAAU,EAAE,CAAC;QACxC,CAAC;QAED,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC;IAC3B,CAAC;IAEO,KAAK;QACX,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;QACvB,KAAK,MAAM,CAAC,EAAE,EAAE,MAAM,CAAC,IAAI,IAAI,CAAC,OAAO,EAAE,CAAC;YACxC,IAAI,GAAG,GAAG,MAAM,CAAC,WAAW,IAAI,SAAS,GAAG,CAAC,EAAE,CAAC;gBAC9C,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;YAC1B,CAAC;QACH,CAAC;IACH,CAAC;CACF,CAAA;AApCY,8CAAiB;4BAAjB,iBAAiB;IAD7B,IAAA,mBAAU,GAAE;;GACA,iBAAiB,CAoC7B"}
1
+ {"version":3,"file":"api-key-rate-limiter.js","sourceRoot":"","sources":["../src/api-key-rate-limiter.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAAkE;AAElE,MAAM,aAAa,GAAG,EAAE,CAAC;AACzB,MAAM,SAAS,GAAG,MAAM,CAAC;AACzB,MAAM,oBAAoB,GAAG,CAAC,GAAG,MAAM,CAAC;AAQjC,IAAM,iBAAiB,GAAvB,MAAM,iBAAiB;IAI5B;QAHiB,YAAO,GAAG,IAAI,GAAG,EAAkB,CAAC;QAInD,yEAAyE;QACzE,IAAI,CAAC,aAAa,GAAG,WAAW,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,KAAK,EAAE,EAAE,oBAAoB,CAAC,CAAC;QAC3E,IAAI,CAAC,aAAa,CAAC,KAAK,EAAE,CAAC;IAC7B,CAAC;IAED,eAAe;QACb,aAAa,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;IACpC,CAAC;IAED,KAAK,CAAC,KAAa,EAAE,WAA0B;QAC7C,MAAM,KAAK,GAAG,WAAW,IAAI,aAAa,CAAC;QAC3C,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;QACvB,IAAI,MAAM,GAAG,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;QAErC,IAAI,CAAC,MAAM,IAAI,GAAG,GAAG,MAAM,CAAC,WAAW,IAAI,SAAS,EAAE,CAAC;YACrD,MAAM,GAAG,EAAE,KAAK,EAAE,CAAC,EAAE,WAAW,EAAE,GAAG,EAAE,CAAC;YACxC,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;YAChC,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC;QAC3B,CAAC;QAED,MAAM,CAAC,KAAK,IAAI,CAAC,CAAC;QAClB,IAAI,MAAM,CAAC,KAAK,GAAG,KAAK,EAAE,CAAC;YACzB,MAAM,UAAU,GAAG,IAAI,CAAC,IAAI,CAAC,CAAC,SAAS,GAAG,CAAC,GAAG,GAAG,MAAM,CAAC,WAAW,CAAC,CAAC,GAAG,IAAI,CAAC,CAAC;YAC9E,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,UAAU,EAAE,CAAC;QACxC,CAAC;QAED,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC;IAC3B,CAAC;IAEO,KAAK;QACX,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;QACvB,KAAK,MAAM,CAAC,EAAE,EAAE,MAAM,CAAC,IAAI,IAAI,CAAC,OAAO,EAAE,CAAC;YACxC,IAAI,GAAG,GAAG,MAAM,CAAC,WAAW,IAAI,SAAS,GAAG,CAAC,EAAE,CAAC;gBAC9C,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;YAC1B,CAAC;QACH,CAAC;IACH,CAAC;CACF,CAAA;AA1CY,8CAAiB;4BAAjB,iBAAiB;IAD7B,IAAA,mBAAU,GAAE;;GACA,iBAAiB,CA0C7B"}
@@ -1 +1 @@
1
- {"version":3,"file":"api-key.guard.d.ts","sourceRoot":"","sources":["../src/api-key.guard.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AACjD,OAAO,EAAe,KAAK,cAAc,EAAE,MAAM,sBAAsB,CAAC;AAExE,OAAO,EACL,WAAW,EACX,gBAAgB,EAOjB,MAAM,gBAAgB,CAAC;AACxB,OAAO,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAC;AAG3D,qBACa,WAAY,YAAW,WAAW;IAiBpB,OAAO,CAAC,QAAQ,CAAC,MAAM;IACnB,OAAO,CAAC,QAAQ,CAAC,WAAW;IACtB,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAC;IAlB/D,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAgC;IAEvD;;;;;;;;;;;;OAYG;gBAEuC,MAAM,EAAE,aAAa,EACjB,WAAW,EAAE,iBAAiB,EACxB,UAAU,CAAC,EAAE,cAAc,YAAA;IAGzE,WAAW,CAAC,GAAG,EAAE,gBAAgB,GAAG,OAAO,CAAC,OAAO,CAAC;CAoE3D"}
1
+ {"version":3,"file":"api-key.guard.d.ts","sourceRoot":"","sources":["../src/api-key.guard.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AACjD,OAAO,EAAe,KAAK,cAAc,EAAE,MAAM,sBAAsB,CAAC;AAExE,OAAO,EACL,WAAW,EACX,gBAAgB,EAOjB,MAAM,gBAAgB,CAAC;AACxB,OAAO,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAC;AAI3D,qBACa,WAAY,YAAW,WAAW;IAiBpB,OAAO,CAAC,QAAQ,CAAC,MAAM;IACnB,OAAO,CAAC,QAAQ,CAAC,WAAW;IACtB,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAC;IAlB/D,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAgC;IAEvD;;;;;;;;;;;;OAYG;gBAEuC,MAAM,EAAE,aAAa,EACjB,WAAW,EAAE,iBAAiB,EACxB,UAAU,CAAC,EAAE,cAAc,YAAA;IAGzE,WAAW,CAAC,GAAG,EAAE,gBAAgB,GAAG,OAAO,CAAC,OAAO,CAAC;CAiE3D"}
@@ -20,6 +20,7 @@ const plugin_api_1 = require("@haneinfo/plugin-api");
20
20
  const common_2 = require("@nestjs/common");
21
21
  const api_key_rate_limiter_1 = require("./api-key-rate-limiter");
22
22
  const api_keys_service_1 = require("./api-keys.service");
23
+ const last_used_at_1 = require("./last-used-at");
23
24
  let ApiKeyGuard = ApiKeyGuard_1 = class ApiKeyGuard {
24
25
  /**
25
26
  * `RBAC_POLICY` is optional at injection and mandatory at use.
@@ -68,7 +69,7 @@ let ApiKeyGuard = ApiKeyGuard_1 = class ApiKeyGuard {
68
69
  actingUser: { select: { id: true, isActive: true, isServiceAccount: true } },
69
70
  },
70
71
  });
71
- if (!apiKey)
72
+ if (!apiKey || !matchesHashedKey(apiKey.hashedKey, hashedKey))
72
73
  return false;
73
74
  const { allowed, retryAfter } = this.rateLimiter.check(apiKey.id, apiKey.rateLimit);
74
75
  if (!allowed) {
@@ -78,10 +79,7 @@ let ApiKeyGuard = ApiKeyGuard_1 = class ApiKeyGuard {
78
79
  response.setHeader('Retry-After', String(retryAfter ?? 60));
79
80
  throw new common_2.HttpException('Too Many Requests', common_2.HttpStatus.TOO_MANY_REQUESTS);
80
81
  }
81
- // Fire-and-forget lastUsedAt update
82
- this.prisma.apiKey
83
- .update({ where: { id: apiKey.id }, data: { lastUsedAt: now } })
84
- .catch((e) => this.logger.error(`lastUsedAt update failed: ${errorMessage(e)}`));
82
+ (0, last_used_at_1.recordLastUsedAt)(this.prisma, this.logger, apiKey, now);
85
83
  const actingUserId = apiKey.actingUser?.isActive && apiKey.actingUser.isServiceAccount
86
84
  ? apiKey.actingUser.id
87
85
  : null;
@@ -105,7 +103,11 @@ exports.ApiKeyGuard = ApiKeyGuard = ApiKeyGuard_1 = __decorate([
105
103
  __metadata("design:paramtypes", [common_1.PrismaService,
106
104
  api_key_rate_limiter_1.ApiKeyRateLimiter, Object])
107
105
  ], ApiKeyGuard);
108
- function errorMessage(error) {
109
- return error instanceof Error ? error.message : String(error);
106
+ function matchesHashedKey(storedHash, expectedHash) {
107
+ if (typeof storedHash !== 'string')
108
+ return false;
109
+ const left = Buffer.from(storedHash, 'utf8');
110
+ const right = Buffer.from(expectedHash, 'utf8');
111
+ return left.length === right.length && (0, node_crypto_1.timingSafeEqual)(left, right);
110
112
  }
111
113
  //# sourceMappingURL=api-key.guard.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"api-key.guard.js","sourceRoot":"","sources":["../src/api-key.guard.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"api-key.guard.js","sourceRoot":"","sources":["../src/api-key.guard.ts"],"names":[],"mappings":"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"}
@@ -1 +1 @@
1
- {"version":3,"file":"api-keys.service.d.ts","sourceRoot":"","sources":["../src/api-keys.service.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,eAAe,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAC;AACzE,OAAO,EAAE,aAAa,EAA2C,MAAM,kBAAkB,CAAC;AAC1F,OAAO,EAAkB,KAAK,iBAAiB,EAAE,MAAM,sBAAsB,CAAC;AAE9E,OAAO,EAAE,eAAe,EAAE,oBAAoB,EAAE,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AACpG,OAAO,EAAE,sBAAsB,EAAE,MAAM,iBAAiB,CAAC;AAEzD,MAAM,WAAW,YAAY;IAC3B,EAAE,EAAE,MAAM,CAAC;IACX,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,MAAM,CAAC;IACf,YAAY,EAAE,MAAM,GAAG,IAAI,CAAC;IAC5B,IAAI,EAAE,OAAO,CAAC;IACd,MAAM,EAAE,MAAM,EAAE,CAAC;IACjB,SAAS,EAAE,MAAM,GAAG,IAAI,CAAC;IACzB,QAAQ,EAAE,OAAO,CAAC;IAClB,SAAS,EAAE,IAAI,GAAG,IAAI,CAAC;IACvB,SAAS,EAAE,MAAM,GAAG,IAAI,CAAC;IACzB,UAAU,EAAE,IAAI,GAAG,IAAI,CAAC;IACxB,SAAS,EAAE,IAAI,CAAC;IAChB,SAAS,EAAE,IAAI,CAAC;CACjB;AAED,eAAO,MAAM,UAAU,aAAa,CAAC;AAqBrC,qBACa,cAAc;IAEA,OAAO,CAAC,QAAQ,CAAC,MAAM;IAC9C;;;;;;;OAOG;IACqB,OAAO,CAAC,QAAQ,CAAC,aAAa;IACtD,4FAA4F;IAC5D,OAAO,CAAC,QAAQ,CAAC,OAAO;gBAXhB,MAAM,EAAE,aAAa;IAC7D;;;;;;;OAOG;IACsC,aAAa,EAAE,iBAAiB;IACzE,4FAA4F;IAC3C,OAAO,EAAE,sBAAsB;IAG5E,MAAM,CAAC,GAAG,EAAE,eAAe,EAAE,SAAS,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,oBAAoB,CAAC;IAoC/E,OAAO,CAAC,KAAK,EAAE,eAAe,GAAG,OAAO,CAAC,eAAe,CAAC,YAAY,CAAC,CAAC;IAkBvE,OAAO,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,YAAY,CAAC;IAM1C,MAAM,CAAC,EAAE,EAAE,MAAM,EAAE,GAAG,EAAE,eAAe,GAAG,OAAO,CAAC,YAAY,CAAC;IA0B/D,MAAM,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAKvC,OAAO,CAAC,cAAc;YAOR,gBAAgB;CAS/B"}
1
+ {"version":3,"file":"api-keys.service.d.ts","sourceRoot":"","sources":["../src/api-keys.service.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,eAAe,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAC;AACzE,OAAO,EAEL,aAAa,EAId,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EAAkB,KAAK,iBAAiB,EAAE,MAAM,sBAAsB,CAAC;AAE9E,OAAO,EAAE,eAAe,EAAE,oBAAoB,EAAE,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AACpG,OAAO,EAAE,sBAAsB,EAAE,MAAM,iBAAiB,CAAC;AAEzD,MAAM,WAAW,YAAY;IAC3B,EAAE,EAAE,MAAM,CAAC;IACX,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,MAAM,CAAC;IACf,YAAY,EAAE,MAAM,GAAG,IAAI,CAAC;IAC5B,IAAI,EAAE,OAAO,CAAC;IACd,MAAM,EAAE,MAAM,EAAE,CAAC;IACjB,SAAS,EAAE,MAAM,GAAG,IAAI,CAAC;IACzB,QAAQ,EAAE,OAAO,CAAC;IAClB,SAAS,EAAE,IAAI,GAAG,IAAI,CAAC;IACvB,SAAS,EAAE,MAAM,GAAG,IAAI,CAAC;IACzB,UAAU,EAAE,IAAI,GAAG,IAAI,CAAC;IACxB,SAAS,EAAE,IAAI,CAAC;IAChB,SAAS,EAAE,IAAI,CAAC;CACjB;AAED,eAAO,MAAM,UAAU,aAAa,CAAC;AAqBrC,qBACa,cAAc;IAEA,OAAO,CAAC,QAAQ,CAAC,MAAM;IAC9C;;;;;;;OAOG;IACqB,OAAO,CAAC,QAAQ,CAAC,aAAa;IACtD,4FAA4F;IAC5D,OAAO,CAAC,QAAQ,CAAC,OAAO;gBAXhB,MAAM,EAAE,aAAa;IAC7D;;;;;;;OAOG;IACsC,aAAa,EAAE,iBAAiB;IACzE,4FAA4F;IAC3C,OAAO,EAAE,sBAAsB;IAG5E,MAAM,CAAC,GAAG,EAAE,eAAe,EAAE,SAAS,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,oBAAoB,CAAC;IA6C/E,OAAO,CAAC,KAAK,EAAE,eAAe,GAAG,OAAO,CAAC,eAAe,CAAC,YAAY,CAAC,CAAC;IAkBvE,OAAO,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,YAAY,CAAC;IAM1C,MAAM,CAAC,EAAE,EAAE,MAAM,EAAE,GAAG,EAAE,eAAe,GAAG,OAAO,CAAC,YAAY,CAAC;IAkC/D,MAAM,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAKvC,OAAO,CAAC,cAAc;YAOR,gBAAgB;CAS/B"}
@@ -44,26 +44,36 @@ let ApiKeysService = class ApiKeysService {
44
44
  this.catalog = catalog;
45
45
  }
46
46
  async create(dto, createdBy) {
47
- this.validateScopes(dto.scopes);
47
+ const scopes = [...new Set(dto.scopes)];
48
+ this.validateScopes(scopes);
48
49
  if (dto.actingUserId)
49
50
  await this.assertActingUser(dto.actingUserId);
50
51
  const raw = exports.KEY_PREFIX + (0, node_crypto_1.randomBytes)(16).toString('hex');
51
52
  const hashedKey = (0, node_crypto_1.createHash)('sha256').update(raw).digest('hex');
52
53
  const prefix = raw.slice(0, exports.KEY_PREFIX.length + PREFIX_DISPLAY_LENGTH);
53
- const apiKey = await this.prisma.apiKey.create({
54
- data: {
55
- name: dto.name,
56
- prefix,
57
- hashedKey,
58
- roleId: dto.roleId,
59
- actingUserId: dto.actingUserId ?? null,
60
- scopes: dto.scopes,
61
- rateLimit: dto.rateLimit ?? null,
62
- expiresAt: dto.expiresAt ? new Date(dto.expiresAt) : null,
63
- createdBy: createdBy ?? null,
64
- },
65
- select: API_KEY_SELECT,
66
- });
54
+ let apiKey;
55
+ try {
56
+ apiKey = await this.prisma.apiKey.create({
57
+ data: {
58
+ name: dto.name,
59
+ prefix,
60
+ hashedKey,
61
+ roleId: dto.roleId,
62
+ actingUserId: dto.actingUserId ?? null,
63
+ scopes,
64
+ rateLimit: dto.rateLimit ?? null,
65
+ expiresAt: dto.expiresAt ? new Date(dto.expiresAt) : null,
66
+ createdBy: createdBy ?? null,
67
+ },
68
+ select: API_KEY_SELECT,
69
+ });
70
+ }
71
+ catch (error) {
72
+ if (isForeignKeyError(error)) {
73
+ throw new common_2.BadRequestException('Invalid roleId');
74
+ }
75
+ throw error;
76
+ }
67
77
  return {
68
78
  id: apiKey.id,
69
79
  key: raw,
@@ -99,28 +109,37 @@ let ApiKeysService = class ApiKeysService {
99
109
  }
100
110
  async update(id, dto) {
101
111
  const existing = await this.findOne(id);
112
+ const scopes = dto.scopes !== undefined ? [...new Set(dto.scopes)] : undefined;
102
113
  // Only scopes newly added by this edit are checked. Legacy grants already on the key are kept
103
114
  // through unrelated edits (rename, toggle, rate limit) even if the catalog no longer lists them.
104
- if (dto.scopes) {
105
- this.validateScopes(dto.scopes.filter((scope) => !existing.scopes.includes(scope)));
115
+ if (scopes) {
116
+ this.validateScopes(scopes.filter((scope) => !existing.scopes.includes(scope)));
106
117
  }
107
118
  if (dto.actingUserId)
108
119
  await this.assertActingUser(dto.actingUserId);
109
- return this.prisma.apiKey.update({
110
- where: { id },
111
- data: {
112
- ...(dto.name !== undefined && { name: dto.name }),
113
- ...(dto.roleId !== undefined && { roleId: dto.roleId }),
114
- ...(dto.actingUserId !== undefined && { actingUserId: dto.actingUserId }),
115
- ...(dto.scopes !== undefined && { scopes: dto.scopes }),
116
- ...(dto.rateLimit !== undefined && { rateLimit: dto.rateLimit }),
117
- ...(dto.isActive !== undefined && { isActive: dto.isActive }),
118
- ...(dto.expiresAt !== undefined && {
119
- expiresAt: dto.expiresAt ? new Date(dto.expiresAt) : null,
120
- }),
121
- },
122
- select: API_KEY_SELECT,
123
- });
120
+ try {
121
+ return await this.prisma.apiKey.update({
122
+ where: { id },
123
+ data: {
124
+ ...(dto.name !== undefined && { name: dto.name }),
125
+ ...(dto.roleId !== undefined && { roleId: dto.roleId }),
126
+ ...(dto.actingUserId !== undefined && { actingUserId: dto.actingUserId }),
127
+ ...(scopes !== undefined && { scopes }),
128
+ ...(dto.rateLimit !== undefined && { rateLimit: dto.rateLimit }),
129
+ ...(dto.isActive !== undefined && { isActive: dto.isActive }),
130
+ ...(dto.expiresAt !== undefined && {
131
+ expiresAt: dto.expiresAt ? new Date(dto.expiresAt) : null,
132
+ }),
133
+ },
134
+ select: API_KEY_SELECT,
135
+ });
136
+ }
137
+ catch (error) {
138
+ if (isForeignKeyError(error)) {
139
+ throw new common_2.BadRequestException('Invalid roleId');
140
+ }
141
+ throw error;
142
+ }
124
143
  }
125
144
  async remove(id) {
126
145
  await this.findOne(id);
@@ -149,4 +168,7 @@ exports.ApiKeysService = ApiKeysService = __decorate([
149
168
  __param(2, (0, common_2.Inject)(scope_catalog_1.M2mScopeCatalogService)),
150
169
  __metadata("design:paramtypes", [common_1.PrismaService, Object, scope_catalog_1.M2mScopeCatalogService])
151
170
  ], ApiKeysService);
171
+ function isForeignKeyError(error) {
172
+ return (0, common_1.isPrismaErrorCode)(error, 'P2003');
173
+ }
152
174
  //# sourceMappingURL=api-keys.service.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"api-keys.service.js","sourceRoot":"","sources":["../src/api-keys.service.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"api-keys.service.js","sourceRoot":"","sources":["../src/api-keys.service.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,6CAAsD;AAEtD,6CAM0B;AAC1B,qDAA8E;AAC9E,2CAA4F;AAE5F,mDAAyD;AAmB5C,QAAA,UAAU,GAAG,UAAU,CAAC;AACrC,MAAM,qBAAqB,GAAG,EAAE,CAAC;AACjC,MAAM,mBAAmB,GAAG,CAAC,MAAM,EAAE,WAAW,EAAE,YAAY,EAAE,WAAW,CAAU,CAAC;AAEtF,MAAM,cAAc,GAAG;IACrB,EAAE,EAAE,IAAI;IACR,IAAI,EAAE,IAAI;IACV,MAAM,EAAE,IAAI;IACZ,MAAM,EAAE,IAAI;IACZ,YAAY,EAAE,IAAI;IAClB,IAAI,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,WAAW,EAAE,IAAI,EAAE,EAAE;IAC7D,MAAM,EAAE,IAAI;IACZ,SAAS,EAAE,IAAI;IACf,QAAQ,EAAE,IAAI;IACd,SAAS,EAAE,IAAI;IACf,SAAS,EAAE,IAAI;IACf,UAAU,EAAE,IAAI;IAChB,SAAS,EAAE,IAAI;IACf,SAAS,EAAE,IAAI;CACP,CAAC;AAGJ,IAAM,cAAc,GAApB,MAAM,cAAc;IACzB,YAC0C,MAAqB,EASpB,aAAgC,EAExB,OAA+B;QAXxC,WAAM,GAAN,MAAM,CAAe;QASpB,kBAAa,GAAb,aAAa,CAAmB;QAExB,YAAO,GAAP,OAAO,CAAwB;IAC/E,CAAC;IAEJ,KAAK,CAAC,MAAM,CAAC,GAAoB,EAAE,SAAkB;QACnD,MAAM,MAAM,GAAG,CAAC,GAAG,IAAI,GAAG,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC;QACxC,IAAI,CAAC,cAAc,CAAC,MAAM,CAAC,CAAC;QAC5B,IAAI,GAAG,CAAC,YAAY;YAAE,MAAM,IAAI,CAAC,gBAAgB,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC;QAEpE,MAAM,GAAG,GAAG,kBAAU,GAAG,IAAA,yBAAW,EAAC,EAAE,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;QACzD,MAAM,SAAS,GAAG,IAAA,wBAAU,EAAC,QAAQ,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;QACjE,MAAM,MAAM,GAAG,GAAG,CAAC,KAAK,CAAC,CAAC,EAAE,kBAAU,CAAC,MAAM,GAAG,qBAAqB,CAAC,CAAC;QAEvE,IAAI,MAAoB,CAAC;QACzB,IAAI,CAAC;YACH,MAAM,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC;gBACvC,IAAI,EAAE;oBACJ,IAAI,EAAE,GAAG,CAAC,IAAI;oBACd,MAAM;oBACN,SAAS;oBACT,MAAM,EAAE,GAAG,CAAC,MAAM;oBAClB,YAAY,EAAE,GAAG,CAAC,YAAY,IAAI,IAAI;oBACtC,MAAM;oBACN,SAAS,EAAE,GAAG,CAAC,SAAS,IAAI,IAAI;oBAChC,SAAS,EAAE,GAAG,CAAC,SAAS,CAAC,CAAC,CAAC,IAAI,IAAI,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,IAAI;oBACzD,SAAS,EAAE,SAAS,IAAI,IAAI;iBAC7B;gBACD,MAAM,EAAE,cAAc;aACvB,CAAC,CAAC;QACL,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,IAAI,iBAAiB,CAAC,KAAK,CAAC,EAAE,CAAC;gBAC7B,MAAM,IAAI,4BAAmB,CAAC,gBAAgB,CAAC,CAAC;YAClD,CAAC;YACD,MAAM,KAAK,CAAC;QACd,CAAC;QAED,OAAO;YACL,EAAE,EAAE,MAAM,CAAC,EAAE;YACb,GAAG,EAAE,GAAG;YACR,MAAM,EAAE,MAAM,CAAC,MAAM;YACrB,IAAI,EAAE,MAAM,CAAC,IAAI;YACjB,MAAM,EAAE,MAAM,CAAC,MAAM;YACrB,YAAY,EAAE,MAAM,CAAC,YAAY;YACjC,IAAI,EAAE,MAAM,CAAC,IAAI;YACjB,MAAM,EAAE,MAAM,CAAC,MAAM;YACrB,SAAS,EAAE,MAAM,CAAC,SAAS;SAC5B,CAAC;IACJ,CAAC;IAED,KAAK,CAAC,OAAO,CAAC,KAAsB;QAClC,MAAM,KAAK,GAAG,KAAK,CAAC,MAAM;YACxB,CAAC,CAAC,EAAE,IAAI,EAAE,EAAE,QAAQ,EAAE,KAAK,CAAC,MAAM,EAAE,IAAI,EAAE,aAAsB,EAAE,EAAE;YACpE,CAAC,CAAC,EAAE,CAAC;QAEP,MAAM,CAAC,IAAI,EAAE,KAAK,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;YACtC,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,QAAQ,CAAC;gBAC1B,KAAK;gBACL,GAAG,IAAA,qBAAY,EAAC,KAAK,CAAC;gBACtB,OAAO,EAAE,IAAA,wBAAe,EAAC,KAAK,EAAE,mBAAmB,CAAC;gBACpD,MAAM,EAAE,cAAc;aACvB,CAAC;YACF,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,KAAK,EAAE,CAAC;SACpC,CAAC,CAAC;QAEH,OAAO,IAAA,iBAAQ,EAAC,IAAI,EAAE,KAAK,CAAC,CAAC;IAC/B,CAAC;IAED,KAAK,CAAC,OAAO,CAAC,EAAU;QACtB,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,UAAU,CAAC,EAAE,KAAK,EAAE,EAAE,EAAE,EAAE,EAAE,MAAM,EAAE,cAAc,EAAE,CAAC,CAAC;QAC9F,IAAI,CAAC,MAAM;YAAE,MAAM,IAAI,0BAAiB,CAAC,UAAU,EAAE,YAAY,CAAC,CAAC;QACnE,OAAO,MAAM,CAAC;IAChB,CAAC;IAED,KAAK,CAAC,MAAM,CAAC,EAAU,EAAE,GAAoB;QAC3C,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;QACxC,MAAM,MAAM,GAAG,GAAG,CAAC,MAAM,KAAK,SAAS,CAAC,CAAC,CAAC,CAAC,GAAG,IAAI,GAAG,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;QAC/E,8FAA8F;QAC9F,iGAAiG;QACjG,IAAI,MAAM,EAAE,CAAC;YACX,IAAI,CAAC,cAAc,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;QAClF,CAAC;QACD,IAAI,GAAG,CAAC,YAAY;YAAE,MAAM,IAAI,CAAC,gBAAgB,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC;QAEpE,IAAI,CAAC;YACH,OAAO,MAAM,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC;gBACrC,KAAK,EAAE,EAAE,EAAE,EAAE;gBACb,IAAI,EAAE;oBACJ,GAAG,CAAC,GAAG,CAAC,IAAI,KAAK,SAAS,IAAI,EAAE,IAAI,EAAE,GAAG,CAAC,IAAI,EAAE,CAAC;oBACjD,GAAG,CAAC,GAAG,CAAC,MAAM,KAAK,SAAS,IAAI,EAAE,MAAM,EAAE,GAAG,CAAC,MAAM,EAAE,CAAC;oBACvD,GAAG,CAAC,GAAG,CAAC,YAAY,KAAK,SAAS,IAAI,EAAE,YAAY,EAAE,GAAG,CAAC,YAAY,EAAE,CAAC;oBACzE,GAAG,CAAC,MAAM,KAAK,SAAS,IAAI,EAAE,MAAM,EAAE,CAAC;oBACvC,GAAG,CAAC,GAAG,CAAC,SAAS,KAAK,SAAS,IAAI,EAAE,SAAS,EAAE,GAAG,CAAC,SAAS,EAAE,CAAC;oBAChE,GAAG,CAAC,GAAG,CAAC,QAAQ,KAAK,SAAS,IAAI,EAAE,QAAQ,EAAE,GAAG,CAAC,QAAQ,EAAE,CAAC;oBAC7D,GAAG,CAAC,GAAG,CAAC,SAAS,KAAK,SAAS,IAAI;wBACjC,SAAS,EAAE,GAAG,CAAC,SAAS,CAAC,CAAC,CAAC,IAAI,IAAI,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,IAAI;qBAC1D,CAAC;iBACH;gBACD,MAAM,EAAE,cAAc;aACvB,CAAC,CAAC;QACL,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,IAAI,iBAAiB,CAAC,KAAK,CAAC,EAAE,CAAC;gBAC7B,MAAM,IAAI,4BAAmB,CAAC,gBAAgB,CAAC,CAAC;YAClD,CAAC;YACD,MAAM,KAAK,CAAC;QACd,CAAC;IACH,CAAC;IAED,KAAK,CAAC,MAAM,CAAC,EAAU;QACrB,MAAM,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;QACvB,MAAM,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,EAAE,KAAK,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC,CAAC;IACrD,CAAC;IAEO,cAAc,CAAC,MAAgB;QACrC,MAAM,OAAO,GAAG,MAAM,CAAC,MAAM,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC;QACvE,IAAI,OAAO,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YACvB,MAAM,IAAI,4BAAmB,CAAC,mBAAmB,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;QACzE,CAAC;IACH,CAAC;IAEO,KAAK,CAAC,gBAAgB,CAAC,YAAoB;QACjD,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,QAAQ,CAAC,YAAY,CAAC,CAAC;QAC7D,IAAI,CAAC,IAAI;YAAE,MAAM,IAAI,4BAAmB,CAAC,eAAe,YAAY,YAAY,CAAC,CAAC;QAClF,IAAI,CAAC,IAAI,CAAC,gBAAgB,EAAE,CAAC;YAC3B,MAAM,IAAI,4BAAmB,CAC3B,gGAAgG,CACjG,CAAC;QACJ,CAAC;IACH,CAAC;CACF,CAAA;AA5IY,wCAAc;yBAAd,cAAc;IAD1B,IAAA,mBAAU,GAAE;IAGR,WAAA,IAAA,eAAM,EAAC,sBAAa,CAAC,CAAA;IASrB,WAAA,IAAA,eAAM,EAAC,2BAAc,CAAC,CAAA;IAEtB,WAAA,IAAA,eAAM,EAAC,sCAAsB,CAAC,CAAA;qCAXiB,sBAAa,UAWH,sCAAsB;GAbvE,cAAc,CA4I1B;AAED,SAAS,iBAAiB,CAAC,KAAc;IACvC,OAAO,IAAA,0BAAiB,EAAC,KAAK,EAAE,OAAO,CAAC,CAAC;AAC3C,CAAC"}
@@ -0,0 +1,8 @@
1
+ import { PrismaService } from '@haneinfo/common';
2
+ import type { Logger } from '@nestjs/common';
3
+ /** Conditional database update makes throttling effective across processes and concurrent requests. */
4
+ export declare function recordLastUsedAt(prisma: PrismaService, logger: Logger, key: {
5
+ id: string;
6
+ lastUsedAt?: Date | null;
7
+ }, now: Date): void;
8
+ //# sourceMappingURL=last-used-at.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"last-used-at.d.ts","sourceRoot":"","sources":["../src/last-used-at.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AACjD,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,gBAAgB,CAAC;AAc7C,uGAAuG;AACvG,wBAAgB,gBAAgB,CAC9B,MAAM,EAAE,aAAa,EACrB,MAAM,EAAE,MAAM,EACd,GAAG,EAAE;IAAE,EAAE,EAAE,MAAM,CAAC;IAAC,UAAU,CAAC,EAAE,IAAI,GAAG,IAAI,CAAA;CAAE,EAC7C,GAAG,EAAE,IAAI,GACR,IAAI,CAaN"}
@@ -0,0 +1,24 @@
1
+ "use strict";
2
+ Object.defineProperty(exports, "__esModule", { value: true });
3
+ exports.recordLastUsedAt = recordLastUsedAt;
4
+ const DEFAULT_INTERVAL_SECONDS = 60;
5
+ function intervalMilliseconds() {
6
+ const value = process.env.M2M_API_KEY_LAST_USED_INTERVAL_SECONDS;
7
+ const seconds = value === undefined || value.trim() === '' ? NaN : Number(value);
8
+ return ((Number.isSafeInteger(seconds) && seconds >= 0 && seconds <= 86400
9
+ ? seconds
10
+ : DEFAULT_INTERVAL_SECONDS) * 1000);
11
+ }
12
+ /** Conditional database update makes throttling effective across processes and concurrent requests. */
13
+ function recordLastUsedAt(prisma, logger, key, now) {
14
+ const cutoff = new Date(now.getTime() - intervalMilliseconds());
15
+ if (key.lastUsedAt && key.lastUsedAt > cutoff)
16
+ return;
17
+ void prisma.apiKey
18
+ .updateMany({
19
+ where: { id: key.id, OR: [{ lastUsedAt: null }, { lastUsedAt: { lte: cutoff } }] },
20
+ data: { lastUsedAt: now },
21
+ })
22
+ .catch((error) => logger.error(`lastUsedAt update failed: ${error instanceof Error ? error.message : String(error)}`));
23
+ }
24
+ //# sourceMappingURL=last-used-at.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"last-used-at.js","sourceRoot":"","sources":["../src/last-used-at.ts"],"names":[],"mappings":";;AAgBA,4CAkBC;AA/BD,MAAM,wBAAwB,GAAG,EAAE,CAAC;AAEpC,SAAS,oBAAoB;IAC3B,MAAM,KAAK,GAAG,OAAO,CAAC,GAAG,CAAC,sCAAsC,CAAC;IACjE,MAAM,OAAO,GAAG,KAAK,KAAK,SAAS,IAAI,KAAK,CAAC,IAAI,EAAE,KAAK,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;IACjF,OAAO,CACL,CAAC,MAAM,CAAC,aAAa,CAAC,OAAO,CAAC,IAAI,OAAO,IAAI,CAAC,IAAI,OAAO,IAAI,KAAK;QAChE,CAAC,CAAC,OAAO;QACT,CAAC,CAAC,wBAAwB,CAAC,GAAG,IAAI,CACrC,CAAC;AACJ,CAAC;AAED,uGAAuG;AACvG,SAAgB,gBAAgB,CAC9B,MAAqB,EACrB,MAAc,EACd,GAA6C,EAC7C,GAAS;IAET,MAAM,MAAM,GAAG,IAAI,IAAI,CAAC,GAAG,CAAC,OAAO,EAAE,GAAG,oBAAoB,EAAE,CAAC,CAAC;IAChE,IAAI,GAAG,CAAC,UAAU,IAAI,GAAG,CAAC,UAAU,GAAG,MAAM;QAAE,OAAO;IACtD,KAAK,MAAM,CAAC,MAAM;SACf,UAAU,CAAC;QACV,KAAK,EAAE,EAAE,EAAE,EAAE,GAAG,CAAC,EAAE,EAAE,EAAE,EAAE,CAAC,EAAE,UAAU,EAAE,IAAI,EAAE,EAAE,EAAE,UAAU,EAAE,EAAE,GAAG,EAAE,MAAM,EAAE,EAAE,CAAC,EAAE;QAClF,IAAI,EAAE,EAAE,UAAU,EAAE,GAAG,EAAE;KAC1B,CAAC;SACD,KAAK,CAAC,CAAC,KAAc,EAAE,EAAE,CACxB,MAAM,CAAC,KAAK,CACV,6BAA6B,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,CACtF,CACF,CAAC;AACN,CAAC"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@haneinfo/m2m-api-key",
3
- "version": "8.1.28",
3
+ "version": "8.1.29",
4
4
  "private": false,
5
5
  "files": [
6
6
  "dist",
@@ -30,12 +30,12 @@
30
30
  "./package.json": "./package.json"
31
31
  },
32
32
  "dependencies": {
33
- "@haneinfo/common": "0.6.0",
34
- "@haneinfo/plugin-api": "1.26.0",
35
- "@haneinfo/frontend-shell": "1.6.0"
33
+ "@haneinfo/common": "0.6.1",
34
+ "@haneinfo/frontend-shell": "1.6.0",
35
+ "@haneinfo/plugin-api": "1.27.0"
36
36
  },
37
37
  "peerDependencies": {
38
- "@haneinfo/common": "^0.3.4 || ^0.4.0 || ^0.5.0 || ^0.6.0",
38
+ "@haneinfo/common": "^0.6.1",
39
39
  "@haneinfo/frontend-shell": "^1.1.0",
40
40
  "@haneinfo/plugin-host-nest": "^2.0.0",
41
41
  "@haneinfo/rbac": "^7.0.0 || ^8.0.0",
@@ -78,11 +78,11 @@
78
78
  "typescript": "^5.9.3",
79
79
  "vitest": "^4.1.11",
80
80
  "zod": "^4.4.0",
81
- "@haneinfo/common": "0.6.0",
81
+ "@haneinfo/common": "0.6.1",
82
82
  "@haneinfo/frontend-shell": "1.6.0",
83
- "@haneinfo/plugin-host-nest": "2.1.0",
84
- "@haneinfo/plugin-testkit": "2.3.0",
85
- "@haneinfo/rbac": "8.2.14"
83
+ "@haneinfo/plugin-host-nest": "2.1.1",
84
+ "@haneinfo/plugin-testkit": "2.3.1",
85
+ "@haneinfo/rbac": "8.2.15"
86
86
  },
87
87
  "license": "UNLICENSED",
88
88
  "publishConfig": {