@roadmanjs/chat 1.3.4 → 1.3.5
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/dist/chat/methods/ChatConvo.methods.js +1 -1
- package/dist/chat/methods/ChatConvo.methods.js.map +1 -1
- package/dist/chat/resolvers/ChatConvo.resolver.js +2 -2
- package/dist/chat/resolvers/ChatConvo.resolver.js.map +1 -1
- package/dist/chat/resolvers/ChatMessage.resolver.js +9 -2
- package/dist/chat/resolvers/ChatMessage.resolver.js.map +1 -1
- package/dist/chat/subscriptions/chatConvo.subscription.d.ts +0 -1
- package/dist/chat/subscriptions/chatConvo.subscription.js +1 -6
- package/dist/chat/subscriptions/chatConvo.subscription.js.map +1 -1
- package/package.json +1 -1
- package/src/chat/methods/ChatConvo.methods.ts +1 -1
- package/src/chat/resolvers/ChatConvo.resolver.ts +3 -2
- package/src/chat/resolvers/ChatMessage.resolver.ts +17 -4
- package/src/chat/subscriptions/chatConvo.subscription.ts +0 -6
|
@@ -223,7 +223,7 @@ const updateConvoSubscriptions = async (args) => {
|
|
|
223
223
|
await (0, pubsub_utils_1.sendPushNotification)(sender, pushmessage);
|
|
224
224
|
}
|
|
225
225
|
// Send subscriptions to owners
|
|
226
|
-
return (0, pubsub_utils_1.publishMessageToTopic)(context, [ChatConvo_model_1.ChatConvo.name
|
|
226
|
+
return (0, pubsub_utils_1.publishMessageToTopic)(context, [ChatConvo_model_1.ChatConvo.name], Object.assign({ convoId, owner: convo.owner }, subscriptionData)); // update sockets
|
|
227
227
|
})));
|
|
228
228
|
(0, logs_1.log)(`updated subscriptions from=${sender} with data=${data}`, membersConvos.map((uc) => uc.id));
|
|
229
229
|
// update sockets
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ChatConvo.methods.js","sourceRoot":"","sources":["../../../src/chat/methods/ChatConvo.methods.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"ChatConvo.methods.js","sourceRoot":"","sources":["../../../src/chat/methods/ChatConvo.methods.ts"],"names":[],"mappings":"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"}
|
|
@@ -22,7 +22,6 @@ const models_1 = require("../models");
|
|
|
22
22
|
const get_1 = __importDefault(require("lodash/get"));
|
|
23
23
|
const ConvoPagination = (0, ContextType_1.getPagination)(ChatConvo_model_1.ChatConvo);
|
|
24
24
|
let ChatConvoResolver = class ChatConvoResolver {
|
|
25
|
-
// TODO auth middleware
|
|
26
25
|
onConvos(data, owner, time // just to make the client HOT
|
|
27
26
|
) {
|
|
28
27
|
return Object.assign({ time, owner }, data);
|
|
@@ -45,8 +44,9 @@ exports.ChatConvoResolver = ChatConvoResolver;
|
|
|
45
44
|
__decorate([
|
|
46
45
|
(0, type_graphql_1.Subscription)(() => models_1.OnChatMessage, {
|
|
47
46
|
topics: ChatConvo_model_1.ChatConvo.name,
|
|
48
|
-
filter: ({ payload,
|
|
47
|
+
filter: ({ payload, context }) => { var _a; return ((_a = context === null || context === void 0 ? void 0 : context.payload) === null || _a === void 0 ? void 0 : _a.userId) === payload.owner; },
|
|
49
48
|
}),
|
|
49
|
+
(0, type_graphql_1.UseMiddleware)(auth_1.isAuth),
|
|
50
50
|
__param(0, (0, type_graphql_1.Root)()),
|
|
51
51
|
__param(1, (0, type_graphql_1.Arg)('owner', () => String, { nullable: false })),
|
|
52
52
|
__param(2, (0, type_graphql_1.Arg)('time', () => Date, { nullable: true }))
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ChatConvo.resolver.js","sourceRoot":"","sources":["../../../src/chat/resolvers/ChatConvo.resolver.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,+CAAoG;AACpG,+DAAmE;AACnE,oFAK8C;AAC9C,0CAAuC;AACvC,0DAAiF;AACjF,sCAAwC;AACxC,qDAA8B;AAE9B,MAAM,eAAe,GAAG,IAAA,2BAAa,EAAC,2BAAS,CAAC,CAAC;AAG1C,IAAM,iBAAiB,GAAvB,MAAM,iBAAiB;
|
|
1
|
+
{"version":3,"file":"ChatConvo.resolver.js","sourceRoot":"","sources":["../../../src/chat/resolvers/ChatConvo.resolver.ts"],"names":[],"mappings":"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"}
|
|
@@ -17,7 +17,6 @@ const ChatMessage_model_1 = require("../models/ChatMessage.model");
|
|
|
17
17
|
const ChatMessageResolver_methods_1 = require("../methods/ChatMessageResolver.methods");
|
|
18
18
|
const ChatPagination = (0, ContextType_1.getPagination)(ChatMessage_model_1.ChatMessage);
|
|
19
19
|
let ChatMessageResolver = class ChatMessageResolver {
|
|
20
|
-
// TODO subscriptions and auth middleware
|
|
21
20
|
onChatMessage(data, owner, convoId, time) {
|
|
22
21
|
return Object.assign({ convoId, time, owner }, data);
|
|
23
22
|
}
|
|
@@ -36,8 +35,16 @@ exports.ChatMessageResolver = ChatMessageResolver;
|
|
|
36
35
|
__decorate([
|
|
37
36
|
(0, type_graphql_1.Subscription)(() => ChatMessage_model_1.OnChatMessage, {
|
|
38
37
|
topics: ChatMessage_model_1.ChatMessage.name,
|
|
39
|
-
filter: ({ payload, args }) =>
|
|
38
|
+
filter: ({ payload, args, context, }) => {
|
|
39
|
+
var _a;
|
|
40
|
+
const requester = (_a = context === null || context === void 0 ? void 0 : context.payload) === null || _a === void 0 ? void 0 : _a.userId;
|
|
41
|
+
if (!requester) {
|
|
42
|
+
return args.convoId === payload.convoId;
|
|
43
|
+
}
|
|
44
|
+
return args.convoId === payload.convoId && requester !== payload.owner;
|
|
45
|
+
},
|
|
40
46
|
}),
|
|
47
|
+
(0, type_graphql_1.UseMiddleware)(auth_1.optionalAuth),
|
|
41
48
|
__param(0, (0, type_graphql_1.Root)()),
|
|
42
49
|
__param(1, (0, type_graphql_1.Arg)('owner', () => String, { nullable: true })),
|
|
43
50
|
__param(2, (0, type_graphql_1.Arg)('convoId', () => String, { nullable: false })),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ChatMessage.resolver.js","sourceRoot":"","sources":["../../../src/chat/resolvers/ChatMessage.resolver.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,+CAAoG;AACpG,0DAAiF;AACjF,
|
|
1
|
+
{"version":3,"file":"ChatMessage.resolver.js","sourceRoot":"","sources":["../../../src/chat/resolvers/ChatMessage.resolver.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,13 +3,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
3
3
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
4
|
};
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
-
exports.ON_CONVOS_SUBSCRIPTION =
|
|
6
|
+
exports.ON_CONVOS_SUBSCRIPTION = void 0;
|
|
7
7
|
const graphql_tag_1 = __importDefault(require("graphql-tag"));
|
|
8
|
-
exports.ON_CHAT_CONVO_SUBSCRIPTION = (0, graphql_tag_1.default) `
|
|
9
|
-
subscription onChatConvo($convoId: String!) {
|
|
10
|
-
data: onChatConvo(convoId: $convoId)
|
|
11
|
-
}
|
|
12
|
-
`;
|
|
13
8
|
exports.ON_CONVOS_SUBSCRIPTION = (0, graphql_tag_1.default) `
|
|
14
9
|
subscription OnConvos($owner: String!, $time: DateTime) {
|
|
15
10
|
data: onConvos(owner: $owner, time: $time) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"chatConvo.subscription.js","sourceRoot":"","sources":["../../../src/chat/subscriptions/chatConvo.subscription.ts"],"names":[],"mappings":";;;;;;AAAA,8DAA8B;AAEjB,QAAA,
|
|
1
|
+
{"version":3,"file":"chatConvo.subscription.js","sourceRoot":"","sources":["../../../src/chat/subscriptions/chatConvo.subscription.ts"],"names":[],"mappings":";;;;;;AAAA,8DAA8B;AAEjB,QAAA,sBAAsB,GAAG,IAAA,qBAAG,EAAA;;;;;;;;;;CAUxC,CAAC"}
|
package/package.json
CHANGED
|
@@ -293,7 +293,7 @@ export const updateConvoSubscriptions = async (
|
|
|
293
293
|
}
|
|
294
294
|
|
|
295
295
|
// Send subscriptions to owners
|
|
296
|
-
return publishMessageToTopic(context, [ChatConvo.name
|
|
296
|
+
return publishMessageToTopic(context, [ChatConvo.name], {
|
|
297
297
|
convoId,
|
|
298
298
|
owner: convo.owner,
|
|
299
299
|
...subscriptionData,
|
|
@@ -15,11 +15,12 @@ const ConvoPagination = getPagination(ChatConvo);
|
|
|
15
15
|
|
|
16
16
|
@Resolver()
|
|
17
17
|
export class ChatConvoResolver {
|
|
18
|
-
// TODO auth middleware
|
|
19
18
|
@Subscription(() => OnChatMessage, {
|
|
20
19
|
topics: ChatConvo.name,
|
|
21
|
-
filter: ({payload,
|
|
20
|
+
filter: ({payload, context}: {payload: OnChatMessage; args: any; context: ContextType}) =>
|
|
21
|
+
context?.payload?.userId === payload.owner,
|
|
22
22
|
})
|
|
23
|
+
@UseMiddleware(isAuth)
|
|
23
24
|
onConvos(
|
|
24
25
|
@Root() data: OnChatMessage,
|
|
25
26
|
@Arg('owner', () => String, {nullable: false}) owner: string,
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import {Resolver, Query, Mutation, Arg, UseMiddleware, Ctx, Subscription, Root} from 'type-graphql';
|
|
2
2
|
import {ContextType, ChatResType, getPagination} from '../../shared/ContextType';
|
|
3
|
-
import {isAuth} from '@roadmanjs/auth';
|
|
3
|
+
import {isAuth, optionalAuth} from '@roadmanjs/auth';
|
|
4
4
|
import {ChatMessage, ChatMessageType, OnChatMessage} from '../models/ChatMessage.model';
|
|
5
5
|
import {chatTyping, chatMessage, createChatMessage} from '../methods/ChatMessageResolver.methods';
|
|
6
6
|
|
|
@@ -8,12 +8,25 @@ const ChatPagination = getPagination(ChatMessage);
|
|
|
8
8
|
|
|
9
9
|
@Resolver()
|
|
10
10
|
export class ChatMessageResolver {
|
|
11
|
-
// TODO subscriptions and auth middleware
|
|
12
11
|
@Subscription(() => OnChatMessage, {
|
|
13
12
|
topics: ChatMessage.name,
|
|
14
|
-
filter: ({
|
|
15
|
-
|
|
13
|
+
filter: ({
|
|
14
|
+
payload,
|
|
15
|
+
args,
|
|
16
|
+
context,
|
|
17
|
+
}: {
|
|
18
|
+
payload: OnChatMessage;
|
|
19
|
+
args: any;
|
|
20
|
+
context: ContextType;
|
|
21
|
+
}) => {
|
|
22
|
+
const requester = context?.payload?.userId;
|
|
23
|
+
if (!requester) {
|
|
24
|
+
return args.convoId === payload.convoId;
|
|
25
|
+
}
|
|
26
|
+
return args.convoId === payload.convoId && requester !== payload.owner;
|
|
27
|
+
},
|
|
16
28
|
})
|
|
29
|
+
@UseMiddleware(optionalAuth)
|
|
17
30
|
onChatMessage(
|
|
18
31
|
@Root() data: OnChatMessage,
|
|
19
32
|
@Arg('owner', () => String, {nullable: true}) owner: string,
|
|
@@ -1,11 +1,5 @@
|
|
|
1
1
|
import gql from 'graphql-tag';
|
|
2
2
|
|
|
3
|
-
export const ON_CHAT_CONVO_SUBSCRIPTION = gql`
|
|
4
|
-
subscription onChatConvo($convoId: String!) {
|
|
5
|
-
data: onChatConvo(convoId: $convoId)
|
|
6
|
-
}
|
|
7
|
-
`;
|
|
8
|
-
|
|
9
3
|
export const ON_CONVOS_SUBSCRIPTION = gql`
|
|
10
4
|
subscription OnConvos($owner: String!, $time: DateTime) {
|
|
11
5
|
data: onConvos(owner: $owner, time: $time) {
|