@tsed/oidc-provider 8.0.0-beta.1 → 8.0.0-beta.3

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.
@@ -1,11 +1,17 @@
1
- import { __decorate, __metadata } from "tslib";
2
- import { Inject, InjectorService, PlatformApplication } from "@tsed/common";
3
- import { Constant, Module } from "@tsed/di";
1
+ import { __decorate } from "tslib";
2
+ import { PlatformApplication } from "@tsed/common";
3
+ import { constant, inject, injector, Module } from "@tsed/di";
4
4
  import koaMount from "koa-mount";
5
5
  import { OidcAdapters } from "./services/OidcAdapters.js";
6
6
  import { OidcJwks } from "./services/OidcJwks.js";
7
7
  import { OidcProvider } from "./services/OidcProvider.js";
8
8
  let OidcModule = class OidcModule {
9
+ constructor() {
10
+ this.app = inject(PlatformApplication);
11
+ this.platformName = constant("PLATFORM_NAME");
12
+ this.basePath = constant("oidc.path", "/oidc");
13
+ this.oidcProvider = inject(OidcProvider);
14
+ }
9
15
  async $onInit() {
10
16
  if (this.oidcProvider.hasConfiguration()) {
11
17
  await this.oidcProvider.create();
@@ -31,12 +37,12 @@ let OidcModule = class OidcModule {
31
37
  }
32
38
  }
33
39
  $onReady() {
34
- if (this.oidcProvider.hasConfiguration() && "getBestHost" in this.injector.settings) {
35
- const { injector } = this;
40
+ const inj = injector();
41
+ if (this.oidcProvider.hasConfiguration() && "getBestHost" in inj.settings) {
36
42
  // @ts-ignore
37
- const host = injector.settings.getBestHost();
43
+ const host = inj.settings.getBestHost();
38
44
  const url = host.toString();
39
- injector.logger.info(`WellKnown is available on ${url}/.well-known/openid-configuration`);
45
+ inj.logger.info(`WellKnown is available on ${url}/.well-known/openid-configuration`);
40
46
  }
41
47
  }
42
48
  async getRewriteMiddleware() {
@@ -52,26 +58,6 @@ let OidcModule = class OidcModule {
52
58
  }
53
59
  }
54
60
  };
55
- __decorate([
56
- Inject(),
57
- __metadata("design:type", PlatformApplication)
58
- ], OidcModule.prototype, "app", void 0);
59
- __decorate([
60
- Constant("PLATFORM_NAME"),
61
- __metadata("design:type", String)
62
- ], OidcModule.prototype, "platformName", void 0);
63
- __decorate([
64
- Constant("oidc.path", "/oidc"),
65
- __metadata("design:type", String)
66
- ], OidcModule.prototype, "basePath", void 0);
67
- __decorate([
68
- Inject(),
69
- __metadata("design:type", OidcProvider)
70
- ], OidcModule.prototype, "oidcProvider", void 0);
71
- __decorate([
72
- Inject(),
73
- __metadata("design:type", InjectorService)
74
- ], OidcModule.prototype, "injector", void 0);
75
61
  OidcModule = __decorate([
76
62
  Module({
77
63
  imports: [OidcProvider, OidcAdapters, OidcJwks]
@@ -1 +1 @@
1
- {"version":3,"file":"OidcModule.js","sourceRoot":"","sources":["../../src/OidcModule.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"OidcModule.js","sourceRoot":"","sources":["../../src/OidcModule.ts"],"names":[],"mappings":";AAAA,OAAO,EAAC,mBAAmB,EAAC,MAAM,cAAc,CAAC;AACjD,OAAO,EAAC,QAAQ,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAC,MAAM,UAAU,CAAC;AAC5D,OAAO,QAAQ,MAAM,WAAW,CAAC;AAEjC,OAAO,EAAC,YAAY,EAAC,MAAM,4BAA4B,CAAC;AACxD,OAAO,EAAC,QAAQ,EAAC,MAAM,wBAAwB,CAAC;AAChD,OAAO,EAAC,YAAY,EAAC,MAAM,4BAA4B,CAAC;AAKjD,IAAM,UAAU,GAAhB,MAAM,UAAU;IAAhB;QACK,QAAG,GAAwB,MAAM,CAAC,mBAAmB,CAAC,CAAC;QACvD,iBAAY,GAAG,QAAQ,CAAS,eAAe,CAAC,CAAC;QACjD,aAAQ,GAAG,QAAQ,CAAC,WAAW,EAAE,OAAO,CAAC,CAAC;QAC1C,iBAAY,GAAG,MAAM,CAAC,YAAY,CAAC,CAAC;IAsDhD,CAAC;IApDC,KAAK,CAAC,OAAO;QACX,IAAI,IAAI,CAAC,YAAY,CAAC,gBAAgB,EAAE,EAAE,CAAC;YACzC,MAAM,IAAI,CAAC,YAAY,CAAC,MAAM,EAAE,CAAC;QACnC,CAAC;IACH,CAAC;IAED,KAAK,CAAC,aAAa;QACjB,IAAI,IAAI,CAAC,QAAQ,KAAK,GAAG,EAAE,CAAC;YAC1B,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,MAAM,IAAI,CAAC,oBAAoB,EAAE,CAAC,CAAC;QAClD,CAAC;IACH,CAAC;IAED,gBAAgB;QACd,IAAI,IAAI,CAAC,YAAY,CAAC,gBAAgB,EAAE,EAAE,CAAC;YACzC,MAAM,QAAQ,GAAG,IAAI,CAAC,YAAY,CAAC,GAAG,EAAE,CAAC;YAEzC,QAAQ,IAAI,CAAC,YAAY,EAAE,CAAC;gBAC1B,QAAQ;gBACR,KAAK,SAAS;oBACZ,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC,QAAQ,EAAE,QAAQ,CAAC,QAAQ,EAAE,CAAC,CAAC;oBACjD,MAAM;gBACR,KAAK,KAAK;oBACR,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,QAAQ,CAAC,IAAI,CAAC,QAAQ,EAAE,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC;oBACpD,MAAM;YACV,CAAC;QACH,CAAC;IACH,CAAC;IAED,QAAQ;QACN,MAAM,GAAG,GAAG,QAAQ,EAAE,CAAC;QAEvB,IAAI,IAAI,CAAC,YAAY,CAAC,gBAAgB,EAAE,IAAI,aAAa,IAAI,GAAG,CAAC,QAAQ,EAAE,CAAC;YAC1E,aAAa;YACb,MAAM,IAAI,GAAG,GAAG,CAAC,QAAQ,CAAC,WAAW,EAAE,CAAC;YACxC,MAAM,GAAG,GAAG,IAAI,CAAC,QAAQ,EAAE,CAAC;YAE5B,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,6BAA6B,GAAG,mCAAmC,CAAC,CAAC;QACvF,CAAC;IACH,CAAC;IAEO,KAAK,CAAC,oBAAoB;QAChC,QAAQ,IAAI,CAAC,YAAY,EAAE,CAAC;YAC1B,QAAQ;YACR,KAAK,SAAS;gBACZ,MAAM,EAAC,OAAO,EAAE,iBAAiB,EAAC,GAAG,MAAM,MAAM,CAAC,oBAAoB,CAAC,CAAC;gBACxE,OAAO,iBAAiB,CAAC,gBAAgB,EAAE,GAAG,IAAI,CAAC,QAAQ,iBAAiB,CAAC,CAAC;YAChF,KAAK,KAAK;gBACR,aAAa;gBACb,MAAM,EAAC,OAAO,EAAE,aAAa,EAAC,GAAG,MAAM,MAAM,CAAC,aAAa,CAAC,CAAC;gBAC7D,OAAO,aAAa,CAAC,mBAAmB,EAAE,GAAG,IAAI,CAAC,QAAQ,iBAAiB,CAAC,CAAC;QACjF,CAAC;IACH,CAAC;CACF,CAAA;AA1DY,UAAU;IAHtB,MAAM,CAAC;QACN,OAAO,EAAE,CAAC,YAAY,EAAE,YAAY,EAAE,QAAQ,CAAC;KAChD,CAAC;GACW,UAAU,CA0DtB"}
@@ -1,11 +1,14 @@
1
- import { __decorate, __metadata } from "tslib";
1
+ import { __decorate } from "tslib";
2
2
  import { Adapters } from "@tsed/adapters";
3
- import { Configuration, Inject, Injectable } from "@tsed/di";
3
+ import { constant, inject, Injectable } from "@tsed/di";
4
4
  let OidcAdapters = class OidcAdapters {
5
+ constructor() {
6
+ this.adapters = inject(Adapters);
7
+ }
5
8
  createAdapterClass() {
6
9
  const self = this;
7
- const adapterBase = this.settings.get("oidc.Adapter", this.settings.get("adapters.Adapter"));
8
- const connectionName = this.settings.get("oidc.connectionName", "default");
10
+ const adapterBase = constant("oidc.Adapter", constant("adapters.Adapter"));
11
+ const connectionName = constant("oidc.connectionName", "default");
9
12
  return class CustomAdapter {
10
13
  constructor(name) {
11
14
  this.adapter = self.adapters.invokeAdapter({
@@ -67,14 +70,6 @@ let OidcAdapters = class OidcAdapters {
67
70
  };
68
71
  }
69
72
  };
70
- __decorate([
71
- Inject(),
72
- __metadata("design:type", Adapters)
73
- ], OidcAdapters.prototype, "adapters", void 0);
74
- __decorate([
75
- Configuration(),
76
- __metadata("design:type", Object)
77
- ], OidcAdapters.prototype, "settings", void 0);
78
73
  OidcAdapters = __decorate([
79
74
  Injectable()
80
75
  ], OidcAdapters);
@@ -1 +1 @@
1
- {"version":3,"file":"OidcAdapters.js","sourceRoot":"","sources":["../../../src/services/OidcAdapters.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"OidcAdapters.js","sourceRoot":"","sources":["../../../src/services/OidcAdapters.ts"],"names":[],"mappings":"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"}
@@ -1,7 +1,6 @@
1
- import { __decorate, __metadata } from "tslib";
2
- import { Constant, InjectContext, PlatformContext } from "@tsed/common";
1
+ import { __decorate } from "tslib";
3
2
  import { Env } from "@tsed/core";
4
- import { Inject, Injectable } from "@tsed/di";
3
+ import { constant, context, inject, Injectable } from "@tsed/di";
5
4
  import { Unauthorized } from "@tsed/exceptions";
6
5
  import omit from "lodash/omit.js";
7
6
  import { INTERACTION_CONTEXT, INTERACTION_DETAILS, INTERACTION_GRANT_ID, INTERACTION_PARAMS, INTERACTION_PROMPT, INTERACTION_SESSION, INTERACTION_UID } from "../constants/constants.js";
@@ -10,6 +9,14 @@ import { debug } from "../utils/debug.js";
10
9
  import { OidcInteractions } from "./OidcInteractions.js";
11
10
  import { OidcProvider } from "./OidcProvider.js";
12
11
  let OidcInteractionContext = class OidcInteractionContext {
12
+ constructor() {
13
+ this.env = constant("env");
14
+ this.oidcProvider = inject(OidcProvider);
15
+ this.oidcInteractions = inject(OidcInteractions);
16
+ }
17
+ get $ctx() {
18
+ return context();
19
+ }
13
20
  get raw() {
14
21
  return this.$ctx.get(INTERACTION_DETAILS);
15
22
  }
@@ -60,8 +67,9 @@ let OidcInteractionContext = class OidcInteractionContext {
60
67
  }
61
68
  async interactionPrompt({ client, ...options }) {
62
69
  client = client || (await this.findClient());
70
+ const omitClientProps = constant("oidc.render.omitClientProps", []);
63
71
  return {
64
- client: omit(client, ["clientSecret", ...this.omitClientProps]),
72
+ client: omit(client, ["clientSecret", ...omitClientProps]),
65
73
  uid: this.uid,
66
74
  grantId: this.grantId,
67
75
  details: this.prompt.details,
@@ -135,26 +143,6 @@ let OidcInteractionContext = class OidcInteractionContext {
135
143
  };
136
144
  }
137
145
  };
138
- __decorate([
139
- Constant("env"),
140
- __metadata("design:type", String)
141
- ], OidcInteractionContext.prototype, "env", void 0);
142
- __decorate([
143
- Constant("oidc.render.omitClientProps", []),
144
- __metadata("design:type", Array)
145
- ], OidcInteractionContext.prototype, "omitClientProps", void 0);
146
- __decorate([
147
- Inject(),
148
- __metadata("design:type", OidcProvider)
149
- ], OidcInteractionContext.prototype, "oidcProvider", void 0);
150
- __decorate([
151
- Inject(),
152
- __metadata("design:type", OidcInteractions)
153
- ], OidcInteractionContext.prototype, "oidcInteractions", void 0);
154
- __decorate([
155
- InjectContext(),
156
- __metadata("design:type", PlatformContext)
157
- ], OidcInteractionContext.prototype, "$ctx", void 0);
158
146
  OidcInteractionContext = __decorate([
159
147
  Injectable()
160
148
  ], OidcInteractionContext);
@@ -1 +1 @@
1
- {"version":3,"file":"OidcInteractionContext.js","sourceRoot":"","sources":["../../../src/services/OidcInteractionContext.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"OidcInteractionContext.js","sourceRoot":"","sources":["../../../src/services/OidcInteractionContext.ts"],"names":[],"mappings":"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"}
@@ -1,10 +1,12 @@
1
- import { __decorate, __metadata } from "tslib";
2
- import { Constant, EndpointMetadata, PlatformHandler } from "@tsed/common";
3
- import { Env } from "@tsed/core";
4
- import { Inject, Injectable, InjectorService } from "@tsed/di";
1
+ import { __decorate } from "tslib";
2
+ import { PlatformHandler } from "@tsed/common";
3
+ import { constant, Injectable, injector } from "@tsed/di";
4
+ import { EndpointMetadata } from "@tsed/schema";
5
5
  import { INTERACTION, INTERACTION_OPTIONS, INTERACTIONS } from "../constants/constants.js";
6
6
  let OidcInteractions = class OidcInteractions {
7
7
  constructor() {
8
+ this.injector = injector();
9
+ this.env = constant("env");
8
10
  this.interactions = new Map();
9
11
  }
10
12
  $onInit() {
@@ -42,18 +44,6 @@ let OidcInteractions = class OidcInteractions {
42
44
  }
43
45
  }
44
46
  };
45
- __decorate([
46
- Inject(),
47
- __metadata("design:type", InjectorService)
48
- ], OidcInteractions.prototype, "injector", void 0);
49
- __decorate([
50
- Constant("env"),
51
- __metadata("design:type", String)
52
- ], OidcInteractions.prototype, "env", void 0);
53
- __decorate([
54
- Constant("oidc"),
55
- __metadata("design:type", Object)
56
- ], OidcInteractions.prototype, "oidcSettings", void 0);
57
47
  OidcInteractions = __decorate([
58
48
  Injectable()
59
49
  ], OidcInteractions);
@@ -1 +1 @@
1
- {"version":3,"file":"OidcInteractions.js","sourceRoot":"","sources":["../../../src/services/OidcInteractions.ts"],"names":[],"mappings":";AAAA,OAAO,EAAC,QAAQ,EAAE,gBAAgB,EAAmB,eAAe,EAA0B,MAAM,cAAc,CAAC;AACnH,OAAO,EAAC,GAAG,EAAC,MAAM,YAAY,CAAC;AAC/B,OAAO,EAAC,MAAM,EAAE,UAAU,EAAE,eAAe,EAAC,MAAM,UAAU,CAAC;AAE7D,OAAO,EAAC,WAAW,EAAE,mBAAmB,EAAE,YAAY,EAAC,MAAM,2BAA2B,CAAC;AAKlF,IAAM,gBAAgB,GAAtB,MAAM,gBAAgB;IAAtB;QAUK,iBAAY,GAA0B,IAAI,GAAG,EAAE,CAAC;IA4C5D,CAAC;IA1CC,OAAO;QACL,MAAM,eAAe,GAAG,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAkB,eAAe,CAAE,CAAC;QAE7E,IAAI,CAAC,eAAe,EAAE,CAAC,OAAO,CAAC,CAAC,QAAkB,EAAE,EAAE;YACpD,MAAM,EAAC,IAAI,EAAC,GAAG,QAAQ,CAAC,KAAK,CAAC,GAAG,CAAyB,mBAAmB,CAAC,CAAC;YAC/E,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;YAEtC,IAAI,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE,OAAO,EAAE,CAAC;gBAC/C,QAAQ,CAAC,KAAK,CAAC,GAAG,CAAC,SAAS,EAAE,eAAe,CAAC,mBAAmB,CAAC,QAAQ,EAAE,SAAS,CAAC,CAAC,CAAC;YAC1F,CAAC;QACH,CAAC,CAAC,CAAC;IACL,CAAC;IAED,eAAe;QACb,MAAM,oBAAoB,GAAG,IAAI,CAAC,QAAQ,CAAC,YAAY,EAAE,CAAC,IAAI,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,QAAQ,CAAC,OAAO,KAAK,YAAY,CAAC,CAAC;QAEhH,0BAA0B;QAC1B,IAAI,CAAC,oBAAoB,EAAE,CAAC;YAC1B,OAAO,EAAE,CAAC;QACZ,CAAC;QAED,OAAO,oBAAoB,CAAC,QAAQ;aACjC,GAAG,CAAC,CAAC,KAAoB,EAAE,EAAE,CAAC,IAAI,CAAC,QAAQ,CAAC,WAAW,CAAC,KAAK,CAAE,CAAC;aAChE,MAAM,CAAC,CAAC,QAAkB,EAAE,EAAE,CAAC,QAAQ,EAAE,OAAO,KAAK,WAAW,CAAC,CAAC;IACvE,CAAC;IAED,sBAAsB,CAAC,IAAY;QACjC,OAAO,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;IACrC,CAAC;IAED,qBAAqB,CAAC,IAAY;QAChC,MAAM,WAAW,GAAG,IAAI,CAAC,sBAAsB,CAAC,IAAI,CAAC,CAAC;QAEtD,IAAI,WAAW,EAAE,CAAC;YAChB,MAAM,QAAQ,GAAG,gBAAgB,CAAC,GAAG,CAAC,WAAW,CAAC,QAAQ,EAAE,SAAS,CAAC,CAAC;YACvE,OAAO,CAAC,GAAoB,EAAE,EAAE;gBAC9B,uCAAuC;gBACvC,GAAG,CAAC,QAAQ,GAAG,QAAQ,CAAC;gBACxB,OAAO,WAAW,CAAC,KAAK,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC,GAAG,CAAC,CAAC;YAC/C,CAAC,CAAC;QACJ,CAAC;IACH,CAAC;CACF,CAAA;AApDW;IADT,MAAM,EAAE;8BACW,eAAe;kDAAC;AAG1B;IADT,QAAQ,CAAC,KAAK,CAAC;;6CACG;AAGT;IADT,QAAQ,CAAC,MAAM,CAAC;;sDACoB;AAR1B,gBAAgB;IAD5B,UAAU,EAAE;GACA,gBAAgB,CAsD5B"}
1
+ {"version":3,"file":"OidcInteractions.js","sourceRoot":"","sources":["../../../src/services/OidcInteractions.ts"],"names":[],"mappings":";AAAA,OAAO,EAAkB,eAAe,EAAC,MAAM,cAAc,CAAC;AAE9D,OAAO,EAAC,QAAQ,EAAE,UAAU,EAAE,QAAQ,EAA0B,MAAM,UAAU,CAAC;AACjF,OAAO,EAAC,gBAAgB,EAAC,MAAM,cAAc,CAAC;AAE9C,OAAO,EAAC,WAAW,EAAE,mBAAmB,EAAE,YAAY,EAAC,MAAM,2BAA2B,CAAC;AAIlF,IAAM,gBAAgB,GAAtB,MAAM,gBAAgB;IAAtB;QACK,aAAQ,GAAG,QAAQ,EAAE,CAAC;QACtB,QAAG,GAAG,QAAQ,CAAM,KAAK,CAAC,CAAC;QAC3B,iBAAY,GAA0B,IAAI,GAAG,EAAE,CAAC;IA4C5D,CAAC;IA1CC,OAAO;QACL,MAAM,eAAe,GAAG,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAkB,eAAe,CAAE,CAAC;QAE7E,IAAI,CAAC,eAAe,EAAE,CAAC,OAAO,CAAC,CAAC,QAAkB,EAAE,EAAE;YACpD,MAAM,EAAC,IAAI,EAAC,GAAG,QAAQ,CAAC,KAAK,CAAC,GAAG,CAAyB,mBAAmB,CAAC,CAAC;YAC/E,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;YAEtC,IAAI,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE,OAAO,EAAE,CAAC;gBAC/C,QAAQ,CAAC,KAAK,CAAC,GAAG,CAAC,SAAS,EAAE,eAAe,CAAC,mBAAmB,CAAC,QAAQ,EAAE,SAAS,CAAC,CAAC,CAAC;YAC1F,CAAC;QACH,CAAC,CAAC,CAAC;IACL,CAAC;IAED,eAAe;QACb,MAAM,oBAAoB,GAAG,IAAI,CAAC,QAAQ,CAAC,YAAY,EAAE,CAAC,IAAI,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,QAAQ,CAAC,OAAO,KAAK,YAAY,CAAC,CAAC;QAEhH,0BAA0B;QAC1B,IAAI,CAAC,oBAAoB,EAAE,CAAC;YAC1B,OAAO,EAAE,CAAC;QACZ,CAAC;QAED,OAAO,oBAAoB,CAAC,QAAQ;aACjC,GAAG,CAAC,CAAC,KAAoB,EAAE,EAAE,CAAC,IAAI,CAAC,QAAQ,CAAC,WAAW,CAAC,KAAK,CAAE,CAAC;aAChE,MAAM,CAAC,CAAC,QAAkB,EAAE,EAAE,CAAC,QAAQ,EAAE,OAAO,KAAK,WAAW,CAAC,CAAC;IACvE,CAAC;IAED,sBAAsB,CAAC,IAAY;QACjC,OAAO,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;IACrC,CAAC;IAED,qBAAqB,CAAC,IAAY;QAChC,MAAM,WAAW,GAAG,IAAI,CAAC,sBAAsB,CAAC,IAAI,CAAC,CAAC;QAEtD,IAAI,WAAW,EAAE,CAAC;YAChB,MAAM,QAAQ,GAAG,gBAAgB,CAAC,GAAG,CAAC,WAAW,CAAC,QAAQ,EAAE,SAAS,CAAC,CAAC;YACvE,OAAO,CAAC,GAAoB,EAAE,EAAE;gBAC9B,uCAAuC;gBACvC,GAAG,CAAC,QAAQ,GAAG,QAAQ,CAAC;gBACxB,OAAO,WAAW,CAAC,KAAK,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC,GAAG,CAAC,CAAC;YAC/C,CAAC,CAAC;QACJ,CAAC;IACH,CAAC;CACF,CAAA;AA/CY,gBAAgB;IAD5B,UAAU,EAAE;GACA,gBAAgB,CA+C5B"}
@@ -1,8 +1,12 @@
1
- import { __decorate, __metadata } from "tslib";
2
- import { Constant, Injectable } from "@tsed/di";
1
+ import { __decorate } from "tslib";
2
+ import { constant, Injectable } from "@tsed/di";
3
3
  import { getJwks } from "@tsed/jwks";
4
4
  import { join } from "path";
5
5
  let OidcJwks = class OidcJwks {
6
+ constructor() {
7
+ this.jwksPath = constant("oidc.jwksPath", join(process.cwd(), "keys", "jwks.json"));
8
+ this.certificates = constant("oidc.certificates");
9
+ }
6
10
  $onInit() {
7
11
  return this.getJwks();
8
12
  }
@@ -13,14 +17,6 @@ let OidcJwks = class OidcJwks {
13
17
  });
14
18
  }
15
19
  };
16
- __decorate([
17
- Constant("oidc.jwksPath", join(process.cwd(), "keys", "jwks.json")),
18
- __metadata("design:type", String)
19
- ], OidcJwks.prototype, "jwksPath", void 0);
20
- __decorate([
21
- Constant("oidc.certificates"),
22
- __metadata("design:type", Array)
23
- ], OidcJwks.prototype, "certificates", void 0);
24
20
  OidcJwks = __decorate([
25
21
  Injectable()
26
22
  ], OidcJwks);
@@ -1 +1 @@
1
- {"version":3,"file":"OidcJwks.js","sourceRoot":"","sources":["../../../src/services/OidcJwks.ts"],"names":[],"mappings":";AAAA,OAAO,EAAC,QAAQ,EAAE,UAAU,EAAC,MAAM,UAAU,CAAC;AAC9C,OAAO,EAAC,OAAO,EAAoB,MAAM,YAAY,CAAC;AACtD,OAAO,EAAC,IAAI,EAAC,MAAM,MAAM,CAAC;AAGnB,IAAM,QAAQ,GAAd,MAAM,QAAQ;IASnB,OAAO;QACL,OAAO,IAAI,CAAC,OAAO,EAAE,CAAC;IACxB,CAAC;IAED,OAAO;QACL,OAAO,OAAO,CAAC;YACb,IAAI,EAAE,IAAI,CAAC,QAAQ;YACnB,YAAY,EAAE,IAAI,CAAC,YAAY;SAChC,CAAC,CAAC;IACL,CAAC;CACF,CAAA;AAjBC;IADC,QAAQ,CAAC,eAAe,EAAE,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,MAAM,EAAE,WAAW,CAAC,CAAC;;0CACnD;AAGjB;IADC,QAAQ,CAAC,mBAAmB,CAAC;;8CACK;AALxB,QAAQ;IADpB,UAAU,EAAE;GACA,QAAQ,CAmBpB"}
1
+ {"version":3,"file":"OidcJwks.js","sourceRoot":"","sources":["../../../src/services/OidcJwks.ts"],"names":[],"mappings":";AAAA,OAAO,EAAC,QAAQ,EAAE,UAAU,EAAC,MAAM,UAAU,CAAC;AAC9C,OAAO,EAAC,OAAO,EAAoB,MAAM,YAAY,CAAC;AACtD,OAAO,EAAC,IAAI,EAAC,MAAM,MAAM,CAAC;AAGnB,IAAM,QAAQ,GAAd,MAAM,QAAQ;IAAd;QACE,aAAQ,GAAW,QAAQ,CAAC,eAAe,EAAE,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,MAAM,EAAE,WAAW,CAAC,CAAC,CAAC;QACvF,iBAAY,GAAyB,QAAQ,CAAC,mBAAmB,CAAC,CAAC;IAa5E,CAAC;IAVC,OAAO;QACL,OAAO,IAAI,CAAC,OAAO,EAAE,CAAC;IACxB,CAAC;IAED,OAAO;QACL,OAAO,OAAO,CAAC;YACb,IAAI,EAAE,IAAI,CAAC,QAAQ;YACnB,YAAY,EAAE,IAAI,CAAC,YAAY;SAChC,CAAC,CAAC;IACL,CAAC;CACF,CAAA;AAfY,QAAQ;IADpB,UAAU,EAAE;GACA,QAAQ,CAepB"}
@@ -1,8 +1,12 @@
1
- import { __decorate, __metadata } from "tslib";
2
- import { Inject, Injectable, InjectorService } from "@tsed/di";
1
+ import { __decorate } from "tslib";
2
+ import { inject, Injectable, injector } from "@tsed/di";
3
3
  import { interactionPolicy } from "oidc-provider";
4
4
  import { OidcInteractions } from "./OidcInteractions.js";
5
5
  let OidcPolicy = class OidcPolicy {
6
+ constructor() {
7
+ this.injector = injector();
8
+ this.oidcInteractions = inject(OidcInteractions);
9
+ }
6
10
  getPolicy() {
7
11
  let policy = interactionPolicy.base();
8
12
  const { usePriority, interactions } = this.getInteractions();
@@ -55,14 +59,6 @@ let OidcPolicy = class OidcPolicy {
55
59
  };
56
60
  }
57
61
  };
58
- __decorate([
59
- Inject(),
60
- __metadata("design:type", InjectorService)
61
- ], OidcPolicy.prototype, "injector", void 0);
62
- __decorate([
63
- Inject(),
64
- __metadata("design:type", OidcInteractions)
65
- ], OidcPolicy.prototype, "oidcInteractions", void 0);
66
62
  OidcPolicy = __decorate([
67
63
  Injectable()
68
64
  ], OidcPolicy);
@@ -1 +1 @@
1
- {"version":3,"file":"OidcPolicy.js","sourceRoot":"","sources":["../../../src/services/OidcPolicy.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"OidcPolicy.js","sourceRoot":"","sources":["../../../src/services/OidcPolicy.ts"],"names":[],"mappings":"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"}
@@ -1,12 +1,11 @@
1
- import { __decorate, __metadata } from "tslib";
2
- import { InjectContext, PlatformApplication, PlatformContext } from "@tsed/common";
1
+ import { __decorate } from "tslib";
2
+ import { PlatformApplication } from "@tsed/common";
3
3
  import { Env, setValue } from "@tsed/core";
4
- import { Constant, Inject, Injectable, InjectorService } from "@tsed/di";
4
+ import { constant, context, inject, Injectable, InjectorService } from "@tsed/di";
5
5
  import Provider from "oidc-provider";
6
6
  import { INTERACTIONS } from "../constants/constants.js";
7
7
  import { OIDC_ERROR_EVENTS } from "../utils/events.js";
8
8
  import { OidcAdapters } from "./OidcAdapters.js";
9
- import { OidcInteractions } from "./OidcInteractions.js";
10
9
  import { OidcJwks } from "./OidcJwks.js";
11
10
  import { OidcPolicy } from "./OidcPolicy.js";
12
11
  function mapError(error) {
@@ -18,8 +17,24 @@ function mapError(error) {
18
17
  }, {});
19
18
  }
20
19
  let OidcProvider = class OidcProvider {
20
+ constructor() {
21
+ this.env = constant("env");
22
+ this.httpPort = constant("httpPort");
23
+ this.httpsPort = constant("httpsPort");
24
+ this.issuer = constant("oidc.issuer", "");
25
+ this.oidc = constant("oidc");
26
+ this.platformName = constant("PLATFORM_NAME");
27
+ this.oidcJwks = inject(OidcJwks);
28
+ this.oidcPolicy = inject(OidcPolicy);
29
+ this.adapters = inject(OidcAdapters);
30
+ this.injector = inject(InjectorService);
31
+ this.app = inject(PlatformApplication);
32
+ }
21
33
  get logger() {
22
- return this.$ctx?.logger || this.injector.logger;
34
+ return this.$ctx.logger;
35
+ }
36
+ get $ctx() {
37
+ return context();
23
38
  }
24
39
  hasConfiguration() {
25
40
  return !!this.oidc;
@@ -133,58 +148,6 @@ let OidcProvider = class OidcProvider {
133
148
  };
134
149
  }
135
150
  };
136
- __decorate([
137
- Constant("env"),
138
- __metadata("design:type", String)
139
- ], OidcProvider.prototype, "env", void 0);
140
- __decorate([
141
- Constant("httpPort"),
142
- __metadata("design:type", Object)
143
- ], OidcProvider.prototype, "httpPort", void 0);
144
- __decorate([
145
- Constant("httpsPort"),
146
- __metadata("design:type", Object)
147
- ], OidcProvider.prototype, "httpsPort", void 0);
148
- __decorate([
149
- Constant("oidc.issuer", ""),
150
- __metadata("design:type", String)
151
- ], OidcProvider.prototype, "issuer", void 0);
152
- __decorate([
153
- Constant("oidc"),
154
- __metadata("design:type", Object)
155
- ], OidcProvider.prototype, "oidc", void 0);
156
- __decorate([
157
- Constant("PLATFORM_NAME"),
158
- __metadata("design:type", String)
159
- ], OidcProvider.prototype, "platformName", void 0);
160
- __decorate([
161
- Inject(),
162
- __metadata("design:type", OidcJwks)
163
- ], OidcProvider.prototype, "oidcJwks", void 0);
164
- __decorate([
165
- Inject(),
166
- __metadata("design:type", OidcInteractions)
167
- ], OidcProvider.prototype, "oidcInteractions", void 0);
168
- __decorate([
169
- Inject(),
170
- __metadata("design:type", OidcPolicy)
171
- ], OidcProvider.prototype, "oidcPolicy", void 0);
172
- __decorate([
173
- Inject(),
174
- __metadata("design:type", OidcAdapters)
175
- ], OidcProvider.prototype, "adapters", void 0);
176
- __decorate([
177
- Inject(),
178
- __metadata("design:type", InjectorService)
179
- ], OidcProvider.prototype, "injector", void 0);
180
- __decorate([
181
- Inject(),
182
- __metadata("design:type", PlatformApplication)
183
- ], OidcProvider.prototype, "app", void 0);
184
- __decorate([
185
- InjectContext(),
186
- __metadata("design:type", PlatformContext)
187
- ], OidcProvider.prototype, "$ctx", void 0);
188
151
  OidcProvider = __decorate([
189
152
  Injectable()
190
153
  ], OidcProvider);
@@ -1 +1 @@
1
- {"version":3,"file":"OidcProvider.js","sourceRoot":"","sources":["../../../src/services/OidcProvider.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"OidcProvider.js","sourceRoot":"","sources":["../../../src/services/OidcProvider.ts"],"names":[],"mappings":"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"}
@@ -1,11 +1,10 @@
1
- import { InjectorService, PlatformApplication } from "@tsed/common";
1
+ import { PlatformApplication } from "@tsed/common";
2
2
  import { OidcProvider } from "./services/OidcProvider.js";
3
3
  export declare class OidcModule {
4
4
  protected app: PlatformApplication;
5
- protected platformName: string;
5
+ protected platformName: string | undefined;
6
6
  protected basePath: string;
7
7
  protected oidcProvider: OidcProvider;
8
- protected injector: InjectorService;
9
8
  $onInit(): Promise<void>;
10
9
  $onRoutesInit(): Promise<void>;
11
10
  $afterRoutesInit(): void;
@@ -1,9 +1,7 @@
1
1
  import { Adapter, Adapters } from "@tsed/adapters";
2
- import { Configuration } from "@tsed/di";
3
2
  import type { Adapter as OidcAdapter, AdapterConstructor } from "oidc-provider";
4
3
  export type OidcAdapterMethods<Model = any> = Adapter<Model> & Partial<Omit<OidcAdapter, "upsert">>;
5
4
  export declare class OidcAdapters {
6
5
  protected adapters: Adapters;
7
- protected settings: Configuration;
8
6
  createAdapterClass(): AdapterConstructor;
9
7
  }
@@ -7,11 +7,10 @@ import { OidcInteractionPromptProps } from "../domain/OidcInteractionPromptProps
7
7
  import { OidcInteractions } from "./OidcInteractions.js";
8
8
  import { OidcProvider } from "./OidcProvider.js";
9
9
  export declare class OidcInteractionContext {
10
- protected env: Env;
11
- protected omitClientProps: string[];
10
+ protected env: Env | undefined;
12
11
  protected oidcProvider: OidcProvider;
13
12
  protected oidcInteractions: OidcInteractions;
14
- protected $ctx: PlatformContext;
13
+ get $ctx(): PlatformContext<import("@tsed/common").PlatformRequest<any>, import("@tsed/common").PlatformResponse<any>>;
15
14
  get raw(): OidcInteraction;
16
15
  get session(): OidcSession | undefined;
17
16
  get prompt(): PromptDetail;
@@ -1,11 +1,9 @@
1
- import { PlatformContext, Provider } from "@tsed/common";
1
+ import { PlatformContext } from "@tsed/common";
2
2
  import { Env } from "@tsed/core";
3
- import { InjectorService } from "@tsed/di";
4
- import { OidcSettings } from "../domain/OidcSettings.js";
3
+ import { Provider } from "@tsed/di";
5
4
  export declare class OidcInteractions {
6
- protected injector: InjectorService;
7
- protected env: Env;
8
- protected oidcSettings: OidcSettings;
5
+ protected injector: import("@tsed/common").InjectorService;
6
+ protected env: Env | undefined;
9
7
  protected interactions: Map<string, Provider>;
10
8
  $onInit(): void;
11
9
  getInteractions(): Provider[];
@@ -1,11 +1,10 @@
1
- import { InjectorService } from "@tsed/di";
2
1
  import { interactionPolicy } from "oidc-provider";
3
2
  import { InteractionMethods } from "../domain/InteractionMethods.js";
4
3
  import { OidcInteractionOptions } from "../domain/OidcInteractionOptions.js";
5
4
  import { OidcInteractions } from "./OidcInteractions.js";
6
5
  import Prompt = interactionPolicy.Prompt;
7
6
  export declare class OidcPolicy {
8
- protected injector: InjectorService;
7
+ protected injector: import("@tsed/di").InjectorService;
9
8
  protected oidcInteractions: OidcInteractions;
10
9
  getPolicy(): any;
11
10
  createPrompt(instance: InteractionMethods, options: OidcInteractionOptions): Prompt;
@@ -4,25 +4,23 @@ import { InjectorService } from "@tsed/di";
4
4
  import Provider, { type Configuration } from "oidc-provider";
5
5
  import { OidcSettings } from "../domain/OidcSettings.js";
6
6
  import { OidcAdapters } from "./OidcAdapters.js";
7
- import { OidcInteractions } from "./OidcInteractions.js";
8
7
  import { OidcJwks } from "./OidcJwks.js";
9
8
  import { OidcPolicy } from "./OidcPolicy.js";
10
9
  export declare class OidcProvider {
11
10
  raw: Provider;
12
- protected env: Env;
13
- protected httpPort: number | string;
14
- protected httpsPort: number | string;
11
+ protected env: Env | undefined;
12
+ protected httpPort: string | number | undefined;
13
+ protected httpsPort: string | number | undefined;
15
14
  protected issuer: string;
16
15
  protected oidc: OidcSettings;
17
- protected platformName: string;
16
+ protected platformName: string | undefined;
18
17
  protected oidcJwks: OidcJwks;
19
- protected oidcInteractions: OidcInteractions;
20
18
  protected oidcPolicy: OidcPolicy;
21
19
  protected adapters: OidcAdapters;
22
20
  protected injector: InjectorService;
23
- protected app: PlatformApplication;
24
- protected $ctx?: PlatformContext;
25
- get logger(): import("@tsed/common").ContextLogger | import("@tsed/common").DILogger;
21
+ protected app: PlatformApplication<any>;
22
+ get logger(): import("@tsed/common").ContextLogger;
23
+ protected get $ctx(): PlatformContext<import("@tsed/common").PlatformRequest<any>, import("@tsed/common").PlatformResponse<any>>;
26
24
  hasConfiguration(): boolean;
27
25
  getConfiguration(): Promise<Configuration>;
28
26
  getIssuer(): string;
package/package.json CHANGED
@@ -2,7 +2,7 @@
2
2
  "name": "@tsed/oidc-provider",
3
3
  "description": "OIDC provider package for Ts.ED framework",
4
4
  "type": "module",
5
- "version": "8.0.0-beta.1",
5
+ "version": "8.0.0-beta.3",
6
6
  "source": "./src/index.ts",
7
7
  "main": "./lib/esm/index.js",
8
8
  "module": "./lib/esm/index.js",
@@ -23,7 +23,7 @@
23
23
  "test:ci": "vitest run --coverage.thresholds.autoUpdate=true"
24
24
  },
25
25
  "dependencies": {
26
- "@tsed/adapters": "8.0.0-beta.1",
26
+ "@tsed/adapters": "8.0.0-beta.3",
27
27
  "express-urlrewrite": "^2.0.3",
28
28
  "jose2": "npm:jose@^2.0.4",
29
29
  "koa-mount": "^4.0.0",
@@ -33,13 +33,13 @@
33
33
  "uuid": "^10.0.0"
34
34
  },
35
35
  "devDependencies": {
36
- "@tsed/barrels": "8.0.0-beta.1",
37
- "@tsed/common": "8.0.0-beta.1",
38
- "@tsed/core": "8.0.0-beta.1",
39
- "@tsed/di": "8.0.0-beta.1",
40
- "@tsed/exceptions": "8.0.0-beta.1",
41
- "@tsed/jwks": "8.0.0-beta.1",
42
- "@tsed/typescript": "8.0.0-beta.1",
36
+ "@tsed/barrels": "8.0.0-beta.3",
37
+ "@tsed/common": "8.0.0-beta.3",
38
+ "@tsed/core": "8.0.0-beta.3",
39
+ "@tsed/di": "8.0.0-beta.3",
40
+ "@tsed/exceptions": "8.0.0-beta.3",
41
+ "@tsed/jwks": "8.0.0-beta.3",
42
+ "@tsed/typescript": "8.0.0-beta.3",
43
43
  "@types/lowdb": "1.0.15",
44
44
  "@types/oidc-provider": "8.5.2",
45
45
  "@types/uuid": "10.0.0",
@@ -51,12 +51,12 @@
51
51
  "vitest": "2.1.2"
52
52
  },
53
53
  "peerDependencies": {
54
- "@tsed/ajv": "8.0.0-beta.1",
55
- "@tsed/common": "8.0.0-beta.1",
56
- "@tsed/core": "8.0.0-beta.1",
57
- "@tsed/di": "8.0.0-beta.1",
58
- "@tsed/json-mapper": "8.0.0-beta.1",
59
- "@tsed/schema": "8.0.0-beta.1",
54
+ "@tsed/ajv": "8.0.0-beta.3",
55
+ "@tsed/common": "8.0.0-beta.3",
56
+ "@tsed/core": "8.0.0-beta.3",
57
+ "@tsed/di": "8.0.0-beta.3",
58
+ "@tsed/json-mapper": "8.0.0-beta.3",
59
+ "@tsed/schema": "8.0.0-beta.3",
60
60
  "oidc-provider": ">=8.0.0"
61
61
  },
62
62
  "peerDependenciesMeta": {
package/vitest.config.mts CHANGED
@@ -10,10 +10,10 @@ export default defineConfig(
10
10
  coverage: {
11
11
  ...presets.test.coverage,
12
12
  thresholds: {
13
- statements: 97.26,
14
- branches: 91.33,
15
- functions: 98.57,
16
- lines: 97.26
13
+ statements: 97.36,
14
+ branches: 92,
15
+ functions: 98.61,
16
+ lines: 97.36
17
17
  }
18
18
  }
19
19
  }