@social.dev/server-sdk 0.0.1-alpha.4 → 0.0.1-alpha.41

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 (245) hide show
  1. package/README.md +691 -40
  2. package/dist/app.module.d.ts +3 -3
  3. package/dist/app.module.js +10 -5
  4. package/dist/app.module.js.map +1 -1
  5. package/dist/auth/auth.controller.d.ts +9 -1
  6. package/dist/auth/auth.controller.js +53 -2
  7. package/dist/auth/auth.controller.js.map +1 -1
  8. package/dist/auth/auth.module.js +4 -0
  9. package/dist/auth/auth.module.js.map +1 -1
  10. package/dist/auth/auth.service.d.ts +7 -6
  11. package/dist/auth/auth.service.js +18 -15
  12. package/dist/auth/auth.service.js.map +1 -1
  13. package/dist/auth/dto/login-success.dto.d.ts +1 -1
  14. package/dist/auth/dto/login-success.dto.js +6 -3
  15. package/dist/auth/dto/login-success.dto.js.map +1 -1
  16. package/dist/auth/dto/register-success.dto.d.ts +3 -0
  17. package/dist/auth/dto/register-success.dto.js +12 -0
  18. package/dist/auth/dto/register-success.dto.js.map +1 -0
  19. package/dist/auth/dto/register.dto.d.ts +6 -0
  20. package/dist/auth/dto/register.dto.js +45 -0
  21. package/dist/auth/dto/register.dto.js.map +1 -0
  22. package/dist/auth/enums/auth-method.enum.d.ts +2 -2
  23. package/dist/auth/enums/auth-method.enum.js +2 -2
  24. package/dist/auth/enums/auth-method.enum.js.map +1 -1
  25. package/dist/auth/oidc/dto/requests.d.ts +6 -0
  26. package/dist/auth/oidc/dto/requests.js +47 -0
  27. package/dist/auth/oidc/dto/requests.js.map +1 -0
  28. package/dist/auth/oidc/dto/responses.js +1 -1
  29. package/dist/auth/oidc/dto/responses.js.map +1 -1
  30. package/dist/auth/oidc/oidc.controller.d.ts +7 -2
  31. package/dist/auth/oidc/oidc.controller.js +31 -17
  32. package/dist/auth/oidc/oidc.controller.js.map +1 -1
  33. package/dist/auth/oidc/oidc.module.js +2 -0
  34. package/dist/auth/oidc/oidc.module.js.map +1 -1
  35. package/dist/auth/oidc/oidc.service.d.ts +13 -7
  36. package/dist/auth/oidc/oidc.service.js +38 -30
  37. package/dist/auth/oidc/oidc.service.js.map +1 -1
  38. package/dist/auth/session/session.controller.js +8 -3
  39. package/dist/auth/session/session.controller.js.map +1 -1
  40. package/dist/auth/session/session.service.d.ts +2 -2
  41. package/dist/auth/session/session.service.js +9 -5
  42. package/dist/auth/session/session.service.js.map +1 -1
  43. package/dist/bootstrap.d.ts +2 -1
  44. package/dist/bootstrap.js +6 -1
  45. package/dist/bootstrap.js.map +1 -1
  46. package/dist/chat/chat.controller.d.ts +1 -2
  47. package/dist/chat/chat.controller.js +8 -4
  48. package/dist/chat/chat.controller.js.map +1 -1
  49. package/dist/chat/chat.module.js +6 -0
  50. package/dist/chat/chat.module.js.map +1 -1
  51. package/dist/chat/chat.service.d.ts +10 -2
  52. package/dist/chat/chat.service.js +79 -17
  53. package/dist/chat/chat.service.js.map +1 -1
  54. package/dist/chat/dto/responses.dto.d.ts +4 -0
  55. package/dist/chat/dto/responses.dto.js +25 -1
  56. package/dist/chat/dto/responses.dto.js.map +1 -1
  57. package/dist/chat/entities/conversation-member.entity.js +1 -1
  58. package/dist/chat/entities/conversation-member.entity.js.map +1 -1
  59. package/dist/chat/entities/conversation.entity.d.ts +1 -0
  60. package/dist/chat/entities/conversation.entity.js +8 -1
  61. package/dist/chat/entities/conversation.entity.js.map +1 -1
  62. package/dist/chat/entities/message.entity.js.map +1 -1
  63. package/dist/common/decorators/api-paginated-response.d.ts +1 -1
  64. package/dist/common/decorators/api-paginated-response.js +2 -2
  65. package/dist/common/decorators/api-paginated-response.js.map +1 -1
  66. package/dist/common/dto/paginated-response.dto.d.ts +2 -0
  67. package/dist/common/dto/paginated-response.dto.js +14 -3
  68. package/dist/common/dto/paginated-response.dto.js.map +1 -1
  69. package/dist/community/community.acl.js.map +1 -1
  70. package/dist/community/community.controller.d.ts +1 -2
  71. package/dist/community/community.controller.js +9 -5
  72. package/dist/community/community.controller.js.map +1 -1
  73. package/dist/community/community.module.js +1 -0
  74. package/dist/community/community.module.js.map +1 -1
  75. package/dist/community/community.service.d.ts +10 -3
  76. package/dist/community/community.service.js +30 -12
  77. package/dist/community/community.service.js.map +1 -1
  78. package/dist/configs/configs.module.js +3 -0
  79. package/dist/configs/configs.module.js.map +1 -1
  80. package/dist/configs/configs.service.d.ts +23 -0
  81. package/dist/configs/configs.service.js +14 -1
  82. package/dist/configs/configs.service.js.map +1 -1
  83. package/dist/core/event-stream/event-stream-processor.interface.d.ts +8 -0
  84. package/dist/core/event-stream/event-stream-processor.interface.js +3 -0
  85. package/dist/core/event-stream/event-stream-processor.interface.js.map +1 -0
  86. package/dist/core/event-stream/event-stream-processor.service.d.ts +13 -0
  87. package/dist/core/event-stream/event-stream-processor.service.js +55 -0
  88. package/dist/core/event-stream/event-stream-processor.service.js.map +1 -0
  89. package/dist/core/event-stream/event-stream.module.d.ts +11 -0
  90. package/dist/core/event-stream/event-stream.module.js +49 -0
  91. package/dist/core/event-stream/event-stream.module.js.map +1 -0
  92. package/dist/core/event-stream/event-stream.service.d.ts +16 -0
  93. package/dist/core/event-stream/event-stream.service.js +100 -0
  94. package/dist/core/event-stream/event-stream.service.js.map +1 -0
  95. package/dist/core/event-stream/types.d.ts +2 -0
  96. package/dist/core/event-stream/types.js +3 -0
  97. package/dist/core/event-stream/types.js.map +1 -0
  98. package/dist/core/hook/hook.module.d.ts +4 -0
  99. package/dist/core/hook/hook.module.js +30 -0
  100. package/dist/core/hook/hook.module.js.map +1 -0
  101. package/dist/core/hook/hook.service.d.ts +7 -0
  102. package/dist/core/{plugin/plugin-hook.service.js → hook/hook.service.js} +10 -10
  103. package/dist/core/hook/hook.service.js.map +1 -0
  104. package/dist/core/plugin/plugin.module.js +7 -5
  105. package/dist/core/plugin/plugin.module.js.map +1 -1
  106. package/dist/db.js +1 -1
  107. package/dist/db.js.map +1 -1
  108. package/dist/file-storage/file-storage.service.d.ts +1 -1
  109. package/dist/file-storage/file-storage.service.js +6 -6
  110. package/dist/file-storage/file-storage.service.js.map +1 -1
  111. package/dist/file-storage/utils.js +3 -1
  112. package/dist/file-storage/utils.js.map +1 -1
  113. package/dist/index.d.ts +0 -1
  114. package/dist/index.js +1 -3
  115. package/dist/index.js.map +1 -1
  116. package/dist/media/entities/media.entity.js +1 -1
  117. package/dist/media/entities/media.entity.js.map +1 -1
  118. package/dist/media/media.acl.d.ts +2 -4
  119. package/dist/media/media.acl.js +3 -0
  120. package/dist/media/media.acl.js.map +1 -1
  121. package/dist/media/media.service.js +15 -12
  122. package/dist/media/media.service.js.map +1 -1
  123. package/dist/migrations/1757061785934-PushNotificationTokens.d.ts +6 -0
  124. package/dist/migrations/1757061785934-PushNotificationTokens.js +20 -0
  125. package/dist/migrations/1757061785934-PushNotificationTokens.js.map +1 -0
  126. package/dist/migrations/1758623241397-AddUserTimestamps.d.ts +6 -0
  127. package/dist/migrations/1758623241397-AddUserTimestamps.js +16 -0
  128. package/dist/migrations/1758623241397-AddUserTimestamps.js.map +1 -0
  129. package/dist/{1756201302119-migrations.d.ts → migrations/1758704603161-UserFollows.d.ts} +1 -1
  130. package/dist/migrations/1758704603161-UserFollows.js +18 -0
  131. package/dist/migrations/1758704603161-UserFollows.js.map +1 -0
  132. package/dist/network/entities/network.entity.js +0 -3
  133. package/dist/network/entities/network.entity.js.map +1 -1
  134. package/dist/network/network.middleware.js +2 -2
  135. package/dist/network/network.middleware.js.map +1 -1
  136. package/dist/network/network.module.js +2 -1
  137. package/dist/network/network.module.js.map +1 -1
  138. package/dist/network/network.service.d.ts +5 -2
  139. package/dist/network/network.service.js +23 -6
  140. package/dist/network/network.service.js.map +1 -1
  141. package/dist/notification/dto/delete-push-token.dto.d.ts +3 -0
  142. package/dist/{common/entities/base.repository.js → notification/dto/delete-push-token.dto.js} +14 -20
  143. package/dist/notification/dto/delete-push-token.dto.js.map +1 -0
  144. package/dist/notification/dto/register-push-token.dto.d.ts +5 -0
  145. package/dist/notification/dto/register-push-token.dto.js +38 -0
  146. package/dist/notification/dto/register-push-token.dto.js.map +1 -0
  147. package/dist/notification/entities/push-token.entity.d.ts +11 -0
  148. package/dist/notification/entities/push-token.entity.js +60 -0
  149. package/dist/notification/entities/push-token.entity.js.map +1 -0
  150. package/dist/notification/enums/push-service.enum.d.ts +6 -0
  151. package/dist/notification/enums/push-service.enum.js +11 -0
  152. package/dist/notification/enums/push-service.enum.js.map +1 -0
  153. package/dist/notification/hook-listener.service.d.ts +13 -0
  154. package/dist/notification/hook-listener.service.js +58 -0
  155. package/dist/notification/hook-listener.service.js.map +1 -0
  156. package/dist/notification/notification.module.d.ts +2 -0
  157. package/dist/notification/notification.module.js +24 -0
  158. package/dist/notification/notification.module.js.map +1 -0
  159. package/dist/notification/push-notification.controller.d.ts +9 -0
  160. package/dist/notification/push-notification.controller.js +69 -0
  161. package/dist/notification/push-notification.controller.js.map +1 -0
  162. package/dist/notification/push-notification.module.d.ts +2 -0
  163. package/dist/notification/push-notification.module.js +27 -0
  164. package/dist/notification/push-notification.module.js.map +1 -0
  165. package/dist/notification/push-notification.service.d.ts +22 -0
  166. package/dist/notification/push-notification.service.js +84 -0
  167. package/dist/notification/push-notification.service.js.map +1 -0
  168. package/dist/post/post.controller.d.ts +3 -2
  169. package/dist/post/post.controller.js +28 -8
  170. package/dist/post/post.controller.js.map +1 -1
  171. package/dist/post/post.module.js +2 -0
  172. package/dist/post/post.module.js.map +1 -1
  173. package/dist/post/post.service.d.ts +7 -3
  174. package/dist/post/post.service.js +18 -8
  175. package/dist/post/post.service.js.map +1 -1
  176. package/dist/tsconfig.build.tsbuildinfo +1 -1
  177. package/dist/user/avatar/avatar.controller.d.ts +10 -0
  178. package/dist/user/avatar/avatar.controller.js +89 -0
  179. package/dist/user/avatar/avatar.controller.js.map +1 -0
  180. package/dist/user/avatar/avatar.service.d.ts +12 -0
  181. package/dist/user/avatar/avatar.service.js +68 -0
  182. package/dist/user/avatar/avatar.service.js.map +1 -0
  183. package/dist/user/constants.d.ts +1 -0
  184. package/dist/user/constants.js +5 -0
  185. package/dist/user/constants.js.map +1 -0
  186. package/dist/user/dto/update-profile.dto.d.ts +3 -0
  187. package/dist/user/dto/update-profile.dto.js +26 -0
  188. package/dist/user/dto/update-profile.dto.js.map +1 -0
  189. package/dist/user/dto/user-response.dto.d.ts +6 -0
  190. package/dist/user/dto/user-response.dto.js +37 -1
  191. package/dist/user/dto/user-response.dto.js.map +1 -1
  192. package/dist/user/dto/user.dto.d.ts +8 -0
  193. package/dist/user/dto/user.dto.js +21 -0
  194. package/dist/user/dto/user.dto.js.map +1 -0
  195. package/dist/user/entities/user.entity.d.ts +4 -0
  196. package/dist/user/entities/user.entity.js +19 -1
  197. package/dist/user/entities/user.entity.js.map +1 -1
  198. package/dist/user/follow/dto/follow-response.dto.d.ts +4 -0
  199. package/dist/user/follow/dto/follow-response.dto.js +38 -0
  200. package/dist/user/follow/dto/follow-response.dto.js.map +1 -0
  201. package/dist/user/follow/dto/follow.dto.d.ts +4 -0
  202. package/dist/user/follow/dto/follow.dto.js +26 -0
  203. package/dist/user/follow/dto/follow.dto.js.map +1 -0
  204. package/dist/user/follow/entities/follow.entity.d.ts +10 -0
  205. package/dist/user/follow/entities/follow.entity.js +60 -0
  206. package/dist/user/follow/entities/follow.entity.js.map +1 -0
  207. package/dist/user/follow/follow.controller.d.ts +9 -0
  208. package/dist/user/follow/follow.controller.js +56 -0
  209. package/dist/user/follow/follow.controller.js.map +1 -0
  210. package/dist/user/follow/follow.module.d.ts +2 -0
  211. package/dist/user/follow/follow.module.js +26 -0
  212. package/dist/user/follow/follow.module.js.map +1 -0
  213. package/dist/user/follow/follow.service.d.ts +11 -0
  214. package/dist/user/follow/follow.service.js +56 -0
  215. package/dist/user/follow/follow.service.js.map +1 -0
  216. package/dist/user/user.controller.d.ts +6 -2
  217. package/dist/user/user.controller.js +47 -8
  218. package/dist/user/user.controller.js.map +1 -1
  219. package/dist/user/user.module.js +12 -3
  220. package/dist/user/user.module.js.map +1 -1
  221. package/dist/user/user.service.d.ts +12 -5
  222. package/dist/user/user.service.js +49 -11
  223. package/dist/user/user.service.js.map +1 -1
  224. package/package.json +6 -3
  225. package/dist/1756201302119-migrations.js +0 -84
  226. package/dist/1756201302119-migrations.js.map +0 -1
  227. package/dist/auth/enums/auth-methods.enum.d.ts +0 -2
  228. package/dist/auth/enums/auth-methods.enum.js +0 -7
  229. package/dist/auth/enums/auth-methods.enum.js.map +0 -1
  230. package/dist/auth/session/auth.controller.d.ts +0 -10
  231. package/dist/auth/session/auth.controller.js +0 -92
  232. package/dist/auth/session/auth.controller.js.map +0 -1
  233. package/dist/auth/session/auth.service.d.ts +0 -12
  234. package/dist/auth/session/auth.service.js +0 -46
  235. package/dist/auth/session/auth.service.js.map +0 -1
  236. package/dist/common/constants.d.ts +0 -1
  237. package/dist/common/constants.js +0 -5
  238. package/dist/common/constants.js.map +0 -1
  239. package/dist/common/entities/base.repository.d.ts +0 -7
  240. package/dist/common/entities/base.repository.js.map +0 -1
  241. package/dist/core/plugin/plugin-hook.service.d.ts +0 -7
  242. package/dist/core/plugin/plugin-hook.service.js.map +0 -1
  243. package/dist/user/dto/update-user.dto.d.ts +0 -5
  244. package/dist/user/dto/update-user.dto.js +0 -13
  245. package/dist/user/dto/update-user.dto.js.map +0 -1
@@ -15,6 +15,7 @@ const user_module_1 = require("../../user/user.module");
15
15
  const typeorm_1 = require("@nestjs/typeorm");
16
16
  const oidc_user_entity_1 = require("./entities/oidc-user.entity");
17
17
  const session_module_1 = require("../session/session.module");
18
+ const configs_module_1 = require("../../configs/configs.module");
18
19
  let OidcModule = class OidcModule {
19
20
  };
20
21
  exports.OidcModule = OidcModule;
@@ -25,6 +26,7 @@ exports.OidcModule = OidcModule = __decorate([
25
26
  axios_1.HttpModule,
26
27
  (0, common_1.forwardRef)(() => user_module_1.UserModule),
27
28
  session_module_1.SessionModule,
29
+ configs_module_1.ConfigsModule,
28
30
  ],
29
31
  providers: [oidc_service_1.OidcService],
30
32
  controllers: [oidc_controller_1.OidcController],
@@ -1 +1 @@
1
- {"version":3,"file":"oidc.module.js","sourceRoot":"","sources":["../../../src/auth/oidc/oidc.module.ts"],"names":[],"mappings":";;;;;;;;;AAAA,2CAAoD;AACpD,uDAAmD;AACnD,iDAA6C;AAC7C,yCAA2C;AAC3C,wDAAgD;AAChD,6CAAgD;AAChD,kEAAuD;AACvD,8DAA0D;AAYnD,IAAM,UAAU,GAAhB,MAAM,UAAU;CAAG,CAAA;AAAb,gCAAU;qBAAV,UAAU;IAVtB,IAAA,eAAM,EAAC;QACN,OAAO,EAAE;YACP,uBAAa,CAAC,UAAU,CAAC,CAAC,2BAAQ,CAAC,CAAC;YACpC,kBAAU;YACV,IAAA,mBAAU,EAAC,GAAG,EAAE,CAAC,wBAAU,CAAC;YAC5B,8BAAa;SACd;QACD,SAAS,EAAE,CAAC,0BAAW,CAAC;QACxB,WAAW,EAAE,CAAC,gCAAc,CAAC;KAC9B,CAAC;GACW,UAAU,CAAG"}
1
+ {"version":3,"file":"oidc.module.js","sourceRoot":"","sources":["../../../src/auth/oidc/oidc.module.ts"],"names":[],"mappings":";;;;;;;;;AAAA,2CAAoD;AACpD,uDAAmD;AACnD,iDAA6C;AAC7C,yCAA2C;AAC3C,wDAAgD;AAChD,6CAAgD;AAChD,kEAAuD;AACvD,8DAA0D;AAC1D,iEAAyD;AAalD,IAAM,UAAU,GAAhB,MAAM,UAAU;CAAG,CAAA;AAAb,gCAAU;qBAAV,UAAU;IAXtB,IAAA,eAAM,EAAC;QACN,OAAO,EAAE;YACP,uBAAa,CAAC,UAAU,CAAC,CAAC,2BAAQ,CAAC,CAAC;YACpC,kBAAU;YACV,IAAA,mBAAU,EAAC,GAAG,EAAE,CAAC,wBAAU,CAAC;YAC5B,8BAAa;YACb,8BAAa;SACd;QACD,SAAS,EAAE,CAAC,0BAAW,CAAC;QACxB,WAAW,EAAE,CAAC,gCAAc,CAAC;KAC9B,CAAC;GACW,UAAU,CAAG"}
@@ -4,7 +4,8 @@ import { User } from '~/user/entities/user.entity';
4
4
  import { DataSource, Repository } from 'typeorm';
5
5
  import { OidcUser } from './entities/oidc-user.entity';
6
6
  import { SessionService } from '../session/session.service';
7
- type OidcProvider = {
7
+ import { ConfigsService } from '~/configs/configs.service';
8
+ export type OidcProvider = {
8
9
  id: string;
9
10
  name: string;
10
11
  issuer: string;
@@ -17,16 +18,21 @@ export declare class OidcService {
17
18
  private http;
18
19
  private users;
19
20
  private sessions;
20
- constructor(oidcUserRepository: Repository<OidcUser>, dataSource: DataSource, http: HttpService, users: UserService, sessions: SessionService);
21
+ private configs;
22
+ constructor(oidcUserRepository: Repository<OidcUser>, dataSource: DataSource, http: HttpService, users: UserService, sessions: SessionService, configs: ConfigsService);
21
23
  getProviders(): OidcProvider[];
22
- getAuthorizationUrl(provider: OidcProvider, stateToken: string): Promise<string>;
23
- processAuthorizationCode(provider: OidcProvider, code: string): Promise<{
24
- accessToken: string;
24
+ getAuthorizationUrl(provider: OidcProvider, stateToken: string, extraParams?: Record<string, string>): Promise<string>;
25
+ processAuthorizationCode({ provider, code, redirectUri, codeVerifier, }: {
26
+ provider: OidcProvider;
27
+ code: string;
28
+ redirectUri?: string;
29
+ codeVerifier?: string;
30
+ }): Promise<{
31
+ authToken: string;
25
32
  user: User;
26
33
  }>;
27
- getUserInfo(endpoint: string, accessToken: string): Promise<Object>;
34
+ getUserInfo(endpoint: string, authToken: string): Promise<Object>;
28
35
  getUserFromSub(provider: OidcProvider, sub: string): Promise<User | null>;
29
36
  private getOpenIdConfiguration;
30
37
  private getJwk;
31
38
  }
32
- export {};
@@ -25,60 +25,66 @@ const typeorm_1 = require("typeorm");
25
25
  const oidc_user_entity_1 = require("./entities/oidc-user.entity");
26
26
  const typeorm_2 = require("@nestjs/typeorm");
27
27
  const session_service_1 = require("../session/session.service");
28
+ const configs_service_1 = require("../../configs/configs.service");
28
29
  let OidcService = class OidcService {
29
30
  oidcUserRepository;
30
31
  dataSource;
31
32
  http;
32
33
  users;
33
34
  sessions;
34
- constructor(oidcUserRepository, dataSource, http, users, sessions) {
35
+ configs;
36
+ constructor(oidcUserRepository, dataSource, http, users, sessions, configs) {
35
37
  this.oidcUserRepository = oidcUserRepository;
36
38
  this.dataSource = dataSource;
37
39
  this.http = http;
38
40
  this.users = users;
39
41
  this.sessions = sessions;
42
+ this.configs = configs;
40
43
  }
41
44
  getProviders() {
42
- return [
43
- {
44
- id: 'test',
45
- name: 'Zitadel',
46
- issuer: 'https://minds-test-hlrirg.zitadel.cloud',
47
- clientId: '241850086068397974@minds-test',
48
- clientSecret: '2QzFBlXKXCUall4gbU706hLKyOgfLQANLIFao7agxR33tRRV4SIJcgZJrAQT2IGP',
49
- },
50
- ];
45
+ return this.configs.get('auth')?.oidc?.providers || [];
51
46
  }
52
- async getAuthorizationUrl(provider, stateToken) {
47
+ async getAuthorizationUrl(provider, stateToken, extraParams) {
53
48
  const openidConfig = await this.getOpenIdConfiguration(provider);
54
49
  const authUrl = openidConfig['authorization_endpoint'];
55
50
  const supportedScopes = openidConfig['scopes_supported'];
56
51
  const scopes = ['openid', 'profile', 'email'].filter((scope) => supportedScopes.includes(scope));
57
52
  const params = new URLSearchParams({
53
+ ...extraParams,
58
54
  response_type: 'code',
59
55
  client_id: provider.clientId,
60
56
  state: stateToken,
61
57
  scope: scopes.join(' '),
62
- redirect_uri: context_1.Context.getNetwork().getBaseUrl() + 'api/auth.oidc.callback',
58
+ redirect_uri: extraParams?.redirect_uri ||
59
+ context_1.Context.getNetwork().getBaseUrl() + 'api/auth.oidc.callback',
63
60
  provider_id: provider.id,
64
61
  });
65
62
  return `${authUrl}?${params.toString()}`;
66
63
  }
67
- async processAuthorizationCode(provider, code) {
64
+ async processAuthorizationCode({ provider, code, redirectUri, codeVerifier, }) {
68
65
  const openidConfig = await this.getOpenIdConfiguration(provider);
69
66
  const tokenUrl = openidConfig['token_endpoint'];
70
- const res = await (0, rxjs_1.firstValueFrom)(this.http.post(tokenUrl, {
71
- code,
72
- client_id: provider.clientId,
73
- client_secret: provider.clientSecret,
74
- redirect_uri: context_1.Context.getNetwork().getBaseUrl() + 'api/auth.oidc.callback',
75
- grant_type: 'authorization_code',
76
- }, {
77
- headers: {
78
- 'Content-Type': 'application/x-www-form-urlencoded',
79
- },
80
- }));
81
- const data = res.data;
67
+ let data;
68
+ try {
69
+ const res = await (0, rxjs_1.firstValueFrom)(this.http.post(tokenUrl, {
70
+ code,
71
+ client_id: provider.clientId,
72
+ client_secret: provider.clientSecret,
73
+ redirect_uri: redirectUri ||
74
+ context_1.Context.getNetwork().getBaseUrl() + 'api/auth.oidc.callback',
75
+ grant_type: 'authorization_code',
76
+ code_verifier: codeVerifier,
77
+ }, {
78
+ headers: {
79
+ 'Content-Type': 'application/x-www-form-urlencoded',
80
+ },
81
+ }));
82
+ data = res.data;
83
+ }
84
+ catch (err) {
85
+ console.log(err);
86
+ throw new common_1.InternalServerErrorException();
87
+ }
82
88
  const jwks = await this.getJwk(provider);
83
89
  if (!jwks) {
84
90
  throw new common_1.NotAcceptableException("The OIDC provider does not have JWK's");
@@ -93,6 +99,7 @@ let OidcService = class OidcService {
93
99
  let user = await this.getUserFromSub(provider, sub);
94
100
  if (!user) {
95
101
  let preferredUsername = userInfo['preferred_username'] ||
102
+ userInfo['nickname'] ||
96
103
  userInfo['name'].replace(' ', '');
97
104
  try {
98
105
  await this.users.verifyUsername(preferredUsername);
@@ -131,13 +138,13 @@ let OidcService = class OidcService {
131
138
  await queryRunner.commitTransaction();
132
139
  queryRunner.release();
133
140
  }
134
- const { accessToken } = await this.sessions.create(user);
135
- return { accessToken, user };
141
+ const { authToken } = await this.sessions.create(user);
142
+ return { authToken, user };
136
143
  }
137
- async getUserInfo(endpoint, accessToken) {
144
+ async getUserInfo(endpoint, authToken) {
138
145
  const res = await (0, rxjs_1.firstValueFrom)(this.http.get(endpoint, {
139
146
  headers: {
140
- Authorization: `Bearer ${accessToken}`,
147
+ Authorization: `Bearer ${authToken}`,
141
148
  },
142
149
  }));
143
150
  return res.data;
@@ -176,6 +183,7 @@ exports.OidcService = OidcService = __decorate([
176
183
  typeorm_1.DataSource,
177
184
  axios_1.HttpService,
178
185
  user_service_1.UserService,
179
- session_service_1.SessionService])
186
+ session_service_1.SessionService,
187
+ configs_service_1.ConfigsService])
180
188
  ], OidcService);
181
189
  //# sourceMappingURL=oidc.service.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"oidc.service.js","sourceRoot":"","sources":["../../../src/auth/oidc/oidc.service.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"oidc.service.js","sourceRoot":"","sources":["../../../src/auth/oidc/oidc.service.ts"],"names":[],"mappings":"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"}
@@ -32,9 +32,14 @@ let SessionController = class SessionController {
32
32
  username: signInDto.username,
33
33
  password: signInDto.password,
34
34
  });
35
- const { accessToken } = await this.service.create(user);
36
- this.service.setSessionCookie(accessToken, res);
37
- res.send({ accessToken, user: (0, class_transformer_1.plainToInstance)(user_response_dto_1.UserResponseDto, user) });
35
+ const { authToken } = await this.service.create(user);
36
+ this.service.setSessionCookie(authToken, res);
37
+ res.send({
38
+ authToken,
39
+ user: (0, class_transformer_1.plainToInstance)(user_response_dto_1.UserResponseDto, user, {
40
+ excludeExtraneousValues: true,
41
+ }),
42
+ });
38
43
  }
39
44
  async logout(res) {
40
45
  this.service.deleteSessionCookie(res);
@@ -1 +1 @@
1
- {"version":3,"file":"session.controller.js","sourceRoot":"","sources":["../../../src/auth/session/session.controller.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,2CAUwB;AAGxB,6CAA8E;AAC9E,yDAAoD;AACpD,wEAA+D;AAC/D,gDAA4C;AAC5C,gEAAmE;AACnE,8CAA0C;AAC1C,uDAAmD;AAI5C,IAAM,iBAAiB,GAAvB,MAAM,iBAAiB;IACR;IAApB,YAAoB,OAAuB;QAAvB,YAAO,GAAP,OAAO,CAAgB;IAAG,CAAC;IAezC,AAAN,KAAK,CAAC,KAAK,CACD,SAAmB,EACM,GAAoB;QAErD,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,2BAA2B,CAAC;YAC1D,QAAQ,EAAE,SAAS,CAAC,QAAQ;YAC5B,QAAQ,EAAE,SAAS,CAAC,QAAQ;SAC7B,CAAC,CAAC;QAEH,MAAM,EAAE,WAAW,EAAE,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;QAExD,IAAI,CAAC,OAAO,CAAC,gBAAgB,CAAC,WAAW,EAAE,GAAG,CAAC,CAAC;QAEhD,GAAG,CAAC,IAAI,CAAC,EAAE,WAAW,EAAE,IAAI,EAAE,IAAA,mCAAe,EAAC,mCAAe,EAAE,IAAI,CAAC,EAAE,CAAC,CAAC;IAC1E,CAAC;IASK,AAAN,KAAK,CAAC,MAAM,CAAkC,GAAoB;QAEhE,IAAI,CAAC,OAAO,CAAC,mBAAmB,CAAC,GAAG,CAAC,CAAC;QAEtC,GAAG,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,yBAAyB,EAAE,CAAC,CAAC;IACnD,CAAC;CACF,CAAA;AA7CY,8CAAiB;AAgBtB;IAbL,IAAA,iBAAQ,EAAC,mBAAU,CAAC,EAAE,CAAC;IACvB,IAAA,sBAAY,EAAC;QACZ,OAAO,EACL,wEAAwE;QAC1E,WAAW,EAAE;oFACmE;KACjF,CAAC;IACD,IAAA,aAAI,EAAC,qBAAqB,CAAC;IAC3B,IAAA,qBAAW,EAAC;QACX,MAAM,EAAE,GAAG;QACX,WAAW,EAAE,kBAAkB;QAC/B,IAAI,EAAE,2CAAuB;KAC9B,CAAC;kCAZQ,mBAAU,CAAC,EAAE;IAcpB,WAAA,IAAA,aAAI,GAAE,CAAA;IACN,WAAA,IAAA,iBAAQ,EAAC,EAAE,WAAW,EAAE,IAAI,EAAE,CAAC,CAAA;;qCADb,oBAAQ;;8CAa5B;AASK;IAPL,IAAA,iBAAQ,EAAC,mBAAU,CAAC,EAAE,CAAC;IACvB,IAAA,sBAAY,EAAC;QACZ,OAAO,EAAE,4DAA4D;QACrE,WAAW,EAAE,kGAAkG;KAChH,CAAC;IACD,IAAA,kBAAS,EAAC,sBAAS,CAAC;IACpB,IAAA,aAAI,EAAC,qBAAqB,CAAC;kCANlB,mBAAU,CAAC,EAAE;IAOT,WAAA,IAAA,iBAAQ,EAAC,EAAE,WAAW,EAAE,IAAI,EAAE,CAAC,CAAA;;;;+CAK5C;4BA5CU,iBAAiB;IAF7B,IAAA,iBAAO,EAAC,MAAM,CAAC;IACf,IAAA,mBAAU,GAAE;qCAEkB,gCAAc;GADhC,iBAAiB,CA6C7B"}
1
+ {"version":3,"file":"session.controller.js","sourceRoot":"","sources":["../../../src/auth/session/session.controller.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,2CAUwB;AAGxB,6CAA8E;AAC9E,yDAAqE;AACrE,wEAA+D;AAC/D,gDAA4C;AAC5C,gEAAmE;AACnE,8CAA0C;AAC1C,uDAAmD;AAI5C,IAAM,iBAAiB,GAAvB,MAAM,iBAAiB;IACR;IAApB,YAAoB,OAAuB;QAAvB,YAAO,GAAP,OAAO,CAAgB;IAAG,CAAC;IAezC,AAAN,KAAK,CAAC,KAAK,CACD,SAAmB,EACM,GAAoB;QAErD,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,2BAA2B,CAAC;YAC1D,QAAQ,EAAE,SAAS,CAAC,QAAQ;YAC5B,QAAQ,EAAE,SAAS,CAAC,QAAQ;SAC7B,CAAC,CAAC;QAEH,MAAM,EAAE,SAAS,EAAE,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;QAEtD,IAAI,CAAC,OAAO,CAAC,gBAAgB,CAAC,SAAS,EAAE,GAAG,CAAC,CAAC;QAE9C,GAAG,CAAC,IAAI,CAAC;YACP,SAAS;YACT,IAAI,EAAE,IAAA,mCAAe,EAAC,mCAAe,EAAE,IAAI,EAAE;gBAC3C,uBAAuB,EAAE,IAAI;aAC9B,CAAC;SACH,CAAC,CAAC;IACL,CAAC;IASK,AAAN,KAAK,CAAC,MAAM,CAAkC,GAAoB;QAEhE,IAAI,CAAC,OAAO,CAAC,mBAAmB,CAAC,GAAG,CAAC,CAAC;QAEtC,GAAG,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,yBAAyB,EAAE,CAAC,CAAC;IACnD,CAAC;CACF,CAAA;AAlDY,8CAAiB;AAgBtB;IAbL,IAAA,iBAAQ,EAAC,mBAAU,CAAC,EAAE,CAAC;IACvB,IAAA,sBAAY,EAAC;QACZ,OAAO,EACL,wEAAwE;QAC1E,WAAW,EAAE;oFACmE;KACjF,CAAC;IACD,IAAA,aAAI,EAAC,qBAAqB,CAAC;IAC3B,IAAA,qBAAW,EAAC;QACX,MAAM,EAAE,GAAG;QACX,WAAW,EAAE,kBAAkB;QAC/B,IAAI,EAAE,2CAAuB;KAC9B,CAAC;kCAZQ,mBAAU,CAAC,EAAE;IAcpB,WAAA,IAAA,aAAI,GAAE,CAAA;IACN,WAAA,IAAA,iBAAQ,EAAC,EAAE,WAAW,EAAE,IAAI,EAAE,CAAC,CAAA;;qCADb,oBAAQ;;8CAkB5B;AASK;IAPL,IAAA,iBAAQ,EAAC,mBAAU,CAAC,EAAE,CAAC;IACvB,IAAA,sBAAY,EAAC;QACZ,OAAO,EAAE,4DAA4D;QACrE,WAAW,EAAE,kGAAkG;KAChH,CAAC;IACD,IAAA,kBAAS,EAAC,sBAAS,CAAC;IACpB,IAAA,aAAI,EAAC,qBAAqB,CAAC;kCANlB,mBAAU,CAAC,EAAE;IAOT,WAAA,IAAA,iBAAQ,EAAC,EAAE,WAAW,EAAE,IAAI,EAAE,CAAC,CAAA;;;;+CAK5C;4BAjDU,iBAAiB;IAF7B,IAAA,iBAAO,EAAC,MAAM,CAAC;IACf,IAAA,mBAAU,GAAE;qCAEkB,gCAAc;GADhC,iBAAiB,CAkD7B"}
@@ -7,9 +7,9 @@ export declare class SessionService {
7
7
  private jwtService;
8
8
  constructor(userService: UserService, jwtService: JwtService);
9
9
  create(user: User): Promise<{
10
- accessToken: string;
10
+ authToken: string;
11
11
  }>;
12
- setSessionCookie(accessToken: string, response: Response): void;
12
+ setSessionCookie(authToken: string, response: Response): void;
13
13
  deleteSessionCookie(response: Response): void;
14
14
  getUserFromUsernamePassword({ username, password, }: {
15
15
  username: string;
@@ -13,6 +13,7 @@ exports.SessionService = void 0;
13
13
  const common_1 = require("@nestjs/common");
14
14
  const jwt_1 = require("@nestjs/jwt");
15
15
  const user_service_1 = require("../../user/user.service");
16
+ const argon2_1 = require("@node-rs/argon2");
16
17
  let SessionService = class SessionService {
17
18
  userService;
18
19
  jwtService;
@@ -26,13 +27,13 @@ let SessionService = class SessionService {
26
27
  sub: user.id,
27
28
  username: user.username,
28
29
  };
29
- const accessToken = await this.jwtService.signAsync(payload);
30
+ const authToken = await this.jwtService.signAsync(payload);
30
31
  return {
31
- accessToken,
32
+ authToken,
32
33
  };
33
34
  }
34
- setSessionCookie(accessToken, response) {
35
- response.cookie('sess', accessToken, {
35
+ setSessionCookie(authToken, response) {
36
+ response.cookie('sess', authToken, {
36
37
  httpOnly: true,
37
38
  secure: true,
38
39
  sameSite: 'strict',
@@ -47,7 +48,10 @@ let SessionService = class SessionService {
47
48
  }
48
49
  async getUserFromUsernamePassword({ username, password, }) {
49
50
  const user = await this.userService.findOneByUsername(username);
50
- if (user?.password !== password) {
51
+ if (!user) {
52
+ throw new common_1.UnauthorizedException();
53
+ }
54
+ if (!(await (0, argon2_1.verify)(user.password, password))) {
51
55
  throw new common_1.UnauthorizedException();
52
56
  }
53
57
  return user;
@@ -1 +1 @@
1
- {"version":3,"file":"session.service.js","sourceRoot":"","sources":["../../../src/auth/session/session.service.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAAmE;AACnE,qCAAyC;AAGzC,0DAAkD;AAG3C,IAAM,cAAc,GAApB,MAAM,cAAc;IAEf;IACA;IAFV,YACU,WAAwB,EACxB,UAAsB;QADtB,gBAAW,GAAX,WAAW,CAAa;QACxB,eAAU,GAAV,UAAU,CAAY;IAC7B,CAAC;IAKJ,KAAK,CAAC,MAAM,CAAC,IAAU;QACrB,MAAM,OAAO,GAAG;YACd,GAAG,EAAE,CAAC;YACN,GAAG,EAAE,IAAI,CAAC,EAAE;YACZ,QAAQ,EAAE,IAAI,CAAC,QAAQ;SACxB,CAAC;QACF,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC;QAC7D,OAAO;YACL,WAAW;SACZ,CAAC;IACJ,CAAC;IAKD,gBAAgB,CAAC,WAAmB,EAAE,QAAkB;QACtD,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,WAAW,EAAE;YACnC,QAAQ,EAAE,IAAI;YACd,MAAM,EAAE,IAAI;YACZ,QAAQ,EAAE,QAAQ;SACnB,CAAC,CAAC;IACL,CAAC;IAKD,mBAAmB,CAAC,QAAkB;QACpC,QAAQ,CAAC,WAAW,CAAC,MAAM,EAAE;YAC3B,QAAQ,EAAE,IAAI;YACd,MAAM,EAAE,IAAI;YACZ,QAAQ,EAAE,QAAQ;SACnB,CAAC,CAAC;IACL,CAAC;IAKD,KAAK,CAAC,2BAA2B,CAAC,EAChC,QAAQ,EACR,QAAQ,GAIT;QACC,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,iBAAiB,CAAC,QAAQ,CAAC,CAAC;QAChE,IAAI,IAAI,EAAE,QAAQ,KAAK,QAAQ,EAAE,CAAC;YAChC,MAAM,IAAI,8BAAqB,EAAE,CAAC;QACpC,CAAC;QACD,OAAO,IAAI,CAAC;IACd,CAAC;CACF,CAAA;AA3DY,wCAAc;yBAAd,cAAc;IAD1B,IAAA,mBAAU,GAAE;qCAGY,0BAAW;QACZ,gBAAU;GAHrB,cAAc,CA2D1B"}
1
+ {"version":3,"file":"session.service.js","sourceRoot":"","sources":["../../../src/auth/session/session.service.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAAmE;AACnE,qCAAyC;AAGzC,0DAAkD;AAClD,4CAAyC;AAGlC,IAAM,cAAc,GAApB,MAAM,cAAc;IAEf;IACA;IAFV,YACU,WAAwB,EACxB,UAAsB;QADtB,gBAAW,GAAX,WAAW,CAAa;QACxB,eAAU,GAAV,UAAU,CAAY;IAC7B,CAAC;IAKJ,KAAK,CAAC,MAAM,CAAC,IAAU;QACrB,MAAM,OAAO,GAAG;YACd,GAAG,EAAE,CAAC;YACN,GAAG,EAAE,IAAI,CAAC,EAAE;YACZ,QAAQ,EAAE,IAAI,CAAC,QAAQ;SACxB,CAAC;QACF,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC;QAC3D,OAAO;YACL,SAAS;SACV,CAAC;IACJ,CAAC;IAKD,gBAAgB,CAAC,SAAiB,EAAE,QAAkB;QACpD,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,SAAS,EAAE;YACjC,QAAQ,EAAE,IAAI;YACd,MAAM,EAAE,IAAI;YACZ,QAAQ,EAAE,QAAQ;SACnB,CAAC,CAAC;IACL,CAAC;IAKD,mBAAmB,CAAC,QAAkB;QACpC,QAAQ,CAAC,WAAW,CAAC,MAAM,EAAE;YAC3B,QAAQ,EAAE,IAAI;YACd,MAAM,EAAE,IAAI;YACZ,QAAQ,EAAE,QAAQ;SACnB,CAAC,CAAC;IACL,CAAC;IAKD,KAAK,CAAC,2BAA2B,CAAC,EAChC,QAAQ,EACR,QAAQ,GAIT;QACC,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,iBAAiB,CAAC,QAAQ,CAAC,CAAC;QAEhE,IAAI,CAAC,IAAI,EAAE,CAAC;YACV,MAAM,IAAI,8BAAqB,EAAE,CAAC;QACpC,CAAC;QAED,IAAI,CAAC,CAAC,MAAM,IAAA,eAAM,EAAC,IAAI,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAC,EAAE,CAAC;YAC7C,MAAM,IAAI,8BAAqB,EAAE,CAAC;QACpC,CAAC;QACD,OAAO,IAAI,CAAC;IACd,CAAC;CACF,CAAA;AAhEY,wCAAc;yBAAd,cAAc;IAD1B,IAAA,mBAAU,GAAE;qCAGY,0BAAW;QACZ,gBAAU;GAHrB,cAAc,CAgE1B"}
@@ -1 +1,2 @@
1
- export declare function bootstrap(): Promise<void>;
1
+ import { Configs } from './configs/configs.service';
2
+ export declare function bootstrap(configs: Configs): Promise<void>;
package/dist/bootstrap.js CHANGED
@@ -8,7 +8,10 @@ const core_1 = require("@nestjs/core");
8
8
  const swagger_1 = require("@nestjs/swagger");
9
9
  const app_module_1 = require("./app.module");
10
10
  const cookie_parser_1 = __importDefault(require("cookie-parser"));
11
- async function bootstrap() {
11
+ const configs_service_1 = require("./configs/configs.service");
12
+ const event_stream_processor_service_1 = require("./core/event-stream/event-stream-processor.service");
13
+ async function bootstrap(configs) {
14
+ configs_service_1.ConfigsService.init(configs);
12
15
  console.log('Environment check - SOCIAL_DEV_SERVER_PORT:', process.env.SOCIAL_DEV_SERVER_PORT);
13
16
  const app = await core_1.NestFactory.create(app_module_1.AppModule);
14
17
  app.enableCors();
@@ -28,5 +31,7 @@ async function bootstrap() {
28
31
  await app.listen(port, '0.0.0.0');
29
32
  console.log(`🚀 Server is running on http://localhost:${port}`);
30
33
  console.log(`📚 Swagger documentation available at http://localhost:${port}/schema`);
34
+ const eventStreamProcessors = app.get(event_stream_processor_service_1.EventStreamProcessorService);
35
+ eventStreamProcessors.setAppRef(app).processAll();
31
36
  }
32
37
  //# sourceMappingURL=bootstrap.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"bootstrap.js","sourceRoot":"","sources":["../src/bootstrap.ts"],"names":[],"mappings":";;;;;AAKA,8BA6BC;AAlCD,uCAA2C;AAC3C,6CAAiE;AACjE,6CAAyC;AACzC,kEAAyC;AAElC,KAAK,UAAU,SAAS;IAC7B,OAAO,CAAC,GAAG,CACT,6CAA6C,EAC7C,OAAO,CAAC,GAAG,CAAC,sBAAsB,CACnC,CAAC;IACF,MAAM,GAAG,GAAG,MAAM,kBAAW,CAAC,MAAM,CAAC,sBAAS,CAAC,CAAC;IAEhD,GAAG,CAAC,UAAU,EAAE,CAAC;IAEjB,MAAM,MAAM,GAAG,IAAI,yBAAe,EAAE;SACjC,QAAQ,CAAC,YAAY,CAAC;SACtB,cAAc,CAAC,oBAAoB,CAAC;SACpC,UAAU,CAAC,KAAK,CAAC;SACjB,MAAM,CAAC,QAAQ,CAAC;SAChB,aAAa,EAAE;SACf,KAAK,EAAE,CAAC;IACX,MAAM,eAAe,GAAG,GAAG,EAAE,CAAC,uBAAa,CAAC,cAAc,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC;IACxE,uBAAa,CAAC,KAAK,CAAC,QAAQ,EAAE,GAAG,EAAE,eAAe,EAAE;QAClD,SAAS,EAAE,uCAAuC;KACnD,CAAC,CAAC;IAEH,GAAG,CAAC,GAAG,CAAC,IAAA,uBAAY,GAAE,CAAC,CAAC;IAExB,MAAM,IAAI,GAAG,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,sBAAsB,IAAI,MAAM,CAAC,CAAC;IACpE,MAAM,GAAG,CAAC,MAAM,CAAC,IAAI,EAAE,SAAS,CAAC,CAAC;IAClC,OAAO,CAAC,GAAG,CAAC,4CAA4C,IAAI,EAAE,CAAC,CAAC;IAChE,OAAO,CAAC,GAAG,CACT,0DAA0D,IAAI,SAAS,CACxE,CAAC;AACJ,CAAC"}
1
+ {"version":3,"file":"bootstrap.js","sourceRoot":"","sources":["../src/bootstrap.ts"],"names":[],"mappings":";;;;;AAOA,8BAsCC;AA7CD,uCAA2C;AAC3C,6CAAiE;AACjE,6CAAyC;AACzC,kEAAyC;AACzC,+DAAoE;AACpE,uGAAiG;AAE1F,KAAK,UAAU,SAAS,CAAC,OAAgB;IAE9C,gCAAc,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;IAE7B,OAAO,CAAC,GAAG,CACT,6CAA6C,EAC7C,OAAO,CAAC,GAAG,CAAC,sBAAsB,CACnC,CAAC;IACF,MAAM,GAAG,GAAG,MAAM,kBAAW,CAAC,MAAM,CAAC,sBAAS,CAAC,CAAC;IAEhD,GAAG,CAAC,UAAU,EAAE,CAAC;IAEjB,MAAM,MAAM,GAAG,IAAI,yBAAe,EAAE;SACjC,QAAQ,CAAC,YAAY,CAAC;SACtB,cAAc,CAAC,oBAAoB,CAAC;SACpC,UAAU,CAAC,KAAK,CAAC;SACjB,MAAM,CAAC,QAAQ,CAAC;SAChB,aAAa,EAAE;SACf,KAAK,EAAE,CAAC;IACX,MAAM,eAAe,GAAG,GAAG,EAAE,CAAC,uBAAa,CAAC,cAAc,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC;IACxE,uBAAa,CAAC,KAAK,CAAC,QAAQ,EAAE,GAAG,EAAE,eAAe,EAAE;QAClD,SAAS,EAAE,uCAAuC;KACnD,CAAC,CAAC;IAEH,GAAG,CAAC,GAAG,CAAC,IAAA,uBAAY,GAAE,CAAC,CAAC;IAExB,MAAM,IAAI,GAAG,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,sBAAsB,IAAI,MAAM,CAAC,CAAC;IACpE,MAAM,GAAG,CAAC,MAAM,CAAC,IAAI,EAAE,SAAS,CAAC,CAAC;IAClC,OAAO,CAAC,GAAG,CAAC,4CAA4C,IAAI,EAAE,CAAC,CAAC;IAChE,OAAO,CAAC,GAAG,CACT,0DAA0D,IAAI,SAAS,CACxE,CAAC;IAKF,MAAM,qBAAqB,GAAG,GAAG,CAAC,GAAG,CAAC,4DAA2B,CAAC,CAAC;IACnE,qBAAqB,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,UAAU,EAAE,CAAC;AACpD,CAAC"}
@@ -2,14 +2,13 @@ import { ChatService } from './chat.service';
2
2
  import { CreateConversationDto } from './dto/create-conversation.dto';
3
3
  import { PaginatedResponseDto } from '~/common/dto/paginated-response.dto';
4
4
  import { ChatConversationResponseDto, ChatMessageResponseDto } from './dto/responses.dto';
5
- import { ChatConversation } from './entities/conversation.entity';
6
5
  import { CreateMessageDto } from './dto/create-message.dto';
7
6
  export declare class ChatController {
8
7
  private service;
9
8
  constructor(service: ChatService);
10
9
  getConversation(conversationId: string): Promise<ChatConversationResponseDto>;
11
10
  listConversations(): Promise<PaginatedResponseDto<ChatConversationResponseDto>>;
12
- createConversation(dto: CreateConversationDto): Promise<ChatConversation>;
11
+ createConversation(dto: CreateConversationDto): Promise<ChatConversationResponseDto>;
13
12
  deleteConversation(): void;
14
13
  getMessage(messageId: string): ChatMessageResponseDto;
15
14
  listMessages(conversationId: string): Promise<PaginatedResponseDto<ChatMessageResponseDto>>;
@@ -35,10 +35,12 @@ let ChatController = class ChatController {
35
35
  return {
36
36
  result: result.map((c) => (0, class_transformer_1.plainToInstance)(responses_dto_1.ChatConversationResponseDto, c)),
37
37
  count,
38
+ next: '',
39
+ previous: '',
38
40
  };
39
41
  }
40
- createConversation(dto) {
41
- return this.service.createConversation(dto);
42
+ async createConversation(dto) {
43
+ return (0, class_transformer_1.plainToInstance)(responses_dto_1.ChatConversationResponseDto, await this.service.createConversation(dto));
42
44
  }
43
45
  deleteConversation() { }
44
46
  getMessage(messageId) {
@@ -51,6 +53,8 @@ let ChatController = class ChatController {
51
53
  return {
52
54
  result: result.map((c) => (0, class_transformer_1.plainToInstance)(responses_dto_1.ChatMessageResponseDto, c)),
53
55
  count,
56
+ next: '',
57
+ previous: '',
54
58
  };
55
59
  }
56
60
  async sendMessage(dto) {
@@ -81,11 +85,11 @@ __decorate([
81
85
  ], ChatController.prototype, "listConversations", null);
82
86
  __decorate([
83
87
  (0, common_1.Post)('chat.conversation.create'),
84
- openapi.ApiResponse({ status: 201, type: require("./entities/conversation.entity").ChatConversation }),
88
+ openapi.ApiResponse({ status: 201, type: require("./dto/responses.dto").ChatConversationResponseDto }),
85
89
  __param(0, (0, common_1.Body)()),
86
90
  __metadata("design:type", Function),
87
91
  __metadata("design:paramtypes", [create_conversation_dto_1.CreateConversationDto]),
88
- __metadata("design:returntype", void 0)
92
+ __metadata("design:returntype", Promise)
89
93
  ], ChatController.prototype, "createConversation", null);
90
94
  __decorate([
91
95
  (0, common_1.Post)('chat.conversation.delete'),
@@ -1 +1 @@
1
- {"version":3,"file":"chat.controller.js","sourceRoot":"","sources":["../../src/chat/chat.controller.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"chat.controller.js","sourceRoot":"","sources":["../../src/chat/chat.controller.ts"],"names":[],"mappings":"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"}
@@ -14,6 +14,9 @@ const typeorm_1 = require("@nestjs/typeorm");
14
14
  const conversation_entity_1 = require("./entities/conversation.entity");
15
15
  const message_entity_1 = require("./entities/message.entity");
16
16
  const conversation_member_entity_1 = require("./entities/conversation-member.entity");
17
+ const hook_module_1 = require("../core/hook/hook.module");
18
+ const push_notification_module_1 = require("../notification/push-notification.module");
19
+ const event_stream_module_1 = require("../core/event-stream/event-stream.module");
17
20
  let ChatModule = class ChatModule {
18
21
  };
19
22
  exports.ChatModule = ChatModule;
@@ -25,6 +28,9 @@ exports.ChatModule = ChatModule = __decorate([
25
28
  conversation_member_entity_1.ChatConversationMember,
26
29
  message_entity_1.ChatMessage,
27
30
  ]),
31
+ hook_module_1.HookModule,
32
+ push_notification_module_1.PushNotificationModule,
33
+ event_stream_module_1.EventStreamModule.forFeature({ topics: ['chat'] }),
28
34
  ],
29
35
  controllers: [chat_controller_1.ChatController],
30
36
  providers: [chat_service_1.ChatService],
@@ -1 +1 @@
1
- {"version":3,"file":"chat.module.js","sourceRoot":"","sources":["../../src/chat/chat.module.ts"],"names":[],"mappings":";;;;;;;;;AAAA,2CAAwC;AACxC,uDAAmD;AACnD,iDAA6C;AAC7C,6CAAgD;AAChD,wEAAkE;AAClE,8DAAwD;AACxD,sFAA+E;AAcxE,IAAM,UAAU,GAAhB,MAAM,UAAU;CAAG,CAAA;AAAb,gCAAU;qBAAV,UAAU;IAZtB,IAAA,eAAM,EAAC;QACN,OAAO,EAAE;YACP,uBAAa,CAAC,UAAU,CAAC;gBACvB,sCAAgB;gBAChB,mDAAsB;gBACtB,4BAAW;aACZ,CAAC;SACH;QACD,WAAW,EAAE,CAAC,gCAAc,CAAC;QAC7B,SAAS,EAAE,CAAC,0BAAW,CAAC;QACxB,OAAO,EAAE,CAAC,0BAAW,CAAC;KACvB,CAAC;GACW,UAAU,CAAG"}
1
+ {"version":3,"file":"chat.module.js","sourceRoot":"","sources":["../../src/chat/chat.module.ts"],"names":[],"mappings":";;;;;;;;;AAAA,2CAAwC;AACxC,uDAAmD;AACnD,iDAA6C;AAC7C,6CAAgD;AAChD,wEAAkE;AAClE,8DAAwD;AACxD,sFAA+E;AAC/E,0DAAqD;AACrD,uFAAiF;AACjF,kFAA4E;AAiBrE,IAAM,UAAU,GAAhB,MAAM,UAAU;CAAG,CAAA;AAAb,gCAAU;qBAAV,UAAU;IAftB,IAAA,eAAM,EAAC;QACN,OAAO,EAAE;YACP,uBAAa,CAAC,UAAU,CAAC;gBACvB,sCAAgB;gBAChB,mDAAsB;gBACtB,4BAAW;aACZ,CAAC;YACF,wBAAU;YACV,iDAAsB;YACtB,uCAAiB,CAAC,UAAU,CAAC,EAAE,MAAM,EAAE,CAAC,MAAM,CAAC,EAAE,CAAC;SACnD;QACD,WAAW,EAAE,CAAC,gCAAc,CAAC;QAC7B,SAAS,EAAE,CAAC,0BAAW,CAAC;QACxB,OAAO,EAAE,CAAC,0BAAW,CAAC;KACvB,CAAC;GACW,UAAU,CAAG"}
@@ -3,20 +3,28 @@ import { DataSource, Repository } from 'typeorm';
3
3
  import { ChatMessage } from './entities/message.entity';
4
4
  import { CreateConversationDto } from './dto/create-conversation.dto';
5
5
  import { ChatConversationMember } from './entities/conversation-member.entity';
6
- import { PluginHookService } from '~/core/plugin/plugin-hook.service';
6
+ import { HookService } from '~/core/hook/hook.service';
7
+ import { PushNotificationService } from '~/notification/push-notification.service';
8
+ import { EventStreamService } from '~/core/event-stream/event-stream.service';
7
9
  export declare class ChatService {
8
10
  private conversationRepositoy;
9
11
  private memberRepositoy;
10
12
  private messageRepositoy;
11
13
  private dataSource;
12
14
  private hookService;
13
- constructor(conversationRepositoy: Repository<ChatConversation>, memberRepositoy: Repository<ChatConversationMember>, messageRepositoy: Repository<ChatMessage>, dataSource: DataSource, hookService: PluginHookService);
15
+ private eventStream;
16
+ private pushService;
17
+ constructor(conversationRepositoy: Repository<ChatConversation>, memberRepositoy: Repository<ChatConversationMember>, messageRepositoy: Repository<ChatMessage>, dataSource: DataSource, hookService: HookService, eventStream: EventStreamService, pushService: PushNotificationService);
18
+ private findExistingOneOnOneConversation;
14
19
  createConversation(dto: CreateConversationDto): Promise<ChatConversation>;
15
20
  getConversation(id: number): Promise<ChatConversation | null>;
16
21
  listConversations({ limit, offset, }: {
17
22
  limit?: number;
18
23
  offset?: number;
19
24
  }): Promise<[ChatConversation[], number]>;
25
+ listMembers({ conversationId, }: {
26
+ conversationId: ChatConversation['id'];
27
+ }): Promise<[ChatConversationMember[], number]>;
20
28
  sendMessage({ conversationId, text, }: {
21
29
  conversationId: ChatConversation['id'];
22
30
  text: string;