@social.dev/server-sdk 0.0.1-alpha.3 → 0.0.1-alpha.30
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.
- package/README.md +7 -65
- package/dist/app.module.js +2 -0
- package/dist/app.module.js.map +1 -1
- package/dist/auth/auth.controller.d.ts +2 -0
- package/dist/auth/auth.controller.js +26 -0
- package/dist/auth/auth.controller.js.map +1 -1
- package/dist/auth/auth.module.js +2 -0
- package/dist/auth/auth.module.js.map +1 -1
- package/dist/auth/auth.service.d.ts +4 -8
- package/dist/auth/auth.service.js +6 -18
- package/dist/auth/auth.service.js.map +1 -1
- package/dist/auth/dto/login-success.dto.d.ts +1 -1
- package/dist/auth/dto/login-success.dto.js +3 -3
- package/dist/auth/dto/login-success.dto.js.map +1 -1
- package/dist/auth/enums/auth-method.enum.d.ts +2 -2
- package/dist/auth/enums/auth-method.enum.js +2 -2
- package/dist/auth/enums/auth-method.enum.js.map +1 -1
- package/dist/auth/oidc/dto/requests.d.ts +6 -0
- package/dist/auth/oidc/dto/requests.js +47 -0
- package/dist/auth/oidc/dto/requests.js.map +1 -0
- package/dist/auth/oidc/dto/responses.js +1 -1
- package/dist/auth/oidc/dto/responses.js.map +1 -1
- package/dist/auth/oidc/oidc.controller.d.ts +6 -2
- package/dist/auth/oidc/oidc.controller.js +25 -17
- package/dist/auth/oidc/oidc.controller.js.map +1 -1
- package/dist/auth/oidc/oidc.module.js +2 -0
- package/dist/auth/oidc/oidc.module.js.map +1 -1
- package/dist/auth/oidc/oidc.service.d.ts +13 -7
- package/dist/auth/oidc/oidc.service.js +38 -30
- package/dist/auth/oidc/oidc.service.js.map +1 -1
- package/dist/auth/session/session.controller.js +3 -3
- package/dist/auth/session/session.controller.js.map +1 -1
- package/dist/auth/session/session.service.d.ts +2 -2
- package/dist/auth/session/session.service.js +4 -4
- package/dist/auth/session/session.service.js.map +1 -1
- package/dist/bootstrap.d.ts +2 -1
- package/dist/bootstrap.js +3 -1
- package/dist/bootstrap.js.map +1 -1
- package/dist/chat/chat.controller.d.ts +1 -2
- package/dist/chat/chat.controller.js +8 -4
- package/dist/chat/chat.controller.js.map +1 -1
- package/dist/chat/chat.module.js +2 -0
- package/dist/chat/chat.module.js.map +1 -1
- package/dist/chat/chat.service.d.ts +6 -2
- package/dist/chat/chat.service.js +38 -7
- package/dist/chat/chat.service.js.map +1 -1
- package/dist/common/dto/paginated-response.dto.d.ts +2 -0
- package/dist/common/dto/paginated-response.dto.js +14 -3
- package/dist/common/dto/paginated-response.dto.js.map +1 -1
- package/dist/common/injection-tokens.d.ts +2 -0
- package/dist/common/injection-tokens.js +6 -0
- package/dist/common/injection-tokens.js.map +1 -0
- package/dist/community/community.controller.d.ts +1 -2
- package/dist/community/community.controller.js +9 -5
- package/dist/community/community.controller.js.map +1 -1
- package/dist/community/community.module.js +1 -0
- package/dist/community/community.module.js.map +1 -1
- package/dist/community/community.service.d.ts +10 -3
- package/dist/community/community.service.js +30 -12
- package/dist/community/community.service.js.map +1 -1
- package/dist/configs/configs.module.js +3 -0
- package/dist/configs/configs.module.js.map +1 -1
- package/dist/configs/configs.service.d.ts +20 -0
- package/dist/configs/configs.service.js +14 -1
- package/dist/configs/configs.service.js.map +1 -1
- package/dist/core/context/context.store.d.ts +1 -0
- package/dist/core/hook/hook.module.d.ts +4 -0
- package/dist/core/hook/hook.module.js +30 -0
- package/dist/core/hook/hook.module.js.map +1 -0
- package/dist/core/hook/hook.service.d.ts +7 -0
- package/dist/core/{plugin/plugin-hook.service.js → hook/hook.service.js} +10 -10
- package/dist/core/hook/hook.service.js.map +1 -0
- package/dist/core/plugin/plugin.module.js +7 -5
- package/dist/core/plugin/plugin.module.js.map +1 -1
- package/dist/db.js +1 -1
- package/dist/db.js.map +1 -1
- package/dist/file-storage/file-storage.service.d.ts +1 -1
- package/dist/file-storage/file-storage.service.js +6 -6
- package/dist/file-storage/file-storage.service.js.map +1 -1
- package/dist/file-storage/utils.js +1 -1
- package/dist/file-storage/utils.js.map +1 -1
- package/dist/index.d.ts +0 -1
- package/dist/index.js +1 -3
- package/dist/index.js.map +1 -1
- package/dist/media/entities/media.entity.js +1 -1
- package/dist/media/entities/media.entity.js.map +1 -1
- package/dist/media/media.acl.d.ts +2 -4
- package/dist/media/media.acl.js +3 -0
- package/dist/media/media.acl.js.map +1 -1
- package/dist/media/media.service.js +15 -12
- package/dist/media/media.service.js.map +1 -1
- package/dist/{1756201302119-migrations.d.ts → migrations/1757061785934-PushNotificationTokens.d.ts} +1 -1
- package/dist/migrations/1757061785934-PushNotificationTokens.js +20 -0
- package/dist/migrations/1757061785934-PushNotificationTokens.js.map +1 -0
- package/dist/network/network.middleware.js +6 -2
- package/dist/network/network.middleware.js.map +1 -1
- package/dist/network/network.module.js +2 -1
- package/dist/network/network.module.js.map +1 -1
- package/dist/network/network.service.d.ts +5 -2
- package/dist/network/network.service.js +23 -6
- package/dist/network/network.service.js.map +1 -1
- package/dist/notification/dto/delete-push-token.dto.d.ts +3 -0
- package/dist/{common/entities/base.repository.js → notification/dto/delete-push-token.dto.js} +14 -20
- package/dist/notification/dto/delete-push-token.dto.js.map +1 -0
- package/dist/notification/dto/register-push-token.dto.d.ts +5 -0
- package/dist/notification/dto/register-push-token.dto.js +38 -0
- package/dist/notification/dto/register-push-token.dto.js.map +1 -0
- package/dist/notification/entities/push-token.entity.d.ts +11 -0
- package/dist/notification/entities/push-token.entity.js +60 -0
- package/dist/notification/entities/push-token.entity.js.map +1 -0
- package/dist/notification/enums/push-service.enum.d.ts +6 -0
- package/dist/notification/enums/push-service.enum.js +11 -0
- package/dist/notification/enums/push-service.enum.js.map +1 -0
- package/dist/notification/hook-listener.service.d.ts +13 -0
- package/dist/notification/hook-listener.service.js +58 -0
- package/dist/notification/hook-listener.service.js.map +1 -0
- package/dist/notification/notification.module.d.ts +2 -0
- package/dist/notification/notification.module.js +34 -0
- package/dist/notification/notification.module.js.map +1 -0
- package/dist/notification/push-notification.controller.d.ts +9 -0
- package/dist/notification/push-notification.controller.js +69 -0
- package/dist/notification/push-notification.controller.js.map +1 -0
- package/dist/notification/push-notification.service.d.ts +22 -0
- package/dist/notification/push-notification.service.js +84 -0
- package/dist/notification/push-notification.service.js.map +1 -0
- package/dist/post/post.controller.d.ts +3 -2
- package/dist/post/post.controller.js +28 -8
- package/dist/post/post.controller.js.map +1 -1
- package/dist/post/post.module.js +2 -0
- package/dist/post/post.module.js.map +1 -1
- package/dist/post/post.service.d.ts +7 -3
- package/dist/post/post.service.js +18 -8
- package/dist/post/post.service.js.map +1 -1
- package/dist/tsconfig.build.tsbuildinfo +1 -1
- package/dist/user/constants.d.ts +1 -0
- package/dist/user/constants.js +5 -0
- package/dist/user/constants.js.map +1 -0
- package/dist/user/user.controller.d.ts +2 -1
- package/dist/user/user.controller.js +9 -4
- package/dist/user/user.controller.js.map +1 -1
- package/dist/user/user.module.js +2 -0
- package/dist/user/user.module.js.map +1 -1
- package/dist/user/user.service.d.ts +3 -1
- package/dist/user/user.service.js +12 -3
- package/dist/user/user.service.js.map +1 -1
- package/package.json +1 -1
- package/dist/1756201302119-migrations.js +0 -84
- package/dist/1756201302119-migrations.js.map +0 -1
- package/dist/auth/enums/auth-methods.enum.d.ts +0 -2
- package/dist/auth/enums/auth-methods.enum.js +0 -7
- package/dist/auth/enums/auth-methods.enum.js.map +0 -1
- package/dist/auth/session/auth.controller.d.ts +0 -10
- package/dist/auth/session/auth.controller.js +0 -92
- package/dist/auth/session/auth.controller.js.map +0 -1
- package/dist/auth/session/auth.service.d.ts +0 -12
- package/dist/auth/session/auth.service.js +0 -46
- package/dist/auth/session/auth.service.js.map +0 -1
- package/dist/common/entities/base.repository.d.ts +0 -7
- package/dist/common/entities/base.repository.js.map +0 -1
- package/dist/core/plugin/plugin-hook.service.d.ts +0 -7
- package/dist/core/plugin/plugin-hook.service.js.map +0 -1
|
@@ -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
|
-
|
|
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:
|
|
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
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
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 {
|
|
135
|
-
return {
|
|
141
|
+
const { authToken } = await this.sessions.create(user);
|
|
142
|
+
return { authToken, user };
|
|
136
143
|
}
|
|
137
|
-
async getUserInfo(endpoint,
|
|
144
|
+
async getUserInfo(endpoint, authToken) {
|
|
138
145
|
const res = await (0, rxjs_1.firstValueFrom)(this.http.get(endpoint, {
|
|
139
146
|
headers: {
|
|
140
|
-
Authorization: `Bearer ${
|
|
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":";;;;;;;;;;;;;;;AAAA,yCAA4C;AAC5C,
|
|
1
|
+
{"version":3,"file":"oidc.service.js","sourceRoot":"","sources":["../../../src/auth/oidc/oidc.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -32,9 +32,9 @@ let SessionController = class SessionController {
|
|
|
32
32
|
username: signInDto.username,
|
|
33
33
|
password: signInDto.password,
|
|
34
34
|
});
|
|
35
|
-
const {
|
|
36
|
-
this.service.setSessionCookie(
|
|
37
|
-
res.send({
|
|
35
|
+
const { authToken } = await this.service.create(user);
|
|
36
|
+
this.service.setSessionCookie(authToken, res);
|
|
37
|
+
res.send({ authToken, user: (0, class_transformer_1.plainToInstance)(user_response_dto_1.UserResponseDto, user) });
|
|
38
38
|
}
|
|
39
39
|
async logout(res) {
|
|
40
40
|
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,
|
|
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,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,EAAE,SAAS,EAAE,IAAI,EAAE,IAAA,mCAAe,EAAC,mCAAe,EAAE,IAAI,CAAC,EAAE,CAAC,CAAC;IACxE,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"}
|
|
@@ -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
|
-
|
|
10
|
+
authToken: string;
|
|
11
11
|
}>;
|
|
12
|
-
setSessionCookie(
|
|
12
|
+
setSessionCookie(authToken: string, response: Response): void;
|
|
13
13
|
deleteSessionCookie(response: Response): void;
|
|
14
14
|
getUserFromUsernamePassword({ username, password, }: {
|
|
15
15
|
username: string;
|
|
@@ -26,13 +26,13 @@ let SessionService = class SessionService {
|
|
|
26
26
|
sub: user.id,
|
|
27
27
|
username: user.username,
|
|
28
28
|
};
|
|
29
|
-
const
|
|
29
|
+
const authToken = await this.jwtService.signAsync(payload);
|
|
30
30
|
return {
|
|
31
|
-
|
|
31
|
+
authToken,
|
|
32
32
|
};
|
|
33
33
|
}
|
|
34
|
-
setSessionCookie(
|
|
35
|
-
response.cookie('sess',
|
|
34
|
+
setSessionCookie(authToken, response) {
|
|
35
|
+
response.cookie('sess', authToken, {
|
|
36
36
|
httpOnly: true,
|
|
37
37
|
secure: true,
|
|
38
38
|
sameSite: 'strict',
|
|
@@ -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,
|
|
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,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;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"}
|
package/dist/bootstrap.d.ts
CHANGED
|
@@ -1 +1,2 @@
|
|
|
1
|
-
|
|
1
|
+
import { Configs } from './configs/configs.service';
|
|
2
|
+
export declare function bootstrap(configs: Configs): Promise<void>;
|
package/dist/bootstrap.js
CHANGED
|
@@ -8,7 +8,9 @@ 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
|
-
|
|
11
|
+
const configs_service_1 = require("./configs/configs.service");
|
|
12
|
+
async function bootstrap(configs) {
|
|
13
|
+
configs_service_1.ConfigsService.init(configs);
|
|
12
14
|
console.log('Environment check - SOCIAL_DEV_SERVER_PORT:', process.env.SOCIAL_DEV_SERVER_PORT);
|
|
13
15
|
const app = await core_1.NestFactory.create(app_module_1.AppModule);
|
|
14
16
|
app.enableCors();
|
package/dist/bootstrap.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"bootstrap.js","sourceRoot":"","sources":["../src/bootstrap.ts"],"names":[],"mappings":";;;;;
|
|
1
|
+
{"version":3,"file":"bootstrap.js","sourceRoot":"","sources":["../src/bootstrap.ts"],"names":[],"mappings":";;;;;AAMA,8BAgCC;AAtCD,uCAA2C;AAC3C,6CAAiE;AACjE,6CAAyC;AACzC,kEAAyC;AACzC,+DAAoE;AAE7D,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;AACJ,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<
|
|
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("./
|
|
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",
|
|
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":";;;;;;;;;;;;;;;;AAAA,2CAAoE;AACpE,iDAA6C;AAC7C,2EAAsE;AAEtE,uDAG6B;AAC7B,wFAAkF;AAClF,yDAAoD;AAGpD,iEAA4D;AAGrD,IAAM,cAAc,GAApB,MAAM,cAAc;IACL;IAApB,YAAoB,OAAoB;QAApB,YAAO,GAAP,OAAO,CAAa;IAAG,CAAC;IAGtC,AAAN,KAAK,CAAC,eAAe,CACI,cAAsB;QAE7C,MAAM,YAAY,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,eAAe,CAAC,CAAC,cAAc,CAAC,CAAC;QACzE,OAAO,IAAA,mCAAe,EAAC,2CAA2B,EAAE,YAAY,CAAC,CAAC;IACpE,CAAC;IAIK,AAAN,KAAK,CAAC,iBAAiB;QAGrB,MAAM,CAAC,MAAM,EAAE,KAAK,CAAC,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,iBAAiB,CAAC,EAAE,CAAC,CAAC;QACjE,OAAO;YACL,MAAM,EAAE,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CACvB,IAAA,mCAAe,EAAC,2CAA2B,EAAE,CAAC,CAAC,CAChD;YACD,KAAK;
|
|
1
|
+
{"version":3,"file":"chat.controller.js","sourceRoot":"","sources":["../../src/chat/chat.controller.ts"],"names":[],"mappings":"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"}
|
package/dist/chat/chat.module.js
CHANGED
|
@@ -14,6 +14,7 @@ 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");
|
|
17
18
|
let ChatModule = class ChatModule {
|
|
18
19
|
};
|
|
19
20
|
exports.ChatModule = ChatModule;
|
|
@@ -25,6 +26,7 @@ exports.ChatModule = ChatModule = __decorate([
|
|
|
25
26
|
conversation_member_entity_1.ChatConversationMember,
|
|
26
27
|
message_entity_1.ChatMessage,
|
|
27
28
|
]),
|
|
29
|
+
hook_module_1.HookModule,
|
|
28
30
|
],
|
|
29
31
|
controllers: [chat_controller_1.ChatController],
|
|
30
32
|
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;
|
|
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;AAE/E,0DAAqD;AAe9C,IAAM,UAAU,GAAhB,MAAM,UAAU;CAAG,CAAA;AAAb,gCAAU;qBAAV,UAAU;IAbtB,IAAA,eAAM,EAAC;QACN,OAAO,EAAE;YACP,uBAAa,CAAC,UAAU,CAAC;gBACvB,sCAAgB;gBAChB,mDAAsB;gBACtB,4BAAW;aACZ,CAAC;YACF,wBAAU;SACX;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,24 @@ 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 {
|
|
6
|
+
import { HookService } from '~/core/hook/hook.service';
|
|
7
7
|
export declare class ChatService {
|
|
8
8
|
private conversationRepositoy;
|
|
9
9
|
private memberRepositoy;
|
|
10
10
|
private messageRepositoy;
|
|
11
11
|
private dataSource;
|
|
12
12
|
private hookService;
|
|
13
|
-
constructor(conversationRepositoy: Repository<ChatConversation>, memberRepositoy: Repository<ChatConversationMember>, messageRepositoy: Repository<ChatMessage>, dataSource: DataSource, hookService:
|
|
13
|
+
constructor(conversationRepositoy: Repository<ChatConversation>, memberRepositoy: Repository<ChatConversationMember>, messageRepositoy: Repository<ChatMessage>, dataSource: DataSource, hookService: HookService);
|
|
14
|
+
private findExistingOneOnOneConversation;
|
|
14
15
|
createConversation(dto: CreateConversationDto): Promise<ChatConversation>;
|
|
15
16
|
getConversation(id: number): Promise<ChatConversation | null>;
|
|
16
17
|
listConversations({ limit, offset, }: {
|
|
17
18
|
limit?: number;
|
|
18
19
|
offset?: number;
|
|
19
20
|
}): Promise<[ChatConversation[], number]>;
|
|
21
|
+
listMembers({ conversationId, }: {
|
|
22
|
+
conversationId: ChatConversation['id'];
|
|
23
|
+
}): Promise<[ChatConversationMember[], number]>;
|
|
20
24
|
sendMessage({ conversationId, text, }: {
|
|
21
25
|
conversationId: ChatConversation['id'];
|
|
22
26
|
text: string;
|
|
@@ -21,7 +21,8 @@ const message_entity_1 = require("./entities/message.entity");
|
|
|
21
21
|
const conversation_member_entity_1 = require("./entities/conversation-member.entity");
|
|
22
22
|
const context_1 = require("../core/context/context");
|
|
23
23
|
const user_entity_1 = require("../user/entities/user.entity");
|
|
24
|
-
const
|
|
24
|
+
const hook_service_1 = require("../core/hook/hook.service");
|
|
25
|
+
const conversation_type_enum_1 = require("./enums/conversation-type.enum");
|
|
25
26
|
let ChatService = class ChatService {
|
|
26
27
|
conversationRepositoy;
|
|
27
28
|
memberRepositoy;
|
|
@@ -35,17 +36,42 @@ let ChatService = class ChatService {
|
|
|
35
36
|
this.dataSource = dataSource;
|
|
36
37
|
this.hookService = hookService;
|
|
37
38
|
}
|
|
39
|
+
async findExistingOneOnOneConversation(otherUserId) {
|
|
40
|
+
const currentUserId = context_1.Context.getUser()?.id;
|
|
41
|
+
return await this.conversationRepositoy
|
|
42
|
+
.createQueryBuilder('conversation')
|
|
43
|
+
.innerJoin('conversation.members', 'm1')
|
|
44
|
+
.innerJoin('conversation.members', 'm2')
|
|
45
|
+
.where('m1.userId = :currentUserId', { currentUserId })
|
|
46
|
+
.andWhere('m2.userId = :otherUserId', { otherUserId })
|
|
47
|
+
.andWhere('conversation.type = :type', { type: conversation_type_enum_1.ConversationType.OneOnOne })
|
|
48
|
+
.getOne();
|
|
49
|
+
}
|
|
38
50
|
async createConversation(dto) {
|
|
51
|
+
const currentUserId = context_1.Context.getUser()?.id;
|
|
52
|
+
if (dto.members.length === 1) {
|
|
53
|
+
const existingConversation = await this.findExistingOneOnOneConversation(dto.members[0]);
|
|
54
|
+
if (existingConversation) {
|
|
55
|
+
if (dto.message) {
|
|
56
|
+
await this.sendMessage({
|
|
57
|
+
conversationId: existingConversation.id,
|
|
58
|
+
text: dto.message.text,
|
|
59
|
+
});
|
|
60
|
+
}
|
|
61
|
+
return existingConversation;
|
|
62
|
+
}
|
|
63
|
+
}
|
|
39
64
|
return await this.dataSource.transaction('SERIALIZABLE', async (manager) => {
|
|
40
|
-
let conversation = manager.create(conversation_entity_1.ChatConversation, {
|
|
65
|
+
let conversation = manager.create(conversation_entity_1.ChatConversation, {
|
|
66
|
+
type: dto.members.length === 1
|
|
67
|
+
? conversation_type_enum_1.ConversationType.OneOnOne
|
|
68
|
+
: conversation_type_enum_1.ConversationType.OneOnOne,
|
|
69
|
+
});
|
|
41
70
|
conversation = await manager.save(conversation_entity_1.ChatConversation, conversation);
|
|
42
|
-
|
|
43
|
-
}
|
|
44
|
-
const memberRecords = [...dto.members, context_1.Context.getUser()?.id].map((userId) => manager.create(conversation_member_entity_1.ChatConversationMember, {
|
|
71
|
+
const memberRecords = [...dto.members, currentUserId].map((userId) => manager.create(conversation_member_entity_1.ChatConversationMember, {
|
|
45
72
|
conversationId: conversation.id,
|
|
46
73
|
userId: userId,
|
|
47
74
|
}));
|
|
48
|
-
console.log(memberRecords);
|
|
49
75
|
await manager.save(conversation_member_entity_1.ChatConversationMember, memberRecords);
|
|
50
76
|
if (dto.message) {
|
|
51
77
|
await this.sendMessage({
|
|
@@ -64,6 +90,11 @@ let ChatService = class ChatService {
|
|
|
64
90
|
const result = await query.getManyAndCount();
|
|
65
91
|
return result;
|
|
66
92
|
}
|
|
93
|
+
async listMembers({ conversationId, }) {
|
|
94
|
+
return this.memberRepositoy.findAndCountBy({
|
|
95
|
+
conversationId,
|
|
96
|
+
});
|
|
97
|
+
}
|
|
67
98
|
async sendMessage({ conversationId, text, }) {
|
|
68
99
|
let message = this.messageRepositoy.create({
|
|
69
100
|
conversation: { id: conversationId },
|
|
@@ -108,6 +139,6 @@ exports.ChatService = ChatService = __decorate([
|
|
|
108
139
|
typeorm_2.Repository,
|
|
109
140
|
typeorm_2.Repository,
|
|
110
141
|
typeorm_2.DataSource,
|
|
111
|
-
|
|
142
|
+
hook_service_1.HookService])
|
|
112
143
|
], ChatService);
|
|
113
144
|
//# sourceMappingURL=chat.service.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"chat.service.js","sourceRoot":"","sources":["../../src/chat/chat.service.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,2CAA4C;AAC5C,6CAAmD;AACnD,wEAAkE;AAClE,
|
|
1
|
+
{"version":3,"file":"chat.service.js","sourceRoot":"","sources":["../../src/chat/chat.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -16,19 +16,30 @@ const class_transformer_1 = require("class-transformer");
|
|
|
16
16
|
class PaginatedResponseDto {
|
|
17
17
|
result;
|
|
18
18
|
count;
|
|
19
|
+
next;
|
|
20
|
+
previous;
|
|
19
21
|
static _OPENAPI_METADATA_FACTORY() {
|
|
20
|
-
return { result: { required: true }, count: { required: true, type: () => Number } };
|
|
22
|
+
return { result: { required: true }, count: { required: true, type: () => Number }, next: { required: true, type: () => String }, previous: { required: true, type: () => String } };
|
|
21
23
|
}
|
|
22
24
|
}
|
|
23
25
|
exports.PaginatedResponseDto = PaginatedResponseDto;
|
|
24
26
|
__decorate([
|
|
25
|
-
(0, swagger_1.ApiProperty)({ description: '
|
|
27
|
+
(0, swagger_1.ApiProperty)({ description: 'Results', isArray: true }),
|
|
26
28
|
(0, class_transformer_1.Expose)(),
|
|
27
29
|
__metadata("design:type", Array)
|
|
28
30
|
], PaginatedResponseDto.prototype, "result", void 0);
|
|
29
31
|
__decorate([
|
|
30
|
-
(0, swagger_1.ApiProperty)({ description: '
|
|
32
|
+
(0, swagger_1.ApiProperty)({ description: 'Total number available' }),
|
|
31
33
|
(0, class_transformer_1.Expose)(),
|
|
32
34
|
__metadata("design:type", Number)
|
|
33
35
|
], PaginatedResponseDto.prototype, "count", void 0);
|
|
36
|
+
__decorate([
|
|
37
|
+
(0, swagger_1.ApiProperty)({ description: 'Cursor to use for the next page' }),
|
|
38
|
+
(0, class_transformer_1.Expose)(),
|
|
39
|
+
__metadata("design:type", String)
|
|
40
|
+
], PaginatedResponseDto.prototype, "next", void 0);
|
|
41
|
+
__decorate([
|
|
42
|
+
(0, swagger_1.ApiProperty)({ description: 'Cursor to use for the previous page' }),
|
|
43
|
+
__metadata("design:type", String)
|
|
44
|
+
], PaginatedResponseDto.prototype, "previous", void 0);
|
|
34
45
|
//# sourceMappingURL=paginated-response.dto.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"paginated-response.dto.js","sourceRoot":"","sources":["../../../src/common/dto/paginated-response.dto.ts"],"names":[],"mappings":";;;;;;;;;;;;;AAAA,6CAA8C;AAC9C,yDAAiD;AAEjD,MAAa,oBAAoB;IAG/B,MAAM,CAAM;IAIZ,KAAK,CAAS;;;;
|
|
1
|
+
{"version":3,"file":"paginated-response.dto.js","sourceRoot":"","sources":["../../../src/common/dto/paginated-response.dto.ts"],"names":[],"mappings":";;;;;;;;;;;;;AAAA,6CAA8C;AAC9C,yDAAiD;AAEjD,MAAa,oBAAoB;IAG/B,MAAM,CAAM;IAIZ,KAAK,CAAS;IAId,IAAI,CAAS;IAGb,QAAQ,CAAS;;;;CAClB;AAfD,oDAeC;AAZC;IAFC,IAAA,qBAAW,EAAC,EAAE,WAAW,EAAE,SAAS,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC;IACtD,IAAA,0BAAM,GAAE;;oDACG;AAIZ;IAFC,IAAA,qBAAW,EAAC,EAAE,WAAW,EAAE,wBAAwB,EAAE,CAAC;IACtD,IAAA,0BAAM,GAAE;;mDACK;AAId;IAFC,IAAA,qBAAW,EAAC,EAAE,WAAW,EAAE,iCAAiC,EAAE,CAAC;IAC/D,IAAA,0BAAM,GAAE;;kDACI;AAGb;IADC,IAAA,qBAAW,EAAC,EAAE,WAAW,EAAE,qCAAqC,EAAE,CAAC;;sDACnD"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"injection-tokens.js","sourceRoot":"","sources":["../../src/common/injection-tokens.ts"],"names":[],"mappings":";;;AAAa,QAAA,IAAI,GAAG,MAAM,CAAC;AACd,QAAA,OAAO,GAAG,SAAS,CAAC"}
|
|
@@ -1,7 +1,6 @@
|
|
|
1
1
|
import { CommunityService } from './community.service';
|
|
2
2
|
import { CreateCommunityDto } from './dto/create-community.dto';
|
|
3
3
|
import { Request } from 'express';
|
|
4
|
-
import { Community } from './entities/community.entity';
|
|
5
4
|
import { CommunityMembershipResponseDto, CommunityResponseDto } from './dto/community-response.dto';
|
|
6
5
|
import { PaginatedResponseDto } from '~/common/dto/paginated-response.dto';
|
|
7
6
|
import { CommunityMembershipListItemResponseDto } from './dto/community-members-response.dto';
|
|
@@ -12,7 +11,7 @@ export declare class CommunityController {
|
|
|
12
11
|
private readonly service;
|
|
13
12
|
private readonly userService;
|
|
14
13
|
constructor(service: CommunityService, userService: UserService);
|
|
15
|
-
create(dto: CreateCommunityDto): Promise<
|
|
14
|
+
create(dto: CreateCommunityDto): Promise<CommunityResponseDto>;
|
|
16
15
|
info(id: string): Promise<CommunityResponseDto>;
|
|
17
16
|
remove({ community: id }: CommunityIdDto): string;
|
|
18
17
|
join(dto: CommunityIdDto): Promise<CommunityMembershipResponseDto>;
|
|
@@ -37,8 +37,8 @@ let CommunityController = class CommunityController {
|
|
|
37
37
|
this.service = service;
|
|
38
38
|
this.userService = userService;
|
|
39
39
|
}
|
|
40
|
-
create(dto) {
|
|
41
|
-
return this.service.create(dto);
|
|
40
|
+
async create(dto) {
|
|
41
|
+
return (0, class_transformer_1.plainToInstance)(community_response_dto_1.CommunityResponseDto, await this.service.create(dto));
|
|
42
42
|
}
|
|
43
43
|
async info(id) {
|
|
44
44
|
return (0, class_transformer_1.plainToInstance)(community_response_dto_1.CommunityResponseDto, this.service.findOne(+id));
|
|
@@ -52,7 +52,7 @@ let CommunityController = class CommunityController {
|
|
|
52
52
|
throw new common_1.NotFoundException();
|
|
53
53
|
}
|
|
54
54
|
const user = context_1.Context.getUser();
|
|
55
|
-
const membership = await this.service.join(community, user);
|
|
55
|
+
const membership = await this.service.join({ community, user });
|
|
56
56
|
return (0, class_transformer_1.plainToInstance)(community_response_dto_1.CommunityMembershipResponseDto, membership);
|
|
57
57
|
}
|
|
58
58
|
async leave({ community: id }) {
|
|
@@ -108,6 +108,8 @@ let CommunityController = class CommunityController {
|
|
|
108
108
|
return {
|
|
109
109
|
result: result.map((member) => (0, class_transformer_1.plainToInstance)(community_members_response_dto_1.CommunityMembershipListItemResponseDto, member)),
|
|
110
110
|
count,
|
|
111
|
+
next: '',
|
|
112
|
+
previous: '',
|
|
111
113
|
};
|
|
112
114
|
}
|
|
113
115
|
async listCommunities(limit = 100, offset = 0, member = false, req) {
|
|
@@ -121,6 +123,8 @@ let CommunityController = class CommunityController {
|
|
|
121
123
|
return {
|
|
122
124
|
result: result.map((s) => (0, class_transformer_1.plainToInstance)(community_response_dto_1.CommunityResponseDto, s)),
|
|
123
125
|
count,
|
|
126
|
+
next: '',
|
|
127
|
+
previous: '',
|
|
124
128
|
};
|
|
125
129
|
}
|
|
126
130
|
};
|
|
@@ -132,11 +136,11 @@ __decorate([
|
|
|
132
136
|
If successful, the command returns a community entity.`,
|
|
133
137
|
}),
|
|
134
138
|
(0, common_1.Post)('community.create'),
|
|
135
|
-
openapi.ApiResponse({ status: 201, type: require("./
|
|
139
|
+
openapi.ApiResponse({ status: 201, type: require("./dto/community-response.dto").CommunityResponseDto }),
|
|
136
140
|
__param(0, (0, common_1.Body)()),
|
|
137
141
|
__metadata("design:type", Function),
|
|
138
142
|
__metadata("design:paramtypes", [create_community_dto_1.CreateCommunityDto]),
|
|
139
|
-
__metadata("design:returntype",
|
|
143
|
+
__metadata("design:returntype", Promise)
|
|
140
144
|
], CommunityController.prototype, "create", null);
|
|
141
145
|
__decorate([
|
|
142
146
|
(0, swagger_1.ApiOperation)({
|