@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
@@ -1 +1 @@
1
- {"version":3,"file":"repository.js","sourceRoot":"","sources":["../../../src/domains/role/repository.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;AAGH,qCAAsD;AAKtD,uCAGsB;AACtB,qDAA+C;AAC/C,qCAAsC;AACtC,wDAA0D;AAC1D,wDAAuD;AAEvD,MAAa,cAAe,SAAQ,oBAAsB;IACtD,YAAY,QAAoC;QAC5C,KAAK,CAAC,mBAAU,EAAE,yBAAe,CAAC,YAAY,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC;IAC5F,CAAC;IAED,KAAK,CAAC,yBAAyB,CAC3B,GAAiB;QAEjB,MAAM,WAAW,GAAG,EAAE,CAAC;QAEvB,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,GAAG,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;YAClC,WAAW,CAAC,IAAI,CAAC,GAAG,MAAM,IAAI,CAAC,mBAAmB,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;QAChE,CAAC;QAED,OAAO,WAAW,CAAC;IACvB,CAAC;IAED,KAAK,CAAC,mBAAmB,CACrB,EAAc;QAEd,MAAM,UAAU,GAAG,IAAI,CAAC,OAAO,CAAC,aAAa,CAAC,sCAAoB,CAAC,CAAC;QAEpE,MAAM,QAAQ,GAAG,MAAM,UAAU,CAAC,IAAI,CAAC;YACnC,KAAK,EAAE;gBACH,OAAO,EAAE,EAAE;aACd;YACD,SAAS,EAAE;gBACP,UAAU,EAAE,IAAI;aACnB;YACD,KAAK,EAAE;gBACH,EAAE,EAAE,IAAA,8BAAY,EAAC;oBACb,MAAM,EAAE,uBAAW,CAAC,sBAAsB;oBAC1C,EAAE;iBACL,CAAC;gBACF,YAAY,EAAE,MAAM;aACvB;SACJ,CAAC,CAAC;QAEH,MAAM,MAAM,GAAyB,EAAE,CAAC;QACxC,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,QAAQ,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;YACvC,MAAM,CAAC,IAAI,CAAC,IAAA,6BAAsB,EAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;QACrD,CAAC;QAED,OAAO,MAAM,CAAC;IAClB,CAAC;CACJ;AA7CD,wCA6CC"}
1
+ {"version":3,"file":"repository.js","sourceRoot":"","sources":["../../../src/domains/role/repository.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;AAGH,qCAAsD;AAKtD,uCAGsB;AACtB,qDAA+C;AAC/C,qCAAsC;AACtC,wDAA0D;AAC1D,wDAAuD;AAEvD,MAAa,cAAe,SAAQ,oBAAsB;IACtD,YAAY,QAAoC;QAC5C,KAAK,CAAC,mBAAU,EAAE,yBAAe,CAAC,YAAY,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC;IAC5F,CAAC;IAED,KAAK,CAAC,yBAAyB,CAC3B,GAAiB;QAEjB,MAAM,WAAW,GAAG,EAAE,CAAC;QAEvB,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,GAAG,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;YAClC,WAAW,CAAC,IAAI,CAAC,GAAG,MAAM,IAAI,CAAC,mBAAmB,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;QAChE,CAAC;QAED,OAAO,WAAW,CAAC;IACvB,CAAC;IAED,KAAK,CAAC,mBAAmB,CACrB,EAAc;QAEd,MAAM,UAAU,GAAG,IAAI,CAAC,OAAO,CAAC,aAAa,CAAC,sCAAoB,CAAC,CAAC;QAEpE,MAAM,QAAQ,GAAG,MAAM,UAAU,CAAC,IAAI,CAAC;YACnC,KAAK,EAAE;gBACH,OAAO,EAAE,EAAE;aACd;YACD,SAAS,EAAE;gBACP,UAAU,EAAE,IAAI;aACnB;YACD,KAAK,EAAE;gBACH,EAAE,EAAE,IAAA,8BAAY,EAAC;oBACb,MAAM,EAAE,uBAAW,CAAC,sBAAsB;oBAC1C,EAAE;iBACL,CAAC;gBACF,YAAY,EAAE,MAAM;aACvB;SACJ,CAAC,CAAC;QAEH,MAAM,MAAM,GAAe,EAAE,CAAC;QAC9B,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,QAAQ,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;YACvC,MAAM,CAAC,IAAI,CAAC,IAAA,mBAAY,EAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;QAC3C,CAAC;QAED,OAAO,MAAM,CAAC;IAClB,CAAC;CACJ;AA7CD,wCA6CC"}
@@ -1,25 +1,26 @@
1
1
  import type { DataSource, EntityManager } from 'typeorm';
2
2
  import { Repository } from 'typeorm';
3
- import type { AbilityDescriptor, Role, User } from '@authup/core';
3
+ import type { Ability, Role, User } from '@authup/core';
4
4
  import { UserEntity } from './entity';
5
5
  export declare class UserRepository extends Repository<UserEntity> {
6
6
  constructor(instance: DataSource | EntityManager);
7
7
  appendAttributes(entity: Partial<Omit<User, 'id'> & Pick<User, 'id'>>, names?: string[]): Promise<Partial<User>>;
8
8
  syncRoles(userId: User['id'], roleIds: Role['id'][]): Promise<void>;
9
- getOwnedPermissions(id: User['id']): Promise<AbilityDescriptor[]>;
10
- getSelfOwnedPermissions(id: string): Promise<AbilityDescriptor[]>;
9
+ getOwnedPermissions(id: User['id']): Promise<Ability[]>;
10
+ getSelfOwnedPermissions(id: string): Promise<Ability[]>;
11
11
  /**
12
- * Verify a user by name and password.
12
+ * Verify a user by id/name and password.
13
13
  *
14
- * @param name
14
+ * @param idOrName
15
15
  * @param password
16
16
  * @param realmId
17
17
  */
18
- verifyCredentials(name: string, password: string, realmId?: string): Promise<UserEntity | undefined>;
18
+ verifyCredentials(idOrName: string, password: string, realmId?: string): Promise<UserEntity | undefined>;
19
19
  createWithPassword(data: Partial<User>): Promise<{
20
20
  entity: UserEntity;
21
21
  password: string;
22
22
  }>;
23
23
  hashPassword(password: string): Promise<string>;
24
+ verifyPassword(password: string, passwordHashed: string): Promise<boolean>;
24
25
  }
25
26
  //# sourceMappingURL=repository.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"repository.d.ts","sourceRoot":"","sources":["../../../src/domains/user/repository.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EACR,UAAU,EACV,aAAa,EAChB,MAAM,SAAS,CAAC;AACjB,OAAO,EAGH,UAAU,EACb,MAAM,SAAS,CAAC;AACjB,OAAO,KAAK,EACR,iBAAiB,EACjB,IAAI,EAAE,IAAI,EAEb,MAAM,cAAc,CAAC;AAWtB,OAAO,EAAE,UAAU,EAAE,MAAM,UAAU,CAAC;AAKtC,qBAAa,cAAe,SAAQ,UAAU,CAAC,UAAU,CAAC;gBAC1C,QAAQ,EAAE,UAAU,GAAG,aAAa;IAI1C,gBAAgB,CAClB,MAAM,EAAE,OAAO,CAAC,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,GAAG,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC,EACpD,KAAK,CAAC,EAAE,MAAM,EAAE,GAChB,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;IA6BpB,SAAS,CACX,MAAM,EAAE,IAAI,CAAC,IAAI,CAAC,EAClB,OAAO,EAAE,IAAI,CAAC,IAAI,CAAC,EAAE;IA6BnB,mBAAmB,CACrB,EAAE,EAAE,IAAI,CAAC,IAAI,CAAC,GACd,OAAO,CAAC,iBAAiB,EAAE,CAAC;IA8B1B,uBAAuB,CAAC,EAAE,EAAE,MAAM,GAAI,OAAO,CAAC,iBAAiB,EAAE,CAAC;IA6BxE;;;;;;OAMG;IACG,iBAAiB,CACnB,IAAI,EAAE,MAAM,EACZ,QAAQ,EAAE,MAAM,EAChB,OAAO,CAAC,EAAE,MAAM,GAChB,OAAO,CAAC,UAAU,GAAG,SAAS,CAAC;IA2B7B,kBAAkB,CAAC,IAAI,EAAE,OAAO,CAAC,IAAI,CAAC,GAAI,OAAO,CAAC;QACpD,MAAM,EAAE,UAAU,CAAC;QACnB,QAAQ,EAAE,MAAM,CAAA;KACnB,CAAC;IAYI,YAAY,CAAC,QAAQ,EAAE,MAAM,GAAI,OAAO,CAAC,MAAM,CAAC;CAGzD"}
1
+ {"version":3,"file":"repository.d.ts","sourceRoot":"","sources":["../../../src/domains/user/repository.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EACR,UAAU,EACV,aAAa,EAChB,MAAM,SAAS,CAAC;AACjB,OAAO,EAGH,UAAU,EACb,MAAM,SAAS,CAAC;AACjB,OAAO,KAAK,EACR,OAAO,EACP,IAAI,EAAE,IAAI,EAEb,MAAM,cAAc,CAAC;AAYtB,OAAO,EAAE,UAAU,EAAE,MAAM,UAAU,CAAC;AAKtC,qBAAa,cAAe,SAAQ,UAAU,CAAC,UAAU,CAAC;gBAC1C,QAAQ,EAAE,UAAU,GAAG,aAAa;IAI1C,gBAAgB,CAClB,MAAM,EAAE,OAAO,CAAC,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,GAAG,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC,EACpD,KAAK,CAAC,EAAE,MAAM,EAAE,GAChB,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;IA6BpB,SAAS,CACX,MAAM,EAAE,IAAI,CAAC,IAAI,CAAC,EAClB,OAAO,EAAE,IAAI,CAAC,IAAI,CAAC,EAAE;IA6BnB,mBAAmB,CACrB,EAAE,EAAE,IAAI,CAAC,IAAI,CAAC,GACd,OAAO,CAAC,OAAO,EAAE,CAAC;IA8BhB,uBAAuB,CAAC,EAAE,EAAE,MAAM,GAAI,OAAO,CAAC,OAAO,EAAE,CAAC;IA6B9D;;;;;;OAMG;IACG,iBAAiB,CACnB,QAAQ,EAAE,MAAM,EAChB,QAAQ,EAAE,MAAM,EAChB,OAAO,CAAC,EAAE,MAAM,GAChB,OAAO,CAAC,UAAU,GAAG,SAAS,CAAC;IAgC7B,kBAAkB,CAAC,IAAI,EAAE,OAAO,CAAC,IAAI,CAAC,GAAI,OAAO,CAAC;QACpD,MAAM,EAAE,UAAU,CAAC;QACnB,QAAQ,EAAE,MAAM,CAAA;KACnB,CAAC;IAYI,YAAY,CAAC,QAAQ,EAAE,MAAM,GAAI,OAAO,CAAC,MAAM,CAAC;IAIhD,cAAc,CAAC,QAAQ,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM,GAAI,OAAO,CAAC,OAAO,CAAC;CAGpF"}
@@ -110,24 +110,29 @@ class UserRepository extends typeorm_1.Repository {
110
110
  });
111
111
  const result = [];
112
112
  for (let i = 0; i < entities.length; i++) {
113
- result.push((0, core_1.buildAbilityDescriptor)(entities[i]));
113
+ result.push((0, core_1.buildAbility)(entities[i]));
114
114
  }
115
115
  return result;
116
116
  }
117
117
  // ------------------------------------------------------------------
118
118
  /**
119
- * Verify a user by name and password.
119
+ * Verify a user by id/name and password.
120
120
  *
121
- * @param name
121
+ * @param idOrName
122
122
  * @param password
123
123
  * @param realmId
124
124
  */
125
- async verifyCredentials(name, password, realmId) {
125
+ async verifyCredentials(idOrName, password, realmId) {
126
126
  const query = this.createQueryBuilder('user')
127
- .leftJoinAndSelect('user.realm', 'realm')
128
- .where('user.name LIKE :name', { name });
129
- if (realmId) {
130
- query.andWhere('user.realm_id = :realmId', { realmId });
127
+ .leftJoinAndSelect('user.realm', 'realm');
128
+ if ((0, core_1.isUUID)(idOrName)) {
129
+ query.where('user.id = :id', { id: idOrName });
130
+ }
131
+ else {
132
+ query.where('user.name LIKE :name', { name: idOrName });
133
+ if (realmId) {
134
+ query.andWhere('user.realm_id = :realmId', { realmId });
135
+ }
131
136
  }
132
137
  const entities = await query
133
138
  .addSelect('user.password')
@@ -136,7 +141,7 @@ class UserRepository extends typeorm_1.Repository {
136
141
  if (!entities[i].password) {
137
142
  continue;
138
143
  }
139
- const verified = await (0, server_kit_1.compare)(password, entities[i].password);
144
+ const verified = await this.verifyPassword(password, entities[i].password);
140
145
  if (verified) {
141
146
  return entities[i];
142
147
  }
@@ -155,6 +160,9 @@ class UserRepository extends typeorm_1.Repository {
155
160
  async hashPassword(password) {
156
161
  return (0, server_kit_1.hash)(password);
157
162
  }
163
+ async verifyPassword(password, passwordHashed) {
164
+ return (0, server_kit_1.compare)(password, passwordHashed);
165
+ }
158
166
  }
159
167
  exports.UserRepository = UserRepository;
160
168
  //# sourceMappingURL=repository.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"repository.js","sourceRoot":"","sources":["../../../src/domains/user/repository.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"repository.js","sourceRoot":"","sources":["../../../src/domains/user/repository.ts"],"names":[],"mappings":"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"}
@@ -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.tokenMaxAgeAccessToken * 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.tokenMaxAgeRefreshToken * 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":"validation.d.ts","sourceRoot":"","sources":["../../../../../src/http/controllers/permission/utils/validation.ts"],"names":[],"mappings":"AAQA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,QAAQ,CAAC;AACtC,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AAC5D,OAAO,EAAE,uBAAuB,EAAE,MAAM,kBAAkB,CAAC;AAC3D,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,qBAAqB,CAAC;AAMnE,wBAAsB,uBAAuB,CACzC,GAAG,EAAE,OAAO,EACZ,SAAS,EAAE,GAAG,uBAAuB,CAAC,MAAM,EAAE,GAAG,GAAG,uBAAuB,CAAC,MAAM,EAAE,GACpF,OAAO,CAAC,uBAAuB,CAAC,gBAAgB,CAAC,CAAC,CAkCrD"}
1
+ {"version":3,"file":"validation.d.ts","sourceRoot":"","sources":["../../../../../src/http/controllers/permission/utils/validation.ts"],"names":[],"mappings":"AAQA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,QAAQ,CAAC;AACtC,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AAC5D,OAAO,EAAE,uBAAuB,EAAE,MAAM,kBAAkB,CAAC;AAC3D,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,qBAAqB,CAAC;AAMnE,wBAAsB,uBAAuB,CACzC,GAAG,EAAE,OAAO,EACZ,SAAS,EAAE,GAAG,uBAAuB,CAAC,MAAM,EAAE,GAAG,GAAG,uBAAuB,CAAC,MAAM,EAAE,GACpF,OAAO,CAAC,uBAAuB,CAAC,gBAAgB,CAAC,CAAC,CAiCrD"}
@@ -16,7 +16,6 @@ async function runPermissionValidation(req, operation) {
16
16
  .exists()
17
17
  .notEmpty()
18
18
  .isString()
19
- .matches(/^(?:[a-zA-Z-]+_[a-zA-Z-]+)+$/)
20
19
  .isLength({ min: 3, max: 128 });
21
20
  if (operation === request_1.RequestHandlerOperation.UPDATE)
22
21
  nameChain.optional({ nullable: true });
@@ -1 +1 @@
1
- {"version":3,"file":"validation.js","sourceRoot":"","sources":["../../../../../src/http/controllers/permission/utils/validation.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;AAEH,yDAA4D;AAG5D,8CAA2D;AAE3D,oDAG6B;AAEtB,KAAK,UAAU,uBAAuB,CACzC,GAAY,EACZ,SAAoF;IAEpF,MAAM,MAAM,GAA+C,IAAA,wCAA2B,GAAE,CAAC;IAEzF,MAAM,SAAS,GAAG,IAAA,yBAAK,EAAC,MAAM,CAAC;SAC1B,MAAM,EAAE;SACR,QAAQ,EAAE;SACV,QAAQ,EAAE;SACV,OAAO,CAAC,8BAA8B,CAAC;SACvC,QAAQ,CAAC,EAAE,GAAG,EAAE,CAAC,EAAE,GAAG,EAAE,GAAG,EAAE,CAAC,CAAC;IAEpC,IAAI,SAAS,KAAK,iCAAuB,CAAC,MAAM;QAAE,SAAS,CAAC,QAAQ,CAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC,CAAC;IAEzF,MAAM,SAAS,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;IAEzB,MAAM,IAAA,yBAAK,EAAC,aAAa,CAAC;SACrB,MAAM,EAAE;SACR,QAAQ,EAAE;SACV,QAAQ,EAAE;SACV,QAAQ,CAAC,EAAE,GAAG,EAAE,CAAC,EAAE,GAAG,EAAE,IAAI,EAAE,CAAC;SAC/B,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,OAAO,MAAM,CAAC;AAClB,CAAC;AArCD,0DAqCC"}
1
+ {"version":3,"file":"validation.js","sourceRoot":"","sources":["../../../../../src/http/controllers/permission/utils/validation.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;AAEH,yDAA4D;AAG5D,8CAA2D;AAE3D,oDAG6B;AAEtB,KAAK,UAAU,uBAAuB,CACzC,GAAY,EACZ,SAAoF;IAEpF,MAAM,MAAM,GAA+C,IAAA,wCAA2B,GAAE,CAAC;IAEzF,MAAM,SAAS,GAAG,IAAA,yBAAK,EAAC,MAAM,CAAC;SAC1B,MAAM,EAAE;SACR,QAAQ,EAAE;SACV,QAAQ,EAAE;SACV,QAAQ,CAAC,EAAE,GAAG,EAAE,CAAC,EAAE,GAAG,EAAE,GAAG,EAAE,CAAC,CAAC;IAEpC,IAAI,SAAS,KAAK,iCAAuB,CAAC,MAAM;QAAE,SAAS,CAAC,QAAQ,CAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC,CAAC;IAEzF,MAAM,SAAS,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;IAEzB,MAAM,IAAA,yBAAK,EAAC,aAAa,CAAC;SACrB,MAAM,EAAE;SACR,QAAQ,EAAE;SACV,QAAQ,EAAE;SACV,QAAQ,CAAC,EAAE,GAAG,EAAE,CAAC,EAAE,GAAG,EAAE,IAAI,EAAE,CAAC;SAC/B,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,OAAO,MAAM,CAAC;AAClB,CAAC;AApCD,0DAoCC"}
@@ -1 +1 @@
1
- {"version":3,"file":"delete.d.ts","sourceRoot":"","sources":["../../../../../src/http/controllers/robot/handlers/delete.ts"],"names":[],"mappings":"AAaA,OAAO,KAAK,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,QAAQ,CAAC;AAMhD,wBAAsB,uBAAuB,CAAC,GAAG,EAAE,OAAO,EAAE,GAAG,EAAE,QAAQ,GAAI,OAAO,CAAC,GAAG,CAAC,CAgDxF"}
1
+ {"version":3,"file":"delete.d.ts","sourceRoot":"","sources":["../../../../../src/http/controllers/robot/handlers/delete.ts"],"names":[],"mappings":"AAYA,OAAO,KAAK,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,QAAQ,CAAC;AAOhD,wBAAsB,uBAAuB,CAAC,GAAG,EAAE,OAAO,EAAE,GAAG,EAAE,QAAQ,GAAI,OAAO,CAAC,GAAG,CAAC,CAiDxF"}
@@ -11,6 +11,7 @@ const http_1 = require("@ebec/http");
11
11
  const core_1 = require("@authup/core");
12
12
  const routup_1 = require("routup");
13
13
  const typeorm_extension_1 = require("typeorm-extension");
14
+ const config_1 = require("../../../../config");
14
15
  const domains_1 = require("../../../../domains");
15
16
  const utils_1 = require("../../../utils");
16
17
  async function deleteRobotRouteHandler(req, res) {
@@ -31,7 +32,8 @@ async function deleteRobotRouteHandler(req, res) {
31
32
  throw new http_1.ForbiddenError();
32
33
  }
33
34
  }
34
- if (entity.name === core_1.ROBOT_SYSTEM_NAME) {
35
+ const config = (0, config_1.useConfig)();
36
+ if (entity.name.toLowerCase() === config.robotAdminName.toLowerCase()) {
35
37
  const realm = await (0, domains_1.resolveRealm)(entity.realm_id);
36
38
  if (realm.name === core_1.REALM_MASTER_NAME) {
37
39
  throw new http_1.BadRequestError('The system robot can not be deleted.');
@@ -1 +1 @@
1
- {"version":3,"file":"delete.js","sourceRoot":"","sources":["../../../../../src/http/controllers/robot/handlers/delete.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;AAEH,qCAA4E;AAC5E,uCAIsB;AAEtB,mCAAuD;AACvD,yDAAkD;AAClD,iDAAiG;AACjG,0CAA+C;AAExC,KAAK,UAAU,uBAAuB,CAAC,GAAY,EAAE,GAAa;IACrE,MAAM,EAAE,GAAG,IAAA,wBAAe,EAAC,GAAG,EAAE,IAAI,CAAC,CAAC;IAEtC,MAAM,UAAU,GAAG,MAAM,IAAA,iCAAa,GAAE,CAAC;IACzC,MAAM,UAAU,GAAG,UAAU,CAAC,aAAa,CAAC,qBAAW,CAAC,CAAC;IACzD,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,MAAM,OAAO,GAAG,IAAA,qBAAa,EAAC,GAAG,EAAE,SAAS,CAAC,CAAC;IAC9C,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,qBAAc,CAAC,UAAU,CAAC,EAAE,CAAC;QAC1C,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE,CAAC;YAClB,MAAM,IAAI,qBAAc,EAAE,CAAC;QAC/B,CAAC;QAED,IACI,MAAM,CAAC,OAAO;YACd,MAAM,CAAC,OAAO,KAAK,IAAA,qBAAa,EAAC,GAAG,EAAE,QAAQ,CAAC,EACjD,CAAC;YACC,MAAM,IAAI,qBAAc,EAAE,CAAC;QAC/B,CAAC;IACL,CAAC;IAED,IAAI,MAAM,CAAC,IAAI,KAAK,wBAAiB,EAAE,CAAC;QACpC,MAAM,KAAK,GAAG,MAAM,IAAA,sBAAY,EAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;QAClD,IAAI,KAAK,CAAC,IAAI,KAAK,wBAAiB,EAAE,CAAC;YACnC,MAAM,IAAI,sBAAe,CAAC,sCAAsC,CAAC,CAAC;QACtE,CAAC;IACL,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,yDAAyD;IACzD,MAAM,IAAA,yCAA+B,EAAC,MAAM,CAAC,CAAC;IAE9C,iDAAiD;IAEjD,OAAO,IAAA,qBAAY,EAAC,GAAG,EAAE,MAAM,CAAC,CAAC;AACrC,CAAC;AAhDD,0DAgDC"}
1
+ {"version":3,"file":"delete.js","sourceRoot":"","sources":["../../../../../src/http/controllers/robot/handlers/delete.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;AAEH,qCAA4E;AAC5E,uCAGsB;AAEtB,mCAAuD;AACvD,yDAAkD;AAClD,+CAA+C;AAC/C,iDAAiG;AACjG,0CAA+C;AAExC,KAAK,UAAU,uBAAuB,CAAC,GAAY,EAAE,GAAa;IACrE,MAAM,EAAE,GAAG,IAAA,wBAAe,EAAC,GAAG,EAAE,IAAI,CAAC,CAAC;IAEtC,MAAM,UAAU,GAAG,MAAM,IAAA,iCAAa,GAAE,CAAC;IACzC,MAAM,UAAU,GAAG,UAAU,CAAC,aAAa,CAAC,qBAAW,CAAC,CAAC;IACzD,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,MAAM,OAAO,GAAG,IAAA,qBAAa,EAAC,GAAG,EAAE,SAAS,CAAC,CAAC;IAC9C,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,qBAAc,CAAC,UAAU,CAAC,EAAE,CAAC;QAC1C,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE,CAAC;YAClB,MAAM,IAAI,qBAAc,EAAE,CAAC;QAC/B,CAAC;QAED,IACI,MAAM,CAAC,OAAO;YACd,MAAM,CAAC,OAAO,KAAK,IAAA,qBAAa,EAAC,GAAG,EAAE,QAAQ,CAAC,EACjD,CAAC;YACC,MAAM,IAAI,qBAAc,EAAE,CAAC;QAC/B,CAAC;IACL,CAAC;IAED,MAAM,MAAM,GAAG,IAAA,kBAAS,GAAE,CAAC;IAC3B,IAAI,MAAM,CAAC,IAAI,CAAC,WAAW,EAAE,KAAK,MAAM,CAAC,cAAc,CAAC,WAAW,EAAE,EAAE,CAAC;QACpE,MAAM,KAAK,GAAG,MAAM,IAAA,sBAAY,EAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;QAClD,IAAI,KAAK,CAAC,IAAI,KAAK,wBAAiB,EAAE,CAAC;YACnC,MAAM,IAAI,sBAAe,CAAC,sCAAsC,CAAC,CAAC;QACtE,CAAC;IACL,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,yDAAyD;IACzD,MAAM,IAAA,yCAA+B,EAAC,MAAM,CAAC,CAAC;IAE9C,iDAAiD;IAEjD,OAAO,IAAA,qBAAY,EAAC,GAAG,EAAE,MAAM,CAAC,CAAC;AACrC,CAAC;AAjDD,0DAiDC"}
@@ -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,CAuDjG"}
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"}
@@ -37,23 +37,37 @@ async function handleRobotIntegrityRouteHandler(req, res) {
37
37
  if (entity.realm) {
38
38
  realm = entity.realm;
39
39
  }
40
- if ((0, vault_1.hasClient)() &&
41
- realm &&
42
- realm.name === core_1.REALM_MASTER_NAME) {
40
+ if (!(0, vault_1.hasClient)() || !realm || realm.name !== core_1.REALM_MASTER_NAME) {
41
+ return (0, routup_1.sendAccepted)(res);
42
+ }
43
+ let refreshCredentials = false;
44
+ if (entity.secret) {
43
45
  const credentials = await (0, domains_1.findRobotCredentialsInVault)({
44
46
  name: entity.name,
45
47
  });
46
- if (!credentials) {
47
- const secret = (0, core_1.createNanoID)(64);
48
- entity.secret = await repository.hashSecret(secret);
49
- await repository.save(entity);
50
- await (0, domains_1.saveRobotCredentialsToVault)({
51
- ...entity,
52
- secret,
53
- });
48
+ if (credentials) {
49
+ const secretHashedEqual = await repository.verifySecret(credentials.secret, entity.secret);
50
+ if (!secretHashedEqual) {
51
+ refreshCredentials = true;
52
+ }
53
+ }
54
+ else {
55
+ refreshCredentials = true;
54
56
  }
55
57
  }
56
- (0, routup_1.sendAccepted)(res);
58
+ else {
59
+ refreshCredentials = true;
60
+ }
61
+ if (refreshCredentials) {
62
+ const secret = (0, core_1.createNanoID)(64);
63
+ entity.secret = await repository.hashSecret(secret);
64
+ await repository.save(entity);
65
+ await (0, domains_1.saveRobotCredentialsToVault)({
66
+ ...entity,
67
+ secret,
68
+ });
69
+ }
70
+ return (0, routup_1.sendAccepted)(res);
57
71
  }
58
72
  exports.handleRobotIntegrityRouteHandler = handleRobotIntegrityRouteHandler;
59
73
  //# sourceMappingURL=integrity.js.map
@@ -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,IACI,IAAA,iBAAS,GAAE;QACX,KAAK;QACL,KAAK,CAAC,IAAI,KAAK,wBAAiB,EAClC,CAAC;QACC,MAAM,WAAW,GAAG,MAAM,IAAA,qCAA2B,EAAC;YAClD,IAAI,EAAE,MAAM,CAAC,IAAI;SACpB,CAAC,CAAC;QAEH,IAAI,CAAC,WAAW,EAAE,CAAC;YACf,MAAM,MAAM,GAAG,IAAA,mBAAY,EAAC,EAAE,CAAC,CAAC;YAEhC,MAAM,CAAC,MAAM,GAAG,MAAM,UAAU,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC;YACpD,MAAM,UAAU,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;YAE9B,MAAM,IAAA,qCAA2B,EAAC;gBAC9B,GAAG,MAAM;gBACT,MAAM;aACT,CAAC,CAAC;QACP,CAAC;IACL,CAAC;IAED,IAAA,qBAAY,EAAC,GAAG,CAAC,CAAC;AACtB,CAAC;AAvDD,4EAuDC"}
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,IAAI,MAAM,CAAC,MAAM,EAAE,CAAC;QAChB,MAAM,WAAW,GAAG,MAAM,IAAA,qCAA2B,EAAC;YAClD,IAAI,EAAE,MAAM,CAAC,IAAI;SACpB,CAAC,CAAC;QAEH,IAAI,WAAW,EAAE,CAAC;YACd,MAAM,iBAAiB,GAAG,MAAM,UAAU,CAAC,YAAY,CAAC,WAAW,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,CAAC,CAAC;YAC3F,IAAI,CAAC,iBAAiB,EAAE,CAAC;gBACrB,kBAAkB,GAAG,IAAI,CAAC;YAC9B,CAAC;QACL,CAAC;aAAM,CAAC;YACJ,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;AAnED,4EAmEC"}
@@ -1 +1 @@
1
- {"version":3,"file":"update.d.ts","sourceRoot":"","sources":["../../../../../src/http/controllers/robot/handlers/update.ts"],"names":[],"mappings":"AAWA,OAAO,KAAK,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,QAAQ,CAAC;AAQhD,wBAAsB,uBAAuB,CAAC,GAAG,EAAE,OAAO,EAAE,GAAG,EAAE,QAAQ,GAAI,OAAO,CAAC,GAAG,CAAC,CAgExF"}
1
+ {"version":3,"file":"update.d.ts","sourceRoot":"","sources":["../../../../../src/http/controllers/robot/handlers/update.ts"],"names":[],"mappings":"AAWA,OAAO,KAAK,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,QAAQ,CAAC;AAShD,wBAAsB,uBAAuB,CAAC,GAAG,EAAE,OAAO,EAAE,GAAG,EAAE,QAAQ,GAAI,OAAO,CAAC,GAAG,CAAC,CAkExF"}
@@ -11,6 +11,7 @@ const http_1 = require("@ebec/http");
11
11
  const core_1 = require("@authup/core");
12
12
  const routup_1 = require("routup");
13
13
  const typeorm_extension_1 = require("typeorm-extension");
14
+ const config_1 = require("../../../../config");
14
15
  const domains_1 = require("../../../../domains");
15
16
  const utils_1 = require("../../../utils");
16
17
  const utils_2 = require("../utils");
@@ -37,9 +38,10 @@ async function updateRobotRouteHandler(req, res) {
37
38
  throw new http_1.ForbiddenError();
38
39
  }
39
40
  }
41
+ const config = (0, config_1.useConfig)();
40
42
  if ((0, core_1.isPropertySet)(result.data, 'name') &&
41
- entity.name !== result.data.name &&
42
- entity.name === core_1.ROBOT_SYSTEM_NAME) {
43
+ entity.name.toLowerCase() !== result.data.name.toLowerCase() &&
44
+ entity.name.toLowerCase() === config.robotAdminName.toLowerCase()) {
43
45
  const realm = await (0, domains_1.resolveRealm)(entity.realm_id);
44
46
  if (realm.name === core_1.REALM_MASTER_NAME) {
45
47
  throw new http_1.BadRequestError('The system robot name can not be changed.');
@@ -1 +1 @@
1
- {"version":3,"file":"update.js","sourceRoot":"","sources":["../../../../../src/http/controllers/robot/handlers/update.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;AAEH,qCAA4E;AAC5E,uCAEsB;AAEtB,mCAAuD;AACvD,yDAAkD;AAClD,iDAAiG;AACjG,0CAA+C;AAC/C,oCAA8C;AAC9C,8CAA2D;AAEpD,KAAK,UAAU,uBAAuB,CAAC,GAAY,EAAE,GAAa;IACrE,MAAM,EAAE,GAAG,IAAA,wBAAe,EAAC,GAAG,EAAE,IAAI,CAAC,CAAC;IAEtC,MAAM,MAAM,GAAG,MAAM,IAAA,0BAAkB,EAAC,GAAG,EAAE,iCAAuB,CAAC,MAAM,CAAC,CAAC;IAC7E,IAAI,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC;QACf,OAAO,IAAA,qBAAY,EAAC,GAAG,CAAC,CAAC;IAC7B,CAAC;IAED,MAAM,UAAU,GAAG,MAAM,IAAA,iCAAa,GAAE,CAAC;IACzC,MAAM,UAAU,GAAG,IAAI,yBAAe,CAAC,UAAU,CAAC,CAAC;IACnD,IAAI,MAAM,GAAG,MAAM,UAAU,CAAC,SAAS,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;IAEhD,IAAI,CAAC,MAAM,EAAE,CAAC;QACV,MAAM,IAAI,oBAAa,EAAE,CAAC;IAC9B,CAAC;IAED,MAAM,OAAO,GAAG,IAAA,qBAAa,EAAC,GAAG,EAAE,SAAS,CAAC,CAAC;IAC9C,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,qBAAc,CAAC,UAAU,CAAC,EAAE,CAAC;QAC1C,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE,CAAC;YAClB,MAAM,IAAI,qBAAc,EAAE,CAAC;QAC/B,CAAC;QAED,IACI,MAAM,CAAC,OAAO;YACd,MAAM,CAAC,OAAO,KAAK,IAAA,qBAAa,EAAC,GAAG,EAAE,QAAQ,CAAC,EACjD,CAAC;YACC,MAAM,IAAI,qBAAc,EAAE,CAAC;QAC/B,CAAC;IACL,CAAC;IAED,IACI,IAAA,oBAAa,EAAC,MAAM,CAAC,IAAI,EAAE,MAAM,CAAC;QAClC,MAAM,CAAC,IAAI,KAAK,MAAM,CAAC,IAAI,CAAC,IAAI;QAChC,MAAM,CAAC,IAAI,KAAK,wBAAiB,EACnC,CAAC;QACC,MAAM,KAAK,GAAG,MAAM,IAAA,sBAAY,EAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;QAClD,IAAI,KAAK,CAAC,IAAI,KAAK,wBAAiB,EAAE,CAAC;YACnC,MAAM,IAAI,sBAAe,CAAC,2CAA2C,CAAC,CAAC;QAC3E,CAAC;IACL,CAAC;IAED,MAAM,GAAG,UAAU,CAAC,KAAK,CAAC,MAAM,EAAE,MAAM,CAAC,IAAI,CAAC,CAAC;IAE/C,IAAI,MAAM,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC;QACrB,MAAM,CAAC,MAAM,GAAG,MAAM,UAAU,CAAC,UAAU,CAAC,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IACpE,CAAC;IAED,MAAM,GAAG,MAAM,UAAU,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IAEvC,iDAAiD;IAEjD,IAAI,MAAM,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC;QACrB,yDAAyD;QACzD,MAAM,IAAA,qCAA2B,EAAC;YAC9B,GAAG,MAAM;YACT,MAAM,EAAE,MAAM,CAAC,IAAI,CAAC,MAAM;SAC7B,CAAC,CAAC;QAEH,MAAM,CAAC,MAAM,GAAG,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC;IACvC,CAAC;IAED,iDAAiD;IAEjD,OAAO,IAAA,qBAAY,EAAC,GAAG,EAAE,MAAM,CAAC,CAAC;AACrC,CAAC;AAhED,0DAgEC"}
1
+ {"version":3,"file":"update.js","sourceRoot":"","sources":["../../../../../src/http/controllers/robot/handlers/update.ts"],"names":[],"mappings":"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"}
@@ -36,7 +36,7 @@ async function deleteRobotPermissionRouteHandler(req, res) {
36
36
  throw new http_1.ForbiddenError();
37
37
  }
38
38
  // ----------------------------------------------
39
- if (!ability.matchTarget(core_1.PermissionName.ROBOT_PERMISSION_DROP, entity.target)) {
39
+ if (!ability.satisfy(core_1.PermissionName.ROBOT_PERMISSION_DROP, { target: entity.target })) {
40
40
  throw new http_1.ForbiddenError('You are not permitted for the robot-permission target.');
41
41
  }
42
42
  // ----------------------------------------------
@@ -1 +1 @@
1
- {"version":3,"file":"delete.js","sourceRoot":"","sources":["../../../../../src/http/controllers/robot-permission/handlers/delete.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;AAEH,qCAA2D;AAC3D,uCAAuE;AAEvE,mCAAuD;AACvD,yDAAkD;AAClD,iDAA4D;AAC5D,0CAA+C;AAE/C;;;;;GAKG;AACI,KAAK,UAAU,iCAAiC,CAAC,GAAY,EAAE,GAAa;IAC/E,MAAM,EAAE,GAAG,IAAA,wBAAe,EAAC,GAAG,EAAE,IAAI,CAAC,CAAC;IAEtC,MAAM,OAAO,GAAG,IAAA,qBAAa,EAAC,GAAG,EAAE,SAAS,CAAC,CAAC;IAC9C,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,qBAAc,CAAC,qBAAqB,CAAC,EAAE,CAAC;QACrD,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,+BAAqB,CAAC,CAAC;IACnE,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,IAAI,CAAC,IAAA,8BAAuB,EAAC,IAAA,qBAAa,EAAC,GAAG,EAAE,OAAO,CAAC,EAAE,MAAM,CAAC,cAAc,CAAC,EAAE,CAAC;QAC/E,MAAM,IAAI,qBAAc,EAAE,CAAC;IAC/B,CAAC;IAED,iDAAiD;IAEjD,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC,qBAAc,CAAC,qBAAqB,EAAE,MAAM,CAAC,MAAM,CAAC,EAAE,CAAC;QAC5E,MAAM,IAAI,qBAAc,CAAC,wDAAwD,CAAC,CAAC;IACvF,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;AAvCD,8EAuCC"}
1
+ {"version":3,"file":"delete.js","sourceRoot":"","sources":["../../../../../src/http/controllers/robot-permission/handlers/delete.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;AAEH,qCAA2D;AAC3D,uCAAuE;AAEvE,mCAAuD;AACvD,yDAAkD;AAClD,iDAA4D;AAC5D,0CAA+C;AAE/C;;;;;GAKG;AACI,KAAK,UAAU,iCAAiC,CAAC,GAAY,EAAE,GAAa;IAC/E,MAAM,EAAE,GAAG,IAAA,wBAAe,EAAC,GAAG,EAAE,IAAI,CAAC,CAAC;IAEtC,MAAM,OAAO,GAAG,IAAA,qBAAa,EAAC,GAAG,EAAE,SAAS,CAAC,CAAC;IAC9C,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,qBAAc,CAAC,qBAAqB,CAAC,EAAE,CAAC;QACrD,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,+BAAqB,CAAC,CAAC;IACnE,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,IAAI,CAAC,IAAA,8BAAuB,EAAC,IAAA,qBAAa,EAAC,GAAG,EAAE,OAAO,CAAC,EAAE,MAAM,CAAC,cAAc,CAAC,EAAE,CAAC;QAC/E,MAAM,IAAI,qBAAc,EAAE,CAAC;IAC/B,CAAC;IAED,iDAAiD;IAEjD,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,qBAAc,CAAC,qBAAqB,EAAE,EAAE,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,CAAC,EAAE,CAAC;QACpF,MAAM,IAAI,qBAAc,CAAC,wDAAwD,CAAC,CAAC;IACvF,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;AAvCD,8EAuCC"}
@@ -58,10 +58,10 @@ async function runRobotPermissionValidation(req, operation) {
58
58
  throw new http_1.ForbiddenError('It is only allowed to assign robot permissions, which are also owned.');
59
59
  }
60
60
  }
61
- const permissionTarget = ability
62
- .getTarget(core_1.PermissionName.ROBOT_PERMISSION_ADD);
63
- if (permissionTarget) {
64
- result.data.target = permissionTarget;
61
+ const permission = ability
62
+ .findOne(core_1.PermissionName.ROBOT_PERMISSION_ADD);
63
+ if (permission) {
64
+ result.data.target = permission.target;
65
65
  }
66
66
  // ----------------------------------------------
67
67
  await (0, validation_1.extendExpressValidationResultWithRelation)(result, domains_1.RobotEntity, {
@@ -1 +1 @@
1
- {"version":3,"file":"validation.js","sourceRoot":"","sources":["../../../../../src/http/controllers/robot-permission/utils/validation.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"validation.js","sourceRoot":"","sources":["../../../../../src/http/controllers/robot-permission/utils/validation.ts"],"names":[],"mappings":"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"}
@@ -30,7 +30,7 @@ async function deleteRoleRouteHandler(req, res) {
30
30
  throw new http_1.ForbiddenError();
31
31
  }
32
32
  // ----------------------------------------------
33
- if (!ability.matchTarget(core_1.PermissionName.ROLE_DROP, entity.target)) {
33
+ if (!ability.satisfy(core_1.PermissionName.ROLE_DROP, { target: entity.target })) {
34
34
  throw new http_1.ForbiddenError('You are not permitted for the role target.');
35
35
  }
36
36
  // ----------------------------------------------
@@ -1 +1 @@
1
- {"version":3,"file":"delete.js","sourceRoot":"","sources":["../../../../../src/http/controllers/role/handlers/delete.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;AAEH,qCAA2D;AAC3D,uCAAuE;AAEvE,mCAAuD;AACvD,yDAAkD;AAClD,iDAAiD;AACjD,0CAA+C;AAExC,KAAK,UAAU,sBAAsB,CAAC,GAAY,EAAE,GAAa;IACpE,MAAM,EAAE,GAAG,IAAA,wBAAe,EAAC,GAAG,EAAE,IAAI,CAAC,CAAC;IAEtC,MAAM,OAAO,GAAG,IAAA,qBAAa,EAAC,GAAG,EAAE,SAAS,CAAC,CAAC;IAC9C,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,qBAAc,CAAC,SAAS,CAAC,EAAE,CAAC;QACzC,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,oBAAU,CAAC,CAAC;IACxD,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,IAAI,CAAC,IAAA,8BAAuB,EAAC,IAAA,qBAAa,EAAC,GAAG,EAAE,OAAO,CAAC,EAAE,MAAM,CAAC,QAAQ,CAAC,EAAE,CAAC;QACzE,MAAM,IAAI,qBAAc,EAAE,CAAC;IAC/B,CAAC;IAED,iDAAiD;IAEjD,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC,qBAAc,CAAC,SAAS,EAAE,MAAM,CAAC,MAAM,CAAC,EAAE,CAAC;QAChE,MAAM,IAAI,qBAAc,CAAC,4CAA4C,CAAC,CAAC;IAC3E,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;AAvCD,wDAuCC"}
1
+ {"version":3,"file":"delete.js","sourceRoot":"","sources":["../../../../../src/http/controllers/role/handlers/delete.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;AAEH,qCAA2D;AAC3D,uCAAuE;AAEvE,mCAAuD;AACvD,yDAAkD;AAClD,iDAAiD;AACjD,0CAA+C;AAExC,KAAK,UAAU,sBAAsB,CAAC,GAAY,EAAE,GAAa;IACpE,MAAM,EAAE,GAAG,IAAA,wBAAe,EAAC,GAAG,EAAE,IAAI,CAAC,CAAC;IAEtC,MAAM,OAAO,GAAG,IAAA,qBAAa,EAAC,GAAG,EAAE,SAAS,CAAC,CAAC;IAC9C,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,qBAAc,CAAC,SAAS,CAAC,EAAE,CAAC;QACzC,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,oBAAU,CAAC,CAAC;IACxD,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,IAAI,CAAC,IAAA,8BAAuB,EAAC,IAAA,qBAAa,EAAC,GAAG,EAAE,OAAO,CAAC,EAAE,MAAM,CAAC,QAAQ,CAAC,EAAE,CAAC;QACzE,MAAM,IAAI,qBAAc,EAAE,CAAC;IAC/B,CAAC;IAED,iDAAiD;IAEjD,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,qBAAc,CAAC,SAAS,EAAE,EAAE,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,CAAC,EAAE,CAAC;QACxE,MAAM,IAAI,qBAAc,CAAC,4CAA4C,CAAC,CAAC;IAC3E,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;AAvCD,wDAuCC"}
@@ -37,7 +37,7 @@ async function updateRoleRouteHandler(req, res) {
37
37
  throw new http_1.ForbiddenError();
38
38
  }
39
39
  // ----------------------------------------------
40
- if (!ability.matchTarget(core_1.PermissionName.ROLE_EDIT, entity.target)) {
40
+ if (!ability.satisfy(core_1.PermissionName.ROLE_EDIT, { target: entity.target })) {
41
41
  throw new http_1.ForbiddenError('You are not permitted for the role target.');
42
42
  }
43
43
  // ----------------------------------------------
@@ -1 +1 @@
1
- {"version":3,"file":"update.js","sourceRoot":"","sources":["../../../../../src/http/controllers/role/handlers/update.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;AAEH,qCAA2D;AAC3D,uCAAuE;AAEvE,mCAAuD;AACvD,yDAAkD;AAClD,iDAAiD;AACjD,0CAA+C;AAC/C,oCAA6C;AAC7C,0DAAqE;AAE9D,KAAK,UAAU,sBAAsB,CAAC,GAAY,EAAE,GAAa;IACpE,MAAM,EAAE,GAAG,IAAA,wBAAe,EAAC,GAAG,EAAE,IAAI,CAAC,CAAC;IAEtC,MAAM,OAAO,GAAG,IAAA,qBAAa,EAAC,GAAG,EAAE,SAAS,CAAC,CAAC;IAC9C,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,qBAAc,CAAC,SAAS,CAAC,EAAE,CAAC;QACzC,MAAM,IAAI,oBAAa,EAAE,CAAC;IAC9B,CAAC;IAED,MAAM,MAAM,GAAG,MAAM,IAAA,yBAAiB,EAAC,GAAG,EAAE,mCAAuB,CAAC,MAAM,CAAC,CAAC;IAC5E,IAAI,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC;QACf,OAAO,IAAA,qBAAY,EAAC,GAAG,CAAC,CAAC;IAC7B,CAAC;IAED,iDAAiD;IAEjD,MAAM,UAAU,GAAG,MAAM,IAAA,iCAAa,GAAE,CAAC;IACzC,MAAM,UAAU,GAAG,UAAU,CAAC,aAAa,CAAC,oBAAU,CAAC,CAAC;IACxD,IAAI,MAAM,GAAG,MAAM,UAAU,CAAC,SAAS,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;IAEhD,IAAI,CAAC,MAAM,EAAE,CAAC;QACV,MAAM,IAAI,oBAAa,EAAE,CAAC;IAC9B,CAAC;IAED,iDAAiD;IAEjD,IAAI,CAAC,IAAA,8BAAuB,EAAC,IAAA,qBAAa,EAAC,GAAG,EAAE,OAAO,CAAC,EAAE,MAAM,CAAC,QAAQ,CAAC,EAAE,CAAC;QACzE,MAAM,IAAI,qBAAc,EAAE,CAAC;IAC/B,CAAC;IAED,iDAAiD;IAEjD,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC,qBAAc,CAAC,SAAS,EAAE,MAAM,CAAC,MAAM,CAAC,EAAE,CAAC;QAChE,MAAM,IAAI,qBAAc,CAAC,4CAA4C,CAAC,CAAC;IAC3E,CAAC;IAED,iDAAiD;IAEjD,MAAM,GAAG,UAAU,CAAC,KAAK,CAAC,MAAM,EAAE,MAAM,CAAC,IAAI,CAAC,CAAC;IAE/C,MAAM,UAAU,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IAE9B,OAAO,IAAA,qBAAY,EAAC,GAAG,EAAE,MAAM,CAAC,CAAC;AACrC,CAAC;AA1CD,wDA0CC"}
1
+ {"version":3,"file":"update.js","sourceRoot":"","sources":["../../../../../src/http/controllers/role/handlers/update.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;AAEH,qCAA2D;AAC3D,uCAAuE;AAEvE,mCAAuD;AACvD,yDAAkD;AAClD,iDAAiD;AACjD,0CAA+C;AAC/C,oCAA6C;AAC7C,0DAAqE;AAE9D,KAAK,UAAU,sBAAsB,CAAC,GAAY,EAAE,GAAa;IACpE,MAAM,EAAE,GAAG,IAAA,wBAAe,EAAC,GAAG,EAAE,IAAI,CAAC,CAAC;IAEtC,MAAM,OAAO,GAAG,IAAA,qBAAa,EAAC,GAAG,EAAE,SAAS,CAAC,CAAC;IAC9C,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,qBAAc,CAAC,SAAS,CAAC,EAAE,CAAC;QACzC,MAAM,IAAI,oBAAa,EAAE,CAAC;IAC9B,CAAC;IAED,MAAM,MAAM,GAAG,MAAM,IAAA,yBAAiB,EAAC,GAAG,EAAE,mCAAuB,CAAC,MAAM,CAAC,CAAC;IAC5E,IAAI,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC;QACf,OAAO,IAAA,qBAAY,EAAC,GAAG,CAAC,CAAC;IAC7B,CAAC;IAED,iDAAiD;IAEjD,MAAM,UAAU,GAAG,MAAM,IAAA,iCAAa,GAAE,CAAC;IACzC,MAAM,UAAU,GAAG,UAAU,CAAC,aAAa,CAAC,oBAAU,CAAC,CAAC;IACxD,IAAI,MAAM,GAAG,MAAM,UAAU,CAAC,SAAS,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;IAEhD,IAAI,CAAC,MAAM,EAAE,CAAC;QACV,MAAM,IAAI,oBAAa,EAAE,CAAC;IAC9B,CAAC;IAED,iDAAiD;IAEjD,IAAI,CAAC,IAAA,8BAAuB,EAAC,IAAA,qBAAa,EAAC,GAAG,EAAE,OAAO,CAAC,EAAE,MAAM,CAAC,QAAQ,CAAC,EAAE,CAAC;QACzE,MAAM,IAAI,qBAAc,EAAE,CAAC;IAC/B,CAAC;IAED,iDAAiD;IAEjD,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,qBAAc,CAAC,SAAS,EAAE,EAAE,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,CAAC,EAAE,CAAC;QACxE,MAAM,IAAI,qBAAc,CAAC,4CAA4C,CAAC,CAAC;IAC3E,CAAC;IAED,iDAAiD;IAEjD,MAAM,GAAG,UAAU,CAAC,KAAK,CAAC,MAAM,EAAE,MAAM,CAAC,IAAI,CAAC,CAAC;IAE/C,MAAM,UAAU,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IAE9B,OAAO,IAAA,qBAAY,EAAC,GAAG,EAAE,MAAM,CAAC,CAAC;AACrC,CAAC;AA1CD,wDA0CC"}
@@ -70,15 +70,15 @@ async function runRoleValidation(req, operation) {
70
70
  // ----------------------------------------------
71
71
  const ability = (0, utils_1.useRequestEnv)(req, 'ability');
72
72
  if (operation === constants_1.RequestHandlerOperation.CREATE) {
73
- const permissionTarget = ability.getTarget(core_1.PermissionName.ROLE_ADD);
73
+ const permissionTarget = ability.findOne(core_1.PermissionName.ROLE_ADD);
74
74
  if (permissionTarget) {
75
- result.data.target = permissionTarget;
75
+ result.data.target = permissionTarget.target;
76
76
  }
77
77
  }
78
78
  else {
79
- const permissionTarget = ability.getTarget(core_1.PermissionName.ROLE_EDIT);
79
+ const permissionTarget = ability.findOne(core_1.PermissionName.ROLE_EDIT);
80
80
  if (permissionTarget) {
81
- result.data.target = permissionTarget;
81
+ result.data.target = permissionTarget.target;
82
82
  }
83
83
  }
84
84
  // ----------------------------------------------
@@ -1 +1 @@
1
- {"version":3,"file":"validaiton.js","sourceRoot":"","sources":["../../../../../src/http/controllers/role/utils/validaiton.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"validaiton.js","sourceRoot":"","sources":["../../../../../src/http/controllers/role/utils/validaiton.ts"],"names":[],"mappings":"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"}
@@ -36,7 +36,7 @@ async function deleteRolePermissionRouteHandler(req, res) {
36
36
  throw new http_1.ForbiddenError();
37
37
  }
38
38
  // ----------------------------------------------
39
- if (!ability.matchTarget(core_1.PermissionName.ROLE_PERMISSION_DROP, entity.target)) {
39
+ if (!ability.satisfy(core_1.PermissionName.ROLE_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
  // ----------------------------------------------
@@ -1 +1 @@
1
- {"version":3,"file":"delete.js","sourceRoot":"","sources":["../../../../../src/http/controllers/role-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,IAAI,CAAC,IAAA,8BAAuB,EAAC,IAAA,mBAAa,EAAC,GAAG,EAAE,OAAO,CAAC,EAAE,MAAM,CAAC,aAAa,CAAC,EAAE,CAAC;QAC9E,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;AAvCD,4EAuCC"}
1
+ {"version":3,"file":"delete.js","sourceRoot":"","sources":["../../../../../src/http/controllers/role-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,IAAI,CAAC,IAAA,8BAAuB,EAAC,IAAA,mBAAa,EAAC,GAAG,EAAE,OAAO,CAAC,EAAE,MAAM,CAAC,aAAa,CAAC,EAAE,CAAC;QAC9E,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;AAvCD,4EAuCC"}
@@ -58,9 +58,9 @@ async function runRolePermissionValidation(req, operation) {
58
58
  throw new http_1.ForbiddenError('It is only allowed to assign role permissions, which are also owned.');
59
59
  }
60
60
  }
61
- const permissionTarget = ability.getTarget(core_1.PermissionName.ROLE_PERMISSION_ADD);
62
- if (permissionTarget) {
63
- result.data.target = permissionTarget;
61
+ const permission = ability.findOne(core_1.PermissionName.ROLE_PERMISSION_ADD);
62
+ if (permission) {
63
+ result.data.target = permission.target;
64
64
  }
65
65
  // ----------------------------------------------
66
66
  await (0, validation_1.extendExpressValidationResultWithRelation)(result, domains_1.RoleEntity, {
@@ -1 +1 @@
1
- {"version":3,"file":"validation.js","sourceRoot":"","sources":["../../../../../src/http/controllers/role-permission/utils/validation.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"validation.js","sourceRoot":"","sources":["../../../../../src/http/controllers/role-permission/utils/validation.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.tokenMaxAgeAccessToken,
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,sBAAsB;KACnD,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.tokenMaxAgeAccessToken,
29
- tokenMaxAgeRefreshToken: config.tokenMaxAgeRefreshToken,
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,sBAAsB;QACrD,uBAAuB,EAAE,MAAM,CAAC,uBAAuB;QACvD,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.tokenMaxAgeAccessToken * 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.tokenMaxAgeRefreshToken * 1000,
64
+ maxAge: config.tokenRefreshMaxAge * 1000,
65
65
  });
66
66
  return (0, routup_1.send)(res, tokenResponse);
67
67
  }