@authup/server-core 1.0.0-beta.5 → 1.0.0-beta.8

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 (61) hide show
  1. package/dist/config/parse.d.ts.map +1 -1
  2. package/dist/config/parse.js +25 -9
  3. package/dist/config/parse.js.map +1 -1
  4. package/dist/database/seeds/module.d.ts.map +1 -1
  5. package/dist/database/seeds/module.js +46 -58
  6. package/dist/database/seeds/module.js.map +1 -1
  7. package/dist/database/utils/data-source-options.d.ts.map +1 -1
  8. package/dist/database/utils/data-source-options.js +5 -0
  9. package/dist/database/utils/data-source-options.js.map +1 -1
  10. package/dist/domains/identity-provider/flow/core/openid.js +1 -1
  11. package/dist/domains/identity-provider/flow/core/openid.js.map +1 -1
  12. package/dist/domains/key/utils/sign.d.ts +2 -2
  13. package/dist/domains/key/utils/sign.d.ts.map +1 -1
  14. package/dist/domains/key/utils/sign.js +12 -1
  15. package/dist/domains/key/utils/sign.js.map +1 -1
  16. package/dist/domains/key/utils/verify.d.ts +1 -2
  17. package/dist/domains/key/utils/verify.d.ts.map +1 -1
  18. package/dist/domains/key/utils/verify.js +5 -7
  19. package/dist/domains/key/utils/verify.js.map +1 -1
  20. package/dist/http/controllers/identity-provider/handlers/custom.js +2 -2
  21. package/dist/http/controllers/identity-provider/handlers/custom.js.map +1 -1
  22. package/dist/http/controllers/robot/handlers/integrity.d.ts.map +1 -1
  23. package/dist/http/controllers/robot/handlers/integrity.js +11 -6
  24. package/dist/http/controllers/robot/handlers/integrity.js.map +1 -1
  25. package/dist/http/controllers/root/authorize/handlers/run.js +2 -2
  26. package/dist/http/controllers/root/authorize/handlers/run.js.map +1 -1
  27. package/dist/http/controllers/root/status/module.js +2 -2
  28. package/dist/http/controllers/root/status/module.js.map +1 -1
  29. package/dist/http/controllers/root/token/handlers/create.js +2 -2
  30. package/dist/http/controllers/root/token/handlers/create.js.map +1 -1
  31. package/dist/http/oauth2/authorize/module.d.ts.map +1 -1
  32. package/dist/http/oauth2/authorize/module.js +5 -5
  33. package/dist/http/oauth2/authorize/module.js.map +1 -1
  34. package/dist/http/oauth2/grant-types/abstract.js +1 -1
  35. package/dist/http/oauth2/grant-types/abstract.js.map +1 -1
  36. package/dist/http/oauth2/grant-types/authorize.js +2 -2
  37. package/dist/http/oauth2/grant-types/authorize.js.map +1 -1
  38. package/dist/http/oauth2/grant-types/client-credentials.js +2 -2
  39. package/dist/http/oauth2/grant-types/client-credentials.js.map +1 -1
  40. package/dist/http/oauth2/grant-types/internal.js +2 -2
  41. package/dist/http/oauth2/grant-types/internal.js.map +1 -1
  42. package/dist/http/oauth2/grant-types/password.js +2 -2
  43. package/dist/http/oauth2/grant-types/password.js.map +1 -1
  44. package/dist/http/oauth2/grant-types/refresh-token.js +2 -2
  45. package/dist/http/oauth2/grant-types/refresh-token.js.map +1 -1
  46. package/dist/http/oauth2/grant-types/robot-credentials.js +2 -2
  47. package/dist/http/oauth2/grant-types/robot-credentials.js.map +1 -1
  48. package/dist/http/oauth2/response/bearer.d.ts.map +1 -1
  49. package/dist/http/oauth2/response/bearer.js +4 -2
  50. package/dist/http/oauth2/response/bearer.js.map +1 -1
  51. package/dist/http/oauth2/token/builder/access-token.d.ts.map +1 -1
  52. package/dist/http/oauth2/token/builder/access-token.js +1 -0
  53. package/dist/http/oauth2/token/builder/access-token.js.map +1 -1
  54. package/dist/http/oauth2/token/builder/id-token.d.ts.map +1 -1
  55. package/dist/http/oauth2/token/builder/id-token.js +2 -1
  56. package/dist/http/oauth2/token/builder/id-token.js.map +1 -1
  57. package/dist/http/oauth2/token/builder/type.d.ts +1 -0
  58. package/dist/http/oauth2/token/builder/type.d.ts.map +1 -1
  59. package/dist/http/oauth2/token/payload/read.js +5 -5
  60. package/dist/http/oauth2/token/payload/read.js.map +1 -1
  61. package/package.json +7 -7
@@ -1 +1 @@
1
- {"version":3,"file":"parse.d.ts","sourceRoot":"","sources":["../../src/config/parse.ts"],"names":[],"mappings":"AAQA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,SAAS,CAAC;AAI3C,wBAAgB,WAAW,CAAC,KAAK,GAAE,OAAY,GAAG,WAAW,CAiE5D"}
1
+ {"version":3,"file":"parse.d.ts","sourceRoot":"","sources":["../../src/config/parse.ts"],"names":[],"mappings":"AAQA,OAAO,KAAK,EAAU,WAAW,EAAE,MAAM,SAAS,CAAC;AAInD,wBAAgB,WAAW,CAAC,KAAK,GAAE,OAAY,GAAG,WAAW,CAqF5D"}
@@ -49,26 +49,42 @@ function parseConfig(input = {}) {
49
49
  .or(zod_1.default.record(zod_1.default.any())).optional(),
50
50
  middlewareQuery: zod_1.default.boolean()
51
51
  .or(zod_1.default.record(zod_1.default.any())).optional(),
52
+ middlewarePrometheus: zod_1.default.boolean()
53
+ .or(zod_1.default.record(zod_1.default.any())).optional(),
54
+ middlewareRateLimit: zod_1.default.boolean()
55
+ .or(zod_1.default.record(zod_1.default.any())).optional(),
52
56
  middlewareSwagger: zod_1.default.boolean().optional(),
53
- tokenMaxAgeAccessToken: zod_1.default.number()
57
+ tokenAccessMaxAge: zod_1.default.number()
54
58
  .nonnegative().optional(),
55
- tokenMaxAgeRefreshToken: zod_1.default.number()
59
+ tokenRefreshMaxAge: zod_1.default.number()
56
60
  .nonnegative().optional(),
57
61
  registration: zod_1.default.boolean().optional(),
58
62
  emailVerification: zod_1.default.boolean().optional(),
59
63
  forgotPassword: zod_1.default.boolean().optional(),
60
- adminUsername: zod_1.default.string()
64
+ clientAuthBasic: zod_1.default.boolean().optional(),
65
+ userAuthBasic: zod_1.default.boolean().optional(),
66
+ userAdminEnabled: zod_1.default.boolean().optional(),
67
+ userAdminName: zod_1.default.string()
61
68
  .min(3)
62
- .max(128).optional(),
63
- adminPassword: zod_1.default.string()
69
+ .max(128)
70
+ .optional(),
71
+ userAdminPassword: zod_1.default.string()
64
72
  .min(3)
65
73
  .max(256).optional(),
66
- adminPasswordReset: zod_1.default.boolean().optional(),
67
- robotEnabled: zod_1.default.boolean().optional(),
68
- robotSecret: zod_1.default.string()
74
+ userAdminPasswordReset: zod_1.default.boolean().optional(),
75
+ robotAuthBasic: zod_1.default.boolean().optional(),
76
+ robotAdminEnabled: zod_1.default.boolean().optional(),
77
+ robotAdminName: zod_1.default.string()
78
+ .min(3)
79
+ .max(128)
80
+ .optional(),
81
+ robotAdminSecret: zod_1.default.string()
69
82
  .min(3)
70
83
  .max(256).optional(),
71
- robotSecretReset: zod_1.default.boolean().optional(),
84
+ robotAdminSecretReset: zod_1.default.boolean().optional(),
85
+ permissions: zod_1.default.string()
86
+ .or(zod_1.default.array(zod_1.default.string()))
87
+ .optional(),
72
88
  });
73
89
  return schema.parse(input);
74
90
  }
@@ -1 +1 @@
1
- {"version":3,"file":"parse.js","sourceRoot":"","sources":["../../src/config/parse.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"parse.js","sourceRoot":"","sources":["../../src/config/parse.ts"],"names":[],"mappings":"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"}
@@ -1 +1 @@
1
- {"version":3,"file":"module.d.ts","sourceRoot":"","sources":["../../../src/database/seeds/module.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAE,UAAU,EAAoB,MAAM,SAAS,CAAC;AAE5D,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAC;AAwBhD,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,cAAc,CAAC;AAW3C,qBAAa,cAAe,YAAW,MAAM;IACzC,SAAS,CAAC,MAAM,EAAE,MAAM,CAAC;IAEzB,SAAS,CAAC,OAAO,EAAE,OAAO,CAAC,MAAM,CAAC,CAAC;gBAEvB,OAAO,CAAC,EAAE,OAAO,CAAC,MAAM,CAAC;IAKrC,OAAO,CAAC,SAAS;IAWJ,GAAG,CAAC,UAAU,EAAE,UAAU,GAAI,OAAO,CAAC,GAAG,CAAC;CAgR1D"}
1
+ {"version":3,"file":"module.d.ts","sourceRoot":"","sources":["../../../src/database/seeds/module.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAE,UAAU,EAAoB,MAAM,SAAS,CAAC;AAE5D,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAC;AAyBhD,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,cAAc,CAAC;AAW3C,qBAAa,cAAe,YAAW,MAAM;IACzC,SAAS,CAAC,MAAM,EAAE,MAAM,CAAC;IAEzB,SAAS,CAAC,OAAO,EAAE,OAAO,CAAC,MAAM,CAAC,CAAC;gBAEvB,OAAO,CAAC,EAAE,OAAO,CAAC,MAAM,CAAC;IAKrC,OAAO,CAAC,SAAS;IAWJ,GAAG,CAAC,UAAU,EAAE,UAAU,GAAI,OAAO,CAAC,GAAG,CAAC;CAmQ1D"}
@@ -128,6 +128,52 @@ class DatabaseSeeder {
128
128
  }
129
129
  await userRoleRepository.save(userRole);
130
130
  // -------------------------------------------------
131
+ /**
132
+ * Create default robot account
133
+ */
134
+ const robotRepository = dataSource.getRepository(domains_1.RobotEntity);
135
+ let robot = await robotRepository.findOneBy({
136
+ name: this.getOption('robotAdminName'),
137
+ realm_id: realm.id,
138
+ });
139
+ const secret = this.getOption('robotAdminSecret') || (0, core_1.createNanoID)(64);
140
+ if (!robot) {
141
+ robot = robotRepository.create({
142
+ name: this.getOption('robotAdminName'),
143
+ realm_id: realm.id,
144
+ secret: await (0, server_kit_1.hash)(secret),
145
+ active: this.getOption('robotAdminEnabled'),
146
+ });
147
+ await robotRepository.save(robot);
148
+ robot.secret = secret;
149
+ response.robot = robot;
150
+ }
151
+ else {
152
+ if (this.getOption('robotAdminSecretReset')) {
153
+ robot.secret = await (0, server_kit_1.hash)(secret);
154
+ }
155
+ robot.active = this.getOption('robotAdminEnabled');
156
+ await robotRepository.save(robot);
157
+ if (this.getOption('robotAdminSecretReset')) {
158
+ robot.secret = secret;
159
+ response.robot = robot;
160
+ }
161
+ }
162
+ // -------------------------------------------------
163
+ /**
164
+ * Create default robot - role association
165
+ */
166
+ const robotRoleData = {
167
+ role_id: role.id,
168
+ robot_id: robot.id,
169
+ };
170
+ const robotRoleRepository = dataSource.getRepository(domains_1.RobotRoleEntity);
171
+ let robotRole = await robotRoleRepository.findOneBy(robotRoleData);
172
+ if (!robotRole) {
173
+ robotRole = robotRoleRepository.create(robotRoleData);
174
+ }
175
+ await robotRoleRepository.save(robotRole);
176
+ // -------------------------------------------------
131
177
  /**
132
178
  * Create all permissions
133
179
  */
@@ -189,64 +235,6 @@ class DatabaseSeeder {
189
235
  if (rolePermissions.length > 0) {
190
236
  await rolePermissionRepository.save(rolePermissions);
191
237
  }
192
- // -------------------------------------------------
193
- /**
194
- * Create default robot account
195
- */
196
- const robotRepository = dataSource.getRepository(domains_1.RobotEntity);
197
- let robot = await robotRepository.findOneBy({
198
- name: this.getOption('robotAdminName'),
199
- realm_id: realm.id,
200
- });
201
- const secret = this.getOption('robotAdminSecret') || (0, core_1.createNanoID)(64);
202
- if (!robot) {
203
- robot = robotRepository.create({
204
- name: this.getOption('robotAdminName'),
205
- realm_id: realm.id,
206
- secret: await (0, server_kit_1.hash)(secret),
207
- active: this.getOption('robotAdminEnabled'),
208
- });
209
- await robotRepository.save(robot);
210
- robot.secret = secret;
211
- response.robot = robot;
212
- }
213
- else {
214
- if (this.getOption('robotAdminSecretReset')) {
215
- robot.secret = await (0, server_kit_1.hash)(secret);
216
- }
217
- robot.active = this.getOption('robotAdminEnabled');
218
- await robotRepository.save(robot);
219
- if (this.getOption('robotAdminSecretReset')) {
220
- robot.secret = secret;
221
- response.robot = robot;
222
- }
223
- }
224
- // -------------------------------------------------
225
- /**
226
- * Assign all permissions to default robot.
227
- */
228
- const robotPermissionIds = [...permissionIds];
229
- const robotPermissionRepository = dataSource.getRepository(domains_1.RobotPermissionEntity);
230
- const existingRobotPermissions = await robotPermissionRepository.findBy({
231
- permission_id: (0, typeorm_1.In)(robotPermissionIds),
232
- robot_id: robot.id,
233
- });
234
- for (let i = 0; i < existingRobotPermissions.length; i++) {
235
- const index = robotPermissionIds.indexOf(existingRobotPermissions[i].permission_id);
236
- if (index !== -1) {
237
- robotPermissionIds.splice(index, 1);
238
- }
239
- }
240
- const robotPermissions = [];
241
- for (let j = 0; j < robotPermissionIds.length; j++) {
242
- robotPermissions.push(robotPermissionRepository.create({
243
- robot_id: robot.id,
244
- permission_id: robotPermissionIds[j],
245
- }));
246
- }
247
- if (robotPermissions.length > 0) {
248
- await robotPermissionRepository.save(robotPermissions);
249
- }
250
238
  return response;
251
239
  }
252
240
  }
@@ -1 +1 @@
1
- {"version":3,"file":"module.js","sourceRoot":"","sources":["../../../src/database/seeds/module.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"module.js","sourceRoot":"","sources":["../../../src/database/seeds/module.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;AAGH,qCAA6B;AAS7B,uCAIsB;AACtB,mDAA0D;AAC1D,2CAUuB;AAEvB,yCAAyC;AAGzC,SAAS,cAAc,CAAC,WAAsB;IAC1C,OAAO,KAAK,CAAC,IAAI,CAAC,IAAI,GAAG,CAAC;QACtB,GAAG,MAAM,CAAC,MAAM,CAAC,qBAAc,CAAC;QAChC,GAAG,CAAC,WAAW,IAAI,EAAE,CAAC;KACzB,CAAC,CAAC,CAAC;AACR,CAAC;AAED,MAAa,cAAc;IAKvB,YAAY,OAAyB;QACjC,IAAI,CAAC,MAAM,GAAG,IAAA,kBAAS,GAAE,CAAC;QAC1B,IAAI,CAAC,OAAO,GAAG,OAAO,IAAI,EAAE,CAAC;IACjC,CAAC;IAEO,SAAS,CAAyB,GAAM;QAC5C,IACI,IAAA,2BAAc,EAAC,IAAI,CAAC,OAAO,EAAE,GAAG,CAAC;YACjC,OAAO,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,KAAK,WAAW,EAC1C,CAAC;YACC,OAAO,IAAI,CAAC,OAAO,CAAC,GAAG,CAAc,CAAC;QAC1C,CAAC;QAED,OAAO,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;IAC5B,CAAC;IAEM,KAAK,CAAC,GAAG,CAAC,UAAsB;QACnC,MAAM,QAAQ,GAA8B,EAAE,CAAC;QAE/C;;WAEG;QACH,MAAM,eAAe,GAAG,UAAU,CAAC,aAAa,CAAC,qBAAW,CAAC,CAAC;QAC9D,IAAI,KAAK,GAAG,MAAM,eAAe,CAAC,SAAS,CAAC;YACxC,IAAI,EAAE,wBAAiB;SAC1B,CAAC,CAAC;QAEH,IAAI,CAAC,KAAK,EAAE,CAAC;YACT,KAAK,GAAG,eAAe,CAAC,MAAM,CAAC;gBAC3B,IAAI,EAAE,wBAAiB;gBACvB,QAAQ,EAAE,KAAK;aAClB,CAAC,CAAC;QACP,CAAC;QAED,MAAM,eAAe,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QAElC,oDAAoD;QAEpD,+CAA+C;QAE/C,MAAM,UAAU,GAAc,MAAM,CAAC,MAAM,CAAC,gBAAS,CAAC,CAAC;QACvD,MAAM,QAAQ,GAAG,EAAE,CAAC;QAEpB,MAAM,eAAe,GAAG,UAAU,CAAC,aAAa,CAAC,qBAAW,CAAC,CAAC;QAE9D,MAAM,cAAc,GAAG,MAAM,eAAe,CAAC,MAAM,CAAC;YAChD,QAAQ,EAAE,IAAI;SACjB,CAAC,CAAC;QACH,MAAM,eAAe,GAAmB,EAAE,CAAC;QAE3C,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,cAAc,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;YAC7C,MAAM,KAAK,GAAG,UAAU,CAAC,OAAO,CAAC,cAAc,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;YACzD,IAAI,KAAK,KAAK,CAAC,CAAC,EAAE,CAAC;gBACf,eAAe,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC,CAAC,CAAC,CAAC;YAC5C,CAAC;iBAAM,CAAC;gBACJ,QAAQ,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;gBACpC,UAAU,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC;YAChC,CAAC;QACL,CAAC;QAED,IAAI,eAAe,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YAC7B,MAAM,eAAe,CAAC,MAAM,CAAC,eAAe,CAAC,CAAC;QAClD,CAAC;QAED,MAAM,MAAM,GAAG,UAAU,CAAC,GAAG,CACzB,CAAC,IAAY,EAAE,EAAE,CAAC,eAAe,CAAC,MAAM,CAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC,CACrE,CAAC;QACF,IAAI,MAAM,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YACpB,MAAM,eAAe,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;YAEnC,QAAQ,CAAC,IAAI,CAAC,GAAG,MAAM,CAAC,GAAG,CAAC,CAAC,UAAU,EAAE,EAAE,CAAC,UAAU,CAAC,EAAE,CAAC,CAAC,CAAC;QAChE,CAAC;QACD,oDAAoD;QAEpD;;WAEG;QACH,MAAM,cAAc,GAAG,UAAU,CAAC,aAAa,CAAC,oBAAU,CAAC,CAAC;QAC5D,IAAI,IAAI,GAAG,MAAM,cAAc,CAAC,SAAS,CAAC;YACtC,IAAI,EAAE,OAAO;SAChB,CAAC,CAAC;QACH,IAAI,CAAC,IAAI,EAAE,CAAC;YACR,IAAI,GAAG,cAAc,CAAC,MAAM,CAAC;gBACzB,IAAI,EAAE,OAAO;aAChB,CAAC,CAAC;QACP,CAAC;QAED,MAAM,cAAc,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAEhC,oDAAoD;QAEpD;;WAEG;QACH,MAAM,cAAc,GAAG,IAAI,wBAAc,CAAC,UAAU,CAAC,CAAC;QACtD,IAAI,IAAI,GAAG,MAAM,cAAc,CAAC,SAAS,CAAC;YACtC,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,eAAe,CAAC;SACxC,CAAC,CAAC;QAEH,MAAM,YAAY,GAAG,IAAI,CAAC,SAAS,CAAC,mBAAmB,CAAC,CAAC;QACzD,IAAI,CAAC,IAAI,EAAE,CAAC;YACR,IAAI,GAAG,cAAc,CAAC,MAAM,CAAC;gBACzB,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,eAAe,CAAC;gBACrC,QAAQ,EAAE,MAAM,IAAA,iBAAI,EAAC,YAAY,CAAC;gBAClC,KAAK,EAAE,6BAA6B;gBACpC,QAAQ,EAAE,KAAK,CAAC,EAAE;gBAClB,MAAM,EAAE,IAAI,CAAC,SAAS,CAAC,kBAAkB,CAAC;aAC7C,CAAC,CAAC;YAEH,QAAQ,CAAC,IAAI,GAAG,IAAI,CAAC;QACzB,CAAC;aAAM,CAAC;YACJ,IAAI,IAAI,CAAC,SAAS,CAAC,wBAAwB,CAAC,EAAE,CAAC;gBAC3C,IAAI,CAAC,QAAQ,GAAG,MAAM,IAAA,iBAAI,EAAC,YAAY,CAAC,CAAC;YAC7C,CAAC;YAED,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,SAAS,CAAC,kBAAkB,CAAC,CAAC;QACrD,CAAC;QAED,MAAM,cAAc,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAChC,oDAAoD;QAEpD;;WAEG;QACH,MAAM,YAAY,GAAuB;YACrC,OAAO,EAAE,IAAI,CAAC,EAAE;YAChB,OAAO,EAAE,IAAI,CAAC,EAAE;SACnB,CAAC;QAEF,MAAM,kBAAkB,GAAG,UAAU,CAAC,aAAa,CAAC,wBAAc,CAAC,CAAC;QACpE,IAAI,QAAQ,GAAG,MAAM,kBAAkB,CAAC,SAAS,CAAC,YAA0C,CAAC,CAAC;QAE9F,IAAI,CAAC,QAAQ,EAAE,CAAC;YACZ,QAAQ,GAAG,kBAAkB,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC;QACvD,CAAC;QAED,MAAM,kBAAkB,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;QAExC,oDAAoD;QAEpD;;WAEG;QACH,MAAM,eAAe,GAAG,UAAU,CAAC,aAAa,CAAQ,qBAAW,CAAC,CAAC;QACrE,IAAI,KAAK,GAAG,MAAM,eAAe,CAAC,SAAS,CAAC;YACxC,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,gBAAgB,CAAC;YACtC,QAAQ,EAAE,KAAK,CAAC,EAAE;SACrB,CAAC,CAAC;QAEH,MAAM,MAAM,GAAG,IAAI,CAAC,SAAS,CAAC,kBAAkB,CAAC,IAAI,IAAA,mBAAY,EAAC,EAAE,CAAC,CAAC;QACtE,IAAI,CAAC,KAAK,EAAE,CAAC;YACT,KAAK,GAAG,eAAe,CAAC,MAAM,CAAC;gBAC3B,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,gBAAgB,CAAC;gBACtC,QAAQ,EAAE,KAAK,CAAC,EAAE;gBAClB,MAAM,EAAE,MAAM,IAAA,iBAAI,EAAC,MAAM,CAAC;gBAC1B,MAAM,EAAE,IAAI,CAAC,SAAS,CAAC,mBAAmB,CAAC;aAC9C,CAAC,CAAC;YAEH,MAAM,eAAe,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;YAElC,KAAK,CAAC,MAAM,GAAG,MAAM,CAAC;YACtB,QAAQ,CAAC,KAAK,GAAG,KAAK,CAAC;QAC3B,CAAC;aAAM,CAAC;YACJ,IAAI,IAAI,CAAC,SAAS,CAAC,uBAAuB,CAAC,EAAE,CAAC;gBAC1C,KAAK,CAAC,MAAM,GAAG,MAAM,IAAA,iBAAI,EAAC,MAAM,CAAC,CAAC;YACtC,CAAC;YAED,KAAK,CAAC,MAAM,GAAG,IAAI,CAAC,SAAS,CAAC,mBAAmB,CAAC,CAAC;YAEnD,MAAM,eAAe,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;YAElC,IAAI,IAAI,CAAC,SAAS,CAAC,uBAAuB,CAAC,EAAE,CAAC;gBAC1C,KAAK,CAAC,MAAM,GAAG,MAAM,CAAC;gBACtB,QAAQ,CAAC,KAAK,GAAG,KAAK,CAAC;YAC3B,CAAC;QACL,CAAC;QAED,oDAAoD;QAEpD;;WAEG;QACH,MAAM,aAAa,GAAwB;YACvC,OAAO,EAAE,IAAI,CAAC,EAAE;YAChB,QAAQ,EAAE,KAAK,CAAC,EAAE;SACrB,CAAC;QAEF,MAAM,mBAAmB,GAAG,UAAU,CAAC,aAAa,CAAC,yBAAe,CAAC,CAAC;QACtE,IAAI,SAAS,GAAG,MAAM,mBAAmB,CAAC,SAAS,CAAC,aAA4C,CAAC,CAAC;QAElG,IAAI,CAAC,SAAS,EAAE,CAAC;YACb,SAAS,GAAG,mBAAmB,CAAC,MAAM,CAAC,aAAa,CAAC,CAAC;QAC1D,CAAC;QAED,MAAM,mBAAmB,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;QAE1C,oDAAoD;QAEpD;;WAEG;QACH,IAAI,eAA0B,CAAC;QAC/B,MAAM,kBAAkB,GAAG,IAAI,CAAC,SAAS,CAAC,aAAa,CAAC,CAAC;QACzD,IAAI,KAAK,CAAC,OAAO,CAAC,kBAAkB,CAAC,EAAE,CAAC;YACpC,eAAe,GAAG,cAAc,CAAC,kBAAkB,CAAC,CAAC;QACzD,CAAC;aAAM,IAAI,OAAO,kBAAkB,KAAK,QAAQ,EAAE,CAAC;YAChD,eAAe,GAAG,cAAc,CAAC,CAAC,kBAAkB,CAAC,CAAC,CAAC;QAC3D,CAAC;QAED,MAAM,aAAa,GAAc,EAAE,CAAC;QAEpC,MAAM,oBAAoB,GAAG,UAAU,CAAC,aAAa,CAAC,0BAAgB,CAAC,CAAC;QAExE,MAAM,mBAAmB,GAAG,MAAM,oBAAoB,CAAC,MAAM,CAAC;YAC1D,QAAQ,EAAE,IAAI;SACjB,CAAC,CAAC;QACH,MAAM,oBAAoB,GAAwB,EAAE,CAAC;QAErD,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,mBAAmB,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;YAClD,MAAM,KAAK,GAAG,eAAe,CAAC,OAAO,CAAC,mBAAmB,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;YACnE,IAAI,KAAK,KAAK,CAAC,CAAC,EAAE,CAAC;gBACf,oBAAoB,CAAC,IAAI,CAAC,mBAAmB,CAAC,CAAC,CAAC,CAAC,CAAC;YACtD,CAAC;iBAAM,CAAC;gBACJ,aAAa,CAAC,IAAI,CAAC,mBAAmB,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;gBAC9C,eAAe,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC;YACrC,CAAC;QACL,CAAC;QAED,IAAI,oBAAoB,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YAClC,MAAM,oBAAoB,CAAC,MAAM,CAAC,oBAAoB,CAAC,CAAC;QAC5D,CAAC;QAED,MAAM,WAAW,GAAkB,eAAe,CAAC,GAAG,CAClD,CAAC,IAAY,EAAE,EAAE,CAAC,oBAAoB,CAAC,MAAM,CAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC,CAC1E,CAAC;QACF,IAAI,WAAW,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YACzB,MAAM,oBAAoB,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;YAE7C,aAAa,CAAC,IAAI,CAAC,GAAG,WAAW,CAAC,GAAG,CAAC,CAAC,UAAU,EAAE,EAAE,CAAC,UAAU,CAAC,EAAE,CAAC,CAAC,CAAC;QAC1E,CAAC;QAED,oDAAoD;QAEpD;;WAEG;QACH,MAAM,iBAAiB,GAAG,CAAC,GAAG,aAAa,CAAC,CAAC;QAC7C,MAAM,wBAAwB,GAAG,UAAU,CAAC,aAAa,CAAC,8BAAoB,CAAC,CAAC;QAEhF,MAAM,uBAAuB,GAAG,MAAM,wBAAwB,CAAC,MAAM,CAAC;YAClE,aAAa,EAAE,IAAA,YAAE,EAAC,iBAAiB,CAAC;YACpC,OAAO,EAAE,IAAI,CAAC,EAAE;SACnB,CAAC,CAAC;QAEH,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,uBAAuB,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;YACtD,MAAM,KAAK,GAAG,iBAAiB,CAAC,OAAO,CAAC,uBAAuB,CAAC,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC;YAClF,IAAI,KAAK,KAAK,CAAC,CAAC,EAAE,CAAC;gBACf,iBAAiB,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC;YACvC,CAAC;QACL,CAAC;QAED,MAAM,eAAe,GAAsB,EAAE,CAAC;QAC9C,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,iBAAiB,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;YAChD,eAAe,CAAC,IAAI,CAAC,wBAAwB,CAAC,MAAM,CAAC;gBACjD,OAAO,EAAE,IAAI,CAAC,EAAE;gBAChB,aAAa,EAAE,iBAAiB,CAAC,CAAC,CAAC;aACtC,CAAC,CAAC,CAAC;QACR,CAAC;QAED,IAAI,eAAe,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YAC7B,MAAM,wBAAwB,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC;QACzD,CAAC;QAED,OAAO,QAAQ,CAAC;IACpB,CAAC;CACJ;AAxRD,wCAwRC"}
@@ -1 +1 @@
1
- {"version":3,"file":"data-source-options.d.ts","sourceRoot":"","sources":["../../../src/database/utils/data-source-options.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,SAAS,CAAC;AAQjD,wBAAsB,sBAAsB,IAAK,OAAO,CAAC,iBAAiB,CAAC,CAS1E;AAED,wBAAsB,uBAAuB,CAAC,OAAO,EAAE,iBAAiB,8BA6BvE"}
1
+ {"version":3,"file":"data-source-options.d.ts","sourceRoot":"","sources":["../../../src/database/utils/data-source-options.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,SAAS,CAAC;AASjD,wBAAsB,sBAAsB,IAAK,OAAO,CAAC,iBAAiB,CAAC,CAS1E;AAED,wBAAsB,uBAAuB,CAAC,OAAO,EAAE,iBAAiB,8BAmCvE"}
@@ -37,6 +37,11 @@ async function extendDataSourceOptions(options) {
37
37
  }
38
38
  options = (0, entities_1.setEntitiesForDataSourceOptions)(options);
39
39
  options = (0, subscribers_1.setSubscribersForDataSourceOptions)(options);
40
+ if (options.type === 'mysql') {
41
+ Object.assign(options, {
42
+ connectorPackage: 'mysql2',
43
+ });
44
+ }
40
45
  return options;
41
46
  }
42
47
  exports.extendDataSourceOptions = extendDataSourceOptions;
@@ -1 +1 @@
1
- {"version":3,"file":"data-source-options.js","sourceRoot":"","sources":["../../../src/database/utils/data-source-options.ts"],"names":[],"mappings":";;;AAOA,qDAAuD;AACvD,yDAAmD;AACnD,yCAAkE;AAClE,yCAA6D;AAC7D,+CAAmE;AACnE,oCAAoD;AAE7C,KAAK,UAAU,sBAAsB;IACxC,MAAM,MAAM,GAAG,IAAA,kBAAS,GAAE,CAAC;IAE3B,MAAM,iBAAiB,GAAG,MAAM,CAAC,EAAE,CAAC;IACpC,IAAI,CAAC,IAAA,gCAAuB,EAAC,iBAAiB,CAAC,IAAI,CAAC,EAAE,CAAC;QACnD,MAAM,IAAI,KAAK,CAAC,yFAAyF,CAAC,CAAC;IAC/G,CAAC;IAED,OAAO,uBAAuB,CAAC,iBAAiB,CAAC,CAAC;AACtD,CAAC;AATD,wDASC;AAEM,KAAK,UAAU,uBAAuB,CAAC,OAA0B;IACpE,MAAM,UAAU,GAAc,EAAE,CAAC;IACjC,MAAM,SAAS,GAAG,MAAM,IAAA,kCAAc,EAClC,2BAA2B,OAAO,CAAC,IAAI,YAAY,CACtD,CAAC;IAEF,UAAU,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;IAE3B,MAAM,CAAC,MAAM,CAAC,OAAO,EAAE;QACnB,OAAO,EAAE,CAAC,OAAO,CAAC;QAClB,UAAU;QACV,yBAAyB,EAAE,MAAM;KACC,CAAC,CAAC;IAExC,IAAI,IAAA,2BAAS,GAAE,IAAI,IAAA,2BAAS,GAAE,EAAE,CAAC;QAC7B,MAAM,CAAC,MAAM,CAAC,OAAO,EAAE;YACnB,KAAK,EAAE;gBACH,QAAQ;oBACJ,OAAO,IAAI,gCAAwB,EAAE,CAAC;gBAC1C,CAAC;gBACD,YAAY,EAAE,IAAI;aACrB;SAC0B,CAAC,CAAC;IACrC,CAAC;IAED,OAAO,GAAG,IAAA,0CAA+B,EAAC,OAAO,CAAC,CAAC;IACnD,OAAO,GAAG,IAAA,gDAAkC,EAAC,OAAO,CAAC,CAAC;IAEtD,OAAO,OAAO,CAAC;AACnB,CAAC;AA7BD,0DA6BC"}
1
+ {"version":3,"file":"data-source-options.js","sourceRoot":"","sources":["../../../src/database/utils/data-source-options.ts"],"names":[],"mappings":";;;AAOA,qDAAuD;AACvD,yDAAmD;AAEnD,yCAAkE;AAClE,yCAA6D;AAC7D,+CAAmE;AACnE,oCAAoD;AAE7C,KAAK,UAAU,sBAAsB;IACxC,MAAM,MAAM,GAAG,IAAA,kBAAS,GAAE,CAAC;IAE3B,MAAM,iBAAiB,GAAG,MAAM,CAAC,EAAE,CAAC;IACpC,IAAI,CAAC,IAAA,gCAAuB,EAAC,iBAAiB,CAAC,IAAI,CAAC,EAAE,CAAC;QACnD,MAAM,IAAI,KAAK,CAAC,yFAAyF,CAAC,CAAC;IAC/G,CAAC;IAED,OAAO,uBAAuB,CAAC,iBAAiB,CAAC,CAAC;AACtD,CAAC;AATD,wDASC;AAEM,KAAK,UAAU,uBAAuB,CAAC,OAA0B;IACpE,MAAM,UAAU,GAAc,EAAE,CAAC;IACjC,MAAM,SAAS,GAAG,MAAM,IAAA,kCAAc,EAClC,2BAA2B,OAAO,CAAC,IAAI,YAAY,CACtD,CAAC;IAEF,UAAU,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;IAE3B,MAAM,CAAC,MAAM,CAAC,OAAO,EAAE;QACnB,OAAO,EAAE,CAAC,OAAO,CAAC;QAClB,UAAU;QACV,yBAAyB,EAAE,MAAM;KACC,CAAC,CAAC;IAExC,IAAI,IAAA,2BAAS,GAAE,IAAI,IAAA,2BAAS,GAAE,EAAE,CAAC;QAC7B,MAAM,CAAC,MAAM,CAAC,OAAO,EAAE;YACnB,KAAK,EAAE;gBACH,QAAQ;oBACJ,OAAO,IAAI,gCAAwB,EAAE,CAAC;gBAC1C,CAAC;gBACD,YAAY,EAAE,IAAI;aACrB;SAC0B,CAAC,CAAC;IACrC,CAAC;IAED,OAAO,GAAG,IAAA,0CAA+B,EAAC,OAAO,CAAC,CAAC;IACnD,OAAO,GAAG,IAAA,gDAAkC,EAAC,OAAO,CAAC,CAAC;IAEtD,IAAI,OAAO,CAAC,IAAI,KAAK,OAAO,EAAE,CAAC;QAC3B,MAAM,CAAC,MAAM,CAAC,OAAO,EAAE;YACnB,gBAAgB,EAAE,QAAQ;SACa,CAAC,CAAC;IACjD,CAAC;IAED,OAAO,OAAO,CAAC;AACnB,CAAC;AAnCD,0DAmCC"}
@@ -22,7 +22,7 @@ class OpenIDIdentityProviderFlow extends oauth2_1.OAuth2IdentityProviderFlow {
22
22
  code: code,
23
23
  state: state,
24
24
  });
25
- const payload = (0, server_kit_1.decodeToken)(token.access_token);
25
+ const payload = (0, server_kit_1.extractTokenPayload)(token.access_token);
26
26
  if (typeof payload === 'string') {
27
27
  throw core_1.TokenError.payloadInvalid();
28
28
  }
@@ -1 +1 @@
1
- {"version":3,"file":"openid.js","sourceRoot":"","sources":["../../../../../src/domains/identity-provider/flow/core/openid.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;AAEH,uCAA0C;AAE1C,mDAAiD;AACjD,+CAAsD;AAGtD,qCAAsD;AAEtD,MAAa,0BAA2B,SAAQ,mCAA0B;IACtE,4FAA4F;IAC5F,YAAY,OAA0C;QAClD,KAAK,CAAC,OAAO,CAAC,CAAC;IACnB,CAAC;IAED,KAAK,CAAC,qBAAqB,CAAC,OAAgB;QACxC,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,GAAG,IAAA,uBAAe,EAAC,OAAO,CAAC,CAAC;QAEjD,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,wBAAwB,CAAC;YAC3D,IAAI,EAAE,IAAc;YACpB,KAAK,EAAE,KAAe;SACzB,CAAC,CAAC;QAEH,MAAM,OAAO,GAAG,IAAA,wBAAW,EAAC,KAAK,CAAC,YAAY,CAAgC,CAAC;QAE/E,IAAI,OAAO,OAAO,KAAK,QAAQ,EAAE,CAAC;YAC9B,MAAM,iBAAU,CAAC,cAAc,EAAE,CAAC;QACtC,CAAC;QAED,OAAO;YACH,EAAE,EAAE,OAAO,CAAC,GAAG;YACf,IAAI,EAAE;gBACF,OAAO,CAAC,kBAAkB;gBAC1B,OAAO,CAAC,QAAQ;gBAChB,OAAO,CAAC,GAAG;aACd;YACD,KAAK,EAAE,OAAO,CAAC,KAAK;YACpB,KAAK,EAAE,IAAI,CAAC,4BAA4B,CAAC,OAAO,CAAC;SACpD,CAAC;IACN,CAAC;CACJ;AA/BD,gEA+BC"}
1
+ {"version":3,"file":"openid.js","sourceRoot":"","sources":["../../../../../src/domains/identity-provider/flow/core/openid.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;AAEH,uCAA0C;AAE1C,mDAAyD;AACzD,+CAAsD;AAGtD,qCAAsD;AAEtD,MAAa,0BAA2B,SAAQ,mCAA0B;IACtE,4FAA4F;IAC5F,YAAY,OAA0C;QAClD,KAAK,CAAC,OAAO,CAAC,CAAC;IACnB,CAAC;IAED,KAAK,CAAC,qBAAqB,CAAC,OAAgB;QACxC,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,GAAG,IAAA,uBAAe,EAAC,OAAO,CAAC,CAAC;QAEjD,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,wBAAwB,CAAC;YAC3D,IAAI,EAAE,IAAc;YACpB,KAAK,EAAE,KAAe;SACzB,CAAC,CAAC;QAEH,MAAM,OAAO,GAAG,IAAA,gCAAmB,EAAC,KAAK,CAAC,YAAY,CAAgC,CAAC;QAEvF,IAAI,OAAO,OAAO,KAAK,QAAQ,EAAE,CAAC;YAC9B,MAAM,iBAAU,CAAC,cAAc,EAAE,CAAC;QACtC,CAAC;QAED,OAAO;YACH,EAAE,EAAE,OAAO,CAAC,GAAG;YACf,IAAI,EAAE;gBACF,OAAO,CAAC,kBAAkB;gBAC1B,OAAO,CAAC,QAAQ;gBAChB,OAAO,CAAC,GAAG;aACd;YACD,KAAK,EAAE,OAAO,CAAC,KAAK;YACpB,KAAK,EAAE,IAAI,CAAC,4BAA4B,CAAC,OAAO,CAAC;SACpD,CAAC;IACN,CAAC;CACJ;AA/BD,gEA+BC"}
@@ -1,5 +1,5 @@
1
- /// <reference types="node" />
2
1
  import type { TokenSignOptions } from '@authup/server-kit';
2
+ import type { OAuth2OpenIdTokenPayload, OAuth2TokenPayload } from '@authup/core';
3
3
  import type { KeyEntity } from '../entity';
4
- export declare function signOAuth2TokenWithKey(payload: string | object | Buffer | Record<string, any>, entity: KeyEntity, options?: Omit<TokenSignOptions, 'type' | 'algorithm' | 'keyPair' | 'secret'>): Promise<string>;
4
+ export declare function signOAuth2TokenWithKey(payload: Partial<OAuth2TokenPayload | OAuth2OpenIdTokenPayload>, entity: KeyEntity, options?: Omit<TokenSignOptions, 'type' | 'algorithm' | 'keyPair' | 'secret'>): Promise<string>;
5
5
  //# sourceMappingURL=sign.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"sign.d.ts","sourceRoot":"","sources":["../../../../src/domains/key/utils/sign.ts"],"names":[],"mappings":";AAOA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AAG3D,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,WAAW,CAAC;AAE3C,wBAAsB,sBAAsB,CACxC,OAAO,EAAE,MAAM,GAAG,MAAM,GAAG,MAAM,GAAG,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EACvD,MAAM,EAAE,SAAS,EACjB,OAAO,CAAC,EAAE,IAAI,CAAC,gBAAgB,EAAE,MAAM,GAAG,WAAW,GAAG,SAAS,GAAG,QAAQ,CAAC,GAC7E,OAAO,CAAC,MAAM,CAAC,CAwBlB"}
1
+ {"version":3,"file":"sign.d.ts","sourceRoot":"","sources":["../../../../src/domains/key/utils/sign.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EACsE,gBAAgB,EACjG,MAAM,oBAAoB,CAAC;AAG5B,OAAO,KAAK,EAAE,wBAAwB,EAAE,kBAAkB,EAAE,MAAM,cAAc,CAAC;AACjF,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,WAAW,CAAC;AAE3C,wBAAsB,sBAAsB,CACxC,OAAO,EAAE,OAAO,CAAC,kBAAkB,GAAG,wBAAwB,CAAC,EAC/D,MAAM,EAAE,SAAS,EACjB,OAAO,CAAC,EAAE,IAAI,CAAC,gBAAgB,EAAE,MAAM,GAAG,WAAW,GAAG,SAAS,GAAG,QAAQ,CAAC,GAC7E,OAAO,CAAC,MAAM,CAAC,CAuClB"}
@@ -13,7 +13,18 @@ async function signOAuth2TokenWithKey(payload, entity, options) {
13
13
  if (entity.type === core_1.KeyType.OCT) {
14
14
  return (0, server_kit_1.signToken)(payload, {
15
15
  type: core_1.KeyType.OCT,
16
- secret: Buffer.from(entity.decryption_key, 'base64'),
16
+ key: Buffer.from(entity.decryption_key, 'base64'),
17
+ ...options,
18
+ });
19
+ }
20
+ if (entity.type === core_1.KeyType.EC) {
21
+ return (0, server_kit_1.signToken)(payload, {
22
+ type: entity.type,
23
+ keyPair: {
24
+ publicKey: (0, core_1.wrapPublicKeyPem)(entity.encryption_key),
25
+ privateKey: (0, core_1.wrapPrivateKeyPem)(entity.decryption_key),
26
+ },
27
+ algorithm: entity.signature_algorithm,
17
28
  ...options,
18
29
  });
19
30
  }
@@ -1 +1 @@
1
- {"version":3,"file":"sign.js","sourceRoot":"","sources":["../../../../src/domains/key/utils/sign.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;AAGH,mDAA+C;AAC/C,uCAA4E;AAGrE,KAAK,UAAU,sBAAsB,CACxC,OAAuD,EACvD,MAAiB,EACjB,OAA6E;IAE7E,IAAI,MAAM,CAAC,IAAI,KAAK,cAAO,CAAC,GAAG,EAAE,CAAC;QAC9B,OAAO,IAAA,sBAAS,EACZ,OAAO,EACP;YACI,IAAI,EAAE,cAAO,CAAC,GAAG;YACjB,MAAM,EAAE,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,cAAc,EAAE,QAAQ,CAAC;YACpD,GAAG,OAAO;SACb,CACJ,CAAC;IACN,CAAC;IAED,OAAO,IAAA,sBAAS,EACZ,OAAO,EACP;QACI,IAAI,EAAE,MAAM,CAAC,IAAI;QACjB,OAAO,EAAE;YACL,SAAS,EAAE,IAAA,uBAAgB,EAAC,MAAM,CAAC,cAAc,CAAC;YAClD,UAAU,EAAE,IAAA,wBAAiB,EAAC,MAAM,CAAC,cAAc,CAAC;SACvD;QACD,SAAS,EAAE,MAAM,CAAC,mBAAmB;QACrC,GAAG,OAAO;KACO,CACxB,CAAC;AACN,CAAC;AA5BD,wDA4BC"}
1
+ {"version":3,"file":"sign.js","sourceRoot":"","sources":["../../../../src/domains/key/utils/sign.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;AAKH,mDAA+C;AAC/C,uCAA4E;AAIrE,KAAK,UAAU,sBAAsB,CACxC,OAA+D,EAC/D,MAAiB,EACjB,OAA6E;IAE7E,IAAI,MAAM,CAAC,IAAI,KAAK,cAAO,CAAC,GAAG,EAAE,CAAC;QAC9B,OAAO,IAAA,sBAAS,EACZ,OAAO,EACP;YACI,IAAI,EAAE,cAAO,CAAC,GAAG;YACjB,GAAG,EAAE,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,cAAc,EAAE,QAAQ,CAAC;YACjD,GAAG,OAAO;SACiB,CAClC,CAAC;IACN,CAAC;IAED,IAAI,MAAM,CAAC,IAAI,KAAK,cAAO,CAAC,EAAE,EAAE,CAAC;QAC7B,OAAO,IAAA,sBAAS,EACZ,OAAO,EACP;YACI,IAAI,EAAE,MAAM,CAAC,IAAI;YACjB,OAAO,EAAE;gBACL,SAAS,EAAE,IAAA,uBAAgB,EAAC,MAAM,CAAC,cAAc,CAAC;gBAClD,UAAU,EAAE,IAAA,wBAAiB,EAAC,MAAM,CAAC,cAAc,CAAC;aACvD;YACD,SAAS,EAAE,MAAM,CAAC,mBAAuC;YACzD,GAAG,OAAO;SACgB,CACjC,CAAC;IACN,CAAC;IAED,OAAO,IAAA,sBAAS,EACZ,OAAO,EACP;QACI,IAAI,EAAE,MAAM,CAAC,IAAI;QACjB,OAAO,EAAE;YACL,SAAS,EAAE,IAAA,uBAAgB,EAAC,MAAM,CAAC,cAAc,CAAC;YAClD,UAAU,EAAE,IAAA,wBAAiB,EAAC,MAAM,CAAC,cAAc,CAAC;SACvD;QACD,SAAS,EAAE,MAAM,CAAC,mBAAwC;QAC1D,GAAG,OAAO;KACiB,CAClC,CAAC;AACN,CAAC;AA3CD,wDA2CC"}
@@ -1,5 +1,4 @@
1
- import type { TokenVerifyOptions } from '@authup/server-kit';
2
1
  import type { OAuth2TokenPayload } from '@authup/core';
3
2
  import type { KeyEntity } from '../entity';
4
- export declare function verifyOAuth2TokenWithKey(token: string, entity: KeyEntity, options?: Omit<TokenVerifyOptions, 'type' | 'algorithms' | 'keyPair' | 'secret'>): Promise<OAuth2TokenPayload>;
3
+ export declare function verifyOAuth2TokenWithKey(token: string, entity: KeyEntity): Promise<OAuth2TokenPayload>;
5
4
  //# sourceMappingURL=verify.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"verify.d.ts","sourceRoot":"","sources":["../../../../src/domains/key/utils/verify.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,oBAAoB,CAAC;AAE7D,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,cAAc,CAAC;AAIvD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,WAAW,CAAC;AAE3C,wBAAsB,wBAAwB,CAC1C,KAAK,EAAE,MAAM,EACb,MAAM,EAAE,SAAS,EACjB,OAAO,CAAC,EAAE,IAAI,CAAC,kBAAkB,EAAE,MAAM,GAAG,YAAY,GAAG,SAAS,GAAG,QAAQ,CAAC,GAChF,OAAO,CAAC,kBAAkB,CAAC,CAwB9B"}
1
+ {"version":3,"file":"verify.d.ts","sourceRoot":"","sources":["../../../../src/domains/key/utils/verify.ts"],"names":[],"mappings":"AASA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,cAAc,CAAC;AAIvD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,WAAW,CAAC;AAE3C,wBAAsB,wBAAwB,CAC1C,KAAK,EAAE,MAAM,EACb,MAAM,EAAE,SAAS,GACjB,OAAO,CAAC,kBAAkB,CAAC,CAsB9B"}
@@ -9,22 +9,20 @@ Object.defineProperty(exports, "__esModule", { value: true });
9
9
  exports.verifyOAuth2TokenWithKey = void 0;
10
10
  const server_kit_1 = require("@authup/server-kit");
11
11
  const core_1 = require("@authup/core");
12
- async function verifyOAuth2TokenWithKey(token, entity, options) {
12
+ async function verifyOAuth2TokenWithKey(token, entity) {
13
13
  if (entity.type === core_1.KeyType.OCT) {
14
- return await (0, server_kit_1.verifyToken)(token, {
14
+ return (0, server_kit_1.verifyToken)(token, {
15
15
  type: core_1.KeyType.OCT,
16
- secret: Buffer.from(entity.decryption_key, 'base64'),
17
- ...options,
16
+ key: Buffer.from(entity.decryption_key, 'base64'),
18
17
  });
19
18
  }
20
- return await (0, server_kit_1.verifyToken)(token, {
19
+ return (0, server_kit_1.verifyToken)(token, {
21
20
  type: entity.type,
22
21
  keyPair: {
23
22
  publicKey: (0, core_1.wrapPublicKeyPem)(entity.encryption_key),
24
23
  privateKey: (0, core_1.wrapPrivateKeyPem)(entity.decryption_key),
25
24
  },
26
- ...(entity.signature_algorithm ? { algorithms: [entity.signature_algorithm] } : {}),
27
- ...options,
25
+ ...(entity.signature_algorithm ? { algorithms: [entity.signature_algorithm] } : []),
28
26
  });
29
27
  }
30
28
  exports.verifyOAuth2TokenWithKey = verifyOAuth2TokenWithKey;
@@ -1 +1 @@
1
- {"version":3,"file":"verify.js","sourceRoot":"","sources":["../../../../src/domains/key/utils/verify.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;AAGH,mDAAiD;AAEjD,uCAEsB;AAGf,KAAK,UAAU,wBAAwB,CAC1C,KAAa,EACb,MAAiB,EACjB,OAAgF;IAEhF,IAAI,MAAM,CAAC,IAAI,KAAK,cAAO,CAAC,GAAG,EAAE,CAAC;QAC9B,OAAO,MAAM,IAAA,wBAAW,EACpB,KAAK,EACL;YACI,IAAI,EAAE,cAAO,CAAC,GAAG;YACjB,MAAM,EAAE,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,cAAc,EAAE,QAAQ,CAAC;YACpD,GAAG,OAAO;SACb,CACkB,CAAC;IAC5B,CAAC;IAED,OAAO,MAAM,IAAA,wBAAW,EACpB,KAAK,EACL;QACI,IAAI,EAAE,MAAM,CAAC,IAAI;QACjB,OAAO,EAAE;YACL,SAAS,EAAE,IAAA,uBAAgB,EAAC,MAAM,CAAC,cAAc,CAAC;YAClD,UAAU,EAAE,IAAA,wBAAiB,EAAC,MAAM,CAAC,cAAc,CAAC;SACvD;QACD,GAAG,CAAC,MAAM,CAAC,mBAAmB,CAAC,CAAC,CAAC,EAAE,UAAU,EAAE,CAAC,MAAM,CAAC,mBAAmB,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QACnF,GAAG,OAAO;KACS,CACJ,CAAC;AAC5B,CAAC;AA5BD,4DA4BC"}
1
+ {"version":3,"file":"verify.js","sourceRoot":"","sources":["../../../../src/domains/key/utils/verify.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;AAGH,mDAAiD;AAEjD,uCAEsB;AAGf,KAAK,UAAU,wBAAwB,CAC1C,KAAa,EACb,MAAiB;IAEjB,IAAI,MAAM,CAAC,IAAI,KAAK,cAAO,CAAC,GAAG,EAAE,CAAC;QAC9B,OAAO,IAAA,wBAAW,EACd,KAAK,EACL;YACI,IAAI,EAAE,cAAO,CAAC,GAAG;YACjB,GAAG,EAAE,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,cAAc,EAAE,QAAQ,CAAC;SACpD,CACJ,CAAC;IACN,CAAC;IAED,OAAO,IAAA,wBAAW,EACd,KAAK,EACL;QACI,IAAI,EAAE,MAAM,CAAC,IAAI;QACjB,OAAO,EAAE;YACL,SAAS,EAAE,IAAA,uBAAgB,EAAC,MAAM,CAAC,cAAc,CAAC;YAClD,UAAU,EAAE,IAAA,wBAAiB,EAAC,MAAM,CAAC,cAAc,CAAC;SACvD;QACD,GAAG,CAAC,MAAM,CAAC,mBAAmB,CAAC,CAAC,CAAC,EAAE,UAAU,EAAE,CAAC,MAAM,CAAC,mBAAmB,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;KAChE,CAC1B,CAAC;AACN,CAAC;AAzBD,4DAyBC"}
@@ -62,11 +62,11 @@ async function authorizeCallbackIdentityProviderRouteHandler(req, res) {
62
62
  }
63
63
  (0, cookie_1.setResponseCookie)(res, core_1.CookieName.ACCESS_TOKEN, token.access_token, {
64
64
  ...cookieOptions,
65
- maxAge: config.tokenRefreshMaxAge * 1000,
65
+ maxAge: config.tokenAccessMaxAge * 1000,
66
66
  });
67
67
  (0, cookie_1.setResponseCookie)(res, core_1.CookieName.REFRESH_TOKEN, token.refresh_token, {
68
68
  ...cookieOptions,
69
- maxAge: config.tokenAccessMaxAge * 1000,
69
+ maxAge: config.tokenRefreshMaxAge * 1000,
70
70
  });
71
71
  return (0, routup_1.sendRedirect)(res, config.authorizeRedirectUrl);
72
72
  }
@@ -1 +1 @@
1
- {"version":3,"file":"custom.js","sourceRoot":"","sources":["../../../../../src/http/controllers/identity-provider/handlers/custom.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"custom.js","sourceRoot":"","sources":["../../../../../src/http/controllers/identity-provider/handlers/custom.ts"],"names":[],"mappings":"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"}
@@ -1 +1 @@
1
- {"version":3,"file":"integrity.d.ts","sourceRoot":"","sources":["../../../../../src/http/controllers/robot/handlers/integrity.ts"],"names":[],"mappings":"AAeA,OAAO,KAAK,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,QAAQ,CAAC;AAUhD,wBAAsB,gCAAgC,CAAC,GAAG,EAAE,OAAO,EAAE,GAAG,EAAE,QAAQ,GAAI,OAAO,CAAC,GAAG,CAAC,CA+DjG"}
1
+ {"version":3,"file":"integrity.d.ts","sourceRoot":"","sources":["../../../../../src/http/controllers/robot/handlers/integrity.ts"],"names":[],"mappings":"AAeA,OAAO,KAAK,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,QAAQ,CAAC;AAUhD,wBAAsB,gCAAgC,CAAC,GAAG,EAAE,OAAO,EAAE,GAAG,EAAE,QAAQ,GAAI,OAAO,CAAC,GAAG,CAAC,CAmEjG"}
@@ -41,12 +41,17 @@ async function handleRobotIntegrityRouteHandler(req, res) {
41
41
  return (0, routup_1.sendAccepted)(res);
42
42
  }
43
43
  let refreshCredentials = false;
44
- const credentials = await (0, domains_1.findRobotCredentialsInVault)({
45
- name: entity.name,
46
- });
47
- if (credentials) {
48
- const secretHashedEqual = await repository.verifySecret(credentials.secret, entity.secret);
49
- if (!secretHashedEqual) {
44
+ if (entity.secret) {
45
+ const credentials = await (0, domains_1.findRobotCredentialsInVault)({
46
+ name: entity.name,
47
+ });
48
+ if (credentials) {
49
+ const secretHashedEqual = await repository.verifySecret(credentials.secret, entity.secret);
50
+ if (!secretHashedEqual) {
51
+ refreshCredentials = true;
52
+ }
53
+ }
54
+ else {
50
55
  refreshCredentials = true;
51
56
  }
52
57
  }
@@ -1 +1 @@
1
- {"version":3,"file":"integrity.js","sourceRoot":"","sources":["../../../../../src/http/controllers/robot/handlers/integrity.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;AAGH,uCAIsB;AACtB,qCAA2C;AAC3C,wCAAyC;AAEzC,mCAAuD;AACvD,yDAAkD;AAClD,iDAK6B;AAEtB,KAAK,UAAU,gCAAgC,CAAC,GAAY,EAAE,GAAa;IAC9E,MAAM,EAAE,GAAG,IAAA,wBAAe,EAAC,GAAG,EAAE,IAAI,CAAC,CAAC;IAEtC,MAAM,UAAU,GAAG,MAAM,IAAA,iCAAa,GAAE,CAAC;IACzC,MAAM,UAAU,GAAG,IAAI,yBAAe,CAAC,UAAU,CAAC,CAAC;IACnD,MAAM,KAAK,GAAG,UAAU,CAAC,kBAAkB,CAAC,OAAO,CAAC,CAAC;IAErD,IAAI,KAAyB,CAAC;IAE9B,IAAI,IAAA,aAAM,EAAC,EAAE,CAAC,EAAE,CAAC;QACb,KAAK,CAAC,KAAK,CAAC,gBAAgB,EAAE,EAAE,EAAE,EAAE,CAAC,CAAC;IAC1C,CAAC;SAAM,CAAC;QACJ,KAAK,CAAC,KAAK,CAAC,uBAAuB,EAAE,EAAE,IAAI,EAAE,EAAE,EAAE,CAAC,CAAC;QAEnD,KAAK,GAAG,MAAM,IAAA,sBAAY,EAAC,IAAA,wBAAe,EAAC,GAAG,EAAE,SAAS,CAAC,EAAE,IAAI,CAAC,CAAC;QAClE,KAAK,CAAC,QAAQ,CAAC,2BAA2B,EAAE,EAAE,OAAO,EAAE,KAAK,CAAC,EAAE,EAAE,CAAC,CAAC;IACvE,CAAC;IAED,IAAI,CAAC,KAAK,EAAE,CAAC;QACT,KAAK,CAAC,iBAAiB,CAAC,aAAa,EAAE,OAAO,CAAC,CAAC;IACpD,CAAC;IAED,MAAM,MAAM,GAAG,MAAM,KAAK,CAAC,MAAM,EAAE,CAAC;IAEpC,IAAI,CAAC,MAAM,EAAE,CAAC;QACV,MAAM,IAAI,oBAAa,EAAE,CAAC;IAC9B,CAAC;IAED,IAAI,MAAM,CAAC,KAAK,EAAE,CAAC;QACf,KAAK,GAAG,MAAM,CAAC,KAAK,CAAC;IACzB,CAAC;IAED,IAAI,CAAC,IAAA,iBAAS,GAAE,IAAI,CAAC,KAAK,IAAI,KAAK,CAAC,IAAI,KAAK,wBAAiB,EAAE,CAAC;QAC7D,OAAO,IAAA,qBAAY,EAAC,GAAG,CAAC,CAAC;IAC7B,CAAC;IAED,IAAI,kBAAkB,GAAa,KAAK,CAAC;IACzC,MAAM,WAAW,GAAG,MAAM,IAAA,qCAA2B,EAAC;QAClD,IAAI,EAAE,MAAM,CAAC,IAAI;KACpB,CAAC,CAAC;IAEH,IAAI,WAAW,EAAE,CAAC;QACd,MAAM,iBAAiB,GAAG,MAAM,UAAU,CAAC,YAAY,CAAC,WAAW,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,CAAC,CAAC;QAC3F,IAAI,CAAC,iBAAiB,EAAE,CAAC;YACrB,kBAAkB,GAAG,IAAI,CAAC;QAC9B,CAAC;IACL,CAAC;SAAM,CAAC;QACJ,kBAAkB,GAAG,IAAI,CAAC;IAC9B,CAAC;IAED,IAAI,kBAAkB,EAAE,CAAC;QACrB,MAAM,MAAM,GAAG,IAAA,mBAAY,EAAC,EAAE,CAAC,CAAC;QAEhC,MAAM,CAAC,MAAM,GAAG,MAAM,UAAU,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC;QACpD,MAAM,UAAU,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QAE9B,MAAM,IAAA,qCAA2B,EAAC;YAC9B,GAAG,MAAM;YACT,MAAM;SACT,CAAC,CAAC;IACP,CAAC;IAED,OAAO,IAAA,qBAAY,EAAC,GAAG,CAAC,CAAC;AAC7B,CAAC;AA/DD,4EA+DC"}
1
+ {"version":3,"file":"integrity.js","sourceRoot":"","sources":["../../../../../src/http/controllers/robot/handlers/integrity.ts"],"names":[],"mappings":"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"}
@@ -15,7 +15,7 @@ async function runAuthorizationRouteHandler(req, res) {
15
15
  const config = (0, config_1.useConfig)();
16
16
  const result = await (0, oauth2_1.runOAuth2Authorization)(req, {
17
17
  issuer: config.publicUrl,
18
- accessTokenMaxAge: config.tokenRefreshMaxAge,
18
+ accessTokenMaxAge: config.tokenAccessMaxAge,
19
19
  });
20
20
  // ---------------------------------------------------------
21
21
  const url = new node_url_1.URL(result.redirectUri);
@@ -31,7 +31,7 @@ async function runAuthorizationRouteHandler(req, res) {
31
31
  if (result.idToken) {
32
32
  url.searchParams.set('id_token', result.idToken);
33
33
  }
34
- (0, routup_1.send)(res, { url: url.href });
34
+ return (0, routup_1.send)(res, { url: url.href });
35
35
  }
36
36
  exports.runAuthorizationRouteHandler = runAuthorizationRouteHandler;
37
37
  //# sourceMappingURL=run.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"run.js","sourceRoot":"","sources":["../../../../../../src/http/controllers/root/authorize/handlers/run.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;AAEH,uCAA+B;AAE/B,mCAA8B;AAC9B,kDAAkD;AAClD,+CAA4D;AAErD,KAAK,UAAU,4BAA4B,CAC9C,GAAY,EACZ,GAAa;IAEb,MAAM,MAAM,GAAG,IAAA,kBAAS,GAAE,CAAC;IAC3B,MAAM,MAAM,GAAG,MAAM,IAAA,+BAAsB,EAAC,GAAG,EAAE;QAC7C,MAAM,EAAE,MAAM,CAAC,SAAS;QACxB,iBAAiB,EAAE,MAAM,CAAC,kBAAkB;KAC/C,CAAC,CAAC;IAEH,4DAA4D;IAE5D,MAAM,GAAG,GAAG,IAAI,cAAG,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC;IACxC,IAAI,MAAM,CAAC,KAAK,EAAE,CAAC;QACf,GAAG,CAAC,YAAY,CAAC,GAAG,CAAC,OAAO,EAAE,MAAM,CAAC,KAAK,CAAC,CAAC;IAChD,CAAC;IAED,IAAI,MAAM,CAAC,iBAAiB,EAAE,CAAC;QAC3B,GAAG,CAAC,YAAY,CAAC,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,iBAAiB,CAAC,CAAC;IAC3D,CAAC;IAED,IAAI,MAAM,CAAC,WAAW,EAAE,CAAC;QACrB,GAAG,CAAC,YAAY,CAAC,GAAG,CAAC,cAAc,EAAE,MAAM,CAAC,WAAW,CAAC,CAAC;IAC7D,CAAC;IAED,IAAI,MAAM,CAAC,OAAO,EAAE,CAAC;QACjB,GAAG,CAAC,YAAY,CAAC,GAAG,CAAC,UAAU,EAAE,MAAM,CAAC,OAAO,CAAC,CAAC;IACrD,CAAC;IAED,IAAA,aAAI,EAAC,GAAG,EAAE,EAAE,GAAG,EAAE,GAAG,CAAC,IAAI,EAAE,CAAC,CAAC;AACjC,CAAC;AA9BD,oEA8BC"}
1
+ {"version":3,"file":"run.js","sourceRoot":"","sources":["../../../../../../src/http/controllers/root/authorize/handlers/run.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;AAEH,uCAA+B;AAE/B,mCAA8B;AAC9B,kDAAkD;AAClD,+CAA4D;AAErD,KAAK,UAAU,4BAA4B,CAC9C,GAAY,EACZ,GAAa;IAEb,MAAM,MAAM,GAAG,IAAA,kBAAS,GAAE,CAAC;IAC3B,MAAM,MAAM,GAAG,MAAM,IAAA,+BAAsB,EAAC,GAAG,EAAE;QAC7C,MAAM,EAAE,MAAM,CAAC,SAAS;QACxB,iBAAiB,EAAE,MAAM,CAAC,iBAAiB;KAC9C,CAAC,CAAC;IAEH,4DAA4D;IAE5D,MAAM,GAAG,GAAG,IAAI,cAAG,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC;IACxC,IAAI,MAAM,CAAC,KAAK,EAAE,CAAC;QACf,GAAG,CAAC,YAAY,CAAC,GAAG,CAAC,OAAO,EAAE,MAAM,CAAC,KAAK,CAAC,CAAC;IAChD,CAAC;IAED,IAAI,MAAM,CAAC,iBAAiB,EAAE,CAAC;QAC3B,GAAG,CAAC,YAAY,CAAC,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,iBAAiB,CAAC,CAAC;IAC3D,CAAC;IAED,IAAI,MAAM,CAAC,WAAW,EAAE,CAAC;QACrB,GAAG,CAAC,YAAY,CAAC,GAAG,CAAC,cAAc,EAAE,MAAM,CAAC,WAAW,CAAC,CAAC;IAC7D,CAAC;IAED,IAAI,MAAM,CAAC,OAAO,EAAE,CAAC;QACjB,GAAG,CAAC,YAAY,CAAC,GAAG,CAAC,UAAU,EAAE,MAAM,CAAC,OAAO,CAAC,CAAC;IACrD,CAAC;IAED,OAAO,IAAA,aAAI,EAAC,GAAG,EAAE,EAAE,GAAG,EAAE,GAAG,CAAC,IAAI,EAAE,CAAC,CAAC;AACxC,CAAC;AA9BD,oEA8BC"}
@@ -25,8 +25,8 @@ async function useInfo() {
25
25
  info = {
26
26
  version: pkgJson.version,
27
27
  timestamp: Date.now(),
28
- tokenMaxAgeAccessToken: config.tokenRefreshMaxAge,
29
- tokenMaxAgeRefreshToken: config.tokenAccessMaxAge,
28
+ tokenMaxAgeAccessToken: config.tokenAccessMaxAge,
29
+ tokenMaxAgeRefreshToken: config.tokenRefreshMaxAge,
30
30
  redis: !!config.redis,
31
31
  vault: !!config.vault,
32
32
  };
@@ -1 +1 @@
1
- {"version":3,"file":"module.js","sourceRoot":"","sources":["../../../../../src/http/controllers/root/status/module.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;;;;AAEH,0DAA6B;AAC7B,mCAA8B;AAC9B,mCAA8B;AAE9B,+CAA+C;AAC/C,wCAAmD;AAWnD,IAAI,IAA+B,CAAC;AAE7B,KAAK,UAAU,OAAO;IACzB,IAAI,OAAO,IAAI,KAAK,WAAW,EAAE,CAAC;QAC9B,OAAO,IAAI,CAAC;IAChB,CAAC;IAED,MAAM,OAAO,GAAG,MAAM,IAAA,aAAI,EAAC,mBAAI,CAAC,IAAI,CAAC,IAAA,yBAAkB,GAAE,EAAE,cAAc,CAAC,CAAC,CAAC;IAC5E,MAAM,MAAM,GAAG,IAAA,kBAAS,GAAE,CAAC;IAE3B,IAAI,GAAG;QACH,OAAO,EAAE,OAAO,CAAC,OAAO;QACxB,SAAS,EAAE,IAAI,CAAC,GAAG,EAAE;QACrB,sBAAsB,EAAE,MAAM,CAAC,kBAAkB;QACjD,uBAAuB,EAAE,MAAM,CAAC,iBAAiB;QACjD,KAAK,EAAE,CAAC,CAAC,MAAM,CAAC,KAAK;QACrB,KAAK,EAAE,CAAC,CAAC,MAAM,CAAC,KAAK;KACxB,CAAC;IAEF,OAAO,IAAI,CAAC;AAChB,CAAC;AAlBD,0BAkBC;AACM,KAAK,UAAU,qBAAqB,CAAC,GAAY,EAAE,GAAa;IACnE,MAAM,MAAM,GAAG,MAAM,OAAO,EAAE,CAAC;IAC/B,MAAM,CAAC,SAAS,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;IAE9B,OAAO,IAAA,aAAI,EAAC,GAAG,EAAE,MAAM,CAAC,CAAC;AAC7B,CAAC;AALD,sDAKC"}
1
+ {"version":3,"file":"module.js","sourceRoot":"","sources":["../../../../../src/http/controllers/root/status/module.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;;;;AAEH,0DAA6B;AAC7B,mCAA8B;AAC9B,mCAA8B;AAE9B,+CAA+C;AAC/C,wCAAmD;AAWnD,IAAI,IAA+B,CAAC;AAE7B,KAAK,UAAU,OAAO;IACzB,IAAI,OAAO,IAAI,KAAK,WAAW,EAAE,CAAC;QAC9B,OAAO,IAAI,CAAC;IAChB,CAAC;IAED,MAAM,OAAO,GAAG,MAAM,IAAA,aAAI,EAAC,mBAAI,CAAC,IAAI,CAAC,IAAA,yBAAkB,GAAE,EAAE,cAAc,CAAC,CAAC,CAAC;IAC5E,MAAM,MAAM,GAAG,IAAA,kBAAS,GAAE,CAAC;IAE3B,IAAI,GAAG;QACH,OAAO,EAAE,OAAO,CAAC,OAAO;QACxB,SAAS,EAAE,IAAI,CAAC,GAAG,EAAE;QACrB,sBAAsB,EAAE,MAAM,CAAC,iBAAiB;QAChD,uBAAuB,EAAE,MAAM,CAAC,kBAAkB;QAClD,KAAK,EAAE,CAAC,CAAC,MAAM,CAAC,KAAK;QACrB,KAAK,EAAE,CAAC,CAAC,MAAM,CAAC,KAAK;KACxB,CAAC;IAEF,OAAO,IAAI,CAAC;AAChB,CAAC;AAlBD,0BAkBC;AACM,KAAK,UAAU,qBAAqB,CAAC,GAAY,EAAE,GAAa;IACnE,MAAM,MAAM,GAAG,MAAM,OAAO,EAAE,CAAC;IAC/B,MAAM,CAAC,SAAS,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;IAE9B,OAAO,IAAA,aAAI,EAAC,GAAG,EAAE,MAAM,CAAC,CAAC;AAC7B,CAAC;AALD,sDAKC"}
@@ -57,11 +57,11 @@ async function createTokenRouteHandler(req, res) {
57
57
  }
58
58
  (0, cookie_1.setResponseCookie)(res, core_1.CookieName.ACCESS_TOKEN, tokenResponse.access_token, {
59
59
  ...cookieOptions,
60
- maxAge: config.tokenRefreshMaxAge * 1000,
60
+ maxAge: config.tokenAccessMaxAge * 1000,
61
61
  });
62
62
  (0, cookie_1.setResponseCookie)(res, core_1.CookieName.REFRESH_TOKEN, tokenResponse.refresh_token, {
63
63
  ...cookieOptions,
64
- maxAge: config.tokenAccessMaxAge * 1000,
64
+ maxAge: config.tokenRefreshMaxAge * 1000,
65
65
  });
66
66
  return (0, routup_1.send)(res, tokenResponse);
67
67
  }
@@ -1 +1 @@
1
- {"version":3,"file":"create.js","sourceRoot":"","sources":["../../../../../../src/http/controllers/root/token/handlers/create.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;AAIH,uCAGsB;AAEtB,iDAAyD;AACzD,uCAA+B;AAE/B,mCAA8B;AAC9B,yDAAoD;AACpD,kDAAkD;AAElD,+CAO4B;AAE5B;;;;;;GAMG;AACI,KAAK,UAAU,uBAAuB,CACzC,GAAY,EACZ,GAAa;IAEb,MAAM,SAAS,GAAG,IAAA,sCAA6B,EAAC,GAAG,CAAC,CAAC;IACrD,IAAI,CAAC,SAAS,EAAE,CAAC;QACb,MAAM,iBAAU,CAAC,YAAY,EAAE,CAAC;IACpC,CAAC;IAED,IAAI,KAAyB,CAAC;IAE9B,QAAQ,SAAS,EAAE,CAAC;QAChB,KAAK,uBAAgB,CAAC,kBAAkB,CAAC,CAAC,CAAC;YACvC,KAAK,GAAG,IAAI,2BAAkB,EAAE,CAAC;YACjC,MAAM;QACV,CAAC;QACD,KAAK,uBAAgB,CAAC,kBAAkB,CAAC,CAAC,CAAC;YACvC,KAAK,GAAG,IAAI,+BAAsB,EAAE,CAAC;YACrC,MAAM;QACV,CAAC;QACD,KAAK,uBAAgB,CAAC,iBAAiB,CAAC,CAAC,CAAC;YACtC,KAAK,GAAG,IAAI,kCAAyB,EAAE,CAAC;YACxC,MAAM;QACV,CAAC;QACD,KAAK,uBAAgB,CAAC,QAAQ,CAAC,CAAC,CAAC;YAC7B,KAAK,GAAG,IAAI,0BAAiB,EAAE,CAAC;YAChC,MAAM;QACV,CAAC;QACD,KAAK,uBAAgB,CAAC,aAAa,CAAC,CAAC,CAAC;YAClC,KAAK,GAAG,IAAI,8BAAqB,EAAE,CAAC;YACpC,MAAM;QACV,CAAC;IACL,CAAC;IAED,MAAM,MAAM,GAAG,IAAA,kBAAS,GAAE,CAAC;IAE3B,MAAM,aAAa,GAA8B,MAAM,KAAK,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;IAEtE,MAAM,aAAa,GAAsB,EAAE,CAAC;IAC5C,IAAI,MAAM,CAAC,GAAG,KAAK,mCAAe,CAAC,UAAU,EAAE,CAAC;QAC5C,aAAa,CAAC,MAAM,GAAG,IAAI,cAAG,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,QAAQ,CAAC;IAC9D,CAAC;IAED,IAAA,0BAAiB,EAAC,GAAG,EAAE,iBAAU,CAAC,YAAY,EAAE,aAAa,CAAC,YAAY,EAAE;QACxE,GAAG,aAAa;QAChB,MAAM,EAAE,MAAM,CAAC,kBAAkB,GAAG,IAAI;KAC3C,CAAC,CAAC;IAEH,IAAA,0BAAiB,EAAC,GAAG,EAAE,iBAAU,CAAC,aAAa,EAAE,aAAa,CAAC,aAAa,EAAE;QAC1E,GAAG,aAAa;QAChB,MAAM,EAAE,MAAM,CAAC,iBAAiB,GAAG,IAAI;KAC1C,CAAC,CAAC;IAEH,OAAO,IAAA,aAAI,EAAC,GAAG,EAAE,aAAa,CAAC,CAAC;AACpC,CAAC;AAtDD,0DAsDC"}
1
+ {"version":3,"file":"create.js","sourceRoot":"","sources":["../../../../../../src/http/controllers/root/token/handlers/create.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;AAIH,uCAGsB;AAEtB,iDAAyD;AACzD,uCAA+B;AAE/B,mCAA8B;AAC9B,yDAAoD;AACpD,kDAAkD;AAElD,+CAO4B;AAE5B;;;;;;GAMG;AACI,KAAK,UAAU,uBAAuB,CACzC,GAAY,EACZ,GAAa;IAEb,MAAM,SAAS,GAAG,IAAA,sCAA6B,EAAC,GAAG,CAAC,CAAC;IACrD,IAAI,CAAC,SAAS,EAAE,CAAC;QACb,MAAM,iBAAU,CAAC,YAAY,EAAE,CAAC;IACpC,CAAC;IAED,IAAI,KAAyB,CAAC;IAE9B,QAAQ,SAAS,EAAE,CAAC;QAChB,KAAK,uBAAgB,CAAC,kBAAkB,CAAC,CAAC,CAAC;YACvC,KAAK,GAAG,IAAI,2BAAkB,EAAE,CAAC;YACjC,MAAM;QACV,CAAC;QACD,KAAK,uBAAgB,CAAC,kBAAkB,CAAC,CAAC,CAAC;YACvC,KAAK,GAAG,IAAI,+BAAsB,EAAE,CAAC;YACrC,MAAM;QACV,CAAC;QACD,KAAK,uBAAgB,CAAC,iBAAiB,CAAC,CAAC,CAAC;YACtC,KAAK,GAAG,IAAI,kCAAyB,EAAE,CAAC;YACxC,MAAM;QACV,CAAC;QACD,KAAK,uBAAgB,CAAC,QAAQ,CAAC,CAAC,CAAC;YAC7B,KAAK,GAAG,IAAI,0BAAiB,EAAE,CAAC;YAChC,MAAM;QACV,CAAC;QACD,KAAK,uBAAgB,CAAC,aAAa,CAAC,CAAC,CAAC;YAClC,KAAK,GAAG,IAAI,8BAAqB,EAAE,CAAC;YACpC,MAAM;QACV,CAAC;IACL,CAAC;IAED,MAAM,MAAM,GAAG,IAAA,kBAAS,GAAE,CAAC;IAE3B,MAAM,aAAa,GAA8B,MAAM,KAAK,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;IAEtE,MAAM,aAAa,GAAsB,EAAE,CAAC;IAC5C,IAAI,MAAM,CAAC,GAAG,KAAK,mCAAe,CAAC,UAAU,EAAE,CAAC;QAC5C,aAAa,CAAC,MAAM,GAAG,IAAI,cAAG,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,QAAQ,CAAC;IAC9D,CAAC;IAED,IAAA,0BAAiB,EAAC,GAAG,EAAE,iBAAU,CAAC,YAAY,EAAE,aAAa,CAAC,YAAY,EAAE;QACxE,GAAG,aAAa;QAChB,MAAM,EAAE,MAAM,CAAC,iBAAiB,GAAG,IAAI;KAC1C,CAAC,CAAC;IAEH,IAAA,0BAAiB,EAAC,GAAG,EAAE,iBAAU,CAAC,aAAa,EAAE,aAAa,CAAC,aAAa,EAAE;QAC1E,GAAG,aAAa;QAChB,MAAM,EAAE,MAAM,CAAC,kBAAkB,GAAG,IAAI;KAC3C,CAAC,CAAC;IAEH,OAAO,IAAA,aAAI,EAAC,GAAG,EAAE,aAAa,CAAC,CAAC;AACpC,CAAC;AAtDD,0DAsDC"}
@@ -1 +1 @@
1
- {"version":3,"file":"module.d.ts","sourceRoot":"","sources":["../../../../src/http/oauth2/authorize/module.ts"],"names":[],"mappings":"AAaA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,QAAQ,CAAC;AAgBtC,OAAO,KAAK,EAAE,uBAAuB,EAAE,sBAAsB,EAAE,MAAM,QAAQ,CAAC;AAG9E,wBAAsB,sBAAsB,CACxC,GAAG,EAAE,OAAO,EACZ,OAAO,EAAE,uBAAuB,GAChC,OAAO,CAAC,sBAAsB,CAAC,CAiFlC"}
1
+ {"version":3,"file":"module.d.ts","sourceRoot":"","sources":["../../../../src/http/oauth2/authorize/module.ts"],"names":[],"mappings":"AAaA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,QAAQ,CAAC;AAgBtC,OAAO,KAAK,EAAE,uBAAuB,EAAE,sBAAsB,EAAE,MAAM,QAAQ,CAAC;AAG9E,wBAAsB,sBAAsB,CACxC,GAAG,EAAE,OAAO,EACZ,OAAO,EAAE,uBAAuB,GAChC,OAAO,CAAC,sBAAsB,CAAC,CAmFlC"}
@@ -52,18 +52,18 @@ async function runOAuth2Authorization(req, options) {
52
52
  };
53
53
  if (responseTypes[core_1.OAuth2AuthorizationResponseType.ID_TOKEN] ||
54
54
  (0, core_1.hasOAuth2OpenIDScope)(entity.scope)) {
55
+ tokenBuildContext.expiresIn = idTokenMaxAge;
55
56
  entity.id_token = await (0, domains_1.signOAuth2TokenWithKey)(await (0, token_1.extendOpenIdTokenPayload)((0, token_1.buildOpenIdTokenPayload)(tokenBuildContext)), key, {
56
- keyid: key.id,
57
- expiresIn: idTokenMaxAge,
57
+ keyId: key.id,
58
58
  });
59
59
  if (responseTypes[core_1.OAuth2AuthorizationResponseType.ID_TOKEN]) {
60
60
  output.idToken = entity.id_token;
61
61
  }
62
62
  }
63
63
  if (responseTypes[core_1.OAuth2AuthorizationResponseType.TOKEN]) {
64
- output.accessToken = await (0, domains_1.signOAuth2TokenWithKey)(await (0, token_1.buildOAuth2AccessTokenPayload)(tokenBuildContext), key, {
65
- keyid: key.id,
66
- expiresIn: accessTokenMaxAge,
64
+ tokenBuildContext.expiresIn = accessTokenMaxAge;
65
+ output.accessToken = await (0, domains_1.signOAuth2TokenWithKey)((0, token_1.buildOAuth2AccessTokenPayload)(tokenBuildContext), key, {
66
+ keyId: key.id,
67
67
  });
68
68
  }
69
69
  await repository.save(entity);
@@ -1 +1 @@
1
- {"version":3,"file":"module.js","sourceRoot":"","sources":["../../../../src/http/oauth2/authorize/module.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"module.js","sourceRoot":"","sources":["../../../../src/http/oauth2/authorize/module.ts"],"names":[],"mappings":"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"}
@@ -34,7 +34,7 @@ class AbstractGrant {
34
34
  async issueRefreshToken(accessToken) {
35
35
  const dataSource = await (0, typeorm_extension_1.useDataSource)();
36
36
  const repository = dataSource.getRepository(domains_1.OAuth2RefreshTokenEntity);
37
- const token = repository.create((0, token_1.transformToRefreshTokenEntity)(accessToken, this.config.tokenAccessMaxAge));
37
+ const token = repository.create((0, token_1.transformToRefreshTokenEntity)(accessToken, this.config.tokenRefreshMaxAge));
38
38
  await repository.insert(token);
39
39
  await this.refreshTokenCache.set(token);
40
40
  return (0, token_1.transformToRefreshTokenPayload)(accessToken, {
@@ -1 +1 @@
1
- {"version":3,"file":"abstract.js","sourceRoot":"","sources":["../../../../src/http/oauth2/grant-types/abstract.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;AAGH,yDAAkD;AAClD,8CAA4D;AAE5D,4CAA4C;AAC5C,oCAIkB;AAClB,oCAAmD;AAGnD,MAAsB,aAAa;IAK/B,wDAAwD;IAExD;QACI,IAAI,CAAC,MAAM,GAAG,IAAA,kBAAS,GAAE,CAAC;QAE1B,IAAI,CAAC,iBAAiB,GAAG,IAAI,+BAAuB,EAAE,CAAC;IAC3D,CAAC;IAED,wDAAwD;IAE9C,KAAK,CAAC,gBAAgB,CAAC,OAAgC;QAC7D,OAAO,IAAA,qCAA6B,EAAC;YACjC,MAAM,EAAE,IAAI,CAAC,MAAM,CAAC,SAAS;YAC7B,OAAO,EAAE,OAAO,CAAC,OAAO;YACxB,SAAS,EAAE,OAAO,CAAC,SAAS;YAC5B,GAAG,EAAE,OAAO,CAAC,GAAG;YAChB,OAAO,EAAE,OAAO,CAAC,OAAO;YACxB,aAAa,EAAE,OAAO,CAAC,aAAa;YACpC,KAAK,EAAE,OAAO,CAAC,KAAK;YACpB,QAAQ,EAAE,OAAO,CAAC,QAAQ;SAC7B,CAAC,CAAC;IACP,CAAC;IAES,KAAK,CAAC,iBAAiB,CAAC,WAAwC;QACtE,MAAM,UAAU,GAAG,MAAM,IAAA,iCAAa,GAAE,CAAC;QACzC,MAAM,UAAU,GAAG,UAAU,CAAC,aAAa,CAAC,kCAAwB,CAAC,CAAC;QAEtE,MAAM,KAAK,GAAG,UAAU,CAAC,MAAM,CAC3B,IAAA,qCAA6B,EACzB,WAAW,EACX,IAAI,CAAC,MAAM,CAAC,iBAAiB,CAChC,CACJ,CAAC;QAEF,MAAM,UAAU,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;QAE/B,MAAM,IAAI,CAAC,iBAAiB,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;QAExC,OAAO,IAAA,sCAA8B,EAAC,WAAW,EAAE;YAC/C,EAAE,EAAE,KAAK,CAAC,EAAE;SACf,CAAC,CAAC;IACP,CAAC;CACJ;AA/CD,sCA+CC"}
1
+ {"version":3,"file":"abstract.js","sourceRoot":"","sources":["../../../../src/http/oauth2/grant-types/abstract.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;AAGH,yDAAkD;AAClD,8CAA4D;AAE5D,4CAA4C;AAC5C,oCAIkB;AAClB,oCAAmD;AAGnD,MAAsB,aAAa;IAK/B,wDAAwD;IAExD;QACI,IAAI,CAAC,MAAM,GAAG,IAAA,kBAAS,GAAE,CAAC;QAE1B,IAAI,CAAC,iBAAiB,GAAG,IAAI,+BAAuB,EAAE,CAAC;IAC3D,CAAC;IAED,wDAAwD;IAE9C,KAAK,CAAC,gBAAgB,CAAC,OAAgC;QAC7D,OAAO,IAAA,qCAA6B,EAAC;YACjC,MAAM,EAAE,IAAI,CAAC,MAAM,CAAC,SAAS;YAC7B,OAAO,EAAE,OAAO,CAAC,OAAO;YACxB,SAAS,EAAE,OAAO,CAAC,SAAS;YAC5B,GAAG,EAAE,OAAO,CAAC,GAAG;YAChB,OAAO,EAAE,OAAO,CAAC,OAAO;YACxB,aAAa,EAAE,OAAO,CAAC,aAAa;YACpC,KAAK,EAAE,OAAO,CAAC,KAAK;YACpB,QAAQ,EAAE,OAAO,CAAC,QAAQ;SAC7B,CAAC,CAAC;IACP,CAAC;IAES,KAAK,CAAC,iBAAiB,CAAC,WAAwC;QACtE,MAAM,UAAU,GAAG,MAAM,IAAA,iCAAa,GAAE,CAAC;QACzC,MAAM,UAAU,GAAG,UAAU,CAAC,aAAa,CAAC,kCAAwB,CAAC,CAAC;QAEtE,MAAM,KAAK,GAAG,UAAU,CAAC,MAAM,CAC3B,IAAA,qCAA6B,EACzB,WAAW,EACX,IAAI,CAAC,MAAM,CAAC,kBAAkB,CACjC,CACJ,CAAC;QAEF,MAAM,UAAU,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;QAE/B,MAAM,IAAI,CAAC,iBAAiB,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;QAExC,OAAO,IAAA,sCAA8B,EAAC,WAAW,EAAE;YAC/C,EAAE,EAAE,KAAK,CAAC,EAAE;SACf,CAAC,CAAC;IACP,CAAC;CACJ;AA/CD,sCA+CC"}
@@ -30,9 +30,9 @@ class AuthorizeGrantType extends abstract_1.AbstractGrant {
30
30
  const refreshToken = await this.issueRefreshToken(accessToken);
31
31
  const buildContext = {
32
32
  accessToken,
33
- accessTokenMaxAge: this.config.tokenRefreshMaxAge,
33
+ accessTokenMaxAge: this.config.tokenAccessMaxAge,
34
34
  refreshToken,
35
- refreshTokenMaxAge: this.config.tokenAccessMaxAge,
35
+ refreshTokenMaxAge: this.config.tokenRefreshMaxAge,
36
36
  };
37
37
  if ((0, core_1.hasOAuth2OpenIDScope)(authorizationCode.scope)) {
38
38
  buildContext.idToken = authorizationCode.id_token;
@@ -1 +1 @@
1
- {"version":3,"file":"authorize.js","sourceRoot":"","sources":["../../../../src/http/oauth2/grant-types/authorize.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"authorize.js","sourceRoot":"","sources":["../../../../src/http/oauth2/grant-types/authorize.ts"],"names":[],"mappings":"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"}
@@ -31,9 +31,9 @@ class ClientCredentialsGrant extends abstract_1.AbstractGrant {
31
31
  const refreshToken = await this.issueRefreshToken(accessToken);
32
32
  return (0, response_1.buildOAuth2BearerTokenResponse)({
33
33
  accessToken,
34
- accessTokenMaxAge: this.config.tokenRefreshMaxAge,
34
+ accessTokenMaxAge: this.config.tokenAccessMaxAge,
35
35
  refreshToken,
36
- refreshTokenMaxAge: this.config.tokenAccessMaxAge,
36
+ refreshTokenMaxAge: this.config.tokenRefreshMaxAge,
37
37
  });
38
38
  }
39
39
  async validate(request) {
@@ -1 +1 @@
1
- {"version":3,"file":"client-credentials.js","sourceRoot":"","sources":["../../../../src/http/oauth2/grant-types/client-credentials.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;AAGH,uCAEsB;AACtB,6CAAoD;AACpD,+CAAsD;AACtD,iCAA0E;AAE1E,mCAAsC;AACtC,yDAAkD;AAClD,8CAAgD;AAChD,yCAA2C;AAE3C,0CAA6D;AAE7D,MAAa,sBAAuB,SAAQ,wBAAa;IACrD,KAAK,CAAC,GAAG,CAAC,OAAgB;QACtB,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;QAE5C,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,gBAAgB,CAAC;YAC5C,aAAa,EAAE,IAAA,qBAAY,EAAC,OAAO,EAAE,EAAE,UAAU,EAAE,IAAI,EAAE,CAAC;YAC1D,KAAK,EAAE,gBAAS,CAAC,MAAM;YACvB,GAAG,EAAE,MAAM,CAAC,EAAE;YACd,OAAO,EAAE,oBAAa,CAAC,MAAM;YAC7B,OAAO,EAAE,MAAM,CAAC,KAAK,CAAC,EAAE;YACxB,SAAS,EAAE,MAAM,CAAC,KAAK,CAAC,IAAI;YAC5B,QAAQ,EAAE,MAAM,CAAC,EAAE;SACtB,CAAC,CAAC;QAEH,MAAM,YAAY,GAAG,MAAM,IAAI,CAAC,iBAAiB,CAAC,WAAW,CAAC,CAAC;QAE/D,OAAO,IAAA,yCAA8B,EAAC;YAClC,WAAW;YACX,iBAAiB,EAAE,IAAI,CAAC,MAAM,CAAC,kBAAkB;YACjD,YAAY;YACZ,kBAAkB,EAAE,IAAI,CAAC,MAAM,CAAC,iBAAiB;SACpD,CAAC,CAAC;IACP,CAAC;IAED,KAAK,CAAC,QAAQ,CAAC,OAAgB;QAC3B,MAAM,CAAC,EAAE,EAAE,MAAM,CAAC,GAAG,IAAI,CAAC,oBAAoB,CAAC,OAAO,CAAC,CAAC;QAExD,MAAM,UAAU,GAAG,MAAM,IAAA,iCAAa,GAAE,CAAC;QACzC,MAAM,UAAU,GAAG,UAAU,CAAC,aAAa,CAAC,sBAAY,CAAC,CAAC;QAE1D,MAAM,MAAM,GAAG,MAAM,UAAU,CAAC,OAAO,CAAC;YACpC,KAAK,EAAE;gBACH,EAAE;gBACF,MAAM;aACT;YACD,SAAS,EAAE,CAAC,OAAO,CAAC;SACvB,CAAC,CAAC;QAEH,IAAI,CAAC,MAAM,EAAE,CAAC;YACV,MAAM,gBAAS,CAAC,kBAAkB,EAAE,CAAC;QACzC,CAAC;QAED,OAAO,MAAM,CAAC;IAClB,CAAC;IAES,oBAAoB,CAAC,OAAgB;QAC3C,IAAI,QAAQ,GAAG,IAAA,qBAAc,EAAC,OAAO,EAAE,WAAW,CAAC,IAAI,IAAA,uBAAe,EAAC,OAAO,EAAE,WAAW,CAAC,CAAC;QAC7F,IAAI,YAAY,GAAG,IAAA,qBAAc,EAAC,OAAO,EAAE,eAAe,CAAC,IAAI,IAAA,uBAAe,EAAC,OAAO,EAAE,eAAe,CAAC,CAAC;QAEzG,IAAI,CAAC,QAAQ,IAAI,CAAC,YAAY,EAAE,CAAC;YAC7B,MAAM,EAAE,aAAa,EAAE,WAAW,EAAE,GAAG,OAAO,CAAC,OAAO,CAAC;YAEvD,MAAM,MAAM,GAAG,IAAA,gCAAwB,EAAC,WAAW,CAAC,CAAC;YAErD,IAAI,MAAM,CAAC,IAAI,KAAK,+BAAuB,CAAC,KAAK,EAAE,CAAC;gBAChD,MAAM,iBAAU,CAAC,cAAc,EAAE,CAAC;YACtC,CAAC;YAED,QAAQ,GAAG,MAAM,CAAC,QAAQ,CAAC;YAC3B,YAAY,GAAG,MAAM,CAAC,QAAQ,CAAC;QACnC,CAAC;QAED,OAAO,CAAC,QAAQ,EAAE,YAAY,CAAC,CAAC;IACpC,CAAC;CACJ;AAhED,wDAgEC"}
1
+ {"version":3,"file":"client-credentials.js","sourceRoot":"","sources":["../../../../src/http/oauth2/grant-types/client-credentials.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;AAGH,uCAEsB;AACtB,6CAAoD;AACpD,+CAAsD;AACtD,iCAA0E;AAE1E,mCAAsC;AACtC,yDAAkD;AAClD,8CAAgD;AAChD,yCAA2C;AAE3C,0CAA6D;AAE7D,MAAa,sBAAuB,SAAQ,wBAAa;IACrD,KAAK,CAAC,GAAG,CAAC,OAAgB;QACtB,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;QAE5C,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,gBAAgB,CAAC;YAC5C,aAAa,EAAE,IAAA,qBAAY,EAAC,OAAO,EAAE,EAAE,UAAU,EAAE,IAAI,EAAE,CAAC;YAC1D,KAAK,EAAE,gBAAS,CAAC,MAAM;YACvB,GAAG,EAAE,MAAM,CAAC,EAAE;YACd,OAAO,EAAE,oBAAa,CAAC,MAAM;YAC7B,OAAO,EAAE,MAAM,CAAC,KAAK,CAAC,EAAE;YACxB,SAAS,EAAE,MAAM,CAAC,KAAK,CAAC,IAAI;YAC5B,QAAQ,EAAE,MAAM,CAAC,EAAE;SACtB,CAAC,CAAC;QAEH,MAAM,YAAY,GAAG,MAAM,IAAI,CAAC,iBAAiB,CAAC,WAAW,CAAC,CAAC;QAE/D,OAAO,IAAA,yCAA8B,EAAC;YAClC,WAAW;YACX,iBAAiB,EAAE,IAAI,CAAC,MAAM,CAAC,iBAAiB;YAChD,YAAY;YACZ,kBAAkB,EAAE,IAAI,CAAC,MAAM,CAAC,kBAAkB;SACrD,CAAC,CAAC;IACP,CAAC;IAED,KAAK,CAAC,QAAQ,CAAC,OAAgB;QAC3B,MAAM,CAAC,EAAE,EAAE,MAAM,CAAC,GAAG,IAAI,CAAC,oBAAoB,CAAC,OAAO,CAAC,CAAC;QAExD,MAAM,UAAU,GAAG,MAAM,IAAA,iCAAa,GAAE,CAAC;QACzC,MAAM,UAAU,GAAG,UAAU,CAAC,aAAa,CAAC,sBAAY,CAAC,CAAC;QAE1D,MAAM,MAAM,GAAG,MAAM,UAAU,CAAC,OAAO,CAAC;YACpC,KAAK,EAAE;gBACH,EAAE;gBACF,MAAM;aACT;YACD,SAAS,EAAE,CAAC,OAAO,CAAC;SACvB,CAAC,CAAC;QAEH,IAAI,CAAC,MAAM,EAAE,CAAC;YACV,MAAM,gBAAS,CAAC,kBAAkB,EAAE,CAAC;QACzC,CAAC;QAED,OAAO,MAAM,CAAC;IAClB,CAAC;IAES,oBAAoB,CAAC,OAAgB;QAC3C,IAAI,QAAQ,GAAG,IAAA,qBAAc,EAAC,OAAO,EAAE,WAAW,CAAC,IAAI,IAAA,uBAAe,EAAC,OAAO,EAAE,WAAW,CAAC,CAAC;QAC7F,IAAI,YAAY,GAAG,IAAA,qBAAc,EAAC,OAAO,EAAE,eAAe,CAAC,IAAI,IAAA,uBAAe,EAAC,OAAO,EAAE,eAAe,CAAC,CAAC;QAEzG,IAAI,CAAC,QAAQ,IAAI,CAAC,YAAY,EAAE,CAAC;YAC7B,MAAM,EAAE,aAAa,EAAE,WAAW,EAAE,GAAG,OAAO,CAAC,OAAO,CAAC;YAEvD,MAAM,MAAM,GAAG,IAAA,gCAAwB,EAAC,WAAW,CAAC,CAAC;YAErD,IAAI,MAAM,CAAC,IAAI,KAAK,+BAAuB,CAAC,KAAK,EAAE,CAAC;gBAChD,MAAM,iBAAU,CAAC,cAAc,EAAE,CAAC;YACtC,CAAC;YAED,QAAQ,GAAG,MAAM,CAAC,QAAQ,CAAC;YAC3B,YAAY,GAAG,MAAM,CAAC,QAAQ,CAAC;QACnC,CAAC;QAED,OAAO,CAAC,QAAQ,EAAE,YAAY,CAAC,CAAC;IACpC,CAAC;CACJ;AAhED,wDAgEC"}
@@ -26,9 +26,9 @@ class InternalGrantType extends abstract_1.AbstractGrant {
26
26
  const refreshToken = await this.issueRefreshToken(accessToken);
27
27
  return (0, response_1.buildOAuth2BearerTokenResponse)({
28
28
  accessToken,
29
- accessTokenMaxAge: this.config.tokenRefreshMaxAge,
29
+ accessTokenMaxAge: this.config.tokenAccessMaxAge,
30
30
  refreshToken,
31
- refreshTokenMaxAge: this.config.tokenAccessMaxAge,
31
+ refreshTokenMaxAge: this.config.tokenRefreshMaxAge,
32
32
  });
33
33
  }
34
34
  }
@@ -1 +1 @@
1
- {"version":3,"file":"internal.js","sourceRoot":"","sources":["../../../../src/http/oauth2/grant-types/internal.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;AAGH,uCAEsB;AAEtB,mCAAsC;AACtC,uCAA4C;AAC5C,yCAA2C;AAI3C,0CAA6D;AAE7D,MAAa,iBAAkB,SAAQ,wBAAa;IAChD,KAAK,CAAC,GAAG,CAAC,OAAgB;QACtB,MAAM,KAAK,GAAG,IAAA,qBAAa,EAAC,OAAO,EAAE,OAAO,CAAC,CAAC;QAC9C,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,gBAAgB,CAAC;YAC5C,aAAa,EAAE,IAAA,qBAAY,EAAC,OAAO,EAAE,EAAE,UAAU,EAAE,IAAI,EAAE,CAAC;YAC1D,KAAK,EAAE,gBAAS,CAAC,MAAM;YACvB,OAAO,EAAE,KAAK,CAAC,EAAE;YACjB,SAAS,EAAE,KAAK,CAAC,IAAI;YACrB,GAAG,EAAE,IAAA,qBAAa,EAAC,OAAO,EAAE,QAAQ,CAAe;YACnD,OAAO,EAAE,oBAAa,CAAC,IAAI;SAC9B,CAAC,CAAC;QAEH,MAAM,YAAY,GAAG,MAAM,IAAI,CAAC,iBAAiB,CAAC,WAAW,CAAC,CAAC;QAE/D,OAAO,IAAA,yCAA8B,EAAC;YAClC,WAAW;YACX,iBAAiB,EAAE,IAAI,CAAC,MAAM,CAAC,kBAAkB;YACjD,YAAY;YACZ,kBAAkB,EAAE,IAAI,CAAC,MAAM,CAAC,iBAAiB;SACpD,CAAC,CAAC;IACP,CAAC;CACJ;AArBD,8CAqBC"}
1
+ {"version":3,"file":"internal.js","sourceRoot":"","sources":["../../../../src/http/oauth2/grant-types/internal.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;AAGH,uCAEsB;AAEtB,mCAAsC;AACtC,uCAA4C;AAC5C,yCAA2C;AAI3C,0CAA6D;AAE7D,MAAa,iBAAkB,SAAQ,wBAAa;IAChD,KAAK,CAAC,GAAG,CAAC,OAAgB;QACtB,MAAM,KAAK,GAAG,IAAA,qBAAa,EAAC,OAAO,EAAE,OAAO,CAAC,CAAC;QAC9C,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,gBAAgB,CAAC;YAC5C,aAAa,EAAE,IAAA,qBAAY,EAAC,OAAO,EAAE,EAAE,UAAU,EAAE,IAAI,EAAE,CAAC;YAC1D,KAAK,EAAE,gBAAS,CAAC,MAAM;YACvB,OAAO,EAAE,KAAK,CAAC,EAAE;YACjB,SAAS,EAAE,KAAK,CAAC,IAAI;YACrB,GAAG,EAAE,IAAA,qBAAa,EAAC,OAAO,EAAE,QAAQ,CAAe;YACnD,OAAO,EAAE,oBAAa,CAAC,IAAI;SAC9B,CAAC,CAAC;QAEH,MAAM,YAAY,GAAG,MAAM,IAAI,CAAC,iBAAiB,CAAC,WAAW,CAAC,CAAC;QAE/D,OAAO,IAAA,yCAA8B,EAAC;YAClC,WAAW;YACX,iBAAiB,EAAE,IAAI,CAAC,MAAM,CAAC,iBAAiB;YAChD,YAAY;YACZ,kBAAkB,EAAE,IAAI,CAAC,MAAM,CAAC,kBAAkB;SACrD,CAAC,CAAC;IACP,CAAC;CACJ;AArBD,8CAqBC"}
@@ -28,9 +28,9 @@ class PasswordGrantType extends abstract_1.AbstractGrant {
28
28
  const refreshToken = await this.issueRefreshToken(accessToken);
29
29
  return (0, response_1.buildOAuth2BearerTokenResponse)({
30
30
  accessToken,
31
- accessTokenMaxAge: this.config.tokenRefreshMaxAge,
31
+ accessTokenMaxAge: this.config.tokenAccessMaxAge,
32
32
  refreshToken,
33
- refreshTokenMaxAge: this.config.tokenAccessMaxAge,
33
+ refreshTokenMaxAge: this.config.tokenRefreshMaxAge,
34
34
  });
35
35
  }
36
36
  async validate(request) {
@@ -1 +1 @@
1
- {"version":3,"file":"password.js","sourceRoot":"","sources":["../../../../src/http/oauth2/grant-types/password.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"password.js","sourceRoot":"","sources":["../../../../src/http/oauth2/grant-types/password.ts"],"names":[],"mappings":"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"}
@@ -31,9 +31,9 @@ class RefreshTokenGrantType extends abstract_1.AbstractGrant {
31
31
  const refreshToken = await this.issueRefreshToken(accessToken);
32
32
  return (0, response_1.buildOAuth2BearerTokenResponse)({
33
33
  accessToken,
34
- accessTokenMaxAge: this.config.tokenRefreshMaxAge,
34
+ accessTokenMaxAge: this.config.tokenAccessMaxAge,
35
35
  refreshToken,
36
- refreshTokenMaxAge: this.config.tokenAccessMaxAge,
36
+ refreshTokenMaxAge: this.config.tokenRefreshMaxAge,
37
37
  });
38
38
  }
39
39
  async validate(request) {
@@ -1 +1 @@
1
- {"version":3,"file":"refresh-token.js","sourceRoot":"","sources":["../../../../src/http/oauth2/grant-types/refresh-token.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;AAGH,uCAEsB;AACtB,6CAAoD;AAEpD,mCAAsC;AACtC,yDAAkD;AAClD,8CAA4D;AAC5D,yCAA2C;AAC3C,0CAA6D;AAE7D,oCAAkD;AAElD,MAAa,qBAAsB,SAAQ,wBAAa;IACpD,KAAK,CAAC,GAAG,CAAC,OAAgB;QACtB,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;QAE3C,MAAM,OAAO,GAAG,IAAA,+BAAwB,EAAC,KAAK,CAAC,CAAC;QAChD,MAAM,GAAG,GAAG,IAAA,2BAAoB,EAAC,KAAK,CAAC,CAAC;QAExC,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,gBAAgB,CAAC;YAC5C,aAAa,EAAE,IAAA,qBAAY,EAAC,OAAO,EAAE,EAAE,UAAU,EAAE,IAAI,EAAE,CAAC;YAC1D,KAAK,EAAE,KAAK,CAAC,KAAK;YAClB,GAAG;YACH,OAAO;YACP,OAAO,EAAE,KAAK,CAAC,KAAK,CAAC,EAAE;YACvB,SAAS,EAAE,KAAK,CAAC,KAAK,CAAC,IAAI;SAC9B,CAAC,CAAC;QAEH,MAAM,YAAY,GAAG,MAAM,IAAI,CAAC,iBAAiB,CAAC,WAAW,CAAC,CAAC;QAE/D,OAAO,IAAA,yCAA8B,EAAC;YAClC,WAAW;YACX,iBAAiB,EAAE,IAAI,CAAC,MAAM,CAAC,kBAAkB;YACjD,YAAY;YACZ,kBAAkB,EAAE,IAAI,CAAC,MAAM,CAAC,iBAAiB;SACpD,CAAC,CAAC;IACP,CAAC;IAED,KAAK,CAAC,QAAQ,CAAC,OAAgB;QAC3B,MAAM,YAAY,GAAG,IAAA,qBAAc,EAAC,OAAO,EAAE,eAAe,CAAC,CAAC;QAE9D,MAAM,OAAO,GAAG,MAAM,IAAA,8BAAsB,EAAC,YAAY,CAAC,CAAC;QAE3D,MAAM,UAAU,GAAG,MAAM,IAAA,iCAAa,GAAE,CAAC;QACzC,MAAM,UAAU,GAAG,UAAU,CAAC,aAAa,CAAC,kCAAwB,CAAC,CAAC;QACtE,MAAM,MAAM,GAAG,MAAM,UAAU,CAAC,OAAO,CAAC;YACpC,KAAK,EAAE;gBACH,EAAE,EAAE,OAAO,CAAC,GAAG;aAClB;YACD,SAAS,EAAE,CAAC,OAAO,CAAC;SACvB,CAAC,CAAC;QAEH,IAAI,CAAC,MAAM,EAAE,CAAC;YACV,MAAM,iBAAU,CAAC,aAAa,CAAC,sBAAe,CAAC,OAAO,CAAC,CAAC;QAC5D,CAAC;QAED,MAAM,OAAO,GAAG,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;QAC3C,IAAI,OAAO,GAAG,IAAI,CAAC,GAAG,EAAE,EAAE,CAAC;YACvB,MAAM,iBAAU,CAAC,OAAO,CAAC,sBAAe,CAAC,OAAO,CAAC,CAAC;QACtD,CAAC;QAED,MAAM,UAAU,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;QAEhC,OAAO,MAAM,CAAC;IAClB,CAAC;CACJ;AArDD,sDAqDC"}
1
+ {"version":3,"file":"refresh-token.js","sourceRoot":"","sources":["../../../../src/http/oauth2/grant-types/refresh-token.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;AAGH,uCAEsB;AACtB,6CAAoD;AAEpD,mCAAsC;AACtC,yDAAkD;AAClD,8CAA4D;AAC5D,yCAA2C;AAC3C,0CAA6D;AAE7D,oCAAkD;AAElD,MAAa,qBAAsB,SAAQ,wBAAa;IACpD,KAAK,CAAC,GAAG,CAAC,OAAgB;QACtB,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;QAE3C,MAAM,OAAO,GAAG,IAAA,+BAAwB,EAAC,KAAK,CAAC,CAAC;QAChD,MAAM,GAAG,GAAG,IAAA,2BAAoB,EAAC,KAAK,CAAC,CAAC;QAExC,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,gBAAgB,CAAC;YAC5C,aAAa,EAAE,IAAA,qBAAY,EAAC,OAAO,EAAE,EAAE,UAAU,EAAE,IAAI,EAAE,CAAC;YAC1D,KAAK,EAAE,KAAK,CAAC,KAAK;YAClB,GAAG;YACH,OAAO;YACP,OAAO,EAAE,KAAK,CAAC,KAAK,CAAC,EAAE;YACvB,SAAS,EAAE,KAAK,CAAC,KAAK,CAAC,IAAI;SAC9B,CAAC,CAAC;QAEH,MAAM,YAAY,GAAG,MAAM,IAAI,CAAC,iBAAiB,CAAC,WAAW,CAAC,CAAC;QAE/D,OAAO,IAAA,yCAA8B,EAAC;YAClC,WAAW;YACX,iBAAiB,EAAE,IAAI,CAAC,MAAM,CAAC,iBAAiB;YAChD,YAAY;YACZ,kBAAkB,EAAE,IAAI,CAAC,MAAM,CAAC,kBAAkB;SACrD,CAAC,CAAC;IACP,CAAC;IAED,KAAK,CAAC,QAAQ,CAAC,OAAgB;QAC3B,MAAM,YAAY,GAAG,IAAA,qBAAc,EAAC,OAAO,EAAE,eAAe,CAAC,CAAC;QAE9D,MAAM,OAAO,GAAG,MAAM,IAAA,8BAAsB,EAAC,YAAY,CAAC,CAAC;QAE3D,MAAM,UAAU,GAAG,MAAM,IAAA,iCAAa,GAAE,CAAC;QACzC,MAAM,UAAU,GAAG,UAAU,CAAC,aAAa,CAAC,kCAAwB,CAAC,CAAC;QACtE,MAAM,MAAM,GAAG,MAAM,UAAU,CAAC,OAAO,CAAC;YACpC,KAAK,EAAE;gBACH,EAAE,EAAE,OAAO,CAAC,GAAG;aAClB;YACD,SAAS,EAAE,CAAC,OAAO,CAAC;SACvB,CAAC,CAAC;QAEH,IAAI,CAAC,MAAM,EAAE,CAAC;YACV,MAAM,iBAAU,CAAC,aAAa,CAAC,sBAAe,CAAC,OAAO,CAAC,CAAC;QAC5D,CAAC;QAED,MAAM,OAAO,GAAG,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;QAC3C,IAAI,OAAO,GAAG,IAAI,CAAC,GAAG,EAAE,EAAE,CAAC;YACvB,MAAM,iBAAU,CAAC,OAAO,CAAC,sBAAe,CAAC,OAAO,CAAC,CAAC;QACtD,CAAC;QAED,MAAM,UAAU,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;QAEhC,OAAO,MAAM,CAAC;IAClB,CAAC;CACJ;AArDD,sDAqDC"}
@@ -27,8 +27,8 @@ class RobotCredentialsGrantType extends abstract_1.AbstractGrant {
27
27
  });
28
28
  return (0, response_1.buildOAuth2BearerTokenResponse)({
29
29
  accessToken,
30
- accessTokenMaxAge: this.config.tokenRefreshMaxAge,
31
- refreshTokenMaxAge: this.config.tokenAccessMaxAge,
30
+ accessTokenMaxAge: this.config.tokenAccessMaxAge,
31
+ refreshTokenMaxAge: this.config.tokenRefreshMaxAge,
32
32
  });
33
33
  }
34
34
  async validate(request) {
@@ -1 +1 @@
1
- {"version":3,"file":"robot-credentials.js","sourceRoot":"","sources":["../../../../src/http/oauth2/grant-types/robot-credentials.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;AAGH,uCAIsB;AACtB,6CAAoD;AAEpD,mCAAsC;AACtC,yDAAkD;AAElD,8CAAmD;AACnD,yCAA2C;AAC3C,0CAA6D;AAG7D,MAAa,yBAA0B,SAAQ,wBAAa;IACxD,KAAK,CAAC,GAAG,CAAC,OAAgB;QACtB,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;QAE5C,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,gBAAgB,CAAC;YAC5C,aAAa,EAAE,IAAA,qBAAY,EAAC,OAAO,EAAE,EAAE,UAAU,EAAE,IAAI,EAAE,CAAC;YAC1D,KAAK,EAAE,gBAAS,CAAC,MAAM;YACvB,OAAO,EAAE,oBAAa,CAAC,KAAK;YAC5B,GAAG,EAAE,MAAM,CAAC,EAAE;YACd,OAAO,EAAE,MAAM,CAAC,KAAK,CAAC,EAAE;YACxB,SAAS,EAAE,MAAM,CAAC,KAAK,CAAC,IAAI;SAC/B,CAAC,CAAC;QAEH,OAAO,IAAA,yCAA8B,EAAC;YAClC,WAAW;YACX,iBAAiB,EAAE,IAAI,CAAC,MAAM,CAAC,kBAAkB;YACjD,kBAAkB,EAAE,IAAI,CAAC,MAAM,CAAC,iBAAiB;SACpD,CAAC,CAAC;IACP,CAAC;IAED,KAAK,CAAC,QAAQ,CAAC,OAAgB;QAC3B,MAAM,EAAE,EAAE,EAAE,MAAM,EAAE,GAAG,IAAA,qBAAc,EAAC,OAAO,CAAC,CAAC;QAE/C,MAAM,UAAU,GAAG,MAAM,IAAA,iCAAa,GAAE,CAAC;QACzC,MAAM,UAAU,GAAG,IAAI,yBAAe,CAAC,UAAU,CAAC,CAAC;QACnD,MAAM,MAAM,GAAG,MAAM,UAAU,CAAC,iBAAiB,CAAC,EAAE,EAAE,MAAM,CAAC,CAAC;QAE9D,IAAI,CAAC,MAAM,EAAE,CAAC;YACV,MAAM,iBAAU,CAAC,kBAAkB,EAAE,CAAC;QAC1C,CAAC;QAED,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC;YACjB,MAAM,iBAAU,CAAC,QAAQ,EAAE,CAAC;QAChC,CAAC;QAED,OAAO,MAAM,CAAC;IAClB,CAAC;CACJ;AArCD,8DAqCC"}
1
+ {"version":3,"file":"robot-credentials.js","sourceRoot":"","sources":["../../../../src/http/oauth2/grant-types/robot-credentials.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;AAGH,uCAIsB;AACtB,6CAAoD;AAEpD,mCAAsC;AACtC,yDAAkD;AAElD,8CAAmD;AACnD,yCAA2C;AAC3C,0CAA6D;AAG7D,MAAa,yBAA0B,SAAQ,wBAAa;IACxD,KAAK,CAAC,GAAG,CAAC,OAAgB;QACtB,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;QAE5C,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,gBAAgB,CAAC;YAC5C,aAAa,EAAE,IAAA,qBAAY,EAAC,OAAO,EAAE,EAAE,UAAU,EAAE,IAAI,EAAE,CAAC;YAC1D,KAAK,EAAE,gBAAS,CAAC,MAAM;YACvB,OAAO,EAAE,oBAAa,CAAC,KAAK;YAC5B,GAAG,EAAE,MAAM,CAAC,EAAE;YACd,OAAO,EAAE,MAAM,CAAC,KAAK,CAAC,EAAE;YACxB,SAAS,EAAE,MAAM,CAAC,KAAK,CAAC,IAAI;SAC/B,CAAC,CAAC;QAEH,OAAO,IAAA,yCAA8B,EAAC;YAClC,WAAW;YACX,iBAAiB,EAAE,IAAI,CAAC,MAAM,CAAC,iBAAiB;YAChD,kBAAkB,EAAE,IAAI,CAAC,MAAM,CAAC,kBAAkB;SACrD,CAAC,CAAC;IACP,CAAC;IAED,KAAK,CAAC,QAAQ,CAAC,OAAgB;QAC3B,MAAM,EAAE,EAAE,EAAE,MAAM,EAAE,GAAG,IAAA,qBAAc,EAAC,OAAO,CAAC,CAAC;QAE/C,MAAM,UAAU,GAAG,MAAM,IAAA,iCAAa,GAAE,CAAC;QACzC,MAAM,UAAU,GAAG,IAAI,yBAAe,CAAC,UAAU,CAAC,CAAC;QACnD,MAAM,MAAM,GAAG,MAAM,UAAU,CAAC,iBAAiB,CAAC,EAAE,EAAE,MAAM,CAAC,CAAC;QAE9D,IAAI,CAAC,MAAM,EAAE,CAAC;YACV,MAAM,iBAAU,CAAC,kBAAkB,EAAE,CAAC;QAC1C,CAAC;QAED,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC;YACjB,MAAM,iBAAU,CAAC,QAAQ,EAAE,CAAC;QAChC,CAAC;QAED,OAAO,MAAM,CAAC;IAClB,CAAC;CACJ;AArCD,8DAqCC"}
@@ -1 +1 @@
1
- {"version":3,"file":"bearer.d.ts","sourceRoot":"","sources":["../../../../src/http/oauth2/response/bearer.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAE,wBAAwB,EAAsB,MAAM,cAAc,CAAC;AAIjF,OAAO,KAAK,EAAE,gCAAgC,EAAE,MAAM,QAAQ,CAAC;AAE/D,wBAAsB,8BAA8B,CAChD,OAAO,EAAE,gCAAgC,qCA+E5C"}
1
+ {"version":3,"file":"bearer.d.ts","sourceRoot":"","sources":["../../../../src/http/oauth2/response/bearer.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAE,wBAAwB,EAAsB,MAAM,cAAc,CAAC;AAIjF,OAAO,KAAK,EAAE,gCAAgC,EAAE,MAAM,QAAQ,CAAC;AAE/D,wBAAsB,8BAA8B,CAChD,OAAO,EAAE,gCAAgC,qCAkF5C"}
@@ -39,9 +39,11 @@ async function buildOAuth2BearerTokenResponse(context) {
39
39
  }
40
40
  key = await (0, domains_1.useKey)({ realm_id: realmId });
41
41
  }
42
+ if (typeof token.exp === 'undefined') {
43
+ token.exp = Math.floor(new Date().getTime() / 1000) + (maxAge || accessTokenMaxAge);
44
+ }
42
45
  return (0, domains_1.signOAuth2TokenWithKey)(token, key, {
43
- keyid: key.id,
44
- expiresIn: maxAge || accessTokenMaxAge,
46
+ keyId: key.id,
45
47
  });
46
48
  };
47
49
  const response = {
@@ -1 +1 @@
1
- {"version":3,"file":"bearer.js","sourceRoot":"","sources":["../../../../src/http/oauth2/response/bearer.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;AAGH,uCAA0C;AAE1C,8CAAkE;AAG3D,KAAK,UAAU,8BAA8B,CAChD,OAAyC;IAEzC,MAAM,iBAAiB,GAAY,OAAO,CAAC,iBAAiB,IAAI,IAAI,CAAC;IAErE,MAAM,UAAU,GAAG,GAAwB,EAAE;QACzC,IAAI,OAAO,CAAC,OAAO,EAAE,CAAC;YAClB,OAAO,OAAO,CAAC,OAAO,CAAC;QAC3B,CAAC;QAED,IAAI,OAAO,OAAO,CAAC,WAAW,KAAK,QAAQ,EAAE,CAAC;YAC1C,OAAO,OAAO,CAAC,WAAW,CAAC,QAAQ,CAAC;QACxC,CAAC;QAED,IACI,OAAO,CAAC,YAAY;YACpB,OAAO,OAAO,CAAC,YAAY,KAAK,QAAQ,EAC1C,CAAC;YACC,OAAO,OAAO,CAAC,YAAY,CAAC,QAAQ,CAAC;QACzC,CAAC;QAED,OAAO,OAAO,CAAC,OAAO;YAClB,OAAO,OAAO,CAAC,OAAO,KAAK,QAAQ,CAAC,CAAC;YACrC,OAAO,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;YAC1B,SAAS,CAAC;IAClB,CAAC,CAAC;IAEF,IAAI,GAA2B,CAAC;IAEhC,MAAM,SAAS,GAAG,KAAK,EACnB,KAA2C,EAC3C,MAAe,EACC,EAAE;QAClB,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE,CAAC;YAC5B,OAAO,KAAK,CAAC;QACjB,CAAC;QAED,IAAI,OAAO,GAAG,KAAK,WAAW,EAAE,CAAC;YAC7B,MAAM,OAAO,GAAG,UAAU,EAAE,CAAC;YAC7B,IAAI,CAAC,OAAO,EAAE,CAAC;gBACX,MAAM,iBAAU,CAAC,iBAAiB,EAAE,CAAC;YACzC,CAAC;YAED,GAAG,GAAG,MAAM,IAAA,gBAAM,EAAC,EAAE,QAAQ,EAAE,OAAO,EAAE,CAAC,CAAC;QAC9C,CAAC;QAED,OAAO,IAAA,gCAAsB,EACzB,KAAK,EACL,GAAG,EACH;YACI,KAAK,EAAE,GAAG,CAAC,EAAE;YACb,SAAS,EAAE,MAAM,IAAI,iBAAiB;SACzC,CACJ,CAAC;IACN,CAAC,CAAC;IAEF,MAAM,QAAQ,GAA8B;QACxC,YAAY,EAAE,MAAM,SAAS,CAAC,OAAO,CAAC,WAAW,CAAC;QAClD,UAAU,EAAE,iBAAiB;QAC7B,UAAU,EAAE,QAAQ;KACvB,CAAC;IAEF,IACI,OAAO,OAAO,CAAC,WAAW,KAAK,QAAQ;QACvC,OAAO,CAAC,WAAW,CAAC,KAAK,EAC3B,CAAC;QACC,QAAQ,CAAC,KAAK,GAAG,OAAO,CAAC,WAAW,CAAC,KAAK,CAAC;IAC/C,CAAC;SAAM,IAAI,OAAO,CAAC,KAAK,EAAE,CAAC;QACvB,QAAQ,CAAC,KAAK,GAAG,OAAO,CAAC,KAAK,CAAC;IACnC,CAAC;IAED,IAAI,OAAO,CAAC,YAAY,EAAE,CAAC;QACvB,QAAQ,CAAC,aAAa,GAAG,MAAM,SAAS,CAAC,OAAO,CAAC,YAAY,EAAE,OAAO,CAAC,kBAAkB,CAAC,CAAC;IAC/F,CAAC;IAED,IAAI,OAAO,CAAC,OAAO,EAAE,CAAC;QAClB,QAAQ,CAAC,QAAQ,GAAG,MAAM,SAAS,CAAC,OAAO,CAAC,OAAO,EAAE,OAAO,CAAC,aAAa,CAAC,CAAC;IAChF,CAAC;IAED,OAAO,QAAQ,CAAC;AACpB,CAAC;AAhFD,wEAgFC"}
1
+ {"version":3,"file":"bearer.js","sourceRoot":"","sources":["../../../../src/http/oauth2/response/bearer.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;AAGH,uCAA0C;AAE1C,8CAAkE;AAG3D,KAAK,UAAU,8BAA8B,CAChD,OAAyC;IAEzC,MAAM,iBAAiB,GAAY,OAAO,CAAC,iBAAiB,IAAI,IAAI,CAAC;IAErE,MAAM,UAAU,GAAG,GAAwB,EAAE;QACzC,IAAI,OAAO,CAAC,OAAO,EAAE,CAAC;YAClB,OAAO,OAAO,CAAC,OAAO,CAAC;QAC3B,CAAC;QAED,IAAI,OAAO,OAAO,CAAC,WAAW,KAAK,QAAQ,EAAE,CAAC;YAC1C,OAAO,OAAO,CAAC,WAAW,CAAC,QAAQ,CAAC;QACxC,CAAC;QAED,IACI,OAAO,CAAC,YAAY;YACpB,OAAO,OAAO,CAAC,YAAY,KAAK,QAAQ,EAC1C,CAAC;YACC,OAAO,OAAO,CAAC,YAAY,CAAC,QAAQ,CAAC;QACzC,CAAC;QAED,OAAO,OAAO,CAAC,OAAO;YAClB,OAAO,OAAO,CAAC,OAAO,KAAK,QAAQ,CAAC,CAAC;YACrC,OAAO,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;YAC1B,SAAS,CAAC;IAClB,CAAC,CAAC;IAEF,IAAI,GAA2B,CAAC;IAEhC,MAAM,SAAS,GAAG,KAAK,EACnB,KAA2C,EAC3C,MAAe,EACC,EAAE;QAClB,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE,CAAC;YAC5B,OAAO,KAAK,CAAC;QACjB,CAAC;QAED,IAAI,OAAO,GAAG,KAAK,WAAW,EAAE,CAAC;YAC7B,MAAM,OAAO,GAAG,UAAU,EAAE,CAAC;YAC7B,IAAI,CAAC,OAAO,EAAE,CAAC;gBACX,MAAM,iBAAU,CAAC,iBAAiB,EAAE,CAAC;YACzC,CAAC;YAED,GAAG,GAAG,MAAM,IAAA,gBAAM,EAAC,EAAE,QAAQ,EAAE,OAAO,EAAE,CAAC,CAAC;QAC9C,CAAC;QAED,IAAI,OAAO,KAAK,CAAC,GAAG,KAAK,WAAW,EAAE,CAAC;YACnC,KAAK,CAAC,GAAG,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,IAAI,EAAE,CAAC,OAAO,EAAE,GAAG,IAAI,CAAC,GAAG,CAAC,MAAM,IAAI,iBAAiB,CAAC,CAAC;QACxF,CAAC;QAED,OAAO,IAAA,gCAAsB,EACzB,KAAK,EACL,GAAG,EACH;YACI,KAAK,EAAE,GAAG,CAAC,EAAE;SAChB,CACJ,CAAC;IACN,CAAC,CAAC;IAEF,MAAM,QAAQ,GAA8B;QACxC,YAAY,EAAE,MAAM,SAAS,CAAC,OAAO,CAAC,WAAW,CAAC;QAClD,UAAU,EAAE,iBAAiB;QAC7B,UAAU,EAAE,QAAQ;KACvB,CAAC;IAEF,IACI,OAAO,OAAO,CAAC,WAAW,KAAK,QAAQ;QACvC,OAAO,CAAC,WAAW,CAAC,KAAK,EAC3B,CAAC;QACC,QAAQ,CAAC,KAAK,GAAG,OAAO,CAAC,WAAW,CAAC,KAAK,CAAC;IAC/C,CAAC;SAAM,IAAI,OAAO,CAAC,KAAK,EAAE,CAAC;QACvB,QAAQ,CAAC,KAAK,GAAG,OAAO,CAAC,KAAK,CAAC;IACnC,CAAC;IAED,IAAI,OAAO,CAAC,YAAY,EAAE,CAAC;QACvB,QAAQ,CAAC,aAAa,GAAG,MAAM,SAAS,CAAC,OAAO,CAAC,YAAY,EAAE,OAAO,CAAC,kBAAkB,CAAC,CAAC;IAC/F,CAAC;IAED,IAAI,OAAO,CAAC,OAAO,EAAE,CAAC;QAClB,QAAQ,CAAC,QAAQ,GAAG,MAAM,SAAS,CAAC,OAAO,CAAC,OAAO,EAAE,OAAO,CAAC,aAAa,CAAC,CAAC;IAChF,CAAC;IAED,OAAO,QAAQ,CAAC;AACpB,CAAC;AAnFD,wEAmFC"}
@@ -1 +1 @@
1
- {"version":3,"file":"access-token.d.ts","sourceRoot":"","sources":["../../../../../src/http/oauth2/token/builder/access-token.ts"],"names":[],"mappings":"AAQA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,cAAc,CAAC;AAEvD,OAAO,KAAK,EAAE,6BAA6B,EAAE,MAAM,QAAQ,CAAC;AAE5D,wBAAgB,6BAA6B,CACzC,OAAO,EAAE,6BAA6B,GACtC,OAAO,CAAC,kBAAkB,CAAC,CAc9B"}
1
+ {"version":3,"file":"access-token.d.ts","sourceRoot":"","sources":["../../../../../src/http/oauth2/token/builder/access-token.ts"],"names":[],"mappings":"AAQA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,cAAc,CAAC;AAEvD,OAAO,KAAK,EAAE,6BAA6B,EAAE,MAAM,QAAQ,CAAC;AAE5D,wBAAgB,6BAA6B,CACzC,OAAO,EAAE,6BAA6B,GACtC,OAAO,CAAC,kBAAkB,CAAC,CAe9B"}
@@ -21,6 +21,7 @@ function buildOAuth2AccessTokenPayload(context) {
21
21
  client_id: context.clientId,
22
22
  realm_id: context.realmId,
23
23
  realm_name: context.realmName,
24
+ ...(context.expiresIn ? { exp: Math.floor(new Date().getTime() / 1000) + context.expiresIn } : {}),
24
25
  ...(context.scope ? { scope: context.scope } : {}),
25
26
  };
26
27
  }
@@ -1 +1 @@
1
- {"version":3,"file":"access-token.js","sourceRoot":"","sources":["../../../../../src/http/oauth2/token/builder/access-token.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;AAEH,6CAAyC;AAEzC,uCAA+C;AAG/C,SAAgB,6BAA6B,CACzC,OAAsC;IAEtC,OAAO;QACH,IAAI,EAAE,sBAAe,CAAC,MAAM;QAC5B,GAAG,EAAE,IAAA,wBAAU,GAAE;QACjB,GAAG,EAAE,OAAO,CAAC,MAAM;QACnB,GAAG,EAAE,OAAO,CAAC,GAAG;QAChB,QAAQ,EAAE,OAAO,CAAC,OAAO;QACzB,cAAc,EAAE,OAAO,CAAC,aAAa;QACrC,GAAG,EAAE,OAAO,CAAC,QAAQ;QACrB,SAAS,EAAE,OAAO,CAAC,QAAQ;QAC3B,QAAQ,EAAE,OAAO,CAAC,OAAO;QACzB,UAAU,EAAE,OAAO,CAAC,SAAS;QAC7B,GAAG,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,OAAO,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;KACrD,CAAC;AACN,CAAC;AAhBD,sEAgBC"}
1
+ {"version":3,"file":"access-token.js","sourceRoot":"","sources":["../../../../../src/http/oauth2/token/builder/access-token.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;AAEH,6CAAyC;AAEzC,uCAA+C;AAG/C,SAAgB,6BAA6B,CACzC,OAAsC;IAEtC,OAAO;QACH,IAAI,EAAE,sBAAe,CAAC,MAAM;QAC5B,GAAG,EAAE,IAAA,wBAAU,GAAE;QACjB,GAAG,EAAE,OAAO,CAAC,MAAM;QACnB,GAAG,EAAE,OAAO,CAAC,GAAG;QAChB,QAAQ,EAAE,OAAO,CAAC,OAAO;QACzB,cAAc,EAAE,OAAO,CAAC,aAAa;QACrC,GAAG,EAAE,OAAO,CAAC,QAAQ;QACrB,SAAS,EAAE,OAAO,CAAC,QAAQ;QAC3B,QAAQ,EAAE,OAAO,CAAC,OAAO;QACzB,UAAU,EAAE,OAAO,CAAC,SAAS;QAC7B,GAAG,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,GAAG,EAAE,IAAI,CAAC,KAAK,CAAC,IAAI,IAAI,EAAE,CAAC,OAAO,EAAE,GAAG,IAAI,CAAC,GAAG,OAAO,CAAC,SAAS,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QAClG,GAAG,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,OAAO,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;KACrD,CAAC;AACN,CAAC;AAjBD,sEAiBC"}
@@ -1 +1 @@
1
- {"version":3,"file":"id-token.d.ts","sourceRoot":"","sources":["../../../../../src/http/oauth2/token/builder/id-token.ts"],"names":[],"mappings":"AAQA,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,cAAc,CAAC;AAI7D,OAAO,KAAK,EAAE,6BAA6B,EAAE,MAAM,QAAQ,CAAC;AAE5D,wBAAgB,uBAAuB,CACnC,OAAO,EAAE,6BAA6B,GACtC,OAAO,CAAC,wBAAwB,CAAC,CAepC;AAED,wBAAsB,wBAAwB,CAC1C,OAAO,EAAE,OAAO,CAAC,wBAAwB,CAAC,GAC1C,OAAO,CAAC,OAAO,CAAC,wBAAwB,CAAC,CAAC,CAc7C"}
1
+ {"version":3,"file":"id-token.d.ts","sourceRoot":"","sources":["../../../../../src/http/oauth2/token/builder/id-token.ts"],"names":[],"mappings":"AAQA,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,cAAc,CAAC;AAI7D,OAAO,KAAK,EAAE,6BAA6B,EAAE,MAAM,QAAQ,CAAC;AAE5D,wBAAgB,uBAAuB,CACnC,OAAO,EAAE,6BAA6B,GACtC,OAAO,CAAC,wBAAwB,CAAC,CAgBpC;AAED,wBAAsB,wBAAwB,CAC1C,OAAO,EAAE,OAAO,CAAC,wBAAwB,CAAC,GAC1C,OAAO,CAAC,OAAO,CAAC,wBAAwB,CAAC,CAAC,CAc7C"}
@@ -23,7 +23,8 @@ function buildOpenIdTokenPayload(context) {
23
23
  client_id: context.clientId,
24
24
  realm_id: context.realmId,
25
25
  realm_name: context.realmName,
26
- auth_time: new Date().getTime(),
26
+ auth_time: Math.floor(new Date().getTime() / 1000),
27
+ ...(context.expiresIn ? { exp: Math.floor(new Date().getTime() / 1000) + context.expiresIn } : {}),
27
28
  ...(context.scope ? { scope: context.scope } : {}),
28
29
  };
29
30
  }
@@ -1 +1 @@
1
- {"version":3,"file":"id-token.js","sourceRoot":"","sources":["../../../../../src/http/oauth2/token/builder/id-token.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;AAEH,6CAAyC;AAEzC,uCAA+C;AAC/C,yCAAgE;AAChE,gCAA6C;AAG7C,SAAgB,uBAAuB,CACnC,OAAsC;IAEtC,OAAO;QACH,IAAI,EAAE,sBAAe,CAAC,QAAQ;QAC9B,GAAG,EAAE,IAAA,wBAAU,GAAE;QACjB,GAAG,EAAE,OAAO,CAAC,MAAM;QACnB,GAAG,EAAE,OAAO,CAAC,GAAG;QAChB,QAAQ,EAAE,OAAO,CAAC,OAAO;QACzB,cAAc,EAAE,OAAO,CAAC,aAAa;QACrC,GAAG,EAAE,OAAO,CAAC,QAAQ;QACrB,SAAS,EAAE,OAAO,CAAC,QAAQ;QAC3B,QAAQ,EAAE,OAAO,CAAC,OAAO;QACzB,UAAU,EAAE,OAAO,CAAC,SAAS;QAC7B,SAAS,EAAE,IAAI,IAAI,EAAE,CAAC,OAAO,EAAE;QAC/B,GAAG,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,OAAO,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;KACrD,CAAC;AACN,CAAC;AAjBD,0DAiBC;AAEM,KAAK,UAAU,wBAAwB,CAC1C,OAA0C;IAE1C,IAAI,CAAC,OAAO,CAAC,QAAQ,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,CAAC;QACpC,OAAO,OAAO,CAAC;IACnB,CAAC;IAED,MAAM,MAAM,GAAuC,IAAA,yCAAgC,EAC/E,OAAO,CAAC,QAAQ,EAChB,MAAM,IAAA,yBAAmB,EAAC,OAAO,CAAC,QAAQ,EAAE,OAAO,CAAC,GAAG,EAAE,OAAO,CAAC,KAAK,CAAC,CAC1E,CAAC;IAEF,OAAO;QACH,GAAG,OAAO;QACV,GAAG,MAAM;KACZ,CAAC;AACN,CAAC;AAhBD,4DAgBC"}
1
+ {"version":3,"file":"id-token.js","sourceRoot":"","sources":["../../../../../src/http/oauth2/token/builder/id-token.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;AAEH,6CAAyC;AAEzC,uCAA+C;AAC/C,yCAAgE;AAChE,gCAA6C;AAG7C,SAAgB,uBAAuB,CACnC,OAAsC;IAEtC,OAAO;QACH,IAAI,EAAE,sBAAe,CAAC,QAAQ;QAC9B,GAAG,EAAE,IAAA,wBAAU,GAAE;QACjB,GAAG,EAAE,OAAO,CAAC,MAAM;QACnB,GAAG,EAAE,OAAO,CAAC,GAAG;QAChB,QAAQ,EAAE,OAAO,CAAC,OAAO;QACzB,cAAc,EAAE,OAAO,CAAC,aAAa;QACrC,GAAG,EAAE,OAAO,CAAC,QAAQ;QACrB,SAAS,EAAE,OAAO,CAAC,QAAQ;QAC3B,QAAQ,EAAE,OAAO,CAAC,OAAO;QACzB,UAAU,EAAE,OAAO,CAAC,SAAS;QAC7B,SAAS,EAAE,IAAI,CAAC,KAAK,CAAC,IAAI,IAAI,EAAE,CAAC,OAAO,EAAE,GAAG,IAAI,CAAC;QAClD,GAAG,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,GAAG,EAAE,IAAI,CAAC,KAAK,CAAC,IAAI,IAAI,EAAE,CAAC,OAAO,EAAE,GAAG,IAAI,CAAC,GAAG,OAAO,CAAC,SAAS,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QAClG,GAAG,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,OAAO,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;KACrD,CAAC;AACN,CAAC;AAlBD,0DAkBC;AAEM,KAAK,UAAU,wBAAwB,CAC1C,OAA0C;IAE1C,IAAI,CAAC,OAAO,CAAC,QAAQ,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,CAAC;QACpC,OAAO,OAAO,CAAC;IACnB,CAAC;IAED,MAAM,MAAM,GAAuC,IAAA,yCAAgC,EAC/E,OAAO,CAAC,QAAQ,EAChB,MAAM,IAAA,yBAAmB,EAAC,OAAO,CAAC,QAAQ,EAAE,OAAO,CAAC,GAAG,EAAE,OAAO,CAAC,KAAK,CAAC,CAC1E,CAAC;IAEF,OAAO;QACH,GAAG,OAAO;QACV,GAAG,MAAM;KACZ,CAAC;AACN,CAAC;AAhBD,4DAgBC"}
@@ -8,6 +8,7 @@ export type OAuth2AccessTokenBuildContext = {
8
8
  scope?: string;
9
9
  clientId?: string;
10
10
  remoteAddress: string;
11
+ expiresIn?: number;
11
12
  };
12
13
  export type OAuth2OpenIdTokenBuildContext = OAuth2AccessTokenBuildContext;
13
14
  export type OAuth2RefreshTokenBuildContext = Omit<OAuth2AccessTokenBuildContext, 'remoteAddress' | 'issuer'> & {
@@ -1 +1 @@
1
- {"version":3,"file":"type.d.ts","sourceRoot":"","sources":["../../../../../src/http/oauth2/token/builder/type.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;AAElD,MAAM,MAAM,6BAA6B,GAAG;IACxC,MAAM,EAAE,MAAM,CAAC;IAEf,GAAG,EAAE,MAAM,CAAC;IACZ,OAAO,EAAE,GAAG,aAAa,EAAE,CAAC;IAE5B,OAAO,EAAE,MAAM,CAAC;IAEhB,SAAS,EAAE,MAAM,CAAC;IAElB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,QAAQ,CAAC,EAAE,MAAM,CAAC;IAElB,aAAa,EAAE,MAAM,CAAC;CACzB,CAAC;AAEF,MAAM,MAAM,6BAA6B,GAAG,6BAA6B,CAAC;AAI1E,MAAM,MAAM,8BAA8B,GAAG,IAAI,CACjD,6BAA6B,EAAE,eAAe,GAAG,QAAQ,CACxD,GAAG;IACA,EAAE,CAAC,EAAE,MAAM,CAAA;CACd,CAAC"}
1
+ {"version":3,"file":"type.d.ts","sourceRoot":"","sources":["../../../../../src/http/oauth2/token/builder/type.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;AAElD,MAAM,MAAM,6BAA6B,GAAG;IACxC,MAAM,EAAE,MAAM,CAAC;IAEf,GAAG,EAAE,MAAM,CAAC;IACZ,OAAO,EAAE,GAAG,aAAa,EAAE,CAAC;IAE5B,OAAO,EAAE,MAAM,CAAC;IAEhB,SAAS,EAAE,MAAM,CAAC;IAElB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,QAAQ,CAAC,EAAE,MAAM,CAAC;IAElB,aAAa,EAAE,MAAM,CAAC;IAEtB,SAAS,CAAC,EAAE,MAAM,CAAA;CACrB,CAAC;AAEF,MAAM,MAAM,6BAA6B,GAAG,6BAA6B,CAAC;AAI1E,MAAM,MAAM,8BAA8B,GAAG,IAAI,CACjD,6BAA6B,EAAE,eAAe,GAAG,QAAQ,CACxD,GAAG;IACA,EAAE,CAAC,EAAE,MAAM,CAAA;CACd,CAAC"}
@@ -17,8 +17,8 @@ async function readOAuth2TokenPayload(token) {
17
17
  if (typeof token === 'undefined' || token === null) {
18
18
  throw core_1.TokenError.requestInvalid('The token is not defined.');
19
19
  }
20
- const jwt = (0, server_kit_1.decodeToken)(token, { complete: true });
21
- if (jwt.header.kid) {
20
+ const header = (0, server_kit_1.extractTokenHeader)(token);
21
+ if (header.kid) {
22
22
  const dataSource = await (0, typeorm_extension_1.useDataSource)();
23
23
  const repository = dataSource.getRepository(domains_1.KeyEntity);
24
24
  const entity = await repository.findOne({
@@ -30,12 +30,12 @@ async function readOAuth2TokenPayload(token) {
30
30
  decryption_key: true,
31
31
  },
32
32
  where: {
33
- id: jwt.header.kid,
33
+ id: header.kid,
34
34
  },
35
35
  cache: {
36
36
  id: (0, redis_extension_1.buildKeyPath)({
37
37
  prefix: 'realm_key',
38
- id: jwt.header.kid,
38
+ id: header.kid,
39
39
  }),
40
40
  milliseconds: 60.000,
41
41
  },
@@ -47,7 +47,7 @@ async function readOAuth2TokenPayload(token) {
47
47
  catch (e) {
48
48
  if ((0, http_1.isHTTPError)(e)) {
49
49
  if (e.code === core_1.ErrorCode.TOKEN_EXPIRED) {
50
- throw core_1.TokenError.expired(jwt.payload.kind);
50
+ throw core_1.TokenError.expired();
51
51
  }
52
52
  }
53
53
  throw e;
@@ -1 +1 @@
1
- {"version":3,"file":"read.js","sourceRoot":"","sources":["../../../../../src/http/oauth2/token/payload/read.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;AAGH,uCAAqD;AACrD,mDAAiD;AACjD,qCAAyC;AACzC,qDAA+C;AAC/C,yDAAkD;AAClD,iDAA0E;AAEnE,KAAK,UAAU,sBAAsB,CAAC,KAAa;IACtD,IAAI,OAAO,KAAK,KAAK,WAAW,IAAI,KAAK,KAAK,IAAI,EAAE,CAAC;QACjD,MAAM,iBAAU,CAAC,cAAc,CAAC,2BAA2B,CAAC,CAAC;IACjE,CAAC;IAED,MAAM,GAAG,GAAG,IAAA,wBAAW,EAAC,KAAK,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC,CAAC;IAEnD,IAAI,GAAG,CAAC,MAAM,CAAC,GAAG,EAAE,CAAC;QACjB,MAAM,UAAU,GAAG,MAAM,IAAA,iCAAa,GAAE,CAAC;QACzC,MAAM,UAAU,GAAG,UAAU,CAAC,aAAa,CAAC,mBAAS,CAAC,CAAC;QACvD,MAAM,MAAM,GAAG,MAAM,UAAU,CAAC,OAAO,CAAC;YACpC,MAAM,EAAE;gBACJ,EAAE,EAAE,IAAI;gBACR,IAAI,EAAE,IAAI;gBACV,mBAAmB,EAAE,IAAI;gBACzB,cAAc,EAAE,IAAI;gBACpB,cAAc,EAAE,IAAI;aACvB;YACD,KAAK,EAAE;gBACH,EAAE,EAAE,GAAG,CAAC,MAAM,CAAC,GAAG;aACrB;YACD,KAAK,EAAE;gBACH,EAAE,EAAE,IAAA,8BAAY,EAAC;oBACb,MAAM,EAAE,WAAW;oBACnB,EAAE,EAAE,GAAG,CAAC,MAAM,CAAC,GAAG;iBACrB,CAAC;gBACF,YAAY,EAAE,MAAM;aACvB;SACJ,CAAC,CAAC;QAEH,IAAI,MAAM,EAAE,CAAC;YACT,IAAI,CAAC;gBACD,OAAO,MAAM,IAAA,kCAAwB,EAAC,KAAK,EAAE,MAAM,CAAC,CAAC;YACzD,CAAC;YAAC,OAAO,CAAC,EAAE,CAAC;gBACT,IAAI,IAAA,kBAAW,EAAC,CAAC,CAAC,EAAE,CAAC;oBACjB,IAAI,CAAC,CAAC,IAAI,KAAK,gBAAS,CAAC,aAAa,EAAE,CAAC;wBACrC,MAAM,iBAAU,CAAC,OAAO,CAAE,GAAG,CAAC,OAA8B,CAAC,IAAI,CAAC,CAAC;oBACvE,CAAC;gBACL,CAAC;gBAED,MAAM,CAAC,CAAC;YACZ,CAAC;QACL,CAAC;IACL,CAAC;IAED,MAAM,iBAAU,CAAC,cAAc,CAAC,2CAA2C,CAAC,CAAC;AACjF,CAAC;AA9CD,wDA8CC"}
1
+ {"version":3,"file":"read.js","sourceRoot":"","sources":["../../../../../src/http/oauth2/token/payload/read.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;AAGH,uCAAqD;AACrD,mDAAwD;AACxD,qCAAyC;AACzC,qDAA+C;AAC/C,yDAAkD;AAClD,iDAA0E;AAEnE,KAAK,UAAU,sBAAsB,CAAC,KAAa;IACtD,IAAI,OAAO,KAAK,KAAK,WAAW,IAAI,KAAK,KAAK,IAAI,EAAE,CAAC;QACjD,MAAM,iBAAU,CAAC,cAAc,CAAC,2BAA2B,CAAC,CAAC;IACjE,CAAC;IAED,MAAM,MAAM,GAAG,IAAA,+BAAkB,EAAC,KAAK,CAAC,CAAC;IAEzC,IAAI,MAAM,CAAC,GAAG,EAAE,CAAC;QACb,MAAM,UAAU,GAAG,MAAM,IAAA,iCAAa,GAAE,CAAC;QACzC,MAAM,UAAU,GAAG,UAAU,CAAC,aAAa,CAAC,mBAAS,CAAC,CAAC;QACvD,MAAM,MAAM,GAAG,MAAM,UAAU,CAAC,OAAO,CAAC;YACpC,MAAM,EAAE;gBACJ,EAAE,EAAE,IAAI;gBACR,IAAI,EAAE,IAAI;gBACV,mBAAmB,EAAE,IAAI;gBACzB,cAAc,EAAE,IAAI;gBACpB,cAAc,EAAE,IAAI;aACvB;YACD,KAAK,EAAE;gBACH,EAAE,EAAE,MAAM,CAAC,GAAG;aACjB;YACD,KAAK,EAAE;gBACH,EAAE,EAAE,IAAA,8BAAY,EAAC;oBACb,MAAM,EAAE,WAAW;oBACnB,EAAE,EAAE,MAAM,CAAC,GAAG;iBACjB,CAAC;gBACF,YAAY,EAAE,MAAM;aACvB;SACJ,CAAC,CAAC;QAEH,IAAI,MAAM,EAAE,CAAC;YACT,IAAI,CAAC;gBACD,OAAO,MAAM,IAAA,kCAAwB,EAAC,KAAK,EAAE,MAAM,CAAC,CAAC;YACzD,CAAC;YAAC,OAAO,CAAC,EAAE,CAAC;gBACT,IAAI,IAAA,kBAAW,EAAC,CAAC,CAAC,EAAE,CAAC;oBACjB,IAAI,CAAC,CAAC,IAAI,KAAK,gBAAS,CAAC,aAAa,EAAE,CAAC;wBACrC,MAAM,iBAAU,CAAC,OAAO,EAAE,CAAC;oBAC/B,CAAC;gBACL,CAAC;gBAED,MAAM,CAAC,CAAC;YACZ,CAAC;QACL,CAAC;IACL,CAAC;IAED,MAAM,iBAAU,CAAC,cAAc,CAAC,2CAA2C,CAAC,CAAC;AACjF,CAAC;AA9CD,wDA8CC"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@authup/server-core",
3
- "version": "1.0.0-beta.5",
3
+ "version": "1.0.0-beta.8",
4
4
  "description": "This is a standalone application.",
5
5
  "main": "dist/index.js",
6
6
  "scripts": {
@@ -45,9 +45,9 @@
45
45
  },
46
46
  "homepage": "https://github.com/authup/authup#readme",
47
47
  "dependencies": {
48
- "@authup/config": "^1.0.0-beta.5",
49
- "@authup/core": "^1.0.0-beta.5",
50
- "@authup/server-kit": "^1.0.0-beta.5",
48
+ "@authup/config": "^1.0.0-beta.8",
49
+ "@authup/core": "^1.0.0-beta.8",
50
+ "@authup/server-kit": "^1.0.0-beta.8",
51
51
  "@ebec/http": "^2.3.0",
52
52
  "@hapic/oauth2": "^2.4.1",
53
53
  "@hapic/vault": "^2.3.2",
@@ -66,7 +66,7 @@
66
66
  "ldapjs": "^3.0.7",
67
67
  "locter": "^2.0.2",
68
68
  "morgan": "^1.10.0",
69
- "mysql": "^2.18.1",
69
+ "mysql2": "^3.9.2",
70
70
  "node-cron": "^3.0.3",
71
71
  "pg": "^8.11.3",
72
72
  "redis-extension": "^1.3.0",
@@ -75,7 +75,7 @@
75
75
  "smob": "^1.4.1",
76
76
  "typeorm": "^0.3.20",
77
77
  "typeorm-extension": "^3.5.0",
78
- "winston": "^3.11.0",
78
+ "winston": "^3.13.0",
79
79
  "yargs": "^17.7.2",
80
80
  "zod": "^3.22.4"
81
81
  },
@@ -88,7 +88,7 @@
88
88
  "@types/yargs": "^17.0.32",
89
89
  "jest-serial-runner": "^1.2.1",
90
90
  "supertest": "^6.3.4",
91
- "testcontainers": "^10.7.1",
91
+ "testcontainers": "^10.7.2",
92
92
  "ts-node": "^10.8.2"
93
93
  },
94
94
  "publishConfig": {