unleash-server 4.1.4 → 4.2.0-beta.1

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 (443) hide show
  1. package/README.md +3 -2
  2. package/dist/lib/addons/datadog-definition.js +7 -0
  3. package/dist/lib/addons/datadog-definition.js.map +1 -1
  4. package/dist/lib/addons/datadog.d.ts +5 -0
  5. package/dist/lib/addons/datadog.js +53 -0
  6. package/dist/lib/addons/datadog.js.map +1 -1
  7. package/dist/lib/addons/datadog.test.js +26 -1
  8. package/dist/lib/addons/datadog.test.js.map +1 -1
  9. package/dist/lib/addons/slack-definition.js +7 -0
  10. package/dist/lib/addons/slack-definition.js.map +1 -1
  11. package/dist/lib/addons/slack.d.ts +5 -0
  12. package/dist/lib/addons/slack.js +62 -9
  13. package/dist/lib/addons/slack.js.map +1 -1
  14. package/dist/lib/addons/slack.test.js +25 -0
  15. package/dist/lib/addons/slack.test.js.map +1 -1
  16. package/dist/lib/addons/teams-definition.js +7 -0
  17. package/dist/lib/addons/teams-definition.js.map +1 -1
  18. package/dist/lib/addons/teams.d.ts +5 -0
  19. package/dist/lib/addons/teams.js +54 -1
  20. package/dist/lib/addons/teams.js.map +1 -1
  21. package/dist/lib/addons/teams.test.js +25 -0
  22. package/dist/lib/addons/teams.test.js.map +1 -1
  23. package/dist/lib/addons/webhook-definition.js +8 -0
  24. package/dist/lib/addons/webhook-definition.js.map +1 -1
  25. package/dist/lib/app.test.js +11 -7
  26. package/dist/lib/app.test.js.map +1 -1
  27. package/dist/lib/create-config.js +4 -1
  28. package/dist/lib/create-config.js.map +1 -1
  29. package/dist/lib/db/api-token-store.d.ts +2 -1
  30. package/dist/lib/db/api-token-store.js +5 -0
  31. package/dist/lib/db/api-token-store.js.map +1 -1
  32. package/dist/lib/db/client-instance-store.js +5 -2
  33. package/dist/lib/db/client-instance-store.js.map +1 -1
  34. package/dist/lib/db/client-metrics-store-v2.d.ts +19 -0
  35. package/dist/lib/db/client-metrics-store-v2.js +126 -0
  36. package/dist/lib/db/client-metrics-store-v2.js.map +1 -0
  37. package/dist/lib/db/client-metrics-store.d.ts +6 -0
  38. package/dist/lib/db/client-metrics-store.js +6 -1
  39. package/dist/lib/db/client-metrics-store.js.map +1 -1
  40. package/dist/lib/db/environment-store.d.ts +7 -7
  41. package/dist/lib/db/environment-store.js +59 -54
  42. package/dist/lib/db/environment-store.js.map +1 -1
  43. package/dist/lib/db/event-store.d.ts +5 -2
  44. package/dist/lib/db/event-store.js +27 -4
  45. package/dist/lib/db/event-store.js.map +1 -1
  46. package/dist/lib/db/feature-environment-store.d.ts +9 -6
  47. package/dist/lib/db/feature-environment-store.js +66 -20
  48. package/dist/lib/db/feature-environment-store.js.map +1 -1
  49. package/dist/lib/db/feature-strategy-store.d.ts +7 -11
  50. package/dist/lib/db/feature-strategy-store.js +84 -147
  51. package/dist/lib/db/feature-strategy-store.js.map +1 -1
  52. package/dist/lib/db/feature-toggle-client-store.d.ts +26 -0
  53. package/dist/lib/db/feature-toggle-client-store.js +104 -0
  54. package/dist/lib/db/feature-toggle-client-store.js.map +1 -0
  55. package/dist/lib/db/feature-toggle-store.d.ts +10 -22
  56. package/dist/lib/db/feature-toggle-store.js +9 -42
  57. package/dist/lib/db/feature-toggle-store.js.map +1 -1
  58. package/dist/lib/db/index.js +4 -0
  59. package/dist/lib/db/index.js.map +1 -1
  60. package/dist/lib/db/project-store.d.ts +4 -6
  61. package/dist/lib/db/project-store.js +7 -43
  62. package/dist/lib/db/project-store.js.map +1 -1
  63. package/dist/lib/event-hook.test.js +8 -7
  64. package/dist/lib/event-hook.test.js.map +1 -1
  65. package/dist/lib/logger.test.js +26 -4
  66. package/dist/lib/logger.test.js.map +1 -1
  67. package/dist/lib/middleware/api-token-middleware.js +10 -2
  68. package/dist/lib/middleware/api-token-middleware.js.map +1 -1
  69. package/dist/lib/middleware/api-token-middleware.test.js +37 -1
  70. package/dist/lib/middleware/api-token-middleware.test.js.map +1 -1
  71. package/dist/lib/middleware/demo-authentication.js +1 -1
  72. package/dist/lib/middleware/demo-authentication.js.map +1 -1
  73. package/dist/lib/middleware/oss-authentication.js +0 -3
  74. package/dist/lib/middleware/oss-authentication.js.map +1 -1
  75. package/dist/lib/middleware/rbac-middleware.js +2 -2
  76. package/dist/lib/middleware/rbac-middleware.js.map +1 -1
  77. package/dist/lib/middleware/rbac-middleware.test.js +39 -0
  78. package/dist/lib/middleware/rbac-middleware.test.js.map +1 -1
  79. package/dist/lib/routes/admin-api/addon.d.ts +4 -3
  80. package/dist/lib/routes/admin-api/addon.js +4 -4
  81. package/dist/lib/routes/admin-api/addon.js.map +1 -1
  82. package/dist/lib/routes/admin-api/api-token-controller.js +10 -38
  83. package/dist/lib/routes/admin-api/api-token-controller.js.map +1 -1
  84. package/dist/lib/routes/admin-api/archive.d.ts +4 -3
  85. package/dist/lib/routes/admin-api/archive.js +3 -3
  86. package/dist/lib/routes/admin-api/archive.js.map +1 -1
  87. package/dist/lib/routes/admin-api/client-metrics.d.ts +12 -0
  88. package/dist/lib/routes/admin-api/client-metrics.js +35 -0
  89. package/dist/lib/routes/admin-api/client-metrics.js.map +1 -0
  90. package/dist/lib/routes/admin-api/context.d.ts +4 -3
  91. package/dist/lib/routes/admin-api/context.js +4 -4
  92. package/dist/lib/routes/admin-api/context.js.map +1 -1
  93. package/dist/lib/routes/admin-api/environments-controller.d.ts +4 -4
  94. package/dist/lib/routes/admin-api/environments-controller.js +17 -43
  95. package/dist/lib/routes/admin-api/environments-controller.js.map +1 -1
  96. package/dist/lib/routes/admin-api/event.js +7 -1
  97. package/dist/lib/routes/admin-api/event.js.map +1 -1
  98. package/dist/lib/routes/admin-api/feature.d.ts +11 -10
  99. package/dist/lib/routes/admin-api/feature.js +26 -24
  100. package/dist/lib/routes/admin-api/feature.js.map +1 -1
  101. package/dist/lib/routes/admin-api/index.js +2 -0
  102. package/dist/lib/routes/admin-api/index.js.map +1 -1
  103. package/dist/lib/routes/admin-api/metrics.js +25 -66
  104. package/dist/lib/routes/admin-api/metrics.js.map +1 -1
  105. package/dist/lib/routes/admin-api/project/environments.js +6 -15
  106. package/dist/lib/routes/admin-api/project/environments.js.map +1 -1
  107. package/dist/lib/routes/admin-api/project/features.d.ts +33 -11
  108. package/dist/lib/routes/admin-api/project/features.js +103 -35
  109. package/dist/lib/routes/admin-api/project/features.js.map +1 -1
  110. package/dist/lib/routes/admin-api/project/health-report.js +7 -18
  111. package/dist/lib/routes/admin-api/project/health-report.js.map +1 -1
  112. package/dist/lib/routes/admin-api/project/index.d.ts +3 -0
  113. package/dist/lib/routes/admin-api/project/index.js +8 -0
  114. package/dist/lib/routes/admin-api/project/index.js.map +1 -1
  115. package/dist/lib/routes/admin-api/state.d.ts +2 -1
  116. package/dist/lib/routes/admin-api/state.js +5 -4
  117. package/dist/lib/routes/admin-api/state.js.map +1 -1
  118. package/dist/lib/routes/admin-api/strategy.d.ts +1 -1
  119. package/dist/lib/routes/admin-api/strategy.js +24 -22
  120. package/dist/lib/routes/admin-api/strategy.js.map +1 -1
  121. package/dist/lib/routes/admin-api/tag-type.d.ts +4 -3
  122. package/dist/lib/routes/admin-api/tag-type.js +19 -50
  123. package/dist/lib/routes/admin-api/tag-type.js.map +1 -1
  124. package/dist/lib/routes/admin-api/tag.d.ts +3 -2
  125. package/dist/lib/routes/admin-api/tag.js +3 -4
  126. package/dist/lib/routes/admin-api/tag.js.map +1 -1
  127. package/dist/lib/routes/admin-api/user-admin.js +11 -37
  128. package/dist/lib/routes/admin-api/user-admin.js.map +1 -1
  129. package/dist/lib/routes/api-def.d.ts +49 -52
  130. package/dist/lib/routes/api-def.js +13 -9
  131. package/dist/lib/routes/api-def.js.map +1 -1
  132. package/dist/lib/routes/client-api/feature.d.ts +7 -8
  133. package/dist/lib/routes/client-api/feature.js +39 -27
  134. package/dist/lib/routes/client-api/feature.js.map +1 -1
  135. package/dist/lib/routes/client-api/feature.test.js +10 -10
  136. package/dist/lib/routes/client-api/feature.test.js.map +1 -1
  137. package/dist/lib/routes/client-api/metrics.d.ts +8 -3
  138. package/dist/lib/routes/client-api/metrics.js +28 -16
  139. package/dist/lib/routes/client-api/metrics.js.map +1 -1
  140. package/dist/lib/routes/client-api/metrics.test.js +27 -9
  141. package/dist/lib/routes/client-api/metrics.test.js.map +1 -1
  142. package/dist/lib/routes/client-api/register.d.ts +4 -2
  143. package/dist/lib/routes/client-api/register.js +16 -14
  144. package/dist/lib/routes/client-api/register.js.map +1 -1
  145. package/dist/lib/routes/controller.d.ts +1 -0
  146. package/dist/lib/routes/controller.js +3 -0
  147. package/dist/lib/routes/controller.js.map +1 -1
  148. package/dist/lib/routes/index.js +5 -5
  149. package/dist/lib/routes/index.js.map +1 -1
  150. package/dist/lib/routes/unleash-types.d.ts +1 -2
  151. package/dist/lib/routes/util.js +1 -0
  152. package/dist/lib/routes/util.js.map +1 -1
  153. package/dist/lib/schema/api-token-schema.d.ts +2 -0
  154. package/dist/lib/schema/api-token-schema.js +28 -0
  155. package/dist/lib/schema/api-token-schema.js.map +1 -0
  156. package/dist/lib/schema/feature-schema.test.js +17 -16
  157. package/dist/lib/schema/feature-schema.test.js.map +1 -1
  158. package/dist/lib/schema/project-schema.d.ts +2 -0
  159. package/dist/lib/schema/project-schema.js +12 -0
  160. package/dist/lib/schema/project-schema.js.map +1 -0
  161. package/dist/lib/server-impl.d.ts +2 -2
  162. package/dist/lib/server-impl.js +9 -6
  163. package/dist/lib/server-impl.js.map +1 -1
  164. package/dist/lib/server-impl.test.js +28 -21
  165. package/dist/lib/server-impl.test.js.map +1 -1
  166. package/dist/lib/services/access-service.d.ts +1 -1
  167. package/dist/lib/services/access-service.js.map +1 -1
  168. package/dist/lib/services/api-token-service.d.ts +3 -8
  169. package/dist/lib/services/api-token-service.js +43 -8
  170. package/dist/lib/services/api-token-service.js.map +1 -1
  171. package/dist/lib/services/client-metrics/client-metrics-schema.js +1 -0
  172. package/dist/lib/services/client-metrics/client-metrics-schema.js.map +1 -1
  173. package/dist/lib/services/client-metrics/client-metrics-service-v2.d.ts +16 -0
  174. package/dist/lib/services/client-metrics/client-metrics-service-v2.js +68 -0
  175. package/dist/lib/services/client-metrics/client-metrics-service-v2.js.map +1 -0
  176. package/dist/lib/services/client-metrics/index.d.ts +0 -1
  177. package/dist/lib/services/client-metrics/index.js +5 -3
  178. package/dist/lib/services/client-metrics/index.js.map +1 -1
  179. package/dist/lib/services/client-metrics/register-schema.js +1 -0
  180. package/dist/lib/services/client-metrics/register-schema.js.map +1 -1
  181. package/dist/lib/services/context-schema.d.ts +3 -3
  182. package/dist/lib/services/context-schema.js +15 -11
  183. package/dist/lib/services/context-schema.js.map +1 -1
  184. package/dist/lib/services/environment-service.d.ts +4 -5
  185. package/dist/lib/services/environment-service.js +14 -14
  186. package/dist/lib/services/environment-service.js.map +1 -1
  187. package/dist/lib/services/event-service.d.ts +1 -0
  188. package/dist/lib/services/event-service.js +4 -3
  189. package/dist/lib/services/event-service.js.map +1 -1
  190. package/dist/lib/services/feature-toggle-service-v2.d.ts +33 -12
  191. package/dist/lib/services/feature-toggle-service-v2.js +200 -55
  192. package/dist/lib/services/feature-toggle-service-v2.js.map +1 -1
  193. package/dist/lib/services/index.js +4 -1
  194. package/dist/lib/services/index.js.map +1 -1
  195. package/dist/lib/services/project-health-service.d.ts +3 -1
  196. package/dist/lib/services/project-health-service.js +7 -3
  197. package/dist/lib/services/project-health-service.js.map +1 -1
  198. package/dist/lib/services/project-schema.d.ts +2 -3
  199. package/dist/lib/services/project-schema.js +12 -7
  200. package/dist/lib/services/project-schema.js.map +1 -1
  201. package/dist/lib/services/project-service.d.ts +4 -2
  202. package/dist/lib/services/project-service.js +21 -11
  203. package/dist/lib/services/project-service.js.map +1 -1
  204. package/dist/lib/services/state-schema.d.ts +2 -0
  205. package/dist/lib/services/state-schema.js +16 -6
  206. package/dist/lib/services/state-schema.js.map +1 -1
  207. package/dist/lib/services/state-service.d.ts +7 -0
  208. package/dist/lib/services/state-service.js +69 -11
  209. package/dist/lib/services/state-service.js.map +1 -1
  210. package/dist/lib/services/state-service.test.js +72 -27
  211. package/dist/lib/services/state-service.test.js.map +1 -1
  212. package/dist/lib/services/state-util.js +1 -1
  213. package/dist/lib/services/state-util.js.map +1 -1
  214. package/dist/lib/types/api-user.d.ts +11 -4
  215. package/dist/lib/types/api-user.js +4 -1
  216. package/dist/lib/types/api-user.js.map +1 -1
  217. package/dist/lib/types/events.d.ts +7 -0
  218. package/dist/lib/types/events.js +9 -1
  219. package/dist/lib/types/events.js.map +1 -1
  220. package/dist/lib/types/model.d.ts +27 -8
  221. package/dist/lib/types/model.js.map +1 -1
  222. package/dist/lib/types/models/api-token.d.ts +19 -0
  223. package/dist/lib/types/models/api-token.js +10 -0
  224. package/dist/lib/types/models/api-token.js.map +1 -0
  225. package/dist/lib/types/models/metrics.d.ts +11 -0
  226. package/dist/lib/types/models/metrics.js +3 -0
  227. package/dist/lib/types/models/metrics.js.map +1 -0
  228. package/dist/lib/types/permissions.d.ts +2 -0
  229. package/dist/lib/types/permissions.js +3 -1
  230. package/dist/lib/types/permissions.js.map +1 -1
  231. package/dist/lib/types/services.d.ts +2 -0
  232. package/dist/lib/types/stores/api-token-store.d.ts +1 -14
  233. package/dist/lib/types/stores/api-token-store.js +0 -6
  234. package/dist/lib/types/stores/api-token-store.js.map +1 -1
  235. package/dist/lib/types/stores/client-instance-store.d.ts +1 -0
  236. package/dist/lib/types/stores/client-metrics-store-v2.d.ts +17 -0
  237. package/dist/lib/types/stores/client-metrics-store-v2.js +3 -0
  238. package/dist/lib/types/stores/client-metrics-store-v2.js.map +1 -0
  239. package/dist/lib/types/stores/environment-store.d.ts +6 -6
  240. package/dist/lib/types/stores/event-store.d.ts +1 -0
  241. package/dist/lib/types/stores/feature-environment-store.d.ts +9 -6
  242. package/dist/lib/types/stores/feature-strategies-store.d.ts +6 -12
  243. package/dist/lib/types/stores/feature-toggle-client-store.d.ts +5 -0
  244. package/dist/lib/types/stores/feature-toggle-client-store.js +3 -0
  245. package/dist/lib/types/stores/feature-toggle-client-store.js.map +1 -0
  246. package/dist/lib/types/stores/feature-toggle-store.d.ts +7 -14
  247. package/dist/lib/types/stores/project-store.d.ts +5 -2
  248. package/dist/lib/types/stores.d.ts +4 -0
  249. package/dist/lib/util/constants.d.ts +1 -0
  250. package/dist/lib/util/constants.js +2 -1
  251. package/dist/lib/util/constants.js.map +1 -1
  252. package/dist/lib/util/extract-user.d.ts +2 -0
  253. package/dist/lib/util/extract-user.js +8 -0
  254. package/dist/lib/util/extract-user.js.map +1 -0
  255. package/dist/lib/util/graceful-shutdown.js +1 -1
  256. package/dist/lib/util/graceful-shutdown.js.map +1 -1
  257. package/dist/lib/util/snakeCase.d.ts +6 -0
  258. package/dist/lib/util/snakeCase.js +28 -0
  259. package/dist/lib/util/snakeCase.js.map +1 -0
  260. package/dist/{test/e2e/api/admin/boostrap.test.d.ts → lib/util/snakeCase.test.d.ts} +0 -0
  261. package/dist/lib/util/snakeCase.test.js +23 -0
  262. package/dist/lib/util/snakeCase.test.js.map +1 -0
  263. package/dist/migrations/20210831072631-add-sort-order-and-type-to-env.d.ts +5 -0
  264. package/dist/migrations/20210831072631-add-sort-order-and-type-to-env.js +14 -0
  265. package/dist/migrations/20210831072631-add-sort-order-and-type-to-env.js.map +1 -0
  266. package/dist/migrations/20210907124058-add-dbcritic-indices.d.ts +5 -0
  267. package/dist/migrations/20210907124058-add-dbcritic-indices.js +30 -0
  268. package/dist/migrations/20210907124058-add-dbcritic-indices.js.map +1 -0
  269. package/dist/migrations/20210907124850-add-dbcritic-primary-keys.d.ts +5 -0
  270. package/dist/migrations/20210907124850-add-dbcritic-primary-keys.js +18 -0
  271. package/dist/migrations/20210907124850-add-dbcritic-primary-keys.js.map +1 -0
  272. package/dist/migrations/20210908100701-add-enabled-to-environments.d.ts +5 -0
  273. package/dist/migrations/20210908100701-add-enabled-to-environments.js +14 -0
  274. package/dist/migrations/20210908100701-add-enabled-to-environments.js.map +1 -0
  275. package/dist/migrations/20210909085651-add-protected-field-to-environments.d.ts +5 -0
  276. package/dist/migrations/20210909085651-add-protected-field-to-environments.js +15 -0
  277. package/dist/migrations/20210909085651-add-protected-field-to-environments.js.map +1 -0
  278. package/dist/migrations/20210913103159-api-keys-scoping.d.ts +2 -0
  279. package/dist/migrations/20210913103159-api-keys-scoping.js +13 -0
  280. package/dist/migrations/20210913103159-api-keys-scoping.js.map +1 -0
  281. package/dist/migrations/20210915122001-add-project-and-environment-columns-to-events.d.ts +2 -0
  282. package/dist/migrations/20210915122001-add-project-and-environment-columns-to-events.js +22 -0
  283. package/dist/migrations/20210915122001-add-project-and-environment-columns-to-events.js.map +1 -0
  284. package/dist/migrations/20210920104218-rename-global-env-to-default-env.d.ts +2 -0
  285. package/dist/migrations/20210920104218-rename-global-env-to-default-env.js +25 -0
  286. package/dist/migrations/20210920104218-rename-global-env-to-default-env.js.map +1 -0
  287. package/dist/migrations/20210921105032-client-api-tokens-default.d.ts +2 -0
  288. package/dist/migrations/20210921105032-client-api-tokens-default.js +13 -0
  289. package/dist/migrations/20210921105032-client-api-tokens-default.js.map +1 -0
  290. package/dist/migrations/20210922084509-add-non-null-constraint-to-environment-type.d.ts +2 -0
  291. package/dist/migrations/20210922084509-add-non-null-constraint-to-environment-type.js +10 -0
  292. package/dist/migrations/20210922084509-add-non-null-constraint-to-environment-type.js.map +1 -0
  293. package/dist/migrations/20210922120521-add-tag-type-permission.d.ts +2 -0
  294. package/dist/migrations/20210922120521-add-tag-type-permission.js +19 -0
  295. package/dist/migrations/20210922120521-add-tag-type-permission.js.map +1 -0
  296. package/dist/migrations/20210928065411-remove-displayname-from-environments.d.ts +2 -0
  297. package/dist/migrations/20210928065411-remove-displayname-from-environments.js +10 -0
  298. package/dist/migrations/20210928065411-remove-displayname-from-environments.js.map +1 -0
  299. package/dist/migrations/20210928080601-add-development-and-production-environments.d.ts +2 -0
  300. package/dist/migrations/20210928080601-add-development-and-production-environments.js +16 -0
  301. package/dist/migrations/20210928080601-add-development-and-production-environments.js.map +1 -0
  302. package/dist/migrations/20210928082228-connect-default-environment-to-all-existing-projects.d.ts +2 -0
  303. package/dist/migrations/20210928082228-connect-default-environment-to-all-existing-projects.js +16 -0
  304. package/dist/migrations/20210928082228-connect-default-environment-to-all-existing-projects.js.map +1 -0
  305. package/dist/migrations/20211004104917-client-metrics-env.d.ts +2 -0
  306. package/dist/migrations/20211004104917-client-metrics-env.js +22 -0
  307. package/dist/migrations/20211004104917-client-metrics-env.js.map +1 -0
  308. package/dist/migrations/20211011094226-add-environment-to-client-instances.d.ts +5 -0
  309. package/dist/migrations/20211011094226-add-environment-to-client-instances.js +21 -0
  310. package/dist/migrations/20211011094226-add-environment-to-client-instances.js.map +1 -0
  311. package/dist/migrator.d.ts +3 -4
  312. package/dist/migrator.js +19 -5
  313. package/dist/migrator.js.map +1 -1
  314. package/dist/server-dev.js +5 -0
  315. package/dist/server-dev.js.map +1 -1
  316. package/dist/test/e2e/api/admin/api-token.auth.e2e.test.js +4 -4
  317. package/dist/test/e2e/api/admin/api-token.auth.e2e.test.js.map +1 -1
  318. package/dist/test/e2e/api/admin/api-token.e2e.test.js +159 -10
  319. package/dist/test/e2e/api/admin/api-token.e2e.test.js.map +1 -1
  320. package/dist/test/e2e/api/admin/archive.test.js.map +1 -1
  321. package/dist/test/e2e/api/admin/{project/feature.strategy.e2e.test.d.ts → bootstrap.test.d.ts} +0 -0
  322. package/dist/test/e2e/api/admin/{boostrap.test.js → bootstrap.test.js} +2 -2
  323. package/dist/test/e2e/api/admin/bootstrap.test.js.map +1 -0
  324. package/dist/test/e2e/api/admin/client-metrics.e2e.test.d.ts +1 -0
  325. package/dist/test/e2e/api/admin/client-metrics.e2e.test.js +219 -0
  326. package/dist/test/e2e/api/admin/client-metrics.e2e.test.js.map +1 -0
  327. package/dist/test/e2e/api/admin/environment.test.js +80 -53
  328. package/dist/test/e2e/api/admin/environment.test.js.map +1 -1
  329. package/dist/test/e2e/api/admin/event.e2e.test.js +28 -0
  330. package/dist/test/e2e/api/admin/event.e2e.test.js.map +1 -1
  331. package/dist/test/e2e/api/admin/feature.e2e.test.js +69 -63
  332. package/dist/test/e2e/api/admin/feature.e2e.test.js.map +1 -1
  333. package/dist/test/e2e/api/admin/project/environments.e2e.test.d.ts +1 -0
  334. package/dist/test/e2e/api/admin/project/environments.e2e.test.js +65 -0
  335. package/dist/test/e2e/api/admin/project/environments.e2e.test.js.map +1 -0
  336. package/dist/test/e2e/api/admin/project/features.e2e.test.d.ts +1 -0
  337. package/dist/test/e2e/api/admin/project/features.e2e.test.js +1267 -0
  338. package/dist/test/e2e/api/admin/project/features.e2e.test.js.map +1 -0
  339. package/dist/test/e2e/api/admin/project/project.health.e2e.test.js +76 -0
  340. package/dist/test/e2e/api/admin/project/project.health.e2e.test.js.map +1 -1
  341. package/dist/test/e2e/api/admin/project/projects.e2e.test.d.ts +1 -0
  342. package/dist/test/e2e/api/admin/project/projects.e2e.test.js +30 -0
  343. package/dist/test/e2e/api/admin/project/projects.e2e.test.js.map +1 -0
  344. package/dist/test/e2e/api/admin/state.e2e.test.js +161 -0
  345. package/dist/test/e2e/api/admin/state.e2e.test.js.map +1 -1
  346. package/dist/test/e2e/api/client/feature.e2e.test.js +83 -29
  347. package/dist/test/e2e/api/client/feature.e2e.test.js.map +1 -1
  348. package/dist/test/e2e/api/client/feature.env.disabled.e2e.test.d.ts +1 -0
  349. package/dist/test/e2e/api/client/feature.env.disabled.e2e.test.js +49 -0
  350. package/dist/test/e2e/api/client/feature.env.disabled.e2e.test.js.map +1 -0
  351. package/dist/test/e2e/api/client/feature.token.access.e2e.test.d.ts +1 -0
  352. package/dist/test/e2e/api/client/feature.token.access.e2e.test.js +156 -0
  353. package/dist/test/e2e/api/client/feature.token.access.e2e.test.js.map +1 -0
  354. package/dist/test/e2e/api/client/metrics.e2e.access.e2e.test.d.ts +1 -0
  355. package/dist/test/e2e/api/client/metrics.e2e.access.e2e.test.js +42 -0
  356. package/dist/test/e2e/api/client/metrics.e2e.access.e2e.test.js.map +1 -0
  357. package/dist/test/e2e/api/client/metrics.e2e.test.js +14 -13
  358. package/dist/test/e2e/api/client/metrics.e2e.test.js.map +1 -1
  359. package/dist/test/e2e/api/client/metricsV2.e2e.test.d.ts +1 -0
  360. package/dist/test/e2e/api/client/metricsV2.e2e.test.js +95 -0
  361. package/dist/test/e2e/api/client/metricsV2.e2e.test.js.map +1 -0
  362. package/dist/test/e2e/api/client/register.e2e.test.js +18 -14
  363. package/dist/test/e2e/api/client/register.e2e.test.js.map +1 -1
  364. package/dist/test/e2e/helpers/database-config.d.ts +1 -1
  365. package/dist/test/e2e/helpers/database-config.js +12 -8
  366. package/dist/test/e2e/helpers/database-config.js.map +1 -1
  367. package/dist/test/e2e/helpers/database-init.d.ts +7 -1
  368. package/dist/test/e2e/helpers/database-init.js +8 -7
  369. package/dist/test/e2e/helpers/database-init.js.map +1 -1
  370. package/dist/test/e2e/helpers/database.json +5 -2
  371. package/dist/test/e2e/helpers/test-helper.d.ts +1 -1
  372. package/dist/test/e2e/helpers/test-helper.js +4 -5
  373. package/dist/test/e2e/helpers/test-helper.js.map +1 -1
  374. package/dist/test/e2e/services/api-token-service.e2e.test.js +28 -15
  375. package/dist/test/e2e/services/api-token-service.e2e.test.js.map +1 -1
  376. package/dist/test/e2e/services/environment-service.test.js +36 -38
  377. package/dist/test/e2e/services/environment-service.test.js.map +1 -1
  378. package/dist/test/e2e/services/feature-toggle-service-v2.e2e.test.js +17 -11
  379. package/dist/test/e2e/services/feature-toggle-service-v2.e2e.test.js.map +1 -1
  380. package/dist/test/e2e/services/project-health-service.e2e.test.js +10 -10
  381. package/dist/test/e2e/services/project-health-service.e2e.test.js.map +1 -1
  382. package/dist/test/e2e/services/project-service.e2e.test.js +25 -2
  383. package/dist/test/e2e/services/project-service.e2e.test.js.map +1 -1
  384. package/dist/test/e2e/stores/client-metrics-store-v2.e2e.test.d.ts +1 -0
  385. package/dist/test/e2e/stores/client-metrics-store-v2.e2e.test.js +338 -0
  386. package/dist/test/e2e/stores/client-metrics-store-v2.e2e.test.js.map +1 -0
  387. package/dist/test/e2e/stores/feature-tag-store.e2e.test.js +3 -3
  388. package/dist/test/e2e/stores/feature-tag-store.e2e.test.js.map +1 -1
  389. package/dist/test/e2e/stores/project-store.e2e.test.js +4 -1
  390. package/dist/test/e2e/stores/project-store.e2e.test.js.map +1 -1
  391. package/dist/test/e2e/stores/user-feedback-store.e2e.test.js +1 -1
  392. package/dist/test/e2e/stores/user-feedback-store.e2e.test.js.map +1 -1
  393. package/dist/test/fixtures/fake-api-token-store.d.ts +2 -1
  394. package/dist/test/fixtures/fake-api-token-store.js.map +1 -1
  395. package/dist/test/fixtures/fake-client-metrics-store-v2.d.ts +20 -0
  396. package/dist/test/fixtures/fake-client-metrics-store-v2.js +52 -0
  397. package/dist/test/fixtures/fake-client-metrics-store-v2.js.map +1 -0
  398. package/dist/test/fixtures/fake-environment-store.d.ts +5 -3
  399. package/dist/test/fixtures/fake-environment-store.js +22 -15
  400. package/dist/test/fixtures/fake-environment-store.js.map +1 -1
  401. package/dist/test/fixtures/fake-event-store.d.ts +1 -0
  402. package/dist/test/fixtures/fake-event-store.js +3 -0
  403. package/dist/test/fixtures/fake-event-store.js.map +1 -1
  404. package/dist/test/fixtures/fake-feature-environment-store.d.ts +8 -5
  405. package/dist/test/fixtures/fake-feature-environment-store.js +38 -10
  406. package/dist/test/fixtures/fake-feature-environment-store.js.map +1 -1
  407. package/dist/test/fixtures/fake-feature-strategies-store.d.ts +7 -13
  408. package/dist/test/fixtures/fake-feature-strategies-store.js +13 -50
  409. package/dist/test/fixtures/fake-feature-strategies-store.js.map +1 -1
  410. package/dist/test/fixtures/fake-feature-toggle-client-store.d.ts +9 -0
  411. package/dist/test/fixtures/fake-feature-toggle-client-store.js +50 -0
  412. package/dist/test/fixtures/fake-feature-toggle-client-store.js.map +1 -0
  413. package/dist/test/fixtures/fake-feature-toggle-store.d.ts +7 -9
  414. package/dist/test/fixtures/fake-feature-toggle-store.js +7 -14
  415. package/dist/test/fixtures/fake-feature-toggle-store.js.map +1 -1
  416. package/dist/test/fixtures/fake-project-store.d.ts +1 -2
  417. package/dist/test/fixtures/fake-project-store.js +0 -7
  418. package/dist/test/fixtures/fake-project-store.js.map +1 -1
  419. package/dist/test/fixtures/permissions.d.ts +3 -3
  420. package/dist/test/fixtures/permissions.js +5 -4
  421. package/dist/test/fixtures/permissions.js.map +1 -1
  422. package/dist/test/fixtures/store.js +4 -0
  423. package/dist/test/fixtures/store.js.map +1 -1
  424. package/package.json +52 -45
  425. package/dist/lib/extract-user.d.ts +0 -2
  426. package/dist/lib/extract-user.js +0 -6
  427. package/dist/lib/extract-user.js.map +0 -1
  428. package/dist/test/e2e/api/admin/boostrap.test.js.map +0 -1
  429. package/dist/test/e2e/api/admin/project/feature.strategy.e2e.test.js +0 -516
  430. package/dist/test/e2e/api/admin/project/feature.strategy.e2e.test.js.map +0 -1
  431. package/docs/api/oas/swagger-ui-bundle.js +0 -3
  432. package/docs/api/oas/swagger-ui-bundle.js.map +0 -1
  433. package/docs/api/oas/swagger-ui-es-bundle-core.js +0 -3
  434. package/docs/api/oas/swagger-ui-es-bundle-core.js.map +0 -1
  435. package/docs/api/oas/swagger-ui-es-bundle.js +0 -3
  436. package/docs/api/oas/swagger-ui-es-bundle.js.map +0 -1
  437. package/docs/api/oas/swagger-ui-standalone-preset.js +0 -3
  438. package/docs/api/oas/swagger-ui-standalone-preset.js.map +0 -1
  439. package/docs/api/oas/swagger-ui.css +0 -8906
  440. package/docs/api/oas/swagger-ui.css.map +0 -1
  441. package/docs/api/oas/swagger-ui.js +0 -3
  442. package/docs/api/oas/swagger-ui.js.map +0 -1
  443. package/docs/api/oas/swagger.json +0 -1479
@@ -23,7 +23,7 @@ function getSetup() {
23
23
  return {
24
24
  base,
25
25
  featureToggleStore: stores.featureToggleStore,
26
- featureStrategiesStore: stores.featureStrategiesStore,
26
+ featureToggleClientStore: stores.featureToggleClientStore,
27
27
  request: supertest_1.default(app),
28
28
  destroy: () => {
29
29
  services.versionService.destroy();
@@ -35,12 +35,12 @@ function getSetup() {
35
35
  let base;
36
36
  let request;
37
37
  let destroy;
38
- let featureStrategiesStore;
38
+ let featureToggleClientStore;
39
39
  beforeEach(() => {
40
40
  const setup = getSetup();
41
41
  base = setup.base;
42
42
  request = setup.request;
43
- featureStrategiesStore = setup.featureStrategiesStore;
43
+ featureToggleClientStore = setup.featureToggleClientStore;
44
44
  destroy = setup.destroy;
45
45
  });
46
46
  afterEach(() => {
@@ -102,7 +102,7 @@ test('if caching is not enabled all calls goes to service', async () => {
102
102
  });
103
103
  test('fetch single feature', async () => {
104
104
  expect.assertions(1);
105
- await featureStrategiesStore.createFeature({
105
+ await featureToggleClientStore.createFeature({
106
106
  name: 'test_',
107
107
  strategies: [{ name: 'default' }],
108
108
  });
@@ -116,10 +116,10 @@ test('fetch single feature', async () => {
116
116
  });
117
117
  test('support name prefix', async () => {
118
118
  expect.assertions(2);
119
- await featureStrategiesStore.createFeature({ name: 'a_test1' });
120
- await featureStrategiesStore.createFeature({ name: 'a_test2' });
121
- await featureStrategiesStore.createFeature({ name: 'b_test1' });
122
- await featureStrategiesStore.createFeature({ name: 'b_test2' });
119
+ await featureToggleClientStore.createFeature({ name: 'a_test1' });
120
+ await featureToggleClientStore.createFeature({ name: 'a_test2' });
121
+ await featureToggleClientStore.createFeature({ name: 'b_test1' });
122
+ await featureToggleClientStore.createFeature({ name: 'b_test2' });
123
123
  const namePrefix = 'b_';
124
124
  return request
125
125
  .get(`${base}/api/client/features?namePrefix=${namePrefix}`)
@@ -132,11 +132,11 @@ test('support name prefix', async () => {
132
132
  });
133
133
  test('support filtering on project', async () => {
134
134
  expect.assertions(2);
135
- await featureStrategiesStore.createFeature({
135
+ await featureToggleClientStore.createFeature({
136
136
  name: 'a_test1',
137
137
  project: 'projecta',
138
138
  });
139
- await featureStrategiesStore.createFeature({
139
+ await featureToggleClientStore.createFeature({
140
140
  name: 'b_test2',
141
141
  project: 'projectb',
142
142
  });
@@ -1 +1 @@
1
- {"version":3,"file":"feature.test.js","sourceRoot":"","sources":["../../../../src/lib/routes/client-api/feature.test.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"feature.test.js","sourceRoot":"","sources":["../../../../src/lib/routes/client-api/feature.test.ts"],"names":[],"mappings":"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"}
@@ -1,12 +1,17 @@
1
- import { Request, Response } from 'express';
1
+ import { Response } from 'express';
2
2
  import Controller from '../controller';
3
3
  import { IUnleashServices } from '../../types';
4
4
  import { IUnleashConfig } from '../../types/option';
5
5
  import ClientMetricsService from '../../services/client-metrics';
6
6
  import { Logger } from '../../logger';
7
+ import { IAuthRequest } from '../unleash-types';
8
+ import ClientMetricsServiceV2 from '../../services/client-metrics/client-metrics-service-v2';
7
9
  export default class ClientMetricsController extends Controller {
8
10
  logger: Logger;
9
11
  metrics: ClientMetricsService;
10
- constructor({ clientMetricsService, }: Pick<IUnleashServices, 'clientMetricsService'>, config: IUnleashConfig);
11
- registerMetrics(req: Request<any, any, any, any>, res: Response): Promise<void>;
12
+ metricsV2: ClientMetricsServiceV2;
13
+ newServiceEnabled: boolean;
14
+ constructor({ clientMetricsService, clientMetricsServiceV2, }: Pick<IUnleashServices, 'clientMetricsService' | 'clientMetricsServiceV2'>, config: IUnleashConfig);
15
+ private resolveEnvironment;
16
+ registerMetrics(req: IAuthRequest, res: Response): Promise<void>;
12
17
  }
@@ -4,29 +4,41 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
4
4
  };
5
5
  Object.defineProperty(exports, "__esModule", { value: true });
6
6
  const controller_1 = __importDefault(require("../controller"));
7
+ const api_user_1 = __importDefault(require("../../types/api-user"));
8
+ const api_token_1 = require("../../types/models/api-token");
7
9
  class ClientMetricsController extends controller_1.default {
8
- constructor({ clientMetricsService, }, config) {
10
+ constructor({ clientMetricsService, clientMetricsServiceV2, }, config) {
9
11
  super(config);
10
- this.logger = config.getLogger('/api/client/metrics');
12
+ this.newServiceEnabled = false;
13
+ const { experimental, getLogger } = config;
14
+ if (experimental && experimental.metricsV2) {
15
+ //@ts-ignore
16
+ this.newServiceEnabled = experimental.metricsV2.enabled;
17
+ }
18
+ this.logger = getLogger('/api/client/metrics');
11
19
  this.metrics = clientMetricsService;
20
+ this.metricsV2 = clientMetricsServiceV2;
12
21
  this.post('/', this.registerMetrics);
13
22
  }
14
- async registerMetrics(req, res) {
15
- const data = req.body;
16
- const clientIp = req.ip;
17
- try {
18
- await this.metrics.registerClientMetrics(data, clientIp);
19
- return res.status(202).end();
20
- }
21
- catch (e) {
22
- this.logger.warn('Failed to store metrics', e);
23
- switch (e.name) {
24
- case 'ValidationError':
25
- return res.status(400).end();
26
- default:
27
- return res.status(500).end();
23
+ resolveEnvironment(user, data) {
24
+ if (user instanceof api_user_1.default) {
25
+ if (user.environment !== api_token_1.ALL) {
26
+ return user.environment;
27
+ }
28
+ else if (user.environment === api_token_1.ALL && data.environment) {
29
+ return data.environment;
28
30
  }
29
31
  }
32
+ return 'default';
33
+ }
34
+ async registerMetrics(req, res) {
35
+ const { body: data, ip: clientIp, user } = req;
36
+ data.environment = this.resolveEnvironment(user, data);
37
+ await this.metrics.registerClientMetrics(data, clientIp);
38
+ if (this.newServiceEnabled) {
39
+ await this.metricsV2.registerClientMetrics(data, clientIp);
40
+ }
41
+ return res.status(202).end();
30
42
  }
31
43
  }
32
44
  exports.default = ClientMetricsController;
@@ -1 +1 @@
1
- {"version":3,"file":"metrics.js","sourceRoot":"","sources":["../../../../src/lib/routes/client-api/metrics.ts"],"names":[],"mappings":";;;;;AACA,+DAAuC;AAMvC,MAAqB,uBAAwB,SAAQ,oBAAU;IAK3D,YACI,EACI,oBAAoB,GACyB,EACjD,MAAsB;QAEtB,KAAK,CAAC,MAAM,CAAC,CAAC;QACd,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC,SAAS,CAAC,qBAAqB,CAAC,CAAC;QACtD,IAAI,CAAC,OAAO,GAAG,oBAAoB,CAAC;QAEpC,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,IAAI,CAAC,eAAe,CAAC,CAAC;IACzC,CAAC;IAED,KAAK,CAAC,eAAe,CACjB,GAAgC,EAChC,GAAa;QAEb,MAAM,IAAI,GAAG,GAAG,CAAC,IAAI,CAAC;QACtB,MAAM,QAAQ,GAAG,GAAG,CAAC,EAAE,CAAC;QAExB,IAAI;YACA,MAAM,IAAI,CAAC,OAAO,CAAC,qBAAqB,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;YACzD,OAAO,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,CAAC;SAChC;QAAC,OAAO,CAAC,EAAE;YACR,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,yBAAyB,EAAE,CAAC,CAAC,CAAC;YAC/C,QAAQ,CAAC,CAAC,IAAI,EAAE;gBACZ,KAAK,iBAAiB;oBAClB,OAAO,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,CAAC;gBACjC;oBACI,OAAO,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,CAAC;aACpC;SACJ;IACL,CAAC;CACJ;AAtCD,0CAsCC;AAED,MAAM,CAAC,OAAO,GAAG,uBAAuB,CAAC"}
1
+ {"version":3,"file":"metrics.js","sourceRoot":"","sources":["../../../../src/lib/routes/client-api/metrics.ts"],"names":[],"mappings":";;;;;AACA,+DAAuC;AAMvC,oEAA2C;AAC3C,4DAAmD;AAKnD,MAAqB,uBAAwB,SAAQ,oBAAU;IAS3D,YACI,EACI,oBAAoB,EACpB,sBAAsB,GAIzB,EACD,MAAsB;QAEtB,KAAK,CAAC,MAAM,CAAC,CAAC;QAZlB,sBAAiB,GAAY,KAAK,CAAC;QAa/B,MAAM,EAAE,YAAY,EAAE,SAAS,EAAE,GAAG,MAAM,CAAC;QAC3C,IAAI,YAAY,IAAI,YAAY,CAAC,SAAS,EAAE;YACxC,YAAY;YACZ,IAAI,CAAC,iBAAiB,GAAG,YAAY,CAAC,SAAS,CAAC,OAAO,CAAC;SAC3D;QAED,IAAI,CAAC,MAAM,GAAG,SAAS,CAAC,qBAAqB,CAAC,CAAC;QAC/C,IAAI,CAAC,OAAO,GAAG,oBAAoB,CAAC;QACpC,IAAI,CAAC,SAAS,GAAG,sBAAsB,CAAC;QAExC,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,IAAI,CAAC,eAAe,CAAC,CAAC;IACzC,CAAC;IAEO,kBAAkB,CAAC,IAAU,EAAE,IAAgB;QACnD,IAAI,IAAI,YAAY,kBAAO,EAAE;YACzB,IAAI,IAAI,CAAC,WAAW,KAAK,eAAG,EAAE;gBAC1B,OAAO,IAAI,CAAC,WAAW,CAAC;aAC3B;iBAAM,IAAI,IAAI,CAAC,WAAW,KAAK,eAAG,IAAI,IAAI,CAAC,WAAW,EAAE;gBACrD,OAAO,IAAI,CAAC,WAAW,CAAC;aAC3B;SACJ;QACD,OAAO,SAAS,CAAC;IACrB,CAAC;IAED,KAAK,CAAC,eAAe,CAAC,GAAiB,EAAE,GAAa;QAClD,MAAM,EAAE,IAAI,EAAE,IAAI,EAAE,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,GAAG,GAAG,CAAC;QAC/C,IAAI,CAAC,WAAW,GAAG,IAAI,CAAC,kBAAkB,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;QACvD,MAAM,IAAI,CAAC,OAAO,CAAC,qBAAqB,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;QAEzD,IAAI,IAAI,CAAC,iBAAiB,EAAE;YACxB,MAAM,IAAI,CAAC,SAAS,CAAC,qBAAqB,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;SAC9D;QAED,OAAO,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,CAAC;IACjC,CAAC;CACJ;AAvDD,0CAuDC;AAED,MAAM,CAAC,OAAO,GAAG,uBAAuB,CAAC"}
@@ -11,9 +11,9 @@ const test_config_1 = require("../../../test/config/test-config");
11
11
  const client_metrics_schema_1 = require("../../services/client-metrics/client-metrics-schema");
12
12
  const services_1 = require("../../services");
13
13
  const eventBus = new events_1.EventEmitter();
14
- function getSetup() {
14
+ function getSetup(opts) {
15
15
  const stores = store_1.default();
16
- const config = test_config_1.createTestConfig();
16
+ const config = test_config_1.createTestConfig(opts);
17
17
  const services = services_1.createServices(stores, config);
18
18
  const app = app_1.default(config, stores, services, eventBus);
19
19
  return {
@@ -39,14 +39,12 @@ afterEach(() => {
39
39
  destroy();
40
40
  });
41
41
  test('should validate client metrics', () => {
42
- expect.assertions(0);
43
42
  return request
44
43
  .post('/api/client/metrics')
45
44
  .send({ random: 'blush' })
46
45
  .expect(400);
47
46
  });
48
47
  test('should accept empty client metrics', () => {
49
- expect.assertions(0);
50
48
  return request
51
49
  .post('/api/client/metrics')
52
50
  .send({
@@ -61,7 +59,6 @@ test('should accept empty client metrics', () => {
61
59
  .expect(202);
62
60
  });
63
61
  test('should accept client metrics with yes/no', () => {
64
- expect.assertions(0);
65
62
  return request
66
63
  .post('/api/client/metrics')
67
64
  .send({
@@ -80,8 +77,30 @@ test('should accept client metrics with yes/no', () => {
80
77
  })
81
78
  .expect(202);
82
79
  });
80
+ test('should accept client metrics with yes/no with metricsV2', async () => {
81
+ const testRunner = getSetup({
82
+ experimental: { metricsV2: { enabled: true } },
83
+ });
84
+ await testRunner.request
85
+ .post('/api/client/metrics')
86
+ .send({
87
+ appName: 'demo',
88
+ instanceId: '1',
89
+ bucket: {
90
+ start: Date.now(),
91
+ stop: Date.now(),
92
+ toggles: {
93
+ toggleA: {
94
+ yes: 200,
95
+ no: 0,
96
+ },
97
+ },
98
+ },
99
+ })
100
+ .expect(202);
101
+ testRunner.destroy();
102
+ });
83
103
  test('should accept client metrics with variants', () => {
84
- expect.assertions(0);
85
104
  return request
86
105
  .post('/api/client/metrics')
87
106
  .send({
@@ -105,7 +124,6 @@ test('should accept client metrics with variants', () => {
105
124
  .expect(202);
106
125
  });
107
126
  test('should accept client metrics without yes/no', () => {
108
- expect.assertions(0);
109
127
  return request
110
128
  .post('/api/client/metrics')
111
129
  .send({
@@ -124,7 +142,7 @@ test('should accept client metrics without yes/no', () => {
124
142
  })
125
143
  .expect(202);
126
144
  });
127
- test('shema allow empty strings', () => {
145
+ test('schema allow empty strings', () => {
128
146
  const data = {
129
147
  appName: 'java-test',
130
148
  instanceId: 'instance y',
@@ -156,7 +174,7 @@ test('schema allow yes=<string nbr>', () => {
156
174
  });
157
175
  test('should set lastSeen on toggle', async () => {
158
176
  expect.assertions(1);
159
- stores.featureToggleStore.createFeature('default', {
177
+ stores.featureToggleStore.create('default', {
160
178
  name: 'toggleLastSeen',
161
179
  });
162
180
  await request
@@ -1 +1 @@
1
- {"version":3,"file":"metrics.test.js","sourceRoot":"","sources":["../../../../src/lib/routes/client-api/metrics.test.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"metrics.test.js","sourceRoot":"","sources":["../../../../src/lib/routes/client-api/metrics.test.ts"],"names":[],"mappings":"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"}
@@ -1,12 +1,14 @@
1
- import { Request, Response } from 'express';
1
+ import { Response } from 'express';
2
2
  import Controller from '../controller';
3
3
  import { IUnleashServices } from '../../types';
4
4
  import { IUnleashConfig } from '../../types/option';
5
5
  import { Logger } from '../../logger';
6
6
  import ClientMetricsService from '../../services/client-metrics';
7
+ import { IAuthRequest } from '../../server-impl';
7
8
  export default class RegisterController extends Controller {
8
9
  logger: Logger;
9
10
  metrics: ClientMetricsService;
10
11
  constructor({ clientMetricsService, }: Pick<IUnleashServices, 'clientMetricsService'>, config: IUnleashConfig);
11
- handleRegister(req: Request, res: Response): Promise<void>;
12
+ private resolveEnvironment;
13
+ handleRegister(req: IAuthRequest, res: Response): Promise<void>;
12
14
  }
@@ -4,6 +4,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
4
4
  };
5
5
  Object.defineProperty(exports, "__esModule", { value: true });
6
6
  const controller_1 = __importDefault(require("../controller"));
7
+ const api_user_1 = __importDefault(require("../../types/api-user"));
8
+ const api_token_1 = require("../../types/models/api-token");
7
9
  class RegisterController extends controller_1.default {
8
10
  constructor({ clientMetricsService, }, config) {
9
11
  super(config);
@@ -11,22 +13,22 @@ class RegisterController extends controller_1.default {
11
13
  this.metrics = clientMetricsService;
12
14
  this.post('/', this.handleRegister);
13
15
  }
14
- async handleRegister(req, res) {
15
- const data = req.body;
16
- try {
17
- const clientIp = req.ip;
18
- await this.metrics.registerClient(data, clientIp);
19
- return res.status(202).end();
20
- }
21
- catch (err) {
22
- this.logger.warn('failed to register client', err);
23
- switch (err.name) {
24
- case 'ValidationError':
25
- return res.status(400).end();
26
- default:
27
- return res.status(500).end();
16
+ resolveEnvironment(user, data) {
17
+ if (user instanceof api_user_1.default) {
18
+ if (user.environment !== api_token_1.ALL) {
19
+ return user.environment;
20
+ }
21
+ else if (user.environment === api_token_1.ALL && data.environment) {
22
+ return data.environment;
28
23
  }
29
24
  }
25
+ return 'default';
26
+ }
27
+ async handleRegister(req, res) {
28
+ const { body: data, ip: clientIp, user } = req;
29
+ data.environment = this.resolveEnvironment(user, data);
30
+ await this.metrics.registerClient(data, clientIp);
31
+ return res.status(202).end();
30
32
  }
31
33
  }
32
34
  exports.default = RegisterController;
@@ -1 +1 @@
1
- {"version":3,"file":"register.js","sourceRoot":"","sources":["../../../../src/lib/routes/client-api/register.ts"],"names":[],"mappings":";;;;;AACA,+DAAuC;AAMvC,MAAqB,kBAAmB,SAAQ,oBAAU;IAKtD,YACI,EACI,oBAAoB,GACyB,EACjD,MAAsB;QAEtB,KAAK,CAAC,MAAM,CAAC,CAAC;QACd,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC,SAAS,CAAC,sBAAsB,CAAC,CAAC;QACvD,IAAI,CAAC,OAAO,GAAG,oBAAoB,CAAC;QACpC,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,IAAI,CAAC,cAAc,CAAC,CAAC;IACxC,CAAC;IAED,KAAK,CAAC,cAAc,CAAC,GAAY,EAAE,GAAa;QAC5C,MAAM,IAAI,GAAG,GAAG,CAAC,IAAI,CAAC;QACtB,IAAI;YACA,MAAM,QAAQ,GAAG,GAAG,CAAC,EAAE,CAAC;YACxB,MAAM,IAAI,CAAC,OAAO,CAAC,cAAc,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;YAClD,OAAO,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,CAAC;SAChC;QAAC,OAAO,GAAG,EAAE;YACV,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,2BAA2B,EAAE,GAAG,CAAC,CAAC;YACnD,QAAQ,GAAG,CAAC,IAAI,EAAE;gBACd,KAAK,iBAAiB;oBAClB,OAAO,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,CAAC;gBACjC;oBACI,OAAO,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,CAAC;aACpC;SACJ;IACL,CAAC;CACJ;AAjCD,qCAiCC"}
1
+ {"version":3,"file":"register.js","sourceRoot":"","sources":["../../../../src/lib/routes/client-api/register.ts"],"names":[],"mappings":";;;;;AACA,+DAAuC;AAOvC,oEAA2C;AAC3C,4DAAmD;AAEnD,MAAqB,kBAAmB,SAAQ,oBAAU;IAKtD,YACI,EACI,oBAAoB,GACyB,EACjD,MAAsB;QAEtB,KAAK,CAAC,MAAM,CAAC,CAAC;QACd,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC,SAAS,CAAC,sBAAsB,CAAC,CAAC;QACvD,IAAI,CAAC,OAAO,GAAG,oBAAoB,CAAC;QACpC,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,IAAI,CAAC,cAAc,CAAC,CAAC;IACxC,CAAC;IAEO,kBAAkB,CAAC,IAAU,EAAE,IAAgB;QACnD,IAAI,IAAI,YAAY,kBAAO,EAAE;YACzB,IAAI,IAAI,CAAC,WAAW,KAAK,eAAG,EAAE;gBAC1B,OAAO,IAAI,CAAC,WAAW,CAAC;aAC3B;iBAAM,IAAI,IAAI,CAAC,WAAW,KAAK,eAAG,IAAI,IAAI,CAAC,WAAW,EAAE;gBACrD,OAAO,IAAI,CAAC,WAAW,CAAC;aAC3B;SACJ;QACD,OAAO,SAAS,CAAC;IACrB,CAAC;IAED,KAAK,CAAC,cAAc,CAAC,GAAiB,EAAE,GAAa;QACjD,MAAM,EAAE,IAAI,EAAE,IAAI,EAAE,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,GAAG,GAAG,CAAC;QAC/C,IAAI,CAAC,WAAW,GAAG,IAAI,CAAC,kBAAkB,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;QACvD,MAAM,IAAI,CAAC,OAAO,CAAC,cAAc,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;QAClD,OAAO,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,CAAC;IACjC,CAAC;CACJ;AAlCD,qCAkCC"}
@@ -20,6 +20,7 @@ export default class Controller {
20
20
  get(path: string, handler: IRequestHandler, permission?: string): void;
21
21
  post(path: string, handler: IRequestHandler, permission?: string, ...acceptedContentTypes: string[]): void;
22
22
  put(path: string, handler: IRequestHandler, permission?: string, ...acceptedContentTypes: string[]): void;
23
+ patch(path: string, handler: IRequestHandler, permission?: string, ...acceptedContentTypes: string[]): void;
23
24
  delete(path: string, handler: IRequestHandler, permission?: string): void;
24
25
  fileupload(path: string, filehandler: IRequestHandler, handler: Function, permission?: string): void;
25
26
  use(path: string, router: IRouter): void;
@@ -46,6 +46,9 @@ class Controller {
46
46
  put(path, handler, permission, ...acceptedContentTypes) {
47
47
  this.app.put(path, checkPermission(permission), requireContentType(...acceptedContentTypes), this.wrap(handler.bind(this)));
48
48
  }
49
+ patch(path, handler, permission, ...acceptedContentTypes) {
50
+ this.app.patch(path, checkPermission(permission), requireContentType(...acceptedContentTypes), this.wrap(handler.bind(this)));
51
+ }
49
52
  delete(path, handler, permission) {
50
53
  this.app.delete(path, checkPermission(permission), this.wrap(handler.bind(this)));
51
54
  }
@@ -1 +1 @@
1
- {"version":3,"file":"controller.js","sourceRoot":"","sources":["../../../src/lib/routes/controller.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"controller.js","sourceRoot":"","sources":["../../../src/lib/routes/controller.ts"],"names":[],"mappings":"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"}
@@ -5,12 +5,12 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
5
5
  Object.defineProperty(exports, "__esModule", { value: true });
6
6
  const backstage_1 = require("./backstage");
7
7
  const reset_password_controller_1 = __importDefault(require("./auth/reset-password-controller"));
8
+ const api_def_1 = require("./api-def");
8
9
  const AdminApi = require('./admin-api');
9
10
  const ClientApi = require('./client-api');
10
11
  const Controller = require('./controller');
11
12
  const HealthCheckController = require('./health-check');
12
13
  const LogoutController = require('./logout');
13
- const api = require('./api-def');
14
14
  const SimplePasswordProvider = require('./auth/simple-password-provider');
15
15
  class IndexRouter extends Controller {
16
16
  constructor(config, services) {
@@ -20,12 +20,12 @@ class IndexRouter extends Controller {
20
20
  this.use('/logout', new LogoutController(config).router);
21
21
  this.use('/auth/simple', new SimplePasswordProvider(config, services).router);
22
22
  this.use('/auth/reset', new reset_password_controller_1.default(config, services).router);
23
- this.get(api.uri, this.index);
24
- this.use(api.links.admin.uri, new AdminApi(config, services).router);
25
- this.use(api.links.client.uri, new ClientApi(config, services).router);
23
+ this.get(api_def_1.api.uri, this.index);
24
+ this.use(api_def_1.api.links.admin.uri, new AdminApi(config, services).router);
25
+ this.use(api_def_1.api.links.client.uri, new ClientApi(config, services).router);
26
26
  }
27
27
  async index(req, res) {
28
- res.json(api);
28
+ res.json(api_def_1.api);
29
29
  }
30
30
  }
31
31
  exports.default = IndexRouter;
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/lib/routes/index.ts"],"names":[],"mappings":";;;;;AACA,2CAAkD;AAClD,iGAAuE;AAIvE,MAAM,QAAQ,GAAG,OAAO,CAAC,aAAa,CAAC,CAAC;AACxC,MAAM,SAAS,GAAG,OAAO,CAAC,cAAc,CAAC,CAAC;AAC1C,MAAM,UAAU,GAAG,OAAO,CAAC,cAAc,CAAC,CAAC;AAC3C,MAAM,qBAAqB,GAAG,OAAO,CAAC,gBAAgB,CAAC,CAAC;AACxD,MAAM,gBAAgB,GAAG,OAAO,CAAC,UAAU,CAAC,CAAC;AAC7C,MAAM,GAAG,GAAG,OAAO,CAAC,WAAW,CAAC,CAAC;AACjC,MAAM,sBAAsB,GAAG,OAAO,CAAC,iCAAiC,CAAC,CAAC;AAE1E,MAAM,WAAY,SAAQ,UAAU;IAChC,YAAY,MAAsB,EAAE,QAA0B;QAC1D,KAAK,CAAC,MAAM,CAAC,CAAC;QACd,IAAI,CAAC,GAAG,CAAC,SAAS,EAAE,IAAI,qBAAqB,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC,MAAM,CAAC,CAAC;QACxE,IAAI,CAAC,GAAG,CAAC,qBAAqB,EAAE,IAAI,+BAAmB,CAAC,MAAM,CAAC,CAAC,MAAM,CAAC,CAAC;QACxE,IAAI,CAAC,GAAG,CAAC,SAAS,EAAE,IAAI,gBAAgB,CAAC,MAAM,CAAC,CAAC,MAAM,CAAC,CAAC;QACzD,IAAI,CAAC,GAAG,CACJ,cAAc,EACd,IAAI,sBAAsB,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC,MAAM,CACtD,CAAC;QACF,IAAI,CAAC,GAAG,CACJ,aAAa,EACb,IAAI,mCAAuB,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC,MAAM,CACvD,CAAC;QACF,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,EAAE,IAAI,CAAC,KAAK,CAAC,CAAC;QAC9B,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,KAAK,CAAC,KAAK,CAAC,GAAG,EAAE,IAAI,QAAQ,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC,MAAM,CAAC,CAAC;QACrE,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,KAAK,CAAC,MAAM,CAAC,GAAG,EAAE,IAAI,SAAS,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC,MAAM,CAAC,CAAC;IAC3E,CAAC;IAED,KAAK,CAAC,KAAK,CAAC,GAAY,EAAE,GAAa;QACnC,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IAClB,CAAC;CACJ;AAED,kBAAe,WAAW,CAAC;AAE3B,MAAM,CAAC,OAAO,GAAG,WAAW,CAAC"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/lib/routes/index.ts"],"names":[],"mappings":";;;;;AACA,2CAAkD;AAClD,iGAAuE;AAGvE,uCAAgC;AAEhC,MAAM,QAAQ,GAAG,OAAO,CAAC,aAAa,CAAC,CAAC;AACxC,MAAM,SAAS,GAAG,OAAO,CAAC,cAAc,CAAC,CAAC;AAC1C,MAAM,UAAU,GAAG,OAAO,CAAC,cAAc,CAAC,CAAC;AAC3C,MAAM,qBAAqB,GAAG,OAAO,CAAC,gBAAgB,CAAC,CAAC;AACxD,MAAM,gBAAgB,GAAG,OAAO,CAAC,UAAU,CAAC,CAAC;AAC7C,MAAM,sBAAsB,GAAG,OAAO,CAAC,iCAAiC,CAAC,CAAC;AAE1E,MAAM,WAAY,SAAQ,UAAU;IAChC,YAAY,MAAsB,EAAE,QAA0B;QAC1D,KAAK,CAAC,MAAM,CAAC,CAAC;QACd,IAAI,CAAC,GAAG,CAAC,SAAS,EAAE,IAAI,qBAAqB,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC,MAAM,CAAC,CAAC;QACxE,IAAI,CAAC,GAAG,CAAC,qBAAqB,EAAE,IAAI,+BAAmB,CAAC,MAAM,CAAC,CAAC,MAAM,CAAC,CAAC;QACxE,IAAI,CAAC,GAAG,CAAC,SAAS,EAAE,IAAI,gBAAgB,CAAC,MAAM,CAAC,CAAC,MAAM,CAAC,CAAC;QACzD,IAAI,CAAC,GAAG,CACJ,cAAc,EACd,IAAI,sBAAsB,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC,MAAM,CACtD,CAAC;QACF,IAAI,CAAC,GAAG,CACJ,aAAa,EACb,IAAI,mCAAuB,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC,MAAM,CACvD,CAAC;QACF,IAAI,CAAC,GAAG,CAAC,aAAG,CAAC,GAAG,EAAE,IAAI,CAAC,KAAK,CAAC,CAAC;QAC9B,IAAI,CAAC,GAAG,CAAC,aAAG,CAAC,KAAK,CAAC,KAAK,CAAC,GAAG,EAAE,IAAI,QAAQ,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC,MAAM,CAAC,CAAC;QACrE,IAAI,CAAC,GAAG,CAAC,aAAG,CAAC,KAAK,CAAC,MAAM,CAAC,GAAG,EAAE,IAAI,SAAS,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC,MAAM,CAAC,CAAC;IAC3E,CAAC;IAED,KAAK,CAAC,KAAK,CAAC,GAAY,EAAE,GAAa;QACnC,GAAG,CAAC,IAAI,CAAC,aAAG,CAAC,CAAC;IAClB,CAAC;CACJ;AAED,kBAAe,WAAW,CAAC;AAE3B,MAAM,CAAC,OAAO,GAAG,WAAW,CAAC"}
@@ -1,7 +1,6 @@
1
1
  import { Request } from 'express';
2
- import * as core from 'express-serve-static-core';
3
2
  import User from '../types/user';
4
- export interface IAuthRequest<PARAM = core.ParamsDictionary, ResBody = any, ReqBody = any, ReqQuery = core.Query> extends Request<PARAM, ResBody, ReqBody, ReqQuery> {
3
+ export interface IAuthRequest<PARAM = any, ResBody = any, ReqBody = any, ReqQuery = any> extends Request<PARAM, ResBody, ReqBody, ReqQuery> {
5
4
  user: User;
6
5
  logout: () => void;
7
6
  session: any;
@@ -32,6 +32,7 @@ const handleErrors = (res, logger, error) => {
32
32
  case 'NotFoundError':
33
33
  return res.status(404).json(error).end();
34
34
  case 'InvalidOperationError':
35
+ return res.status(403).json(error).end();
35
36
  case 'NameExistsError':
36
37
  return res.status(409).json(error).end();
37
38
  case 'ValidationError':
@@ -1 +1 @@
1
- {"version":3,"file":"util.js","sourceRoot":"","sources":["../../../src/lib/routes/util.ts"],"names":[],"mappings":";;;;;;AAAA,8CAAsB;AAIT,QAAA,SAAS,GAAG,aAAG,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;IACxC,IAAI,EAAE,eAAe;IACrB,IAAI,EAAE,CAAC,CAAC,MAAM,EAAE;IAChB,QAAQ,EAAE;QACN,oBAAoB,EAAE,iCAAiC;KAC1D;IACD,QAAQ,CAAC,KAAK,EAAE,OAAO;QACnB,kDAAkD;QAClD,IAAI,kBAAkB,CAAC,KAAK,CAAC,KAAK,KAAK,EAAE;YACrC,yDAAyD;YACzD,OAAO,EAAE,KAAK,EAAE,MAAM,EAAE,OAAO,CAAC,KAAK,CAAC,oBAAoB,CAAC,EAAE,CAAC;SACjE;QACD,OAAO,SAAS,CAAC;IACrB,CAAC;CACJ,CAAC,CAAC,CAAC;AAES,QAAA,QAAQ,GAAG,iBAAS,CAAC,aAAa,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,QAAQ,EAAE,CAAC;AAEtE,MAAM,YAAY,GAIb,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,EAAE;IAC/B,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;IAC3B,aAAa;IACb,6CAA6C;IAC7C,KAAK,CAAC,KAAK,GAAG,IAAI,CAAC;IACnB,QAAQ,KAAK,CAAC,IAAI,EAAE;QAChB,KAAK,eAAe;YAChB,OAAO,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,GAAG,EAAE,CAAC;QAC7C,KAAK,eAAe;YAChB,OAAO,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,GAAG,EAAE,CAAC;QAC7C,KAAK,uBAAuB,CAAC;QAC7B,KAAK,iBAAiB;YAClB,OAAO,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,GAAG,EAAE,CAAC;QAC7C,KAAK,iBAAiB;YAClB,OAAO,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,GAAG,EAAE,CAAC;QAC7C,KAAK,cAAc;YACf,OAAO,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,GAAG,EAAE,CAAC;QAC7C,KAAK,oBAAoB;YACrB,OAAO,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,GAAG,EAAE,CAAC;QAC7C,KAAK,gBAAgB;YACjB,OAAO,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,GAAG,EAAE,CAAC;QAC7C,KAAK,mBAAmB;YACpB,OAAO,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,GAAG,EAAE,CAAC;QAC7C,KAAK,sBAAsB;YACvB,OAAO,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,GAAG,EAAE,CAAC;QAC7C,KAAK,wBAAwB;YACzB,OAAO,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,GAAG,EAAE,CAAC;QAC7C;YACI,MAAM,CAAC,KAAK,CAAC,iCAAiC,EAAE,KAAK,CAAC,CAAC;YACvD,OAAO,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,CAAC;KACpC;AACL,CAAC,CAAC;AAnCW,QAAA,YAAY,gBAmCvB"}
1
+ {"version":3,"file":"util.js","sourceRoot":"","sources":["../../../src/lib/routes/util.ts"],"names":[],"mappings":"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"}
@@ -0,0 +1,2 @@
1
+ import joi from 'joi';
2
+ export declare const createApiToken: joi.ObjectSchema<any>;
@@ -0,0 +1,28 @@
1
+ "use strict";
2
+ var __importDefault = (this && this.__importDefault) || function (mod) {
3
+ return (mod && mod.__esModule) ? mod : { "default": mod };
4
+ };
5
+ Object.defineProperty(exports, "__esModule", { value: true });
6
+ exports.createApiToken = void 0;
7
+ const joi_1 = __importDefault(require("joi"));
8
+ const api_token_1 = require("../types/models/api-token");
9
+ const constants_1 = require("../util/constants");
10
+ exports.createApiToken = joi_1.default
11
+ .object()
12
+ .keys({
13
+ username: joi_1.default.string().required(),
14
+ type: joi_1.default
15
+ .string()
16
+ .lowercase()
17
+ .required()
18
+ .valid(api_token_1.ApiTokenType.ADMIN, api_token_1.ApiTokenType.CLIENT),
19
+ expiresAt: joi_1.default.date().optional(),
20
+ project: joi_1.default.string().optional().default(api_token_1.ALL),
21
+ environment: joi_1.default.when('type', {
22
+ is: joi_1.default.string().valid(api_token_1.ApiTokenType.CLIENT),
23
+ then: joi_1.default.string().optional().default(constants_1.DEFAULT_ENV),
24
+ otherwise: joi_1.default.string().optional().default(api_token_1.ALL),
25
+ }),
26
+ })
27
+ .options({ stripUnknown: true, allowUnknown: false, abortEarly: false });
28
+ //# sourceMappingURL=api-token-schema.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"api-token-schema.js","sourceRoot":"","sources":["../../../src/lib/schema/api-token-schema.ts"],"names":[],"mappings":";;;;;;AAAA,8CAAsB;AACtB,yDAA8D;AAC9D,iDAAgD;AAEnC,QAAA,cAAc,GAAG,aAAG;KAC5B,MAAM,EAAE;KACR,IAAI,CAAC;IACF,QAAQ,EAAE,aAAG,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;IACjC,IAAI,EAAE,aAAG;SACJ,MAAM,EAAE;SACR,SAAS,EAAE;SACX,QAAQ,EAAE;SACV,KAAK,CAAC,wBAAY,CAAC,KAAK,EAAE,wBAAY,CAAC,MAAM,CAAC;IACnD,SAAS,EAAE,aAAG,CAAC,IAAI,EAAE,CAAC,QAAQ,EAAE;IAChC,OAAO,EAAE,aAAG,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE,CAAC,OAAO,CAAC,eAAG,CAAC;IAC7C,WAAW,EAAE,aAAG,CAAC,IAAI,CAAC,MAAM,EAAE;QAC1B,EAAE,EAAE,aAAG,CAAC,MAAM,EAAE,CAAC,KAAK,CAAC,wBAAY,CAAC,MAAM,CAAC;QAC3C,IAAI,EAAE,aAAG,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE,CAAC,OAAO,CAAC,uBAAW,CAAC;QAClD,SAAS,EAAE,aAAG,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE,CAAC,OAAO,CAAC,eAAG,CAAC;KAClD,CAAC;CACL,CAAC;KACD,OAAO,CAAC,EAAE,YAAY,EAAE,IAAI,EAAE,YAAY,EAAE,KAAK,EAAE,UAAU,EAAE,KAAK,EAAE,CAAC,CAAC"}