@things-factory/auth-base 5.0.7 → 6.0.0-alpha.0

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 (411) hide show
  1. package/client/actions/auth.ts +23 -0
  2. package/client/{auth.js → auth.ts} +66 -59
  3. package/client/{bootstrap.js → bootstrap.ts} +5 -4
  4. package/client/index.ts +1 -0
  5. package/client/reducers/{auth.js → auth.ts} +1 -1
  6. package/config/config.development.js +2 -1
  7. package/dist-client/actions/auth.d.ts +8 -0
  8. package/dist-client/actions/auth.js +15 -0
  9. package/dist-client/actions/auth.js.map +1 -0
  10. package/dist-client/auth.d.ts +34 -0
  11. package/dist-client/auth.js +209 -0
  12. package/dist-client/auth.js.map +1 -0
  13. package/dist-client/bootstrap.d.ts +1 -0
  14. package/dist-client/bootstrap.js +34 -0
  15. package/dist-client/bootstrap.js.map +1 -0
  16. package/dist-client/index.d.ts +1 -0
  17. package/dist-client/index.js +2 -0
  18. package/dist-client/index.js.map +1 -0
  19. package/dist-client/reducers/auth.d.ts +14 -0
  20. package/dist-client/reducers/auth.js +19 -0
  21. package/dist-client/reducers/auth.js.map +1 -0
  22. package/dist-client/tsconfig.tsbuildinfo +1 -0
  23. package/dist-server/constants/error-code.d.ts +17 -0
  24. package/dist-server/constants/error-code.js.map +1 -1
  25. package/dist-server/constants/error-message.d.ts +0 -0
  26. package/dist-server/constants/error-message.js.map +1 -1
  27. package/dist-server/constants/max-age.d.ts +1 -0
  28. package/dist-server/constants/max-age.js.map +1 -1
  29. package/dist-server/controllers/auth.d.ts +5 -0
  30. package/dist-server/controllers/auth.js +6 -18
  31. package/dist-server/controllers/auth.js.map +1 -1
  32. package/dist-server/controllers/change-pwd.d.ts +1 -0
  33. package/dist-server/controllers/change-pwd.js +11 -12
  34. package/dist-server/controllers/change-pwd.js.map +1 -1
  35. package/dist-server/controllers/checkin.d.ts +4 -0
  36. package/dist-server/controllers/checkin.js +3 -3
  37. package/dist-server/controllers/checkin.js.map +1 -1
  38. package/dist-server/controllers/delete-user.d.ts +3 -0
  39. package/dist-server/controllers/delete-user.js.map +1 -1
  40. package/dist-server/controllers/invitation.d.ts +11 -0
  41. package/dist-server/controllers/invitation.js +14 -20
  42. package/dist-server/controllers/invitation.js.map +1 -1
  43. package/dist-server/controllers/profile.d.ts +26 -0
  44. package/dist-server/controllers/profile.js +4 -4
  45. package/dist-server/controllers/profile.js.map +1 -1
  46. package/dist-server/controllers/reset-password.d.ts +5 -0
  47. package/dist-server/controllers/reset-password.js +14 -16
  48. package/dist-server/controllers/reset-password.js.map +1 -1
  49. package/dist-server/controllers/signin.d.ts +6 -0
  50. package/dist-server/controllers/signin.js +4 -3
  51. package/dist-server/controllers/signin.js.map +1 -1
  52. package/dist-server/controllers/signup.d.ts +8 -0
  53. package/dist-server/controllers/signup.js +13 -9
  54. package/dist-server/controllers/signup.js.map +1 -1
  55. package/dist-server/controllers/unlock-user.d.ts +5 -0
  56. package/dist-server/controllers/unlock-user.js +6 -6
  57. package/dist-server/controllers/unlock-user.js.map +1 -1
  58. package/dist-server/controllers/utils/make-invitation-token.d.ts +1 -0
  59. package/dist-server/controllers/utils/make-invitation-token.js +2 -4
  60. package/dist-server/controllers/utils/make-invitation-token.js.map +1 -1
  61. package/dist-server/controllers/utils/make-verification-token.d.ts +1 -0
  62. package/dist-server/controllers/utils/make-verification-token.js +2 -4
  63. package/dist-server/controllers/utils/make-verification-token.js.map +1 -1
  64. package/dist-server/controllers/utils/password-rule.d.ts +14 -0
  65. package/dist-server/controllers/utils/password-rule.js +2 -5
  66. package/dist-server/controllers/utils/password-rule.js.map +1 -1
  67. package/dist-server/controllers/utils/save-invitation-token.d.ts +5 -0
  68. package/dist-server/controllers/utils/save-invitation-token.js +2 -2
  69. package/dist-server/controllers/utils/save-invitation-token.js.map +1 -1
  70. package/dist-server/controllers/utils/save-verification-token.d.ts +6 -0
  71. package/dist-server/controllers/utils/save-verification-token.js +2 -2
  72. package/dist-server/controllers/utils/save-verification-token.js.map +1 -1
  73. package/dist-server/controllers/verification.d.ts +6 -0
  74. package/dist-server/controllers/verification.js +8 -8
  75. package/dist-server/controllers/verification.js.map +1 -1
  76. package/dist-server/errors/auth-error.d.ts +11 -0
  77. package/dist-server/errors/auth-error.js +2 -24
  78. package/dist-server/errors/auth-error.js.map +1 -1
  79. package/dist-server/errors/index.d.ts +2 -0
  80. package/dist-server/errors/index.js +3 -16
  81. package/dist-server/errors/index.js.map +1 -1
  82. package/dist-server/errors/user-domain-not-match-error.d.ts +9 -0
  83. package/dist-server/errors/user-domain-not-match-error.js.map +1 -1
  84. package/dist-server/index.d.ts +13 -0
  85. package/dist-server/index.js +13 -25
  86. package/dist-server/index.js.map +1 -1
  87. package/dist-server/middlewares/authenticate-401-middleware.d.ts +1 -0
  88. package/dist-server/middlewares/authenticate-401-middleware.js +12 -20
  89. package/dist-server/middlewares/authenticate-401-middleware.js.map +1 -1
  90. package/dist-server/middlewares/domain-authenticate-middleware.d.ts +11 -0
  91. package/dist-server/middlewares/domain-authenticate-middleware.js +8 -8
  92. package/dist-server/middlewares/domain-authenticate-middleware.js.map +1 -1
  93. package/dist-server/middlewares/graphql-authenticate-middleware.d.ts +1 -0
  94. package/dist-server/middlewares/graphql-authenticate-middleware.js +1 -3
  95. package/dist-server/middlewares/graphql-authenticate-middleware.js.map +1 -1
  96. package/dist-server/middlewares/index.d.ts +5 -0
  97. package/dist-server/middlewares/index.js +6 -24
  98. package/dist-server/middlewares/index.js.map +1 -1
  99. package/dist-server/middlewares/jwt-authenticate-middleware.d.ts +1 -0
  100. package/dist-server/middlewares/jwt-authenticate-middleware.js +5 -11
  101. package/dist-server/middlewares/jwt-authenticate-middleware.js.map +1 -1
  102. package/dist-server/middlewares/signin-middleware.d.ts +1 -0
  103. package/dist-server/middlewares/signin-middleware.js +2 -6
  104. package/dist-server/middlewares/signin-middleware.js.map +1 -1
  105. package/dist-server/migrations/1548206416130-SeedUser.d.ts +5 -0
  106. package/dist-server/migrations/1548206416130-SeedUser.js +4 -5
  107. package/dist-server/migrations/1548206416130-SeedUser.js.map +1 -1
  108. package/dist-server/migrations/1566805283882-SeedPrivilege.d.ts +5 -0
  109. package/dist-server/migrations/1566805283882-SeedPrivilege.js +2 -2
  110. package/dist-server/migrations/1566805283882-SeedPrivilege.js.map +1 -1
  111. package/dist-server/migrations/index.d.ts +1 -0
  112. package/dist-server/migrations/index.js.map +1 -1
  113. package/dist-server/router/auth-checkin-router.d.ts +1 -0
  114. package/dist-server/router/auth-checkin-router.js +3 -8
  115. package/dist-server/router/auth-checkin-router.js.map +1 -1
  116. package/dist-server/router/auth-private-process-router.d.ts +1 -0
  117. package/dist-server/router/auth-private-process-router.js +16 -21
  118. package/dist-server/router/auth-private-process-router.js.map +1 -1
  119. package/dist-server/router/auth-public-process-router.d.ts +1 -0
  120. package/dist-server/router/auth-public-process-router.js +6 -25
  121. package/dist-server/router/auth-public-process-router.js.map +1 -1
  122. package/dist-server/router/auth-signin-router.d.ts +1 -0
  123. package/dist-server/router/auth-signin-router.js +2 -7
  124. package/dist-server/router/auth-signin-router.js.map +1 -1
  125. package/dist-server/router/auth-signup-router.d.ts +1 -0
  126. package/dist-server/router/auth-signup-router.js +34 -40
  127. package/dist-server/router/auth-signup-router.js.map +1 -1
  128. package/dist-server/router/index.d.ts +8 -0
  129. package/dist-server/router/index.js +9 -22
  130. package/dist-server/router/index.js.map +1 -1
  131. package/dist-server/router/oauth2/index.d.ts +2 -0
  132. package/dist-server/router/oauth2/index.js +3 -16
  133. package/dist-server/router/oauth2/index.js.map +1 -1
  134. package/dist-server/router/oauth2/oauth2-authorize-router.d.ts +1 -0
  135. package/dist-server/router/oauth2/oauth2-authorize-router.js +4 -11
  136. package/dist-server/router/oauth2/oauth2-authorize-router.js.map +1 -1
  137. package/dist-server/router/oauth2/oauth2-router.d.ts +9 -0
  138. package/dist-server/router/oauth2/oauth2-router.js +11 -17
  139. package/dist-server/router/oauth2/oauth2-router.js.map +1 -1
  140. package/dist-server/router/oauth2/oauth2-server.d.ts +5 -0
  141. package/dist-server/router/oauth2/oauth2-server.js +25 -35
  142. package/dist-server/router/oauth2/oauth2-server.js.map +1 -1
  143. package/dist-server/router/oauth2/passport-oauth2-client-password.d.ts +7 -0
  144. package/dist-server/router/oauth2/passport-oauth2-client-password.js +3 -5
  145. package/dist-server/router/oauth2/passport-oauth2-client-password.js.map +1 -1
  146. package/dist-server/router/oauth2/passport-refresh-token.d.ts +7 -0
  147. package/dist-server/router/oauth2/passport-refresh-token.js +3 -5
  148. package/dist-server/router/oauth2/passport-refresh-token.js.map +1 -1
  149. package/dist-server/router/path-base-domain-router.d.ts +1 -0
  150. package/dist-server/router/path-base-domain-router.js +2 -6
  151. package/dist-server/router/path-base-domain-router.js.map +1 -1
  152. package/dist-server/router/site-root-router.d.ts +1 -0
  153. package/dist-server/router/site-root-router.js +4 -13
  154. package/dist-server/router/site-root-router.js.map +1 -1
  155. package/dist-server/routes.d.ts +1 -0
  156. package/dist-server/routes.js +2 -9
  157. package/dist-server/routes.js.map +1 -1
  158. package/dist-server/service/app-binding/app-binding-mutation.d.ts +3 -0
  159. package/dist-server/service/app-binding/app-binding-mutation.js +11 -24
  160. package/dist-server/service/app-binding/app-binding-mutation.js.map +1 -1
  161. package/dist-server/service/app-binding/app-binding-query.d.ts +14 -0
  162. package/dist-server/service/app-binding/app-binding-query.js +51 -60
  163. package/dist-server/service/app-binding/app-binding-query.js.map +1 -1
  164. package/dist-server/service/app-binding/app-binding-types.d.ts +5 -0
  165. package/dist-server/service/app-binding/app-binding-types.js +6 -14
  166. package/dist-server/service/app-binding/app-binding-types.js.map +1 -1
  167. package/dist-server/service/app-binding/app-binding.d.ts +7 -0
  168. package/dist-server/service/app-binding/app-binding.js +8 -16
  169. package/dist-server/service/app-binding/app-binding.js.map +1 -1
  170. package/dist-server/service/app-binding/index.d.ts +3 -0
  171. package/dist-server/service/app-binding/index.js.map +1 -1
  172. package/dist-server/service/appliance/appliance-mutation.d.ts +8 -0
  173. package/dist-server/service/appliance/appliance-mutation.js +40 -53
  174. package/dist-server/service/appliance/appliance-mutation.js.map +1 -1
  175. package/dist-server/service/appliance/appliance-query.d.ts +11 -0
  176. package/dist-server/service/appliance/appliance-query.js +35 -48
  177. package/dist-server/service/appliance/appliance-query.js.map +1 -1
  178. package/dist-server/service/appliance/appliance-types.d.ts +22 -0
  179. package/dist-server/service/appliance/appliance-types.js +34 -42
  180. package/dist-server/service/appliance/appliance-types.js.map +1 -1
  181. package/dist-server/service/appliance/appliance.d.ts +22 -0
  182. package/dist-server/service/appliance/appliance.js +35 -47
  183. package/dist-server/service/appliance/appliance.js.map +1 -1
  184. package/dist-server/service/appliance/index.d.ts +5 -0
  185. package/dist-server/service/appliance/index.js.map +1 -1
  186. package/dist-server/service/application/application-mutation.d.ts +66 -0
  187. package/dist-server/service/application/application-mutation.js +47 -61
  188. package/dist-server/service/application/application-mutation.js.map +1 -1
  189. package/dist-server/service/application/application-query.d.ts +16 -0
  190. package/dist-server/service/application/application-query.js +54 -67
  191. package/dist-server/service/application/application-query.js.map +1 -1
  192. package/dist-server/service/application/application-types.d.ts +27 -0
  193. package/dist-server/service/application/application-types.js +41 -49
  194. package/dist-server/service/application/application-types.js.map +1 -1
  195. package/dist-server/service/application/application.d.ts +35 -0
  196. package/dist-server/service/application/application.js +42 -54
  197. package/dist-server/service/application/application.js.map +1 -1
  198. package/dist-server/service/application/index.d.ts +5 -0
  199. package/dist-server/service/application/index.js.map +1 -1
  200. package/dist-server/service/domain-generator/domain-generator-mutation.d.ts +6 -0
  201. package/dist-server/service/domain-generator/domain-generator-mutation.js +21 -32
  202. package/dist-server/service/domain-generator/domain-generator-mutation.js.map +1 -1
  203. package/dist-server/service/domain-generator/domain-generator-types.d.ts +19 -0
  204. package/dist-server/service/domain-generator/domain-generator-types.js +26 -35
  205. package/dist-server/service/domain-generator/domain-generator-types.js.map +1 -1
  206. package/dist-server/service/domain-generator/index.d.ts +2 -0
  207. package/dist-server/service/domain-generator/index.js.map +1 -1
  208. package/dist-server/service/granted-role/granted-role-mutation.d.ts +11 -0
  209. package/dist-server/service/granted-role/granted-role-mutation.js +23 -29
  210. package/dist-server/service/granted-role/granted-role-mutation.js.map +1 -1
  211. package/dist-server/service/granted-role/granted-role-query.d.ts +16 -0
  212. package/dist-server/service/granted-role/granted-role-query.js +31 -43
  213. package/dist-server/service/granted-role/granted-role-query.js.map +1 -1
  214. package/dist-server/service/granted-role/granted-role.d.ts +9 -0
  215. package/dist-server/service/granted-role/granted-role.js +12 -21
  216. package/dist-server/service/granted-role/granted-role.js.map +1 -1
  217. package/dist-server/service/granted-role/index.d.ts +5 -0
  218. package/dist-server/service/granted-role/index.js.map +1 -1
  219. package/dist-server/service/index.d.ts +31 -0
  220. package/dist-server/service/index.js +22 -35
  221. package/dist-server/service/index.js.map +1 -1
  222. package/dist-server/service/invitation/index.d.ts +5 -0
  223. package/dist-server/service/invitation/index.js.map +1 -1
  224. package/dist-server/service/invitation/invitation-mutation.d.ts +17 -0
  225. package/dist-server/service/invitation/invitation-mutation.js +26 -37
  226. package/dist-server/service/invitation/invitation-mutation.js.map +1 -1
  227. package/dist-server/service/invitation/invitation-query.d.ts +8 -0
  228. package/dist-server/service/invitation/invitation-query.js +19 -30
  229. package/dist-server/service/invitation/invitation-query.js.map +1 -1
  230. package/dist-server/service/invitation/invitation-types.d.ts +5 -0
  231. package/dist-server/service/invitation/invitation-types.js +6 -14
  232. package/dist-server/service/invitation/invitation-types.js.map +1 -1
  233. package/dist-server/service/invitation/invitation.d.ts +14 -0
  234. package/dist-server/service/invitation/invitation.js +24 -32
  235. package/dist-server/service/invitation/invitation.js.map +1 -1
  236. package/dist-server/service/login-history/index.d.ts +4 -0
  237. package/dist-server/service/login-history/index.js.map +1 -1
  238. package/dist-server/service/login-history/login-history-query.d.ts +8 -0
  239. package/dist-server/service/login-history/login-history-query.js +27 -40
  240. package/dist-server/service/login-history/login-history-query.js.map +1 -1
  241. package/dist-server/service/login-history/login-history.d.ts +12 -0
  242. package/dist-server/service/login-history/login-history.js +29 -38
  243. package/dist-server/service/login-history/login-history.js.map +1 -1
  244. package/dist-server/service/partner/index.d.ts +5 -0
  245. package/dist-server/service/partner/index.js.map +1 -1
  246. package/dist-server/service/partner/partner-mutation.d.ts +4 -0
  247. package/dist-server/service/partner/partner-mutation.js +20 -32
  248. package/dist-server/service/partner/partner-mutation.js.map +1 -1
  249. package/dist-server/service/partner/partner-query.d.ts +14 -0
  250. package/dist-server/service/partner/partner-query.js +53 -66
  251. package/dist-server/service/partner/partner-query.js.map +1 -1
  252. package/dist-server/service/partner/partner-types.d.ts +5 -0
  253. package/dist-server/service/partner/partner-types.js +6 -14
  254. package/dist-server/service/partner/partner-types.js.map +1 -1
  255. package/dist-server/service/partner/partner.d.ts +15 -0
  256. package/dist-server/service/partner/partner.js +24 -33
  257. package/dist-server/service/partner/partner.js.map +1 -1
  258. package/dist-server/service/password-history/index.d.ts +2 -0
  259. package/dist-server/service/password-history/index.js.map +1 -1
  260. package/dist-server/service/password-history/password-history.d.ts +4 -0
  261. package/dist-server/service/password-history/password-history.js +6 -14
  262. package/dist-server/service/password-history/password-history.js.map +1 -1
  263. package/dist-server/service/privilege/index.d.ts +5 -0
  264. package/dist-server/service/privilege/index.js.map +1 -1
  265. package/dist-server/service/privilege/privilege-directive.d.ts +3 -0
  266. package/dist-server/service/privilege/privilege-directive.js +4 -7
  267. package/dist-server/service/privilege/privilege-directive.js.map +1 -1
  268. package/dist-server/service/privilege/privilege-mutation.d.ts +7 -0
  269. package/dist-server/service/privilege/privilege-mutation.js +32 -42
  270. package/dist-server/service/privilege/privilege-mutation.js.map +1 -1
  271. package/dist-server/service/privilege/privilege-query.d.ts +13 -0
  272. package/dist-server/service/privilege/privilege-query.js +41 -53
  273. package/dist-server/service/privilege/privilege-query.js.map +1 -1
  274. package/dist-server/service/privilege/privilege-types.d.ts +25 -0
  275. package/dist-server/service/privilege/privilege-types.js +35 -43
  276. package/dist-server/service/privilege/privilege-types.js.map +1 -1
  277. package/dist-server/service/privilege/privilege.d.ts +15 -0
  278. package/dist-server/service/privilege/privilege.js +24 -32
  279. package/dist-server/service/privilege/privilege.js.map +1 -1
  280. package/dist-server/service/role/index.d.ts +5 -0
  281. package/dist-server/service/role/index.js.map +1 -1
  282. package/dist-server/service/role/role-mutation.d.ts +8 -0
  283. package/dist-server/service/role/role-mutation.js +40 -49
  284. package/dist-server/service/role/role-mutation.js.map +1 -1
  285. package/dist-server/service/role/role-query.d.ts +18 -0
  286. package/dist-server/service/role/role-query.js +73 -84
  287. package/dist-server/service/role/role-query.js.map +1 -1
  288. package/dist-server/service/role/role-types.d.ts +33 -0
  289. package/dist-server/service/role/role-types.js +48 -56
  290. package/dist-server/service/role/role-types.js.map +1 -1
  291. package/dist-server/service/role/role.d.ts +18 -0
  292. package/dist-server/service/role/role.js +28 -37
  293. package/dist-server/service/role/role.js.map +1 -1
  294. package/dist-server/service/user/index.d.ts +5 -0
  295. package/dist-server/service/user/index.js.map +1 -1
  296. package/dist-server/service/user/user-mutation.d.ts +28 -0
  297. package/dist-server/service/user/user-mutation.js +89 -93
  298. package/dist-server/service/user/user-mutation.js.map +1 -1
  299. package/dist-server/service/user/user-query.d.ts +16 -0
  300. package/dist-server/service/user/user-query.js +73 -82
  301. package/dist-server/service/user/user-query.js.map +1 -1
  302. package/dist-server/service/user/user-types.d.ts +26 -0
  303. package/dist-server/service/user/user-types.js +40 -48
  304. package/dist-server/service/user/user-types.js.map +1 -1
  305. package/dist-server/service/user/user.d.ts +39 -0
  306. package/dist-server/service/user/user.js +53 -63
  307. package/dist-server/service/user/user.js.map +1 -1
  308. package/dist-server/service/verification-token/index.d.ts +2 -0
  309. package/dist-server/service/verification-token/index.js.map +1 -1
  310. package/dist-server/service/verification-token/verification-token.d.ts +14 -0
  311. package/dist-server/service/verification-token/verification-token.js +14 -22
  312. package/dist-server/service/verification-token/verification-token.js.map +1 -1
  313. package/dist-server/templates/account-unlock-email.d.ts +4 -0
  314. package/dist-server/templates/account-unlock-email.js.map +1 -1
  315. package/dist-server/templates/invitation-email.d.ts +4 -0
  316. package/dist-server/templates/invitation-email.js.map +1 -1
  317. package/dist-server/templates/reset-password-email.d.ts +4 -0
  318. package/dist-server/templates/reset-password-email.js.map +1 -1
  319. package/dist-server/templates/verification-email.d.ts +4 -0
  320. package/dist-server/templates/verification-email.js.map +1 -1
  321. package/dist-server/tsconfig.tsbuildinfo +1 -0
  322. package/dist-server/types.d.ts +17 -0
  323. package/dist-server/types.js +3 -0
  324. package/dist-server/types.js.map +1 -0
  325. package/dist-server/utils/accepts.d.ts +1 -0
  326. package/dist-server/utils/accepts.js.map +1 -1
  327. package/dist-server/utils/access-token-cookie.d.ts +3 -0
  328. package/dist-server/utils/access-token-cookie.js.map +1 -1
  329. package/dist-server/utils/check-user-belongs-domain.d.ts +10 -0
  330. package/dist-server/utils/check-user-belongs-domain.js +2 -2
  331. package/dist-server/utils/check-user-belongs-domain.js.map +1 -1
  332. package/dist-server/utils/get-domain-from-hostname.d.ts +1 -0
  333. package/dist-server/utils/get-domain-from-hostname.js.map +1 -1
  334. package/dist-server/utils/get-domain-users.d.ts +5 -0
  335. package/dist-server/utils/get-domain-users.js +2 -3
  336. package/dist-server/utils/get-domain-users.js.map +1 -1
  337. package/dist-server/utils/get-secret.d.ts +1 -0
  338. package/dist-server/utils/get-secret.js.map +1 -1
  339. package/dist-server/utils/get-user-domains.d.ts +5 -0
  340. package/dist-server/utils/get-user-domains.js +7 -5
  341. package/dist-server/utils/get-user-domains.js.map +1 -1
  342. package/package.json +15 -13
  343. package/server/controllers/auth.ts +1 -0
  344. package/server/controllers/change-pwd.ts +12 -15
  345. package/server/controllers/checkin.ts +3 -3
  346. package/server/controllers/invitation.ts +10 -16
  347. package/server/controllers/profile.ts +4 -3
  348. package/server/controllers/reset-password.ts +13 -14
  349. package/server/controllers/signin.ts +4 -2
  350. package/server/controllers/signup.ts +13 -8
  351. package/server/controllers/unlock-user.ts +5 -3
  352. package/server/controllers/utils/password-rule.ts +0 -1
  353. package/server/controllers/utils/save-invitation-token.ts +2 -1
  354. package/server/controllers/utils/save-verification-token.ts +2 -1
  355. package/server/controllers/verification.ts +6 -4
  356. package/server/errors/auth-error.ts +3 -0
  357. package/server/errors/user-domain-not-match-error.ts +3 -0
  358. package/server/index.ts +3 -1
  359. package/server/middlewares/authenticate-401-middleware.ts +15 -11
  360. package/server/middlewares/domain-authenticate-middleware.ts +11 -12
  361. package/server/middlewares/graphql-authenticate-middleware.ts +1 -5
  362. package/server/middlewares/index.ts +0 -4
  363. package/server/middlewares/jwt-authenticate-middleware.ts +4 -9
  364. package/server/middlewares/signin-middleware.ts +6 -5
  365. package/server/migrations/1548206416130-SeedUser.ts +3 -3
  366. package/server/migrations/1566805283882-SeedPrivilege.ts +2 -1
  367. package/server/router/auth-checkin-router.ts +5 -7
  368. package/server/router/auth-private-process-router.ts +16 -18
  369. package/server/router/auth-public-process-router.ts +6 -37
  370. package/server/router/auth-signin-router.ts +1 -5
  371. package/server/router/auth-signup-router.ts +40 -47
  372. package/server/router/oauth2/oauth2-authorize-router.ts +4 -10
  373. package/server/router/oauth2/oauth2-router.ts +4 -11
  374. package/server/router/oauth2/oauth2-server.ts +19 -34
  375. package/server/router/path-base-domain-router.ts +0 -4
  376. package/server/router/site-root-router.ts +4 -11
  377. package/server/routes.ts +8 -13
  378. package/server/service/app-binding/app-binding-mutation.ts +6 -8
  379. package/server/service/app-binding/app-binding-query.ts +15 -14
  380. package/server/service/appliance/appliance-mutation.ts +14 -13
  381. package/server/service/appliance/appliance-query.ts +11 -10
  382. package/server/service/application/application-mutation.ts +24 -18
  383. package/server/service/application/application-query.ts +20 -17
  384. package/server/service/domain-generator/domain-generator-mutation.ts +15 -10
  385. package/server/service/granted-role/granted-role-mutation.ts +15 -13
  386. package/server/service/granted-role/granted-role-query.ts +12 -10
  387. package/server/service/invitation/invitation-mutation.ts +7 -5
  388. package/server/service/invitation/invitation-query.ts +6 -4
  389. package/server/service/login-history/login-history-query.ts +13 -11
  390. package/server/service/login-history/login-history.ts +5 -4
  391. package/server/service/partner/partner-mutation.ts +10 -9
  392. package/server/service/partner/partner-query.ts +10 -10
  393. package/server/service/privilege/privilege-directive.ts +1 -3
  394. package/server/service/privilege/privilege-mutation.ts +15 -9
  395. package/server/service/privilege/privilege-query.ts +7 -7
  396. package/server/service/role/role-mutation.ts +18 -11
  397. package/server/service/role/role-query.ts +18 -16
  398. package/server/service/user/user-mutation.ts +39 -34
  399. package/server/service/user/user-query.ts +29 -21
  400. package/server/service/user/user.ts +12 -10
  401. package/server/types.ts +21 -0
  402. package/server/utils/check-user-belongs-domain.ts +2 -2
  403. package/server/utils/get-domain-users.ts +4 -2
  404. package/server/utils/get-user-domains.ts +8 -5
  405. package/things-factory.config.js +1 -1
  406. package/translations/en.json +2 -5
  407. package/translations/ko.json +5 -8
  408. package/translations/ms.json +2 -5
  409. package/translations/zh.json +2 -5
  410. package/client/actions/auth.js +0 -16
  411. package/client/index.js +0 -2
@@ -1 +1 @@
1
- {"version":3,"file":"invitation.js","sourceRoot":"","sources":["../../../server/service/invitation/invitation.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,qCASgB;AAChB,+CAAoD;AACpD,uCAAmC;AAQnC,IAAa,UAAU,GAAvB,MAAa,UAAU;CA8CtB,CAAA;AA3CC;IAFC,IAAA,gCAAsB,EAAC,MAAM,CAAC;IAC9B,IAAA,oBAAK,EAAC,IAAI,CAAC,EAAE,CAAC,iBAAE,CAAC;;sCACC;AAInB;IAFC,IAAA,gBAAM,GAAE;IACR,IAAA,oBAAK,GAAE;;yCACK;AAIb;IAFC,IAAA,gBAAM,GAAE;IACR,IAAA,oBAAK,GAAE;;6CACS;AAIjB;IAFC,IAAA,gBAAM,GAAE;IACR,IAAA,oBAAK,GAAE;;wCACI;AAIZ;IAFC,IAAA,gBAAM,GAAE;IACR,IAAA,oBAAK,GAAE;;yCACK;AAIb;IAFC,IAAA,0BAAgB,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;IACpC,IAAA,oBAAK,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;8BACf,IAAI;6CAAA;AAIf;IAFC,IAAA,0BAAgB,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;IACpC,IAAA,oBAAK,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;8BACf,IAAI;6CAAA;AAMf;IAJC,IAAA,mBAAS,EAAC,IAAI,CAAC,EAAE,CAAC,WAAI,EAAE;QACvB,QAAQ,EAAE,IAAI;KACf,CAAC;IACD,IAAA,oBAAK,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;8BACjB,WAAI;2CAAA;AAGb;IADC,IAAA,oBAAU,EAAC,CAAC,UAAsB,EAAE,EAAE,CAAC,UAAU,CAAC,OAAO,CAAC;;6CAC1C;AAMjB;IAJC,IAAA,mBAAS,EAAC,IAAI,CAAC,EAAE,CAAC,WAAI,EAAE;QACvB,QAAQ,EAAE,IAAI;KACf,CAAC;IACD,IAAA,oBAAK,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;8BACjB,WAAI;2CAAA;AAGb;IADC,IAAA,oBAAU,EAAC,CAAC,UAAsB,EAAE,EAAE,CAAC,UAAU,CAAC,OAAO,CAAC;;6CAC1C;AA7CN,UAAU;IANtB,IAAA,gBAAM,GAAE;IACR,IAAA,eAAK,EAAC,iBAAiB,EAAE,CAAC,UAAsB,EAAE,EAAE,CAAC,CAAC,UAAU,CAAC,KAAK,EAAE,UAAU,CAAC,SAAS,EAAE,UAAU,CAAC,IAAI,CAAC,EAAE;QAC/G,MAAM,EAAE,IAAI;KACb,CAAC;IACD,IAAA,eAAK,EAAC,iBAAiB,EAAE,CAAC,UAAsB,EAAE,EAAE,CAAC,CAAC,UAAU,CAAC,KAAK,CAAC,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC;IAC1F,IAAA,yBAAU,GAAE;GACA,UAAU,CA8CtB;AA9CY,gCAAU"}
1
+ {"version":3,"file":"invitation.js","sourceRoot":"","sources":["../../../server/service/invitation/invitation.ts"],"names":[],"mappings":";;;;AAAA,qCASgB;AAChB,+CAAoD;AACpD,uCAAmC;AAQnC,IAAa,UAAU,GAAvB,MAAa,UAAU;CA8CtB,CAAA;AA3CC;IAFC,IAAA,gCAAsB,EAAC,MAAM,CAAC;IAC9B,IAAA,oBAAK,EAAC,IAAI,CAAC,EAAE,CAAC,iBAAE,CAAC;;sCACC;AAInB;IAFC,IAAA,gBAAM,GAAE;IACR,IAAA,oBAAK,GAAE;;yCACK;AAIb;IAFC,IAAA,gBAAM,GAAE;IACR,IAAA,oBAAK,GAAE;;6CACS;AAIjB;IAFC,IAAA,gBAAM,GAAE;IACR,IAAA,oBAAK,GAAE;;wCACI;AAIZ;IAFC,IAAA,gBAAM,GAAE;IACR,IAAA,oBAAK,GAAE;;yCACK;AAIb;IAFC,IAAA,0BAAgB,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;IACpC,IAAA,oBAAK,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;sCACf,IAAI;6CAAA;AAIf;IAFC,IAAA,0BAAgB,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;IACpC,IAAA,oBAAK,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;sCACf,IAAI;6CAAA;AAMf;IAJC,IAAA,mBAAS,EAAC,IAAI,CAAC,EAAE,CAAC,WAAI,EAAE;QACvB,QAAQ,EAAE,IAAI;KACf,CAAC;IACD,IAAA,oBAAK,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;sCACjB,WAAI;2CAAA;AAGb;IADC,IAAA,oBAAU,EAAC,CAAC,UAAsB,EAAE,EAAE,CAAC,UAAU,CAAC,OAAO,CAAC;;6CAC1C;AAMjB;IAJC,IAAA,mBAAS,EAAC,IAAI,CAAC,EAAE,CAAC,WAAI,EAAE;QACvB,QAAQ,EAAE,IAAI;KACf,CAAC;IACD,IAAA,oBAAK,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;sCACjB,WAAI;2CAAA;AAGb;IADC,IAAA,oBAAU,EAAC,CAAC,UAAsB,EAAE,EAAE,CAAC,UAAU,CAAC,OAAO,CAAC;;6CAC1C;AA7CN,UAAU;IANtB,IAAA,gBAAM,GAAE;IACR,IAAA,eAAK,EAAC,iBAAiB,EAAE,CAAC,UAAsB,EAAE,EAAE,CAAC,CAAC,UAAU,CAAC,KAAK,EAAE,UAAU,CAAC,SAAS,EAAE,UAAU,CAAC,IAAI,CAAC,EAAE;QAC/G,MAAM,EAAE,IAAI;KACb,CAAC;IACD,IAAA,eAAK,EAAC,iBAAiB,EAAE,CAAC,UAAsB,EAAE,EAAE,CAAC,CAAC,UAAU,CAAC,KAAK,CAAC,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC;IAC1F,IAAA,yBAAU,GAAE;GACA,UAAU,CA8CtB;AA9CY,gCAAU","sourcesContent":["import {\n CreateDateColumn,\n UpdateDateColumn,\n Entity,\n Index,\n Column,\n ManyToOne,\n RelationId,\n PrimaryGeneratedColumn\n} from 'typeorm'\nimport { ObjectType, Field, ID } from 'type-graphql'\nimport { User } from '../user/user'\n\n@Entity()\n@Index('ix_invitation_0', (invitation: Invitation) => [invitation.email, invitation.reference, invitation.type], {\n unique: true\n})\n@Index('ix_invitation_1', (invitation: Invitation) => [invitation.token], { unique: true })\n@ObjectType()\nexport class Invitation {\n @PrimaryGeneratedColumn('uuid')\n @Field(type => ID)\n readonly id: string\n\n @Column()\n @Field()\n email: string\n\n @Column()\n @Field()\n reference: string // company, bizplace\n\n @Column()\n @Field()\n type: string // company, bizplace, .. should think whether this column needs.\n\n @Column()\n @Field()\n token: string\n\n @CreateDateColumn({ nullable: true })\n @Field({ nullable: true })\n createdAt: Date\n\n @UpdateDateColumn({ nullable: true })\n @Field({ nullable: true })\n updatedAt: Date\n\n @ManyToOne(type => User, {\n nullable: true\n })\n @Field({ nullable: true })\n creator: User\n\n @RelationId((invitation: Invitation) => invitation.creator)\n creatorId: string\n\n @ManyToOne(type => User, {\n nullable: true\n })\n @Field({ nullable: true })\n updater: User\n\n @RelationId((invitation: Invitation) => invitation.updater)\n updaterId: string\n}\n"]}
@@ -0,0 +1,4 @@
1
+ import { LoginHistory } from './login-history';
2
+ import { LoginHistoryQuery } from './login-history-query';
3
+ export declare const entities: (typeof LoginHistory)[];
4
+ export declare const resolvers: (typeof LoginHistoryQuery)[];
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../server/service/login-history/index.ts"],"names":[],"mappings":";;;AAAA,mDAA8C;AAC9C,+DAAyD;AAE5C,QAAA,QAAQ,GAAG,CAAC,4BAAY,CAAC,CAAA;AACzB,QAAA,SAAS,GAAG,CAAC,uCAAiB,CAAC,CAAA"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../server/service/login-history/index.ts"],"names":[],"mappings":";;;AAAA,mDAA8C;AAC9C,+DAAyD;AAE5C,QAAA,QAAQ,GAAG,CAAC,4BAAY,CAAC,CAAA;AACzB,QAAA,SAAS,GAAG,CAAC,uCAAiB,CAAC,CAAA","sourcesContent":["import { LoginHistory } from './login-history'\nimport { LoginHistoryQuery } from './login-history-query'\n\nexport const entities = [LoginHistory]\nexport const resolvers = [LoginHistoryQuery]\n"]}
@@ -0,0 +1,8 @@
1
+ import { Domain } from '@things-factory/shell';
2
+ import { User } from '../user/user';
3
+ import { LoginHistory } from './login-history';
4
+ export declare class LoginHistoryQuery {
5
+ myLoginHistories(limit: number, context: ResolverContext): Promise<LoginHistory[]>;
6
+ accessDomain(loginHistory: LoginHistory): Promise<Domain>;
7
+ accessUser(loginHistory: LoginHistory): Promise<User>;
8
+ }
@@ -1,66 +1,53 @@
1
1
  "use strict";
2
- var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
3
- var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
4
- if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
5
- else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
6
- return c > 3 && r && Object.defineProperty(target, key, r), r;
7
- };
8
- var __metadata = (this && this.__metadata) || function (k, v) {
9
- if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
10
- };
11
- var __param = (this && this.__param) || function (paramIndex, decorator) {
12
- return function (target, key) { decorator(target, key, paramIndex); }
13
- };
14
2
  Object.defineProperty(exports, "__esModule", { value: true });
15
3
  exports.LoginHistoryQuery = void 0;
16
- const login_history_1 = require("./login-history");
4
+ const tslib_1 = require("tslib");
17
5
  const type_graphql_1 = require("type-graphql");
18
- const user_1 = require("../user/user");
19
- const typeorm_1 = require("typeorm");
20
6
  const shell_1 = require("@things-factory/shell");
7
+ const user_1 = require("../user/user");
8
+ const login_history_1 = require("./login-history");
21
9
  let LoginHistoryQuery = class LoginHistoryQuery {
22
10
  async myLoginHistories(limit, context) {
23
- if (!limit)
24
- limit = 10;
25
11
  const user = context.state.user;
26
- if (!user)
12
+ if (!user) {
27
13
  throw new Error('No user specified');
28
- return await (0, typeorm_1.getRepository)(login_history_1.LoginHistory).find({
29
- where: { accessUser: user },
30
- take: limit,
14
+ }
15
+ return await (0, shell_1.getRepository)(login_history_1.LoginHistory).find({
16
+ where: { accessUser: { id: user.id } },
17
+ take: limit || 10,
31
18
  order: { accessedAt: 'DESC' }
32
19
  });
33
20
  }
34
21
  async accessDomain(loginHistory) {
35
- return await (0, typeorm_1.getRepository)(shell_1.Domain).findOne(loginHistory.accessDomainId);
22
+ return await (0, shell_1.getRepository)(shell_1.Domain).findOneBy({ id: loginHistory.accessDomainId });
36
23
  }
37
24
  async accessUser(loginHistory) {
38
- return await (0, typeorm_1.getRepository)(user_1.User).findOne(loginHistory.accessUserId);
25
+ return await (0, shell_1.getRepository)(user_1.User).findOneBy({ id: loginHistory.accessUserId });
39
26
  }
40
27
  };
41
- __decorate([
28
+ tslib_1.__decorate([
42
29
  (0, type_graphql_1.Query)(returns => [login_history_1.LoginHistory]),
43
- __param(0, (0, type_graphql_1.Arg)('limit')),
44
- __param(1, (0, type_graphql_1.Ctx)()),
45
- __metadata("design:type", Function),
46
- __metadata("design:paramtypes", [Number, Object]),
47
- __metadata("design:returntype", Promise)
30
+ tslib_1.__param(0, (0, type_graphql_1.Arg)('limit')),
31
+ tslib_1.__param(1, (0, type_graphql_1.Ctx)()),
32
+ tslib_1.__metadata("design:type", Function),
33
+ tslib_1.__metadata("design:paramtypes", [Number, Object]),
34
+ tslib_1.__metadata("design:returntype", Promise)
48
35
  ], LoginHistoryQuery.prototype, "myLoginHistories", null);
49
- __decorate([
36
+ tslib_1.__decorate([
50
37
  (0, type_graphql_1.FieldResolver)(),
51
- __param(0, (0, type_graphql_1.Root)()),
52
- __metadata("design:type", Function),
53
- __metadata("design:paramtypes", [login_history_1.LoginHistory]),
54
- __metadata("design:returntype", Promise)
38
+ tslib_1.__param(0, (0, type_graphql_1.Root)()),
39
+ tslib_1.__metadata("design:type", Function),
40
+ tslib_1.__metadata("design:paramtypes", [login_history_1.LoginHistory]),
41
+ tslib_1.__metadata("design:returntype", Promise)
55
42
  ], LoginHistoryQuery.prototype, "accessDomain", null);
56
- __decorate([
43
+ tslib_1.__decorate([
57
44
  (0, type_graphql_1.FieldResolver)(),
58
- __param(0, (0, type_graphql_1.Root)()),
59
- __metadata("design:type", Function),
60
- __metadata("design:paramtypes", [login_history_1.LoginHistory]),
61
- __metadata("design:returntype", Promise)
45
+ tslib_1.__param(0, (0, type_graphql_1.Root)()),
46
+ tslib_1.__metadata("design:type", Function),
47
+ tslib_1.__metadata("design:paramtypes", [login_history_1.LoginHistory]),
48
+ tslib_1.__metadata("design:returntype", Promise)
62
49
  ], LoginHistoryQuery.prototype, "accessUser", null);
63
- LoginHistoryQuery = __decorate([
50
+ LoginHistoryQuery = tslib_1.__decorate([
64
51
  (0, type_graphql_1.Resolver)(login_history_1.LoginHistory)
65
52
  ], LoginHistoryQuery);
66
53
  exports.LoginHistoryQuery = LoginHistoryQuery;
@@ -1 +1 @@
1
- {"version":3,"file":"login-history-query.js","sourceRoot":"","sources":["../../../server/service/login-history/login-history-query.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,mDAA8C;AAC9C,+CAA6E;AAC7E,uCAAmC;AACnC,qCAAuC;AACvC,iDAA8C;AAG9C,IAAa,iBAAiB,GAA9B,MAAa,iBAAiB;IAE5B,KAAK,CAAC,gBAAgB,CAAe,KAAa,EAAS,OAAY;QACrE,IAAI,CAAC,KAAK;YAAE,KAAK,GAAG,EAAE,CAAA;QACtB,MAAM,IAAI,GAAS,OAAO,CAAC,KAAK,CAAC,IAAI,CAAA;QACrC,IAAI,CAAC,IAAI;YAAE,MAAM,IAAI,KAAK,CAAC,mBAAmB,CAAC,CAAA;QAE/C,OAAO,MAAM,IAAA,uBAAa,EAAC,4BAAY,CAAC,CAAC,IAAI,CAAC;YAC5C,KAAK,EAAE,EAAE,UAAU,EAAE,IAAI,EAAE;YAC3B,IAAI,EAAE,KAAK;YACX,KAAK,EAAE,EAAE,UAAU,EAAE,MAAM,EAAE;SAC9B,CAAC,CAAA;IACJ,CAAC;IAGD,KAAK,CAAC,YAAY,CAAS,YAA0B;QACnD,OAAO,MAAM,IAAA,uBAAa,EAAC,cAAM,CAAC,CAAC,OAAO,CAAC,YAAY,CAAC,cAAc,CAAC,CAAA;IACzE,CAAC;IAGD,KAAK,CAAC,UAAU,CAAS,YAA0B;QACjD,OAAO,MAAM,IAAA,uBAAa,EAAC,WAAI,CAAC,CAAC,OAAO,CAAC,YAAY,CAAC,YAAY,CAAC,CAAA;IACrE,CAAC;CACF,CAAA;AArBC;IADC,IAAA,oBAAK,EAAC,OAAO,CAAC,EAAE,CAAC,CAAC,4BAAY,CAAC,CAAC;IACT,WAAA,IAAA,kBAAG,EAAC,OAAO,CAAC,CAAA;IAAiB,WAAA,IAAA,kBAAG,GAAE,CAAA;;;;yDAUzD;AAGD;IADC,IAAA,4BAAa,GAAE;IACI,WAAA,IAAA,mBAAI,GAAE,CAAA;;qCAAe,4BAAY;;qDAEpD;AAGD;IADC,IAAA,4BAAa,GAAE;IACE,WAAA,IAAA,mBAAI,GAAE,CAAA;;qCAAe,4BAAY;;mDAElD;AAtBU,iBAAiB;IAD7B,IAAA,uBAAQ,EAAC,4BAAY,CAAC;GACV,iBAAiB,CAuB7B;AAvBY,8CAAiB"}
1
+ {"version":3,"file":"login-history-query.js","sourceRoot":"","sources":["../../../server/service/login-history/login-history-query.ts"],"names":[],"mappings":";;;;AAAA,+CAA6E;AAE7E,iDAA6D;AAE7D,uCAAmC;AACnC,mDAA8C;AAG9C,IAAa,iBAAiB,GAA9B,MAAa,iBAAiB;IAE5B,KAAK,CAAC,gBAAgB,CAAe,KAAa,EAAS,OAAwB;QACjF,MAAM,IAAI,GAAS,OAAO,CAAC,KAAK,CAAC,IAAI,CAAA;QACrC,IAAI,CAAC,IAAI,EAAE;YACT,MAAM,IAAI,KAAK,CAAC,mBAAmB,CAAC,CAAA;SACrC;QAED,OAAO,MAAM,IAAA,qBAAa,EAAC,4BAAY,CAAC,CAAC,IAAI,CAAC;YAC5C,KAAK,EAAE,EAAE,UAAU,EAAE,EAAE,EAAE,EAAE,IAAI,CAAC,EAAE,EAAE,EAAE;YACtC,IAAI,EAAE,KAAK,IAAI,EAAE;YACjB,KAAK,EAAE,EAAE,UAAU,EAAE,MAAM,EAAE;SAC9B,CAAC,CAAA;IACJ,CAAC;IAGD,KAAK,CAAC,YAAY,CAAS,YAA0B;QACnD,OAAO,MAAM,IAAA,qBAAa,EAAC,cAAM,CAAC,CAAC,SAAS,CAAC,EAAE,EAAE,EAAE,YAAY,CAAC,cAAc,EAAE,CAAC,CAAA;IACnF,CAAC;IAGD,KAAK,CAAC,UAAU,CAAS,YAA0B;QACjD,OAAO,MAAM,IAAA,qBAAa,EAAC,WAAI,CAAC,CAAC,SAAS,CAAC,EAAE,EAAE,EAAE,YAAY,CAAC,YAAY,EAAE,CAAC,CAAA;IAC/E,CAAC;CACF,CAAA;AAtBC;IADC,IAAA,oBAAK,EAAC,OAAO,CAAC,EAAE,CAAC,CAAC,4BAAY,CAAC,CAAC;IACT,mBAAA,IAAA,kBAAG,EAAC,OAAO,CAAC,CAAA;IAAiB,mBAAA,IAAA,kBAAG,GAAE,CAAA;;;;yDAWzD;AAGD;IADC,IAAA,4BAAa,GAAE;IACI,mBAAA,IAAA,mBAAI,GAAE,CAAA;;6CAAe,4BAAY;;qDAEpD;AAGD;IADC,IAAA,4BAAa,GAAE;IACE,mBAAA,IAAA,mBAAI,GAAE,CAAA;;6CAAe,4BAAY;;mDAElD;AAvBU,iBAAiB;IAD7B,IAAA,uBAAQ,EAAC,4BAAY,CAAC;GACV,iBAAiB,CAwB7B;AAxBY,8CAAiB","sourcesContent":["import { Arg, Ctx, FieldResolver, Query, Resolver, Root } from 'type-graphql'\n\nimport { Domain, getRepository } from '@things-factory/shell'\n\nimport { User } from '../user/user'\nimport { LoginHistory } from './login-history'\n\n@Resolver(LoginHistory)\nexport class LoginHistoryQuery {\n @Query(returns => [LoginHistory])\n async myLoginHistories(@Arg('limit') limit: number, @Ctx() context: ResolverContext): Promise<LoginHistory[]> {\n const user: User = context.state.user\n if (!user) {\n throw new Error('No user specified')\n }\n\n return await getRepository(LoginHistory).find({\n where: { accessUser: { id: user.id } },\n take: limit || 10,\n order: { accessedAt: 'DESC' }\n })\n }\n\n @FieldResolver()\n async accessDomain(@Root() loginHistory: LoginHistory) {\n return await getRepository(Domain).findOneBy({ id: loginHistory.accessDomainId })\n }\n\n @FieldResolver()\n async accessUser(@Root() loginHistory: LoginHistory) {\n return await getRepository(User).findOneBy({ id: loginHistory.accessUserId })\n }\n}\n"]}
@@ -0,0 +1,12 @@
1
+ import { Domain } from '@things-factory/shell';
2
+ import { User } from '../user/user';
3
+ export declare class LoginHistory {
4
+ readonly id: string;
5
+ accessDomain: Domain;
6
+ accessDomainId: string;
7
+ accessUser: User;
8
+ accessUserId: string;
9
+ accessorIp: string;
10
+ accessedAt: Date;
11
+ static stamp(accessDomain: Domain, accessUser: User, accessorIp: string): Promise<void>;
12
+ }
@@ -1,66 +1,57 @@
1
1
  "use strict";
2
- var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
3
- var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
4
- if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
5
- else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
6
- return c > 3 && r && Object.defineProperty(target, key, r), r;
7
- };
8
- var __metadata = (this && this.__metadata) || function (k, v) {
9
- if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
10
- };
11
- var LoginHistory_1, _a;
2
+ var LoginHistory_1;
12
3
  Object.defineProperty(exports, "__esModule", { value: true });
13
4
  exports.LoginHistory = void 0;
14
- const shell_1 = require("@things-factory/shell");
15
- const typeorm_1 = require("typeorm");
16
- const typeorm_2 = require("typeorm");
5
+ const tslib_1 = require("tslib");
17
6
  const type_graphql_1 = require("type-graphql");
7
+ const typeorm_1 = require("typeorm");
8
+ const shell_1 = require("@things-factory/shell");
18
9
  const user_1 = require("../user/user");
19
10
  let LoginHistory = LoginHistory_1 = class LoginHistory {
20
11
  static async stamp(accessDomain, accessUser, accessorIp) {
21
- await (0, typeorm_1.getRepository)(LoginHistory_1).save({
12
+ await (0, shell_1.getRepository)(LoginHistory_1).save({
22
13
  accessDomain,
23
14
  accessUser,
24
15
  accessorIp
25
16
  });
26
17
  }
27
18
  };
28
- __decorate([
29
- (0, typeorm_2.PrimaryGeneratedColumn)('uuid'),
19
+ tslib_1.__decorate([
20
+ (0, typeorm_1.PrimaryGeneratedColumn)('uuid'),
30
21
  (0, type_graphql_1.Field)(type => type_graphql_1.ID),
31
- __metadata("design:type", String)
22
+ tslib_1.__metadata("design:type", String)
32
23
  ], LoginHistory.prototype, "id", void 0);
33
- __decorate([
34
- (0, typeorm_2.ManyToOne)(type => shell_1.Domain),
24
+ tslib_1.__decorate([
25
+ (0, typeorm_1.ManyToOne)(type => shell_1.Domain),
35
26
  (0, type_graphql_1.Field)(),
36
- __metadata("design:type", typeof (_a = typeof shell_1.Domain !== "undefined" && shell_1.Domain) === "function" ? _a : Object)
27
+ tslib_1.__metadata("design:type", shell_1.Domain)
37
28
  ], LoginHistory.prototype, "accessDomain", void 0);
38
- __decorate([
39
- (0, typeorm_2.RelationId)((loginHistory) => loginHistory.accessDomain),
40
- __metadata("design:type", String)
29
+ tslib_1.__decorate([
30
+ (0, typeorm_1.RelationId)((loginHistory) => loginHistory.accessDomain),
31
+ tslib_1.__metadata("design:type", String)
41
32
  ], LoginHistory.prototype, "accessDomainId", void 0);
42
- __decorate([
43
- (0, typeorm_2.ManyToOne)(type => user_1.User),
33
+ tslib_1.__decorate([
34
+ (0, typeorm_1.ManyToOne)(type => user_1.User),
44
35
  (0, type_graphql_1.Field)(),
45
- __metadata("design:type", user_1.User)
36
+ tslib_1.__metadata("design:type", user_1.User)
46
37
  ], LoginHistory.prototype, "accessUser", void 0);
47
- __decorate([
48
- (0, typeorm_2.RelationId)((loginHistory) => loginHistory.accessUser),
49
- __metadata("design:type", String)
38
+ tslib_1.__decorate([
39
+ (0, typeorm_1.RelationId)((loginHistory) => loginHistory.accessUser),
40
+ tslib_1.__metadata("design:type", String)
50
41
  ], LoginHistory.prototype, "accessUserId", void 0);
51
- __decorate([
52
- (0, typeorm_2.Column)({ nullable: true }),
42
+ tslib_1.__decorate([
43
+ (0, typeorm_1.Column)({ nullable: true }),
53
44
  (0, type_graphql_1.Field)({ nullable: true }),
54
- __metadata("design:type", String)
45
+ tslib_1.__metadata("design:type", String)
55
46
  ], LoginHistory.prototype, "accessorIp", void 0);
56
- __decorate([
57
- (0, typeorm_2.CreateDateColumn)(),
47
+ tslib_1.__decorate([
48
+ (0, typeorm_1.CreateDateColumn)(),
58
49
  (0, type_graphql_1.Field)({ nullable: true }),
59
- __metadata("design:type", Date)
50
+ tslib_1.__metadata("design:type", Date)
60
51
  ], LoginHistory.prototype, "accessedAt", void 0);
61
- LoginHistory = LoginHistory_1 = __decorate([
62
- (0, typeorm_2.Entity)(),
63
- (0, typeorm_2.Index)('ix_login_history_0', (loginHistory) => [loginHistory.accessDomain, loginHistory.accessUser]),
52
+ LoginHistory = LoginHistory_1 = tslib_1.__decorate([
53
+ (0, typeorm_1.Entity)(),
54
+ (0, typeorm_1.Index)('ix_login_history_0', (loginHistory) => [loginHistory.accessDomain, loginHistory.accessUser]),
64
55
  (0, type_graphql_1.ObjectType)()
65
56
  ], LoginHistory);
66
57
  exports.LoginHistory = LoginHistory;
@@ -1 +1 @@
1
- {"version":3,"file":"login-history.js","sourceRoot":"","sources":["../../../server/service/login-history/login-history.ts"],"names":[],"mappings":";;;;;;;;;;;;;AAAA,iDAA8C;AAC9C,qCAAuC;AACvC,qCAAgH;AAChH,+CAAoD;AACpD,uCAAmC;AAKnC,IAAa,YAAY,oBAAzB,MAAa,YAAY;IA2BvB,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,YAAoB,EAAE,UAAgB,EAAE,UAAkB;QAC3E,MAAM,IAAA,uBAAa,EAAC,cAAY,CAAC,CAAC,IAAI,CAAC;YACrC,YAAY;YACZ,UAAU;YACV,UAAU;SACX,CAAC,CAAA;IACJ,CAAC;CACF,CAAA;AA/BC;IAFC,IAAA,gCAAsB,EAAC,MAAM,CAAC;IAC9B,IAAA,oBAAK,EAAC,IAAI,CAAC,EAAE,CAAC,iBAAE,CAAC;;wCACC;AAInB;IAFC,IAAA,mBAAS,EAAC,IAAI,CAAC,EAAE,CAAC,cAAM,CAAC;IACzB,IAAA,oBAAK,GAAE;kDACM,cAAM,oBAAN,cAAM;kDAAA;AAGpB;IADC,IAAA,oBAAU,EAAC,CAAC,YAA0B,EAAE,EAAE,CAAC,YAAY,CAAC,YAAY,CAAC;;oDAChD;AAItB;IAFC,IAAA,mBAAS,EAAC,IAAI,CAAC,EAAE,CAAC,WAAI,CAAC;IACvB,IAAA,oBAAK,GAAE;8BACI,WAAI;gDAAA;AAGhB;IADC,IAAA,oBAAU,EAAC,CAAC,YAA0B,EAAE,EAAE,CAAC,YAAY,CAAC,UAAU,CAAC;;kDAChD;AAIpB;IAFC,IAAA,gBAAM,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;IAC1B,IAAA,oBAAK,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;gDACR;AAIlB;IAFC,IAAA,0BAAgB,GAAE;IAClB,IAAA,oBAAK,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;8BACd,IAAI;gDAAA;AAzBL,YAAY;IAHxB,IAAA,gBAAM,GAAE;IACR,IAAA,eAAK,EAAC,oBAAoB,EAAE,CAAC,YAA0B,EAAE,EAAE,CAAC,CAAC,YAAY,CAAC,YAAY,EAAE,YAAY,CAAC,UAAU,CAAC,CAAC;IACjH,IAAA,yBAAU,GAAE;GACA,YAAY,CAkCxB;AAlCY,oCAAY"}
1
+ {"version":3,"file":"login-history.js","sourceRoot":"","sources":["../../../server/service/login-history/login-history.ts"],"names":[],"mappings":";;;;;AAAA,+CAAoD;AACpD,qCAAgH;AAEhH,iDAA6D;AAE7D,uCAAmC;AAKnC,IAAa,YAAY,oBAAzB,MAAa,YAAY;IA2BvB,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,YAAoB,EAAE,UAAgB,EAAE,UAAkB;QAC3E,MAAM,IAAA,qBAAa,EAAC,cAAY,CAAC,CAAC,IAAI,CAAC;YACrC,YAAY;YACZ,UAAU;YACV,UAAU;SACX,CAAC,CAAA;IACJ,CAAC;CACF,CAAA;AA/BC;IAFC,IAAA,gCAAsB,EAAC,MAAM,CAAC;IAC9B,IAAA,oBAAK,EAAC,IAAI,CAAC,EAAE,CAAC,iBAAE,CAAC;;wCACC;AAInB;IAFC,IAAA,mBAAS,EAAC,IAAI,CAAC,EAAE,CAAC,cAAM,CAAC;IACzB,IAAA,oBAAK,GAAE;sCACM,cAAM;kDAAA;AAGpB;IADC,IAAA,oBAAU,EAAC,CAAC,YAA0B,EAAE,EAAE,CAAC,YAAY,CAAC,YAAY,CAAC;;oDAChD;AAItB;IAFC,IAAA,mBAAS,EAAC,IAAI,CAAC,EAAE,CAAC,WAAI,CAAC;IACvB,IAAA,oBAAK,GAAE;sCACI,WAAI;gDAAA;AAGhB;IADC,IAAA,oBAAU,EAAC,CAAC,YAA0B,EAAE,EAAE,CAAC,YAAY,CAAC,UAAU,CAAC;;kDAChD;AAIpB;IAFC,IAAA,gBAAM,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;IAC1B,IAAA,oBAAK,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;gDACR;AAIlB;IAFC,IAAA,0BAAgB,GAAE;IAClB,IAAA,oBAAK,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;sCACd,IAAI;gDAAA;AAzBL,YAAY;IAHxB,IAAA,gBAAM,GAAE;IACR,IAAA,eAAK,EAAC,oBAAoB,EAAE,CAAC,YAA0B,EAAE,EAAE,CAAC,CAAC,YAAY,CAAC,YAAY,EAAE,YAAY,CAAC,UAAU,CAAC,CAAC;IACjH,IAAA,yBAAU,GAAE;GACA,YAAY,CAkCxB;AAlCY,oCAAY","sourcesContent":["import { Field, ID, ObjectType } from 'type-graphql'\nimport { Column, CreateDateColumn, Entity, Index, ManyToOne, PrimaryGeneratedColumn, RelationId } from 'typeorm'\n\nimport { Domain, getRepository } from '@things-factory/shell'\n\nimport { User } from '../user/user'\n\n@Entity()\n@Index('ix_login_history_0', (loginHistory: LoginHistory) => [loginHistory.accessDomain, loginHistory.accessUser])\n@ObjectType()\nexport class LoginHistory {\n @PrimaryGeneratedColumn('uuid')\n @Field(type => ID)\n readonly id: string\n\n @ManyToOne(type => Domain)\n @Field()\n accessDomain: Domain\n\n @RelationId((loginHistory: LoginHistory) => loginHistory.accessDomain)\n accessDomainId: string\n\n @ManyToOne(type => User)\n @Field()\n accessUser: User\n\n @RelationId((loginHistory: LoginHistory) => loginHistory.accessUser)\n accessUserId: string\n\n @Column({ nullable: true })\n @Field({ nullable: true })\n accessorIp: string\n\n @CreateDateColumn()\n @Field({ nullable: true })\n accessedAt: Date\n\n static async stamp(accessDomain: Domain, accessUser: User, accessorIp: string): Promise<void> {\n await getRepository(LoginHistory).save({\n accessDomain,\n accessUser,\n accessorIp\n })\n }\n}\n"]}
@@ -0,0 +1,5 @@
1
+ import { Partner } from './partner';
2
+ import { PartnerQuery } from './partner-query';
3
+ import { PartnerMutation } from './partner-mutation';
4
+ export declare const entities: (typeof Partner)[];
5
+ export declare const resolvers: (typeof PartnerQuery | typeof PartnerMutation)[];
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../server/service/partner/index.ts"],"names":[],"mappings":";;;AAAA,uCAAmC;AACnC,mDAA8C;AAC9C,yDAAoD;AAEvC,QAAA,QAAQ,GAAG,CAAC,iBAAO,CAAC,CAAA;AACpB,QAAA,SAAS,GAAG,CAAC,4BAAY,EAAE,kCAAe,CAAC,CAAA"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../server/service/partner/index.ts"],"names":[],"mappings":";;;AAAA,uCAAmC;AACnC,mDAA8C;AAC9C,yDAAoD;AAEvC,QAAA,QAAQ,GAAG,CAAC,iBAAO,CAAC,CAAA;AACpB,QAAA,SAAS,GAAG,CAAC,4BAAY,EAAE,kCAAe,CAAC,CAAA","sourcesContent":["import { Partner } from './partner'\nimport { PartnerQuery } from './partner-query'\nimport { PartnerMutation } from './partner-mutation'\n\nexport const entities = [Partner]\nexport const resolvers = [PartnerQuery, PartnerMutation]\n"]}
@@ -0,0 +1,4 @@
1
+ export declare class PartnerMutation {
2
+ inviteCustomer(customerDomainName: string, context: ResolverContext): Promise<boolean>;
3
+ terminateContract(partnerName: string, context: ResolverContext): Promise<boolean>;
4
+ }
@@ -1,36 +1,24 @@
1
1
  "use strict";
2
- var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
3
- var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
4
- if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
5
- else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
6
- return c > 3 && r && Object.defineProperty(target, key, r), r;
7
- };
8
- var __metadata = (this && this.__metadata) || function (k, v) {
9
- if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
10
- };
11
- var __param = (this && this.__param) || function (paramIndex, decorator) {
12
- return function (target, key) { decorator(target, key, paramIndex); }
13
- };
14
2
  Object.defineProperty(exports, "__esModule", { value: true });
15
3
  exports.PartnerMutation = void 0;
16
- const partner_1 = require("./partner");
4
+ const tslib_1 = require("tslib");
17
5
  const type_graphql_1 = require("type-graphql");
18
6
  const shell_1 = require("@things-factory/shell");
19
- const typeorm_1 = require("typeorm");
20
7
  const granted_role_mutation_1 = require("../granted-role/granted-role-mutation");
8
+ const partner_1 = require("./partner");
21
9
  let PartnerMutation = class PartnerMutation {
22
10
  async inviteCustomer(customerDomainName, context) {
23
11
  // 1. Try to find existing customer
24
12
  const { domain, user } = context.state;
25
- const customerDomain = await (0, typeorm_1.getRepository)(shell_1.Domain).findOne({ where: { name: customerDomainName } });
13
+ const customerDomain = await (0, shell_1.getRepository)(shell_1.Domain).findOne({ where: { name: customerDomainName } });
26
14
  if (!customerDomain)
27
15
  throw new Error(`There's no customer which has ${customerDomainName} as name`);
28
- const isExistingCustomer = Boolean(await (0, typeorm_1.getRepository)(partner_1.Partner).count({
29
- where: { domain, partnerDomain: customerDomain }
16
+ const isExistingCustomer = Boolean(await (0, shell_1.getRepository)(partner_1.Partner).count({
17
+ where: { domain: { id: domain.id }, partnerDomain: customerDomain }
30
18
  }));
31
19
  if (isExistingCustomer)
32
20
  throw new Error('Partner is registered as customer already');
33
- await (0, typeorm_1.getRepository)(partner_1.Partner).save({
21
+ await (0, shell_1.getRepository)(partner_1.Partner).save({
34
22
  domain,
35
23
  partnerDomain: customerDomain,
36
24
  requester: user,
@@ -48,7 +36,7 @@ let PartnerMutation = class PartnerMutation {
48
36
  throw new Error(context.t('error.failed to find x', { x: context.t('label.partner') }));
49
37
  // Find partner
50
38
  const partner = await tx.getRepository(partner_1.Partner).findOne({
51
- where: { domain, partnerDomain }
39
+ where: { domain: { id: domain.id }, partnerDomain }
52
40
  });
53
41
  if (!partner)
54
42
  throw new Error(context.t('error.failed to find x', { x: context.t('label.partner') }));
@@ -59,26 +47,26 @@ let PartnerMutation = class PartnerMutation {
59
47
  return true;
60
48
  }
61
49
  };
62
- __decorate([
50
+ tslib_1.__decorate([
63
51
  (0, type_graphql_1.Directive)('@privilege(category: "partner", privilege: "mutation")'),
64
52
  (0, type_graphql_1.Mutation)(returns => Boolean),
65
- __param(0, (0, type_graphql_1.Arg)('customerDomainName')),
66
- __param(1, (0, type_graphql_1.Ctx)()),
67
- __metadata("design:type", Function),
68
- __metadata("design:paramtypes", [String, Object]),
69
- __metadata("design:returntype", Promise)
53
+ tslib_1.__param(0, (0, type_graphql_1.Arg)('customerDomainName')),
54
+ tslib_1.__param(1, (0, type_graphql_1.Ctx)()),
55
+ tslib_1.__metadata("design:type", Function),
56
+ tslib_1.__metadata("design:paramtypes", [String, Object]),
57
+ tslib_1.__metadata("design:returntype", Promise)
70
58
  ], PartnerMutation.prototype, "inviteCustomer", null);
71
- __decorate([
59
+ tslib_1.__decorate([
72
60
  (0, type_graphql_1.Directive)('@privilege(category: "partner", privilege: "mutation")'),
73
61
  (0, type_graphql_1.Directive)('@transaction'),
74
62
  (0, type_graphql_1.Mutation)(returns => Boolean),
75
- __param(0, (0, type_graphql_1.Arg)('partnerName')),
76
- __param(1, (0, type_graphql_1.Ctx)()),
77
- __metadata("design:type", Function),
78
- __metadata("design:paramtypes", [String, Object]),
79
- __metadata("design:returntype", Promise)
63
+ tslib_1.__param(0, (0, type_graphql_1.Arg)('partnerName')),
64
+ tslib_1.__param(1, (0, type_graphql_1.Ctx)()),
65
+ tslib_1.__metadata("design:type", Function),
66
+ tslib_1.__metadata("design:paramtypes", [String, Object]),
67
+ tslib_1.__metadata("design:returntype", Promise)
80
68
  ], PartnerMutation.prototype, "terminateContract", null);
81
- PartnerMutation = __decorate([
69
+ PartnerMutation = tslib_1.__decorate([
82
70
  (0, type_graphql_1.Resolver)(partner_1.Partner)
83
71
  ], PartnerMutation);
84
72
  exports.PartnerMutation = PartnerMutation;
@@ -1 +1 @@
1
- {"version":3,"file":"partner-mutation.js","sourceRoot":"","sources":["../../../server/service/partner/partner-mutation.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"partner-mutation.js","sourceRoot":"","sources":["../../../server/service/partner/partner-mutation.ts"],"names":[],"mappings":"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","sourcesContent":["import { Arg, Ctx, Directive, Mutation, Resolver } from 'type-graphql'\n\nimport { Domain, getRepository } from '@things-factory/shell'\n\nimport { terminateGrantedRoles } from '../granted-role/granted-role-mutation'\nimport { Partner } from './partner'\n\n@Resolver(Partner)\nexport class PartnerMutation {\n @Directive('@privilege(category: \"partner\", privilege: \"mutation\")')\n @Mutation(returns => Boolean)\n async inviteCustomer(@Arg('customerDomainName') customerDomainName: string, @Ctx() context: ResolverContext) {\n // 1. Try to find existing customer\n const { domain, user } = context.state\n const customerDomain: Domain = await getRepository(Domain).findOne({ where: { name: customerDomainName } })\n if (!customerDomain) throw new Error(`There's no customer which has ${customerDomainName} as name`)\n\n const isExistingCustomer: boolean = Boolean(\n await getRepository(Partner).count({\n where: { domain: { id: domain.id }, partnerDomain: customerDomain }\n })\n )\n if (isExistingCustomer) throw new Error('Partner is registered as customer already')\n\n await getRepository(Partner).save({\n domain,\n partnerDomain: customerDomain,\n requester: user,\n approver: user\n })\n\n return true\n }\n\n @Directive('@privilege(category: \"partner\", privilege: \"mutation\")')\n @Directive('@transaction')\n @Mutation(returns => Boolean)\n async terminateContract(@Arg('partnerName') partnerName: string, @Ctx() context: ResolverContext) {\n const { tx, domain } = context.state\n\n // Find partnerDomain\n const partnerDomain: Domain = await tx.getRepository(Domain).findOne({\n where: { name: partnerName }\n })\n if (!partnerDomain) throw new Error(context.t('error.failed to find x', { x: context.t('label.partner') }))\n\n // Find partner\n const partner: Partner = await tx.getRepository(Partner).findOne({\n where: { domain: { id: domain.id }, partnerDomain }\n })\n if (!partner) throw new Error(context.t('error.failed to find x', { x: context.t('label.partner') }))\n\n // Remove record from partner\n await tx.getRepository(Partner).delete(partner.id)\n\n // Remove granted roles\n await terminateGrantedRoles(domain, partnerDomain, tx)\n\n return true\n }\n}\n"]}
@@ -0,0 +1,14 @@
1
+ import { Domain, DomainList, ListParam } from '@things-factory/shell';
2
+ import { User } from '../user/user';
3
+ import { Partner } from './partner';
4
+ import { PartnerList } from './partner-types';
5
+ export declare class PartnerQuery {
6
+ partners(params: ListParam, context: ResolverContext): Promise<PartnerList>;
7
+ customers(context: ResolverContext): Promise<Domain[]>;
8
+ searchCustomers(params: ListParam, context: ResolverContext): Promise<DomainList>;
9
+ vendors(context: ResolverContext): Promise<Domain[]>;
10
+ domain(partner: Partner): Promise<Domain>;
11
+ partnerDomain(partner: Partner): Promise<Domain>;
12
+ requester(partner: Partner): Promise<User>;
13
+ approver(partner: Partner): Promise<User>;
14
+ }
@@ -1,21 +1,8 @@
1
1
  "use strict";
2
- var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
3
- var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
4
- if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
5
- else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
6
- return c > 3 && r && Object.defineProperty(target, key, r), r;
7
- };
8
- var __metadata = (this && this.__metadata) || function (k, v) {
9
- if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
10
- };
11
- var __param = (this && this.__param) || function (paramIndex, decorator) {
12
- return function (target, key) { decorator(target, key, paramIndex); }
13
- };
14
- var _a, _b;
15
2
  Object.defineProperty(exports, "__esModule", { value: true });
16
3
  exports.PartnerQuery = void 0;
4
+ const tslib_1 = require("tslib");
17
5
  const type_graphql_1 = require("type-graphql");
18
- const typeorm_1 = require("typeorm");
19
6
  const shell_1 = require("@things-factory/shell");
20
7
  const check_user_belongs_domain_1 = require("../../utils/check-user-belongs-domain");
21
8
  const user_1 = require("../user/user");
@@ -24,7 +11,7 @@ const partner_types_1 = require("./partner-types");
24
11
  let PartnerQuery = class PartnerQuery {
25
12
  async partners(params, context) {
26
13
  if (await (0, check_user_belongs_domain_1.checkUserBelongsDomain)(context.state.domain, context.state.user)) {
27
- const qb = (0, typeorm_1.getRepository)(partner_1.Partner).createQueryBuilder('PARTNER');
14
+ const qb = (0, shell_1.getRepository)(partner_1.Partner).createQueryBuilder('PARTNER');
28
15
  (0, shell_1.buildQuery)(qb, params, context);
29
16
  const [items, total] = await qb.getManyAndCount();
30
17
  return { items, total };
@@ -35,7 +22,7 @@ let PartnerQuery = class PartnerQuery {
35
22
  }
36
23
  async customers(context) {
37
24
  const { domain } = context.state;
38
- const partners = await (0, typeorm_1.getRepository)(partner_1.Partner).find({
25
+ const partners = await (0, shell_1.getRepository)(partner_1.Partner).find({
39
26
  where: { domain },
40
27
  relations: ['partnerDomain']
41
28
  });
@@ -43,11 +30,11 @@ let PartnerQuery = class PartnerQuery {
43
30
  }
44
31
  async searchCustomers(params, context) {
45
32
  const { domain } = context.state;
46
- const partners = await (0, typeorm_1.getRepository)(partner_1.Partner).find({
33
+ const partners = await (0, shell_1.getRepository)(partner_1.Partner).find({
47
34
  where: { domain },
48
35
  relations: ['partnerDomain']
49
36
  });
50
- const qb = (0, typeorm_1.getRepository)(shell_1.Domain).createQueryBuilder('DOMAIN');
37
+ const qb = (0, shell_1.getRepository)(shell_1.Domain).createQueryBuilder('DOMAIN');
51
38
  (0, shell_1.buildQuery)(qb, params, context, { domainRef: false });
52
39
  qb.andWhereInIds(partners.map((p) => p.partnerDomain.id));
53
40
  const [items, total] = await qb.getManyAndCount();
@@ -55,7 +42,7 @@ let PartnerQuery = class PartnerQuery {
55
42
  }
56
43
  async vendors(context) {
57
44
  const { domain } = context.state;
58
- const qb = (0, typeorm_1.getRepository)(partner_1.Partner).createQueryBuilder('PARTNER');
45
+ const qb = (0, shell_1.getRepository)(partner_1.Partner).createQueryBuilder('PARTNER');
59
46
  const partners = await qb
60
47
  .leftJoinAndSelect('PARTNER.domain', 'DOMAIN')
61
48
  .leftJoinAndSelect('PARTNER.partnerDomain', 'P_DOMAIN')
@@ -64,81 +51,81 @@ let PartnerQuery = class PartnerQuery {
64
51
  return partners.map((p) => p.domain);
65
52
  }
66
53
  async domain(partner) {
67
- return await (0, typeorm_1.getRepository)(shell_1.Domain).findOne(partner.domainId);
54
+ return await (0, shell_1.getRepository)(shell_1.Domain).findOneBy({ id: partner.domainId });
68
55
  }
69
56
  async partnerDomain(partner) {
70
- return await (0, typeorm_1.getRepository)(shell_1.Domain).findOne(partner.partnerDomainId);
57
+ return await (0, shell_1.getRepository)(shell_1.Domain).findOneBy({ id: partner.partnerDomainId });
71
58
  }
72
59
  async requester(partner) {
73
- return await (0, typeorm_1.getRepository)(user_1.User).findOne(partner.requesterId);
60
+ return await (0, shell_1.getRepository)(user_1.User).findOneBy({ id: partner.requesterId });
74
61
  }
75
62
  async approver(partner) {
76
- return await (0, typeorm_1.getRepository)(user_1.User).findOne(partner.approverId);
63
+ return await (0, shell_1.getRepository)(user_1.User).findOneBy({ id: partner.approverId });
77
64
  }
78
65
  };
79
- __decorate([
66
+ tslib_1.__decorate([
80
67
  (0, type_graphql_1.Directive)('@privilege(category: "partner", privilege: "query", domainOwnerGranted: true)'),
81
68
  (0, type_graphql_1.Query)(returns => partner_types_1.PartnerList),
82
- __param(0, (0, type_graphql_1.Args)()),
83
- __param(1, (0, type_graphql_1.Ctx)()),
84
- __metadata("design:type", Function),
85
- __metadata("design:paramtypes", [typeof (_a = typeof shell_1.ListParam !== "undefined" && shell_1.ListParam) === "function" ? _a : Object, Object]),
86
- __metadata("design:returntype", Promise)
69
+ tslib_1.__param(0, (0, type_graphql_1.Args)()),
70
+ tslib_1.__param(1, (0, type_graphql_1.Ctx)()),
71
+ tslib_1.__metadata("design:type", Function),
72
+ tslib_1.__metadata("design:paramtypes", [shell_1.ListParam, Object]),
73
+ tslib_1.__metadata("design:returntype", Promise)
87
74
  ], PartnerQuery.prototype, "partners", null);
88
- __decorate([
75
+ tslib_1.__decorate([
89
76
  (0, type_graphql_1.Directive)('@privilege(category: "partner", privilege: "query", domainOwnerGranted: true)'),
90
77
  (0, type_graphql_1.Query)(returns => [shell_1.Domain]),
91
- __param(0, (0, type_graphql_1.Ctx)()),
92
- __metadata("design:type", Function),
93
- __metadata("design:paramtypes", [Object]),
94
- __metadata("design:returntype", Promise)
78
+ tslib_1.__param(0, (0, type_graphql_1.Ctx)()),
79
+ tslib_1.__metadata("design:type", Function),
80
+ tslib_1.__metadata("design:paramtypes", [Object]),
81
+ tslib_1.__metadata("design:returntype", Promise)
95
82
  ], PartnerQuery.prototype, "customers", null);
96
- __decorate([
83
+ tslib_1.__decorate([
97
84
  (0, type_graphql_1.Directive)('@privilege(category: "partner", privilege: "query")'),
98
85
  (0, type_graphql_1.Query)(returns => shell_1.DomainList),
99
- __param(0, (0, type_graphql_1.Args)()),
100
- __param(1, (0, type_graphql_1.Ctx)()),
101
- __metadata("design:type", Function),
102
- __metadata("design:paramtypes", [typeof (_b = typeof shell_1.ListParam !== "undefined" && shell_1.ListParam) === "function" ? _b : Object, Object]),
103
- __metadata("design:returntype", Promise)
86
+ tslib_1.__param(0, (0, type_graphql_1.Args)()),
87
+ tslib_1.__param(1, (0, type_graphql_1.Ctx)()),
88
+ tslib_1.__metadata("design:type", Function),
89
+ tslib_1.__metadata("design:paramtypes", [shell_1.ListParam, Object]),
90
+ tslib_1.__metadata("design:returntype", Promise)
104
91
  ], PartnerQuery.prototype, "searchCustomers", null);
105
- __decorate([
92
+ tslib_1.__decorate([
106
93
  (0, type_graphql_1.Directive)('@privilege(category: "partner", privilege: "query", domainOwnerGranted: true)'),
107
94
  (0, type_graphql_1.Query)(returns => [shell_1.Domain]),
108
- __param(0, (0, type_graphql_1.Ctx)()),
109
- __metadata("design:type", Function),
110
- __metadata("design:paramtypes", [Object]),
111
- __metadata("design:returntype", Promise)
95
+ tslib_1.__param(0, (0, type_graphql_1.Ctx)()),
96
+ tslib_1.__metadata("design:type", Function),
97
+ tslib_1.__metadata("design:paramtypes", [Object]),
98
+ tslib_1.__metadata("design:returntype", Promise)
112
99
  ], PartnerQuery.prototype, "vendors", null);
113
- __decorate([
100
+ tslib_1.__decorate([
114
101
  (0, type_graphql_1.FieldResolver)(),
115
- __param(0, (0, type_graphql_1.Root)()),
116
- __metadata("design:type", Function),
117
- __metadata("design:paramtypes", [partner_1.Partner]),
118
- __metadata("design:returntype", Promise)
102
+ tslib_1.__param(0, (0, type_graphql_1.Root)()),
103
+ tslib_1.__metadata("design:type", Function),
104
+ tslib_1.__metadata("design:paramtypes", [partner_1.Partner]),
105
+ tslib_1.__metadata("design:returntype", Promise)
119
106
  ], PartnerQuery.prototype, "domain", null);
120
- __decorate([
107
+ tslib_1.__decorate([
121
108
  (0, type_graphql_1.FieldResolver)(),
122
- __param(0, (0, type_graphql_1.Root)()),
123
- __metadata("design:type", Function),
124
- __metadata("design:paramtypes", [partner_1.Partner]),
125
- __metadata("design:returntype", Promise)
109
+ tslib_1.__param(0, (0, type_graphql_1.Root)()),
110
+ tslib_1.__metadata("design:type", Function),
111
+ tslib_1.__metadata("design:paramtypes", [partner_1.Partner]),
112
+ tslib_1.__metadata("design:returntype", Promise)
126
113
  ], PartnerQuery.prototype, "partnerDomain", null);
127
- __decorate([
114
+ tslib_1.__decorate([
128
115
  (0, type_graphql_1.FieldResolver)(),
129
- __param(0, (0, type_graphql_1.Root)()),
130
- __metadata("design:type", Function),
131
- __metadata("design:paramtypes", [partner_1.Partner]),
132
- __metadata("design:returntype", Promise)
116
+ tslib_1.__param(0, (0, type_graphql_1.Root)()),
117
+ tslib_1.__metadata("design:type", Function),
118
+ tslib_1.__metadata("design:paramtypes", [partner_1.Partner]),
119
+ tslib_1.__metadata("design:returntype", Promise)
133
120
  ], PartnerQuery.prototype, "requester", null);
134
- __decorate([
121
+ tslib_1.__decorate([
135
122
  (0, type_graphql_1.FieldResolver)(),
136
- __param(0, (0, type_graphql_1.Root)()),
137
- __metadata("design:type", Function),
138
- __metadata("design:paramtypes", [partner_1.Partner]),
139
- __metadata("design:returntype", Promise)
123
+ tslib_1.__param(0, (0, type_graphql_1.Root)()),
124
+ tslib_1.__metadata("design:type", Function),
125
+ tslib_1.__metadata("design:paramtypes", [partner_1.Partner]),
126
+ tslib_1.__metadata("design:returntype", Promise)
140
127
  ], PartnerQuery.prototype, "approver", null);
141
- PartnerQuery = __decorate([
128
+ PartnerQuery = tslib_1.__decorate([
142
129
  (0, type_graphql_1.Resolver)(partner_1.Partner)
143
130
  ], PartnerQuery);
144
131
  exports.PartnerQuery = PartnerQuery;