@roadmanjs/chat 0.0.28 → 0.0.29
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/resolvers/ChatMessage.resolver.js +3 -3
- package/dist/chat/resolvers/ChatMessage.resolver.js.map +1 -1
- package/package.json +1 -1
- package/dist/middlewares/firebaseToken.d.ts +0 -2
- package/dist/middlewares/firebaseToken.js +0 -71
- package/dist/middlewares/firebaseToken.js.map +0 -1
- package/dist/middlewares/index.d.ts +0 -2
- package/dist/middlewares/index.js +0 -19
- package/dist/middlewares/index.js.map +0 -1
- package/dist/middlewares/isAuth.d.ts +0 -2
- package/dist/middlewares/isAuth.js +0 -32
- package/dist/middlewares/isAuth.js.map +0 -1
|
@@ -42,7 +42,7 @@ const ContextType_1 = require("../../shared/ContextType");
|
|
|
42
42
|
const identity_1 = __importDefault(require("lodash/identity"));
|
|
43
43
|
const pickBy_1 = __importDefault(require("lodash/pickBy"));
|
|
44
44
|
const logs_1 = require("@roadmanjs/logs");
|
|
45
|
-
const
|
|
45
|
+
const auth_1 = require("@roadmanjs/auth");
|
|
46
46
|
const ChatMessage_model_1 = __importStar(require("../models/ChatMessage.model"));
|
|
47
47
|
const pubsub_utils_1 = require("../../shared/pubsub.utils");
|
|
48
48
|
const ChatConvo_model_1 = require("../models/ChatConvo.model");
|
|
@@ -126,7 +126,7 @@ let ChatMessageResolver = class ChatMessageResolver {
|
|
|
126
126
|
};
|
|
127
127
|
__decorate([
|
|
128
128
|
(0, couchset_1.Query)(() => ChatPagination),
|
|
129
|
-
(0, couchset_1.UseMiddleware)(
|
|
129
|
+
(0, couchset_1.UseMiddleware)(auth_1.isAuth),
|
|
130
130
|
__param(0, (0, couchset_1.Arg)('convoId', () => String, { nullable: false })),
|
|
131
131
|
__param(1, (0, couchset_1.Arg)('before', () => Date, { nullable: true })),
|
|
132
132
|
__param(2, (0, couchset_1.Arg)('after', () => Date, { nullable: true })),
|
|
@@ -134,7 +134,7 @@ __decorate([
|
|
|
134
134
|
], ChatMessageResolver.prototype, "chatMessage", null);
|
|
135
135
|
__decorate([
|
|
136
136
|
(0, couchset_1.Mutation)(() => ContextType_1.ChatResType),
|
|
137
|
-
(0, couchset_1.UseMiddleware)(
|
|
137
|
+
(0, couchset_1.UseMiddleware)(auth_1.isAuth),
|
|
138
138
|
__param(0, (0, couchset_1.Ctx)()),
|
|
139
139
|
__param(1, (0, couchset_1.Arg)('args', () => ChatMessage_model_1.ChatMessageType, { nullable: false }))
|
|
140
140
|
], ChatMessageResolver.prototype, "createChatMessage", null);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ChatMessage.resolver.js","sourceRoot":"","sources":["../../../src/chat/resolvers/ChatMessage.resolver.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,uCAQkB;AAClB,2DAA+C;AAC/C,0DAAiF;AACjF,+DAAuC;AACvC,2DAAmC;AACnC,0CAAoC;AACpC,
|
|
1
|
+
{"version":3,"file":"ChatMessage.resolver.js","sourceRoot":"","sources":["../../../src/chat/resolvers/ChatMessage.resolver.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,71 +0,0 @@
|
|
|
1
|
-
"use strict";
|
|
2
|
-
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
|
3
|
-
if (k2 === undefined) k2 = k;
|
|
4
|
-
var desc = Object.getOwnPropertyDescriptor(m, k);
|
|
5
|
-
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
|
6
|
-
desc = { enumerable: true, get: function() { return m[k]; } };
|
|
7
|
-
}
|
|
8
|
-
Object.defineProperty(o, k2, desc);
|
|
9
|
-
}) : (function(o, m, k, k2) {
|
|
10
|
-
if (k2 === undefined) k2 = k;
|
|
11
|
-
o[k2] = m[k];
|
|
12
|
-
}));
|
|
13
|
-
var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
|
|
14
|
-
Object.defineProperty(o, "default", { enumerable: true, value: v });
|
|
15
|
-
}) : function(o, v) {
|
|
16
|
-
o["default"] = v;
|
|
17
|
-
});
|
|
18
|
-
var __importStar = (this && this.__importStar) || function (mod) {
|
|
19
|
-
if (mod && mod.__esModule) return mod;
|
|
20
|
-
var result = {};
|
|
21
|
-
if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
|
|
22
|
-
__setModuleDefault(result, mod);
|
|
23
|
-
return result;
|
|
24
|
-
};
|
|
25
|
-
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
26
|
-
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
27
|
-
};
|
|
28
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
29
|
-
exports.FirebaseTokenVerify = void 0;
|
|
30
|
-
const firebase = __importStar(require("firebase-admin"));
|
|
31
|
-
const firebase_admin_1 = require("@roadmanjs/firebase-admin");
|
|
32
|
-
const get_1 = __importDefault(require("lodash/get"));
|
|
33
|
-
const isEmpty_1 = __importDefault(require("lodash/isEmpty"));
|
|
34
|
-
const logs_1 = require("@roadmanjs/logs");
|
|
35
|
-
const FirebaseTokenVerify = async ({ args }, next) => {
|
|
36
|
-
await (0, firebase_admin_1.configureFirebase)();
|
|
37
|
-
const token = (args && args.firebaseToken) || (0, get_1.default)(args, 'user.firebaseToken', ''); // args.user.firebaseToken;
|
|
38
|
-
if ((0, isEmpty_1.default)(token)) {
|
|
39
|
-
throw new Error('Token No authorization');
|
|
40
|
-
}
|
|
41
|
-
const verifyToken = (idToken) => {
|
|
42
|
-
// idToken comes from the client app
|
|
43
|
-
return new Promise((res) => {
|
|
44
|
-
firebase
|
|
45
|
-
.auth()
|
|
46
|
-
.verifyIdToken(idToken)
|
|
47
|
-
.then((decodedToken) => {
|
|
48
|
-
const uid = decodedToken.uid;
|
|
49
|
-
res(uid);
|
|
50
|
-
})
|
|
51
|
-
.catch((error) => {
|
|
52
|
-
// Handle error
|
|
53
|
-
(0, logs_1.log)(`Error verifying token ${error && error.token}`);
|
|
54
|
-
res(null);
|
|
55
|
-
});
|
|
56
|
-
});
|
|
57
|
-
};
|
|
58
|
-
try {
|
|
59
|
-
const verified = await verifyToken(token);
|
|
60
|
-
if (!verified) {
|
|
61
|
-
throw new Error('No authorization, please try again');
|
|
62
|
-
}
|
|
63
|
-
}
|
|
64
|
-
catch (err) {
|
|
65
|
-
console.log(err);
|
|
66
|
-
return null;
|
|
67
|
-
}
|
|
68
|
-
return next();
|
|
69
|
-
};
|
|
70
|
-
exports.FirebaseTokenVerify = FirebaseTokenVerify;
|
|
71
|
-
//# sourceMappingURL=firebaseToken.js.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"firebaseToken.js","sourceRoot":"","sources":["../../src/middlewares/firebaseToken.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,yDAA2C;AAG3C,8DAA4D;AAC5D,qDAA6B;AAC7B,6DAAqC;AACrC,0CAAoC;AAE7B,MAAM,mBAAmB,GAAiB,KAAK,EAAE,EAAC,IAAI,EAAM,EAAE,IAAI,EAAE,EAAE;IACzE,MAAM,IAAA,kCAAiB,GAAE,CAAC;IAC1B,MAAM,KAAK,GAAG,CAAC,IAAI,IAAI,IAAI,CAAC,aAAa,CAAC,IAAI,IAAA,aAAG,EAAC,IAAI,EAAE,oBAAoB,EAAE,EAAE,CAAC,CAAC,CAAC,2BAA2B;IAE9G,IAAI,IAAA,iBAAO,EAAC,KAAK,CAAC,EAAE;QAChB,MAAM,IAAI,KAAK,CAAC,wBAAwB,CAAC,CAAC;KAC7C;IAED,MAAM,WAAW,GAAG,CAAC,OAAe,EAA0B,EAAE;QAC5D,oCAAoC;QACpC,OAAO,IAAI,OAAO,CAAC,CAAC,GAAG,EAAE,EAAE;YACvB,QAAQ;iBACH,IAAI,EAAE;iBACN,aAAa,CAAC,OAAO,CAAC;iBACtB,IAAI,CAAC,CAAC,YAAY,EAAE,EAAE;gBACnB,MAAM,GAAG,GAAG,YAAY,CAAC,GAAG,CAAC;gBAC7B,GAAG,CAAC,GAAG,CAAC,CAAC;YACb,CAAC,CAAC;iBACD,KAAK,CAAC,CAAC,KAAK,EAAE,EAAE;gBACb,eAAe;gBACf,IAAA,UAAG,EAAC,yBAAyB,KAAK,IAAI,KAAK,CAAC,KAAK,EAAE,CAAC,CAAC;gBACrD,GAAG,CAAC,IAAI,CAAC,CAAC;YACd,CAAC,CAAC,CAAC;QACX,CAAC,CAAC,CAAC;IACP,CAAC,CAAC;IAEF,IAAI;QACA,MAAM,QAAQ,GAAG,MAAM,WAAW,CAAC,KAAK,CAAC,CAAC;QAE1C,IAAI,CAAC,QAAQ,EAAE;YACX,MAAM,IAAI,KAAK,CAAC,oCAAoC,CAAC,CAAC;SACzD;KACJ;IAAC,OAAO,GAAG,EAAE;QACV,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;QACjB,OAAO,IAAI,CAAC;KACf;IACD,OAAO,IAAI,EAAE,CAAC;AAClB,CAAC,CAAC;AArCW,QAAA,mBAAmB,uBAqC9B"}
|
|
@@ -1,19 +0,0 @@
|
|
|
1
|
-
"use strict";
|
|
2
|
-
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
|
3
|
-
if (k2 === undefined) k2 = k;
|
|
4
|
-
var desc = Object.getOwnPropertyDescriptor(m, k);
|
|
5
|
-
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
|
6
|
-
desc = { enumerable: true, get: function() { return m[k]; } };
|
|
7
|
-
}
|
|
8
|
-
Object.defineProperty(o, k2, desc);
|
|
9
|
-
}) : (function(o, m, k, k2) {
|
|
10
|
-
if (k2 === undefined) k2 = k;
|
|
11
|
-
o[k2] = m[k];
|
|
12
|
-
}));
|
|
13
|
-
var __exportStar = (this && this.__exportStar) || function(m, exports) {
|
|
14
|
-
for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
|
|
15
|
-
};
|
|
16
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
17
|
-
__exportStar(require("./firebaseToken"), exports);
|
|
18
|
-
__exportStar(require("./isAuth"), exports);
|
|
19
|
-
//# sourceMappingURL=index.js.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/middlewares/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,kDAAgC;AAChC,2CAAyB"}
|
|
@@ -1,32 +0,0 @@
|
|
|
1
|
-
"use strict";
|
|
2
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.isAuth = void 0;
|
|
4
|
-
const lodash_1 = require("lodash");
|
|
5
|
-
const jsonwebtoken_1 = require("jsonwebtoken");
|
|
6
|
-
const isAuth = ({ context }, next) => {
|
|
7
|
-
const authorization = (0, lodash_1.get)(context, 'req.headers.authorization', '');
|
|
8
|
-
if ((0, lodash_1.isEmpty)(authorization)) {
|
|
9
|
-
throw new Error('Not Authenticated');
|
|
10
|
-
}
|
|
11
|
-
try {
|
|
12
|
-
const token = authorization.split(' ')[1];
|
|
13
|
-
const verified = (0, jsonwebtoken_1.verify)(token, process.env.ACCESS_TOKEN_SECRET);
|
|
14
|
-
// verbose('user is auth', verified);
|
|
15
|
-
/**
|
|
16
|
-
{
|
|
17
|
-
userId: 'xxxxxxx04453',
|
|
18
|
-
iat: 1616303858,
|
|
19
|
-
exp: 1616307458
|
|
20
|
-
}
|
|
21
|
-
*/
|
|
22
|
-
context.payload = verified;
|
|
23
|
-
// TODO set user object to request
|
|
24
|
-
}
|
|
25
|
-
catch (err) {
|
|
26
|
-
console.log('not authenticated');
|
|
27
|
-
throw new Error('not authenticated');
|
|
28
|
-
}
|
|
29
|
-
return next();
|
|
30
|
-
};
|
|
31
|
-
exports.isAuth = isAuth;
|
|
32
|
-
//# sourceMappingURL=isAuth.js.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"isAuth.js","sourceRoot":"","sources":["../../src/middlewares/isAuth.ts"],"names":[],"mappings":";;;AACA,mCAA4C;AAE5C,+CAAoC;AAE7B,MAAM,MAAM,GAA8B,CAAC,EAAC,OAAO,EAAC,EAAE,IAAI,EAAE,EAAE;IACjE,MAAM,aAAa,GAAG,IAAA,YAAI,EAAC,OAAO,EAAE,2BAA2B,EAAE,EAAE,CAAC,CAAC;IAErE,IAAI,IAAA,gBAAO,EAAC,aAAa,CAAC,EAAE;QACxB,MAAM,IAAI,KAAK,CAAC,mBAAmB,CAAC,CAAC;KACxC;IAED,IAAI;QACA,MAAM,KAAK,GAAG,aAAa,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;QAC1C,MAAM,QAAQ,GAAG,IAAA,qBAAM,EAAC,KAAK,EAAE,OAAO,CAAC,GAAG,CAAC,mBAAoB,CAAC,CAAC;QAEjE,qCAAqC;QACrC;;;;;;OAMD;QACC,OAAO,CAAC,OAAO,GAAG,QAAe,CAAC;QAElC,kCAAkC;KACrC;IAAC,OAAO,GAAG,EAAE;QACV,OAAO,CAAC,GAAG,CAAC,mBAAmB,CAAC,CAAC;QACjC,MAAM,IAAI,KAAK,CAAC,mBAAmB,CAAC,CAAC;KACxC;IAED,OAAO,IAAI,EAAE,CAAC;AAClB,CAAC,CAAC;AA5BW,QAAA,MAAM,UA4BjB"}
|