@authup/server-core 1.0.0-beta.4 → 1.0.0-beta.7

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 (150) hide show
  1. package/dist/commands/setup.js +2 -2
  2. package/dist/commands/setup.js.map +1 -1
  3. package/dist/commands/start.d.ts.map +1 -1
  4. package/dist/commands/start.js +4 -5
  5. package/dist/commands/start.js.map +1 -1
  6. package/dist/config/build.d.ts +1 -1
  7. package/dist/config/build.d.ts.map +1 -1
  8. package/dist/config/build.js +12 -5
  9. package/dist/config/build.js.map +1 -1
  10. package/dist/config/constants.d.ts +13 -6
  11. package/dist/config/constants.d.ts.map +1 -1
  12. package/dist/config/constants.js +13 -6
  13. package/dist/config/constants.js.map +1 -1
  14. package/dist/config/index.d.ts +1 -1
  15. package/dist/config/index.d.ts.map +1 -1
  16. package/dist/config/index.js +1 -1
  17. package/dist/config/index.js.map +1 -1
  18. package/dist/config/module.d.ts +1 -1
  19. package/dist/config/module.d.ts.map +1 -1
  20. package/dist/config/parse.d.ts +1 -1
  21. package/dist/config/parse.d.ts.map +1 -1
  22. package/dist/config/parse.js +25 -9
  23. package/dist/config/parse.js.map +1 -1
  24. package/dist/config/setup.d.ts +1 -1
  25. package/dist/config/setup.d.ts.map +1 -1
  26. package/dist/config/{type.d.ts → types.d.ts} +31 -11
  27. package/dist/config/types.d.ts.map +1 -0
  28. package/dist/config/{type.js → types.js} +1 -1
  29. package/dist/config/types.js.map +1 -0
  30. package/dist/config/utils/env.d.ts +1 -1
  31. package/dist/config/utils/env.d.ts.map +1 -1
  32. package/dist/config/utils/env.js +52 -21
  33. package/dist/config/utils/env.js.map +1 -1
  34. package/dist/database/seeds/module.d.ts.map +1 -1
  35. package/dist/database/seeds/module.js +56 -65
  36. package/dist/database/seeds/module.js.map +1 -1
  37. package/dist/domains/client/repository.d.ts +4 -3
  38. package/dist/domains/client/repository.d.ts.map +1 -1
  39. package/dist/domains/client/repository.js +28 -16
  40. package/dist/domains/client/repository.js.map +1 -1
  41. package/dist/domains/identity-provider/flow/core/openid.js +1 -1
  42. package/dist/domains/identity-provider/flow/core/openid.js.map +1 -1
  43. package/dist/domains/key/utils/sign.d.ts +2 -2
  44. package/dist/domains/key/utils/sign.d.ts.map +1 -1
  45. package/dist/domains/key/utils/sign.js +12 -1
  46. package/dist/domains/key/utils/sign.js.map +1 -1
  47. package/dist/domains/key/utils/verify.d.ts +1 -2
  48. package/dist/domains/key/utils/verify.d.ts.map +1 -1
  49. package/dist/domains/key/utils/verify.js +5 -7
  50. package/dist/domains/key/utils/verify.js.map +1 -1
  51. package/dist/domains/robot/repository.d.ts +8 -6
  52. package/dist/domains/robot/repository.d.ts.map +1 -1
  53. package/dist/domains/robot/repository.js +30 -16
  54. package/dist/domains/robot/repository.js.map +1 -1
  55. package/dist/domains/robot/vault.js +3 -3
  56. package/dist/domains/robot/vault.js.map +1 -1
  57. package/dist/domains/role/repository.d.ts +3 -3
  58. package/dist/domains/role/repository.d.ts.map +1 -1
  59. package/dist/domains/role/repository.js +1 -1
  60. package/dist/domains/role/repository.js.map +1 -1
  61. package/dist/domains/user/repository.d.ts +7 -6
  62. package/dist/domains/user/repository.d.ts.map +1 -1
  63. package/dist/domains/user/repository.js +17 -9
  64. package/dist/domains/user/repository.js.map +1 -1
  65. package/dist/http/controllers/identity-provider/handlers/custom.js +2 -2
  66. package/dist/http/controllers/identity-provider/handlers/custom.js.map +1 -1
  67. package/dist/http/controllers/permission/utils/validation.d.ts.map +1 -1
  68. package/dist/http/controllers/permission/utils/validation.js +0 -1
  69. package/dist/http/controllers/permission/utils/validation.js.map +1 -1
  70. package/dist/http/controllers/robot/handlers/delete.d.ts.map +1 -1
  71. package/dist/http/controllers/robot/handlers/delete.js +3 -1
  72. package/dist/http/controllers/robot/handlers/delete.js.map +1 -1
  73. package/dist/http/controllers/robot/handlers/integrity.d.ts.map +1 -1
  74. package/dist/http/controllers/robot/handlers/integrity.js +26 -12
  75. package/dist/http/controllers/robot/handlers/integrity.js.map +1 -1
  76. package/dist/http/controllers/robot/handlers/update.d.ts.map +1 -1
  77. package/dist/http/controllers/robot/handlers/update.js +4 -2
  78. package/dist/http/controllers/robot/handlers/update.js.map +1 -1
  79. package/dist/http/controllers/robot-permission/handlers/delete.js +1 -1
  80. package/dist/http/controllers/robot-permission/handlers/delete.js.map +1 -1
  81. package/dist/http/controllers/robot-permission/utils/validation.js +4 -4
  82. package/dist/http/controllers/robot-permission/utils/validation.js.map +1 -1
  83. package/dist/http/controllers/role/handlers/delete.js +1 -1
  84. package/dist/http/controllers/role/handlers/delete.js.map +1 -1
  85. package/dist/http/controllers/role/handlers/update.js +1 -1
  86. package/dist/http/controllers/role/handlers/update.js.map +1 -1
  87. package/dist/http/controllers/role/utils/validaiton.js +4 -4
  88. package/dist/http/controllers/role/utils/validaiton.js.map +1 -1
  89. package/dist/http/controllers/role-permission/handlers/delete.js +1 -1
  90. package/dist/http/controllers/role-permission/handlers/delete.js.map +1 -1
  91. package/dist/http/controllers/role-permission/utils/validation.js +3 -3
  92. package/dist/http/controllers/role-permission/utils/validation.js.map +1 -1
  93. package/dist/http/controllers/root/authorize/handlers/run.js +2 -2
  94. package/dist/http/controllers/root/authorize/handlers/run.js.map +1 -1
  95. package/dist/http/controllers/root/status/module.js +2 -2
  96. package/dist/http/controllers/root/status/module.js.map +1 -1
  97. package/dist/http/controllers/root/token/handlers/create.js +2 -2
  98. package/dist/http/controllers/root/token/handlers/create.js.map +1 -1
  99. package/dist/http/controllers/user/handlers/update.js +1 -1
  100. package/dist/http/controllers/user-permission/handlers/delete.js +1 -1
  101. package/dist/http/controllers/user-permission/handlers/delete.js.map +1 -1
  102. package/dist/http/controllers/user-permission/utils/validation.js +2 -2
  103. package/dist/http/controllers/user-permission/utils/validation.js.map +1 -1
  104. package/dist/http/middleware/built-in/auth/module.d.ts.map +1 -1
  105. package/dist/http/middleware/built-in/auth/module.js +8 -3
  106. package/dist/http/middleware/built-in/auth/module.js.map +1 -1
  107. package/dist/http/middleware/built-in/auth/verify.d.ts.map +1 -1
  108. package/dist/http/middleware/built-in/auth/verify.js +30 -30
  109. package/dist/http/middleware/built-in/auth/verify.js.map +1 -1
  110. package/dist/http/middleware/built-in/rate-limit.d.ts.map +1 -1
  111. package/dist/http/middleware/built-in/rate-limit.js +3 -1
  112. package/dist/http/middleware/built-in/rate-limit.js.map +1 -1
  113. package/dist/http/oauth2/authorize/module.d.ts.map +1 -1
  114. package/dist/http/oauth2/authorize/module.js +5 -5
  115. package/dist/http/oauth2/authorize/module.js.map +1 -1
  116. package/dist/http/oauth2/grant-types/abstract.js +1 -1
  117. package/dist/http/oauth2/grant-types/abstract.js.map +1 -1
  118. package/dist/http/oauth2/grant-types/authorize.js +2 -2
  119. package/dist/http/oauth2/grant-types/authorize.js.map +1 -1
  120. package/dist/http/oauth2/grant-types/client-credentials.js +2 -2
  121. package/dist/http/oauth2/grant-types/client-credentials.js.map +1 -1
  122. package/dist/http/oauth2/grant-types/internal.js +2 -2
  123. package/dist/http/oauth2/grant-types/internal.js.map +1 -1
  124. package/dist/http/oauth2/grant-types/password.js +2 -2
  125. package/dist/http/oauth2/grant-types/password.js.map +1 -1
  126. package/dist/http/oauth2/grant-types/refresh-token.js +2 -2
  127. package/dist/http/oauth2/grant-types/refresh-token.js.map +1 -1
  128. package/dist/http/oauth2/grant-types/robot-credentials.js +2 -2
  129. package/dist/http/oauth2/grant-types/robot-credentials.js.map +1 -1
  130. package/dist/http/oauth2/response/bearer.d.ts.map +1 -1
  131. package/dist/http/oauth2/response/bearer.js +4 -2
  132. package/dist/http/oauth2/response/bearer.js.map +1 -1
  133. package/dist/http/oauth2/token/builder/access-token.d.ts.map +1 -1
  134. package/dist/http/oauth2/token/builder/access-token.js +1 -0
  135. package/dist/http/oauth2/token/builder/access-token.js.map +1 -1
  136. package/dist/http/oauth2/token/builder/id-token.d.ts.map +1 -1
  137. package/dist/http/oauth2/token/builder/id-token.js +2 -1
  138. package/dist/http/oauth2/token/builder/id-token.js.map +1 -1
  139. package/dist/http/oauth2/token/builder/type.d.ts +1 -0
  140. package/dist/http/oauth2/token/builder/type.d.ts.map +1 -1
  141. package/dist/http/oauth2/token/payload/read.js +5 -5
  142. package/dist/http/oauth2/token/payload/read.js.map +1 -1
  143. package/dist/http/oauth2/token/permissions.d.ts +2 -2
  144. package/dist/http/oauth2/token/permissions.d.ts.map +1 -1
  145. package/dist/http/utils/owner.d.ts.map +1 -1
  146. package/dist/http/utils/owner.js +2 -3
  147. package/dist/http/utils/owner.js.map +1 -1
  148. package/package.json +8 -8
  149. package/dist/config/type.d.ts.map +0 -1
  150. package/dist/config/type.js.map +0 -1
package/dist/http/controllers/root/token/handlers/create.js.map CHANGED
@@ -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,sBAAsB,GAAG,IAAI;KAC/C,CAAC,CAAC;IAEH,IAAA,0BAAiB,EAAC,GAAG,EAAE,iBAAU,CAAC,aAAa,EAAE,aAAa,CAAC,aAAa,EAAE;QAC1E,GAAG,aAAa;QAChB,MAAM,EAAE,MAAM,CAAC,uBAAuB,GAAG,IAAI;KAChD,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"}
package/dist/http/controllers/user/handlers/update.js CHANGED
@@ -51,7 +51,7 @@ async function updateUserRouteHandler(req, res) {
51
51
  delete result.data.name;
52
52
  }
53
53
  const config = (0, config_1.useConfig)();
54
- if (entity.name === config.adminUsername) {
54
+ if (entity.name === config.userAdminName) {
55
55
  throw new http_1.BadRequestError('The default user name can not be changed.');
56
56
  }
57
57
  }
package/dist/http/controllers/user-permission/handlers/delete.js CHANGED
@@ -36,7 +36,7 @@ async function deleteUserPermissionRouteHandler(req, res) {
36
36
  throw new http_1.ForbiddenError();
37
37
  }
38
38
  // ----------------------------------------------
39
- if (!ability.matchTarget(core_1.PermissionName.USER_PERMISSION_DROP, entity.target)) {
39
+ if (!ability.satisfy(core_1.PermissionName.USER_PERMISSION_DROP, { target: entity.target })) {
40
40
  throw new http_1.ForbiddenError('You are not permitted for the role-permission target.');
41
41
  }
42
42
  // ----------------------------------------------
package/dist/http/controllers/user-permission/handlers/delete.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"delete.js","sourceRoot":"","sources":["../../../../../src/http/controllers/user-permission/handlers/delete.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;AAEH,qCAA2D;AAC3D,uCAAuE;AAEvE,mCAAuD;AACvD,yDAAkD;AAClD,iDAA2D;AAC3D,4CAAmD;AAEnD;;;;;GAKG;AACI,KAAK,UAAU,gCAAgC,CAAC,GAAY,EAAE,GAAa;IAC9E,MAAM,EAAE,GAAG,IAAA,wBAAe,EAAC,GAAG,EAAE,IAAI,CAAC,CAAC;IAEtC,MAAM,OAAO,GAAG,IAAA,mBAAa,EAAC,GAAG,EAAE,SAAS,CAAC,CAAC;IAC9C,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,qBAAc,CAAC,oBAAoB,CAAC,EAAE,CAAC;QACpD,MAAM,IAAI,qBAAc,EAAE,CAAC;IAC/B,CAAC;IAED,MAAM,UAAU,GAAG,MAAM,IAAA,iCAAa,GAAE,CAAC;IACzC,MAAM,UAAU,GAAG,UAAU,CAAC,aAAa,CAAC,8BAAoB,CAAC,CAAC;IAClE,MAAM,MAAM,GAAG,MAAM,UAAU,CAAC,SAAS,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;IAElD,IAAI,CAAC,MAAM,EAAE,CAAC;QACV,MAAM,IAAI,oBAAa,EAAE,CAAC;IAC9B,CAAC;IAED,iDAAiD;IAEjD,IACI,CAAC,IAAA,8BAAuB,EAAC,IAAA,mBAAa,EAAC,GAAG,EAAE,OAAO,CAAC,EAAE,MAAM,CAAC,aAAa,CAAC,EAC7E,CAAC;QACC,MAAM,IAAI,qBAAc,EAAE,CAAC;IAC/B,CAAC;IAED,iDAAiD;IAEjD,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC,qBAAc,CAAC,oBAAoB,EAAE,MAAM,CAAC,MAAM,CAAC,EAAE,CAAC;QAC3E,MAAM,IAAI,qBAAc,CAAC,uDAAuD,CAAC,CAAC;IACtF,CAAC;IAED,iDAAiD;IAEjD,MAAM,EAAE,EAAE,EAAE,QAAQ,EAAE,GAAG,MAAM,CAAC;IAEhC,MAAM,UAAU,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;IAEhC,MAAM,CAAC,EAAE,GAAG,QAAQ,CAAC;IAErB,iDAAiD;IAEjD,OAAO,IAAA,qBAAY,EAAC,GAAG,EAAE,MAAM,CAAC,CAAC;AACrC,CAAC;AAzCD,4EAyCC"}
1
+ {"version":3,"file":"delete.js","sourceRoot":"","sources":["../../../../../src/http/controllers/user-permission/handlers/delete.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;AAEH,qCAA2D;AAC3D,uCAAuE;AAEvE,mCAAuD;AACvD,yDAAkD;AAClD,iDAA2D;AAC3D,4CAAmD;AAEnD;;;;;GAKG;AACI,KAAK,UAAU,gCAAgC,CAAC,GAAY,EAAE,GAAa;IAC9E,MAAM,EAAE,GAAG,IAAA,wBAAe,EAAC,GAAG,EAAE,IAAI,CAAC,CAAC;IAEtC,MAAM,OAAO,GAAG,IAAA,mBAAa,EAAC,GAAG,EAAE,SAAS,CAAC,CAAC;IAC9C,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,qBAAc,CAAC,oBAAoB,CAAC,EAAE,CAAC;QACpD,MAAM,IAAI,qBAAc,EAAE,CAAC;IAC/B,CAAC;IAED,MAAM,UAAU,GAAG,MAAM,IAAA,iCAAa,GAAE,CAAC;IACzC,MAAM,UAAU,GAAG,UAAU,CAAC,aAAa,CAAC,8BAAoB,CAAC,CAAC;IAClE,MAAM,MAAM,GAAG,MAAM,UAAU,CAAC,SAAS,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;IAElD,IAAI,CAAC,MAAM,EAAE,CAAC;QACV,MAAM,IAAI,oBAAa,EAAE,CAAC;IAC9B,CAAC;IAED,iDAAiD;IAEjD,IACI,CAAC,IAAA,8BAAuB,EAAC,IAAA,mBAAa,EAAC,GAAG,EAAE,OAAO,CAAC,EAAE,MAAM,CAAC,aAAa,CAAC,EAC7E,CAAC;QACC,MAAM,IAAI,qBAAc,EAAE,CAAC;IAC/B,CAAC;IAED,iDAAiD;IAEjD,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,qBAAc,CAAC,oBAAoB,EAAE,EAAE,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,CAAC,EAAE,CAAC;QACnF,MAAM,IAAI,qBAAc,CAAC,uDAAuD,CAAC,CAAC;IACtF,CAAC;IAED,iDAAiD;IAEjD,MAAM,EAAE,EAAE,EAAE,QAAQ,EAAE,GAAG,MAAM,CAAC;IAEhC,MAAM,UAAU,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;IAEhC,MAAM,CAAC,EAAE,GAAG,QAAQ,CAAC;IAErB,iDAAiD;IAEjD,OAAO,IAAA,qBAAY,EAAC,GAAG,EAAE,MAAM,CAAC,CAAC;AACrC,CAAC;AAzCD,4EAyCC"}
package/dist/http/controllers/user-permission/utils/validation.js CHANGED
@@ -58,9 +58,9 @@ async function runUserPermissionValidation(req, operation) {
58
58
  throw new http_1.ForbiddenError('It is only allowed to assign user permissions, which are also owned.');
59
59
  }
60
60
  }
61
- const permissionTarget = ability.getTarget(core_1.PermissionName.USER_PERMISSION_ADD);
61
+ const permissionTarget = ability.findOne(core_1.PermissionName.USER_PERMISSION_ADD);
62
62
  if (permissionTarget) {
63
- result.data.target = permissionTarget;
63
+ result.data.target = permissionTarget.target;
64
64
  }
65
65
  // ----------------------------------------------
66
66
  await (0, validation_1.extendExpressValidationResultWithRelation)(result, domains_1.UserEntity, {
package/dist/http/controllers/user-permission/utils/validation.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"validation.js","sourceRoot":"","sources":["../../../../../src/http/controllers/user-permission/utils/validation.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;AAEH,yDAA4D;AAC5D,qCAA6D;AAC7D,uCAAuE;AAGvE,iDAE6B;AAC7B,0CAAkE;AAElE,oDAM6B;AAC7B,0DAAqE;AAE9D,KAAK,UAAU,2BAA2B,CAC7C,GAAY,EACZ,SAAoF;IAEpF,MAAM,MAAM,GAAmD,IAAA,wCAA2B,GAAE,CAAC;IAE7F,IAAI,SAAS,KAAK,mCAAuB,CAAC,MAAM,EAAE,CAAC;QAC/C,MAAM,IAAA,yBAAK,EAAC,SAAS,CAAC;aACjB,MAAM,EAAE;aACR,MAAM,EAAE;aACR,GAAG,CAAC,GAAG,CAAC,CAAC;QAEd,MAAM,IAAA,yBAAK,EAAC,eAAe,CAAC;aACvB,MAAM,EAAE;aACR,QAAQ,EAAE;aACV,GAAG,CAAC,GAAG,CAAC,CAAC;QAEd,MAAM,IAAA,yBAAK,EAAC,QAAQ,CAAC;aAChB,MAAM,EAAE;aACR,QAAQ,EAAE;aACV,QAAQ,CAAC,EAAE,GAAG,EAAE,CAAC,EAAE,GAAG,EAAE,EAAE,EAAE,CAAC;aAC7B,QAAQ,CAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;aAC5B,GAAG,CAAC,GAAG,CAAC,CAAC;IAClB,CAAC;IAED,MAAM,IAAA,yBAAK,EAAC,WAAW,CAAC;SACnB,MAAM,EAAE;SACR,QAAQ,EAAE;SACV,QAAQ,CAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;SAC5B,GAAG,CAAC,GAAG,CAAC,CAAC;IAEd,iDAAiD;IAEjD,MAAM,UAAU,GAAG,IAAA,oCAAgB,EAAC,GAAG,CAAC,CAAC;IACzC,IAAI,CAAC,UAAU,CAAC,OAAO,EAAE,EAAE,CAAC;QACxB,MAAM,IAAI,mCAAsB,CAAC,UAAU,CAAC,CAAC;IACjD,CAAC;IAED,MAAM,CAAC,IAAI,GAAG,IAAA,kCAAqB,EAAC,GAAG,EAAE,EAAE,gBAAgB,EAAE,IAAI,EAAE,CAAC,CAAC;IAErE,iDAAiD;IAEjD,MAAM,OAAO,GAAG,IAAA,qBAAa,EAAC,GAAG,EAAE,SAAS,CAAC,CAAC;IAE9C,MAAM,IAAA,sDAAyC,EAAC,MAAM,EAAE,0BAAgB,EAAE;QACtE,EAAE,EAAE,eAAe;QACnB,MAAM,EAAE,YAAY;KACvB,CAAC,CAAC;IAEH,IAAI,MAAM,CAAC,QAAQ,CAAC,UAAU,EAAE,CAAC;QAC7B,IAAI,MAAM,CAAC,QAAQ,CAAC,UAAU,CAAC,MAAM,EAAE,CAAC;YACpC,MAAM,CAAC,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC,QAAQ,CAAC,UAAU,CAAC,MAAM,CAAC;QAC3D,CAAC;QAED,IACI,CAAC,IAAA,yBAAiB,EAAC,GAAG,CAAC;YACvB,CAAC,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,QAAQ,CAAC,UAAU,CAAC,IAAI,CAAC,EAC/C,CAAC;YACC,MAAM,IAAI,qBAAc,CAAC,sEAAsE,CAAC,CAAC;QACrG,CAAC;IACL,CAAC;IAED,MAAM,gBAAgB,GAAG,OAAO,CAAC,SAAS,CAAC,qBAAc,CAAC,mBAAmB,CAAC,CAAC;IAC/E,IAAI,gBAAgB,EAAE,CAAC;QACnB,MAAM,CAAC,IAAI,CAAC,MAAM,GAAG,gBAAgB,CAAC;IAC1C,CAAC;IAED,iDAAiD;IAEjD,MAAM,IAAA,sDAAyC,EAAC,MAAM,EAAE,oBAAU,EAAE;QAChE,EAAE,EAAE,SAAS;QACb,MAAM,EAAE,MAAM;KACjB,CAAC,CAAC;IAEH,IAAI,MAAM,CAAC,QAAQ,CAAC,IAAI,EAAE,CAAC;QACvB,IACI,CAAC,IAAA,8BAAuB,EAAC,IAAA,qBAAa,EAAC,GAAG,EAAE,OAAO,CAAC,EAAE,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,QAAQ,CAAC,EACtF,CAAC;YACC,MAAM,IAAI,sBAAe,CAAC,IAAA,+CAAkC,EAAC,SAAS,CAAC,CAAC,CAAC;QAC7E,CAAC;QAED,MAAM,CAAC,IAAI,CAAC,aAAa,GAAG,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,QAAQ,CAAC;IAC9D,CAAC;IAED,iDAAiD;IAEjD,OAAO,MAAM,CAAC;AAClB,CAAC;AAvFD,kEAuFC"}
1
+ {"version":3,"file":"validation.js","sourceRoot":"","sources":["../../../../../src/http/controllers/user-permission/utils/validation.ts"],"names":[],"mappings":"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"}
package/dist/http/middleware/built-in/auth/module.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"module.d.ts","sourceRoot":"","sources":["../../../../../src/http/middleware/built-in/auth/module.ts"],"names":[],"mappings":"AAUA,OAAO,KAAK,EACW,MAAM,EAC5B,MAAM,QAAQ,CAAC;AA0BhB,wBAAgB,sBAAsB,CAAC,MAAM,EAAE,MAAM,QA4BpD"}
1
+ {"version":3,"file":"module.d.ts","sourceRoot":"","sources":["../../../../../src/http/middleware/built-in/auth/module.ts"],"names":[],"mappings":"AAUA,OAAO,KAAK,EACW,MAAM,EAC5B,MAAM,QAAQ,CAAC;AA0BhB,wBAAgB,sBAAsB,CAAC,MAAM,EAAE,MAAM,QAgCpD"}
package/dist/http/middleware/built-in/auth/module.js CHANGED
@@ -34,9 +34,14 @@ function registerAuthMiddleware(router) {
34
34
  let { authorization: headerValue } = request.headers;
35
35
  (0, utils_1.setRequestEnv)(request, 'ability', new core_1.AbilityManager());
36
36
  try {
37
- const cookie = parseRequestAccessTokenCookie(request);
38
- if (cookie) {
39
- headerValue = (0, hapic_1.stringifyAuthorizationHeader)({ type: 'Bearer', token: cookie });
37
+ if (typeof headerValue === 'undefined') {
38
+ const cookie = parseRequestAccessTokenCookie(request);
39
+ if (cookie) {
40
+ headerValue = (0, hapic_1.stringifyAuthorizationHeader)({
41
+ type: 'Bearer',
42
+ token: cookie,
43
+ });
44
+ }
40
45
  }
41
46
  if (typeof headerValue !== 'string') {
42
47
  next();
package/dist/http/middleware/built-in/auth/module.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"module.js","sourceRoot":"","sources":["../../../../../src/http/middleware/built-in/auth/module.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;AAEH,iCAA+E;AAC/E,uCAA+B;AAC/B,mCAAqC;AAKrC,iDAA6E;AAC7E,uCAA0D;AAC1D,yDAAoD;AACpD,+CAA+C;AAC/C,0CAA+C;AAC/C,qCAAqD;AAErD,SAAS,6BAA6B,CAAC,OAAgB;IACnD,OAAO,IAAA,yBAAgB,EAAC,OAAO,EAAE,iBAAU,CAAC,YAAY,CAAC,CAAC;AAC9D,CAAC;AAED,SAAS,YAAY,CAAC,GAAa;IAC/B,MAAM,MAAM,GAAG,IAAA,kBAAS,GAAE,CAAC;IAC3B,MAAM,aAAa,GAAsB,EAAE,CAAC;IAE5C,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,4BAAmB,EAAC,GAAG,EAAE,iBAAU,CAAC,YAAY,EAAE,aAAa,CAAC,CAAC;IACjE,IAAA,4BAAmB,EAAC,GAAG,EAAE,iBAAU,CAAC,aAAa,EAAE,aAAa,CAAC,CAAC;IAClE,IAAA,4BAAmB,EAAC,GAAG,EAAE,iBAAU,CAAC,wBAAwB,EAAE,aAAa,CAAC,CAAC;AACjF,CAAC;AAED,SAAgB,sBAAsB,CAAC,MAAc;IACjD,MAAM,CAAC,GAAG,CAAC,IAAA,oBAAW,EAAC,KAAK,EAAE,OAAO,EAAE,QAAQ,EAAE,IAAI,EAAE,EAAE;QACrD,IAAI,EAAE,aAAa,EAAE,WAAW,EAAE,GAAG,OAAO,CAAC,OAAO,CAAC;QAErD,IAAA,qBAAa,EAAC,OAAO,EAAE,SAAS,EAAE,IAAI,qBAAc,EAAE,CAAC,CAAC;QAExD,IAAI,CAAC;YACD,MAAM,MAAM,GAAG,6BAA6B,CAAC,OAAO,CAAC,CAAC;YAEtD,IAAI,MAAM,EAAE,CAAC;gBACT,WAAW,GAAG,IAAA,oCAA4B,EAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,KAAK,EAAE,MAAM,EAAE,CAAC,CAAC;YAClF,CAAC;YAED,IAAI,OAAO,WAAW,KAAK,QAAQ,EAAE,CAAC;gBAClC,IAAI,EAAE,CAAC;gBACP,OAAO;YACX,CAAC;YAED,MAAM,MAAM,GAAG,IAAA,gCAAwB,EAAC,WAAW,CAAC,CAAC;YAErD,MAAM,IAAA,kCAAyB,EAAC,OAAO,EAAE,MAAM,CAAC,CAAC;YAEjD,IAAI,EAAE,CAAC;QACX,CAAC;QAAC,OAAO,CAAC,EAAE,CAAC;YACT,YAAY,CAAC,QAAQ,CAAC,CAAC;YACvB,IAAI,CAAC,CAAC,CAAC,CAAC;QACZ,CAAC;IACL,CAAC,CAAC,CAAC,CAAC;AACR,CAAC;AA5BD,wDA4BC"}
1
+ {"version":3,"file":"module.js","sourceRoot":"","sources":["../../../../../src/http/middleware/built-in/auth/module.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;AAEH,iCAA+E;AAC/E,uCAA+B;AAC/B,mCAAqC;AAKrC,iDAA6E;AAC7E,uCAA0D;AAC1D,yDAAoD;AACpD,+CAA+C;AAC/C,0CAA+C;AAC/C,qCAAqD;AAErD,SAAS,6BAA6B,CAAC,OAAgB;IACnD,OAAO,IAAA,yBAAgB,EAAC,OAAO,EAAE,iBAAU,CAAC,YAAY,CAAC,CAAC;AAC9D,CAAC;AAED,SAAS,YAAY,CAAC,GAAa;IAC/B,MAAM,MAAM,GAAG,IAAA,kBAAS,GAAE,CAAC;IAC3B,MAAM,aAAa,GAAsB,EAAE,CAAC;IAE5C,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,4BAAmB,EAAC,GAAG,EAAE,iBAAU,CAAC,YAAY,EAAE,aAAa,CAAC,CAAC;IACjE,IAAA,4BAAmB,EAAC,GAAG,EAAE,iBAAU,CAAC,aAAa,EAAE,aAAa,CAAC,CAAC;IAClE,IAAA,4BAAmB,EAAC,GAAG,EAAE,iBAAU,CAAC,wBAAwB,EAAE,aAAa,CAAC,CAAC;AACjF,CAAC;AAED,SAAgB,sBAAsB,CAAC,MAAc;IACjD,MAAM,CAAC,GAAG,CAAC,IAAA,oBAAW,EAAC,KAAK,EAAE,OAAO,EAAE,QAAQ,EAAE,IAAI,EAAE,EAAE;QACrD,IAAI,EAAE,aAAa,EAAE,WAAW,EAAE,GAAG,OAAO,CAAC,OAAO,CAAC;QAErD,IAAA,qBAAa,EAAC,OAAO,EAAE,SAAS,EAAE,IAAI,qBAAc,EAAE,CAAC,CAAC;QAExD,IAAI,CAAC;YACD,IAAI,OAAO,WAAW,KAAK,WAAW,EAAE,CAAC;gBACrC,MAAM,MAAM,GAAG,6BAA6B,CAAC,OAAO,CAAC,CAAC;gBACtD,IAAI,MAAM,EAAE,CAAC;oBACT,WAAW,GAAG,IAAA,oCAA4B,EAAC;wBACvC,IAAI,EAAE,QAAQ;wBACd,KAAK,EAAE,MAAM;qBAChB,CAAC,CAAC;gBACP,CAAC;YACL,CAAC;YAED,IAAI,OAAO,WAAW,KAAK,QAAQ,EAAE,CAAC;gBAClC,IAAI,EAAE,CAAC;gBACP,OAAO;YACX,CAAC;YAED,MAAM,MAAM,GAAG,IAAA,gCAAwB,EAAC,WAAW,CAAC,CAAC;YAErD,MAAM,IAAA,kCAAyB,EAAC,OAAO,EAAE,MAAM,CAAC,CAAC;YAEjD,IAAI,EAAE,CAAC;QACX,CAAC;QAAC,OAAO,CAAC,EAAE,CAAC;YACT,YAAY,CAAC,QAAQ,CAAC,CAAC;YACvB,IAAI,CAAC,CAAC,CAAC,CAAC;QACZ,CAAC;IACL,CAAC,CAAC,CAAC,CAAC;AACR,CAAC;AAhCD,wDAgCC"}
package/dist/http/middleware/built-in/auth/verify.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"verify.d.ts","sourceRoot":"","sources":["../../../../../src/http/middleware/built-in/auth/verify.ts"],"names":[],"mappings":"AAeA,OAAO,KAAK,EACR,mBAAmB,EAGtB,MAAM,OAAO,CAAC;AAKf,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,QAAQ,CAAC;AAqItC,wBAAsB,yBAAyB,CAC3C,OAAO,EAAE,OAAO,EAChB,MAAM,EAAE,mBAAmB,GAC3B,OAAO,CAAC,IAAI,CAAC,CAShB"}
1
+ {"version":3,"file":"verify.d.ts","sourceRoot":"","sources":["../../../../../src/http/middleware/built-in/auth/verify.ts"],"names":[],"mappings":"AAgBA,OAAO,KAAK,EACR,mBAAmB,EAGtB,MAAM,OAAO,CAAC;AAKf,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,QAAQ,CAAC;AAoItC,wBAAsB,yBAAyB,CAC3C,OAAO,EAAE,OAAO,EAChB,MAAM,EAAE,mBAAmB,GAC3B,OAAO,CAAC,IAAI,CAAC,CAShB"}
package/dist/http/middleware/built-in/auth/verify.js CHANGED
@@ -63,42 +63,42 @@ async function verifyBasicAuthorizationHeader(request, header) {
63
63
  let permissions = [];
64
64
  const config = (0, config_1.useConfig)();
65
65
  const dataSource = await (0, typeorm_extension_1.useDataSource)();
66
- const userRepository = new domains_1.UserRepository(dataSource);
67
- const user = await userRepository.verifyCredentials(header.username, header.password);
68
- if (user) {
69
- await userRepository.appendAttributes(user);
70
- // allow authentication but not authorization with basic auth in production!
71
- if (config.env !== typeorm_extension_1.EnvironmentName.PRODUCTION) {
66
+ if (config.userAuthBasic) {
67
+ const userRepository = new domains_1.UserRepository(dataSource);
68
+ const user = await userRepository.verifyCredentials(header.username, header.password);
69
+ if (user) {
70
+ await userRepository.appendAttributes(user);
72
71
  permissions = await userRepository.getOwnedPermissions(user.id);
72
+ (0, utils_1.setRequestEnv)(request, 'ability', new core_1.AbilityManager(permissions));
73
+ (0, utils_1.setRequestEnv)(request, 'scopes', [core_1.ScopeName.GLOBAL]);
74
+ (0, utils_1.setRequestEnv)(request, 'user', user);
75
+ (0, utils_1.setRequestEnv)(request, 'userId', user.id);
76
+ (0, utils_1.setRequestEnv)(request, 'realm', user.realm);
77
+ return;
73
78
  }
74
- (0, utils_1.setRequestEnv)(request, 'ability', new core_1.AbilityManager(permissions));
75
- (0, utils_1.setRequestEnv)(request, 'scopes', [core_1.ScopeName.GLOBAL]);
76
- (0, utils_1.setRequestEnv)(request, 'user', user);
77
- (0, utils_1.setRequestEnv)(request, 'userId', user.id);
78
- (0, utils_1.setRequestEnv)(request, 'realm', user.realm);
79
- return;
80
79
  }
81
- const robotRepository = new domains_1.RobotRepository(dataSource);
82
- const robot = await robotRepository.verifyCredentials(header.username, header.password);
83
- if (robot) {
84
- // allow authentication but not authorization with basic auth in production!
85
- if (config.env !== typeorm_extension_1.EnvironmentName.PRODUCTION) {
80
+ if (config.robotAuthBasic) {
81
+ const robotRepository = new domains_1.RobotRepository(dataSource);
82
+ const robot = await robotRepository.verifyCredentials(header.username, header.password);
83
+ if (robot) {
86
84
  permissions = await robotRepository.getOwnedPermissions(robot.id);
85
+ (0, utils_1.setRequestEnv)(request, 'ability', new core_1.AbilityManager(permissions));
86
+ (0, utils_1.setRequestEnv)(request, 'scopes', [core_1.ScopeName.GLOBAL]);
87
+ (0, utils_1.setRequestEnv)(request, 'robot', robot);
88
+ (0, utils_1.setRequestEnv)(request, 'robotId', robot.id);
89
+ (0, utils_1.setRequestEnv)(request, 'realm', robot.realm);
87
90
  }
88
- (0, utils_1.setRequestEnv)(request, 'ability', new core_1.AbilityManager(permissions));
89
- (0, utils_1.setRequestEnv)(request, 'scopes', [core_1.ScopeName.GLOBAL]);
90
- (0, utils_1.setRequestEnv)(request, 'robot', robot);
91
- (0, utils_1.setRequestEnv)(request, 'robotId', robot.id);
92
- (0, utils_1.setRequestEnv)(request, 'realm', robot.realm);
93
91
  }
94
- const oauth2ClientRepository = new domains_1.OAuth2ClientRepository(dataSource);
95
- const oauth2Client = await oauth2ClientRepository.verifyCredentials(header.username, header.password);
96
- if (oauth2Client) {
97
- (0, utils_1.setRequestEnv)(request, 'ability', new core_1.AbilityManager());
98
- (0, utils_1.setRequestEnv)(request, 'scopes', [core_1.ScopeName.GLOBAL]);
99
- (0, utils_1.setRequestEnv)(request, 'client', oauth2Client);
100
- (0, utils_1.setRequestEnv)(request, 'clientId', oauth2Client.id);
101
- (0, utils_1.setRequestEnv)(request, 'realm', oauth2Client.realm);
92
+ if (config.clientAuthBasic) {
93
+ const clientRepository = new domains_1.ClientRepository(dataSource);
94
+ const oauth2Client = await clientRepository.verifyCredentials(header.username, header.password);
95
+ if (oauth2Client) {
96
+ (0, utils_1.setRequestEnv)(request, 'ability', new core_1.AbilityManager());
97
+ (0, utils_1.setRequestEnv)(request, 'scopes', [core_1.ScopeName.GLOBAL]);
98
+ (0, utils_1.setRequestEnv)(request, 'client', oauth2Client);
99
+ (0, utils_1.setRequestEnv)(request, 'clientId', oauth2Client.id);
100
+ (0, utils_1.setRequestEnv)(request, 'realm', oauth2Client.realm);
101
+ }
102
102
  }
103
103
  }
104
104
  async function verifyAuthorizationHeader(request, header) {
package/dist/http/middleware/built-in/auth/verify.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"verify.js","sourceRoot":"","sources":["../../../../../src/http/middleware/built-in/auth/verify.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"verify.js","sourceRoot":"","sources":["../../../../../src/http/middleware/built-in/auth/verify.ts"],"names":[],"mappings":"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"}
package/dist/http/middleware/built-in/rate-limit.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"rate-limit.d.ts","sourceRoot":"","sources":["../../../../src/http/middleware/built-in/rate-limit.ts"],"names":[],"mappings":"AAQA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAEvD,OAAO,KAAK,EAAW,MAAM,EAAE,MAAM,QAAQ,CAAC;AAI9C,wBAAgB,2BAA2B,CAAC,MAAM,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,YAAY,QAmC/E"}
1
+ {"version":3,"file":"rate-limit.d.ts","sourceRoot":"","sources":["../../../../src/http/middleware/built-in/rate-limit.ts"],"names":[],"mappings":"AAQA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAEvD,OAAO,KAAK,EAAW,MAAM,EAAE,MAAM,QAAQ,CAAC;AAK9C,wBAAgB,2BAA2B,CAAC,MAAM,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,YAAY,QAoC/E"}
package/dist/http/middleware/built-in/rate-limit.js CHANGED
@@ -10,15 +10,17 @@ exports.registerRateLimitMiddleware = void 0;
10
10
  const core_1 = require("@authup/core");
11
11
  const rate_limit_1 = require("@routup/rate-limit");
12
12
  const smob_1 = require("smob");
13
+ const config_1 = require("../../../config");
13
14
  const utils_1 = require("../../utils");
14
15
  function registerRateLimitMiddleware(router, input) {
16
+ const config = (0, config_1.useConfig)();
15
17
  let options = {
16
18
  skip(req) {
17
19
  const robot = (0, utils_1.useRequestEnv)(req, 'robot');
18
20
  if (robot) {
19
21
  const { name } = (0, utils_1.useRequestEnv)(req, 'realm');
20
22
  if (name === core_1.REALM_MASTER_NAME &&
21
- robot.name === core_1.ROBOT_SYSTEM_NAME) {
23
+ robot.name === config.robotAdminName) {
22
24
  return true;
23
25
  }
24
26
  }
package/dist/http/middleware/built-in/rate-limit.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"rate-limit.js","sourceRoot":"","sources":["../../../../src/http/middleware/built-in/rate-limit.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;AAEH,uCAAoE;AAEpE,mDAA+C;AAE/C,+BAA6B;AAC7B,uCAA4C;AAE5C,SAAgB,2BAA2B,CAAC,MAAc,EAAE,KAAoB;IAC5E,IAAI,OAAO,GAAkB;QACzB,IAAI,CAAC,GAAY;YACb,MAAM,KAAK,GAAG,IAAA,qBAAa,EAAC,GAAG,EAAE,OAAO,CAAC,CAAC;YAC1C,IAAI,KAAK,EAAE,CAAC;gBACR,MAAM,EAAE,IAAI,EAAE,GAAG,IAAA,qBAAa,EAAC,GAAG,EAAE,OAAO,CAAC,CAAC;gBAE7C,IACI,IAAI,KAAK,wBAAiB;oBAC1B,KAAK,CAAC,IAAI,KAAK,wBAAiB,EAClC,CAAC;oBACC,OAAO,IAAI,CAAC;gBAChB,CAAC;YACL,CAAC;YAED,OAAO,KAAK,CAAC;QACjB,CAAC;QACD,GAAG,CAAC,GAAY;YACZ,IAAI,IAAA,qBAAa,EAAC,GAAG,EAAE,QAAQ,CAAC,EAAE,CAAC;gBAC/B,OAAO,EAAE,GAAG,GAAG,CAAC,CAAC,iBAAiB;YACtC,CAAC;YAED,MAAM,KAAK,GAAG,IAAA,qBAAa,EAAC,GAAG,EAAE,OAAO,CAAC,CAAC;YAC1C,IAAI,KAAK,EAAE,CAAC;gBACR,OAAO,EAAE,GAAG,IAAI,CAAC,CAAC,kBAAkB;YACxC,CAAC;YAED,OAAO,EAAE,GAAG,EAAE,CAAC,CAAC,gBAAgB;QACpC,CAAC;QACD,QAAQ,EAAE,EAAE,GAAG,IAAI,EAAE,SAAS;KACjC,CAAC;IAEF,OAAO,GAAG,IAAA,YAAK,EAAC,KAAK,IAAI,EAAE,EAAE,OAAO,CAAC,CAAC;IAEtC,MAAM,CAAC,GAAG,CAAC,IAAA,sBAAS,EAAC,OAAO,CAAC,CAAC,CAAC;AACnC,CAAC;AAnCD,kEAmCC"}
1
+ {"version":3,"file":"rate-limit.js","sourceRoot":"","sources":["../../../../src/http/middleware/built-in/rate-limit.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;AAEH,uCAAiD;AAEjD,mDAA+C;AAE/C,+BAA6B;AAC7B,4CAA4C;AAC5C,uCAA4C;AAE5C,SAAgB,2BAA2B,CAAC,MAAc,EAAE,KAAoB;IAC5E,MAAM,MAAM,GAAG,IAAA,kBAAS,GAAE,CAAC;IAC3B,IAAI,OAAO,GAAkB;QACzB,IAAI,CAAC,GAAY;YACb,MAAM,KAAK,GAAG,IAAA,qBAAa,EAAC,GAAG,EAAE,OAAO,CAAC,CAAC;YAC1C,IAAI,KAAK,EAAE,CAAC;gBACR,MAAM,EAAE,IAAI,EAAE,GAAG,IAAA,qBAAa,EAAC,GAAG,EAAE,OAAO,CAAC,CAAC;gBAE7C,IACI,IAAI,KAAK,wBAAiB;oBAC1B,KAAK,CAAC,IAAI,KAAK,MAAM,CAAC,cAAc,EACtC,CAAC;oBACC,OAAO,IAAI,CAAC;gBAChB,CAAC;YACL,CAAC;YAED,OAAO,KAAK,CAAC;QACjB,CAAC;QACD,GAAG,CAAC,GAAY;YACZ,IAAI,IAAA,qBAAa,EAAC,GAAG,EAAE,QAAQ,CAAC,EAAE,CAAC;gBAC/B,OAAO,EAAE,GAAG,GAAG,CAAC,CAAC,iBAAiB;YACtC,CAAC;YAED,MAAM,KAAK,GAAG,IAAA,qBAAa,EAAC,GAAG,EAAE,OAAO,CAAC,CAAC;YAC1C,IAAI,KAAK,EAAE,CAAC;gBACR,OAAO,EAAE,GAAG,IAAI,CAAC,CAAC,kBAAkB;YACxC,CAAC;YAED,OAAO,EAAE,GAAG,EAAE,CAAC,CAAC,gBAAgB;QACpC,CAAC;QACD,QAAQ,EAAE,EAAE,GAAG,IAAI,EAAE,SAAS;KACjC,CAAC;IAEF,OAAO,GAAG,IAAA,YAAK,EAAC,KAAK,IAAI,EAAE,EAAE,OAAO,CAAC,CAAC;IAEtC,MAAM,CAAC,GAAG,CAAC,IAAA,sBAAS,EAAC,OAAO,CAAC,CAAC,CAAC;AACnC,CAAC;AApCD,kEAoCC"}
package/dist/http/oauth2/authorize/module.d.ts.map CHANGED
@@ -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"}
package/dist/http/oauth2/authorize/module.js CHANGED
@@ -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);
package/dist/http/oauth2/authorize/module.js.map CHANGED
@@ -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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"}
package/dist/http/oauth2/grant-types/abstract.js CHANGED
@@ -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.tokenMaxAgeRefreshToken));
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, {
package/dist/http/oauth2/grant-types/abstract.js.map CHANGED
@@ -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,uBAAuB,CACtC,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"}
package/dist/http/oauth2/grant-types/authorize.js CHANGED
@@ -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.tokenMaxAgeAccessToken,
33
+ accessTokenMaxAge: this.config.tokenAccessMaxAge,
34
34
  refreshToken,
35
- refreshTokenMaxAge: this.config.tokenMaxAgeRefreshToken,
35
+ refreshTokenMaxAge: this.config.tokenRefreshMaxAge,
36
36
  };
37
37
  if ((0, core_1.hasOAuth2OpenIDScope)(authorizationCode.scope)) {
38
38
  buildContext.idToken = authorizationCode.id_token;
package/dist/http/oauth2/grant-types/authorize.js.map CHANGED
@@ -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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"}
package/dist/http/oauth2/grant-types/client-credentials.js CHANGED
@@ -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.tokenMaxAgeAccessToken,
34
+ accessTokenMaxAge: this.config.tokenAccessMaxAge,
35
35
  refreshToken,
36
- refreshTokenMaxAge: this.config.tokenMaxAgeRefreshToken,
36
+ refreshTokenMaxAge: this.config.tokenRefreshMaxAge,
37
37
  });
38
38
  }
39
39
  async validate(request) {
package/dist/http/oauth2/grant-types/client-credentials.js.map CHANGED
@@ -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,sBAAsB;YACrD,YAAY;YACZ,kBAAkB,EAAE,IAAI,CAAC,MAAM,CAAC,uBAAuB;SAC1D,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"}
package/dist/http/oauth2/grant-types/internal.js CHANGED
@@ -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.tokenMaxAgeAccessToken,
29
+ accessTokenMaxAge: this.config.tokenAccessMaxAge,
30
30
  refreshToken,
31
- refreshTokenMaxAge: this.config.tokenMaxAgeRefreshToken,
31
+ refreshTokenMaxAge: this.config.tokenRefreshMaxAge,
32
32
  });
33
33
  }
34
34
  }
package/dist/http/oauth2/grant-types/internal.js.map CHANGED
@@ -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,sBAAsB;YACrD,YAAY;YACZ,kBAAkB,EAAE,IAAI,CAAC,MAAM,CAAC,uBAAuB;SAC1D,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"}
package/dist/http/oauth2/grant-types/password.js CHANGED
@@ -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.tokenMaxAgeAccessToken,
31
+ accessTokenMaxAge: this.config.tokenAccessMaxAge,
32
32
  refreshToken,
33
- refreshTokenMaxAge: this.config.tokenMaxAgeRefreshToken,
33
+ refreshTokenMaxAge: this.config.tokenRefreshMaxAge,
34
34
  });
35
35
  }
36
36
  async validate(request) {
package/dist/http/oauth2/grant-types/password.js.map CHANGED
@@ -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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"}
package/dist/http/oauth2/grant-types/refresh-token.js CHANGED
@@ -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.tokenMaxAgeAccessToken,
34
+ accessTokenMaxAge: this.config.tokenAccessMaxAge,
35
35
  refreshToken,
36
- refreshTokenMaxAge: this.config.tokenMaxAgeRefreshToken,
36
+ refreshTokenMaxAge: this.config.tokenRefreshMaxAge,
37
37
  });
38
38
  }
39
39
  async validate(request) {
package/dist/http/oauth2/grant-types/refresh-token.js.map CHANGED
@@ -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,sBAAsB;YACrD,YAAY;YACZ,kBAAkB,EAAE,IAAI,CAAC,MAAM,CAAC,uBAAuB;SAC1D,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"}
package/dist/http/oauth2/grant-types/robot-credentials.js CHANGED
@@ -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.tokenMaxAgeAccessToken,
31
- refreshTokenMaxAge: this.config.tokenMaxAgeRefreshToken,
30
+ accessTokenMaxAge: this.config.tokenAccessMaxAge,
31
+ refreshTokenMaxAge: this.config.tokenRefreshMaxAge,
32
32
  });
33
33
  }
34
34
  async validate(request) {
package/dist/http/oauth2/grant-types/robot-credentials.js.map CHANGED
@@ -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,sBAAsB;YACrD,kBAAkB,EAAE,IAAI,CAAC,MAAM,CAAC,uBAAuB;SAC1D,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"}
package/dist/http/oauth2/response/bearer.d.ts.map CHANGED
@@ -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"}
package/dist/http/oauth2/response/bearer.js CHANGED
@@ -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 = {
package/dist/http/oauth2/response/bearer.js.map CHANGED
@@ -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"}
package/dist/http/oauth2/token/builder/access-token.d.ts.map CHANGED
@@ -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"}
package/dist/http/oauth2/token/builder/access-token.js CHANGED
@@ -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
  }
package/dist/http/oauth2/token/builder/access-token.js.map CHANGED
@@ -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"}
package/dist/http/oauth2/token/builder/id-token.d.ts.map CHANGED
@@ -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"}
package/dist/http/oauth2/token/builder/id-token.js CHANGED
@@ -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
  }
package/dist/http/oauth2/token/builder/id-token.js.map CHANGED
@@ -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"}
package/dist/http/oauth2/token/builder/type.d.ts CHANGED
@@ -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'> & {
package/dist/http/oauth2/token/builder/type.d.ts.map CHANGED
@@ -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"}