somod-chat-service 0.6.3 → 0.7.0

package/build/lib/sessionUtil.d.ts

@@ -1,6 +1,7 @@
 type SessionIdResult = {
     sessionId: string;
     error?: string;
+    sessionRequiredTill?: number;
 };
 export declare const Error: {
     required: string;

package/build/lib/sessionUtil.js

@@ -10,31 +10,43 @@ export var Error = {
     invalid: "invalid field: sessionToken"
 };
 export var handleSessionToken = function (userId, threadId, type, action, sessionToken) { return __awaiter(void 0, void 0, void 0, function () {
-    var result, isSessionRequiredForThisTypeAction, thread, session, now;
-    var _a, _b;
-    return __generator(this, function (_c) {
-        switch (_c.label) {
+    var result, isSessionRequiredForThisTypeAction, oneDay, thread_1, sessionRequired, session, now;
+    var _a, _b, _c;
+    return __generator(this, function (_d) {
+        switch (_d.label) {
             case 0:
                 result = { sessionId: "" };
                 if (!sessionJwtSecret) return [3 /*break*/, 6];
                 if (!!sessionToken) return [3 /*break*/, 5];
                 isSessionRequiredForThisTypeAction = (_a = sessionRequirement[type]) === null || _a === void 0 ? void 0 : _a[action];
                 if (!(isSessionRequiredForThisTypeAction !== undefined)) return [3 /*break*/, 4];
+                oneDay = Date.now() + 1000 * 60 * 60 * 24;
                 if (!(isSessionRequiredForThisTypeAction === "always")) return [3 /*break*/, 1];
                 result.error = Error.required;
+                result.sessionRequiredTill = oneDay;
                 return [3 /*break*/, 4];
             case 1:
                 if (!(isSessionRequiredForThisTypeAction === "thread")) return [3 /*break*/, 4];
                 if (!(sessionForce == "true")) return [3 /*break*/, 2];
                 result.error = Error.required;
+                result.sessionRequiredTill = oneDay;
                 return [3 /*break*/, 4];
             case 2: return [4 /*yield*/, threadCache.get(threadId, -1)];
             case 3:
-                thread = _c.sent();
-                if ((_b = thread === null || thread === void 0 ? void 0 : thread.sessionRequired) === null || _b === void 0 ? void 0 : _b.includes(userId)) {
+                thread_1 = _d.sent();
+                sessionRequired = Object.fromEntries((_c = (_b = thread_1 === null || thread_1 === void 0 ? void 0 : thread_1.sessionRequired) === null || _b === void 0 ? void 0 : _b.map(function (userId, index) {
+                    var _a;
+                    return [
+                        userId,
+                        (_a = thread_1 === null || thread_1 === void 0 ? void 0 : thread_1.sessionRequiredTill) === null || _a === void 0 ? void 0 : _a[index]
+                    ];
+                })) !== null && _c !== void 0 ? _c : []);
+                if (sessionRequired[userId] !== undefined &&
+                    sessionRequired[userId] < Date.now()) {
                     result.error = Error.required;
+                    result.sessionRequiredTill = sessionRequired[userId];
                 }
-                _c.label = 4;
+                _d.label = 4;
             case 4: return [3 /*break*/, 6];
             case 5:
                 try {
@@ -60,7 +72,7 @@ export var handleSessionToken = function (userId, threadId, type, action, sessio
                         err);
                     result.error = Error.invalid;
                 }
-                _c.label = 6;
+                _d.label = 6;
             case 6: return [2 /*return*/, result];
         }
     });

package/build/lib/types.d.ts

@@ -1,8 +1,9 @@
 export type ThreadInput = {
     participants: string[];
-};
+} & ThreadSessionRequired;
 export type ThreadSessionRequired = {
     sessionRequired?: string[];
+    sessionRequiredTill?: number[];
 };
 export type Thread = {
     id: string;
@@ -10,7 +11,7 @@ export type Thread = {
 export type MessageInput = {
     threadId: string;
     type: "text" | "image" | "control" | "call" | "pooja";
-    action: "new" | "edit" | "delete" | "sessionStart" | "sessionExtend" | "sessionEnd" | "sessionRequirementChange" | "initiated" | "declined";
+    action: "new" | "edit" | "delete" | "sessionStart" | "sessionExtend" | "sessionEnd" | "initiated" | "declined";
     message: string;
     sessionToken?: string;
 };

package/build/lib/types.js

@@ -1,13 +1,7 @@
 export var typeToAllowedActionsMap = {
     text: ["new", "edit"],
     image: ["new", "edit"],
-    control: [
-        "delete",
-        "sessionStart",
-        "sessionExtend",
-        "sessionEnd",
-        "sessionRequirementChange"
-    ],
+    control: ["delete", "sessionStart", "sessionExtend", "sessionEnd"],
     call: ["initiated", "declined"],
     pooja: ["new", "edit"]
 };

package/build/serverless/functions/message.js

@@ -30,7 +30,8 @@ var postMessageHandler = function (request, event) { return __awaiter(void 0, vo
                             headers: { "Content-Type": "application/json; charset=utf-8" },
                             body: JSON.stringify({
                                 message: sessionIdResult.error,
-                                threadId: request.body.threadId
+                                threadId: request.body.threadId,
+                                sessionRequiredTill: sessionIdResult.sessionRequiredTill
                             })
                         }];
                 }

package/build/serverless/functions/thread.http.json

@@ -1 +1 @@
-{"/thread":{"POST":{"body":{"parser":"json","schema":{"type":"object","additionalProperties":false,"required":["participants"],"properties":{"participants":{"type":"array","items":{"type":"string","pattern":"^[a-zA-Z0-9-_]{1,50}$"},"minItems":2,"maxItems":2}}}}}},"/thread/{id}":{"GET":{"parameters":[{"name":"id","in":"path","schema":{"type":"string","pattern":"^[a-f0-9]{32}$"},"required":true}]}},"/thread/{id}/session":{"POST":{"parameters":[{"name":"id","in":"path","schema":{"type":"string","pattern":"^[a-f0-9]{32}$"},"required":true}],"body":{"parser":"json","schema":{"type":"object","required":["sessionRequired"],"properties":{"sessionRequired":{"type":"array","items":{"type":"string","pattern":"^[a-zA-Z0-9-_]{1,50}$"},"minItems":0,"maxItems":2}}}}}}}
+{"/thread":{"POST":{"body":{"parser":"json","schema":{"type":"object","additionalProperties":false,"required":["participants"],"properties":{"participants":{"type":"array","items":{"type":"string","pattern":"^[a-f0-9]{32}$"},"minItems":2,"maxItems":2},"sessionRequired":{"type":"array","items":{"type":"string","pattern":"^[a-f0-9]{32}$"},"minItems":0,"maxItems":2},"sessionRequiredTill":{"type":"array","items":{"type":"number"},"minItems":0,"maxItems":2}}}}}},"/thread/{id}":{"GET":{"parameters":[{"name":"id","in":"path","schema":{"type":"string","pattern":"^[a-f0-9]{32}$"},"required":true}]}},"/thread/{id}/session":{"POST":{"parameters":[{"name":"id","in":"path","schema":{"type":"string","pattern":"^[a-f0-9]{32}$"},"required":true}],"body":{"parser":"json","schema":{"type":"object","required":["sessionRequired","sessionRequiredTill"],"properties":{"sessionRequired":{"type":"array","items":{"type":"string","pattern":"^[a-f0-9]{32}$"},"minItems":0,"maxItems":2},"sessionRequiredTill":{"type":"array","items":{"type":"number"},"minItems":0,"maxItems":2}}}}}}}

package/build/serverless/functions/thread.js

@@ -1,10 +1,8 @@
 import { __assign, __awaiter, __generator } from "tslib";
-import { RouteBuilder } from "somod-http-extension";
 import { DynamoDBClient, GetItemCommand, PutItemCommand, UpdateItemCommand } from "@aws-sdk/client-dynamodb";
 import { convertToAttr, marshall, unmarshall } from "@aws-sdk/util-dynamodb";
-import { v1, v1 as v1uuid } from "uuid";
-import { putMessage } from "../../lib/message";
-import { getUserIdFromEvent } from "../../lib/getUserIdFromEvent";
+import { RouteBuilder } from "somod-http-extension";
+import { v1 as v1uuid } from "uuid";
 var builder = new RouteBuilder();
 var dynamodb = new DynamoDBClient();
 var createThread = function (request) { return __awaiter(void 0, void 0, void 0, function () {
@@ -54,52 +52,32 @@ var getThread = function (request) { return __awaiter(void 0, void 0, void 0, fu
         }
     });
 }); };
-var updateSessionRequired = function (request, event) { return __awaiter(void 0, void 0, void 0, function () {
-    var userId, updateItemCommand, e_1;
-    var _a;
-    return __generator(this, function (_b) {
-        switch (_b.label) {
+var updateSessionRequired = function (request) { return __awaiter(void 0, void 0, void 0, function () {
+    var updateItemCommand;
+    return __generator(this, function (_a) {
+        switch (_a.label) {
             case 0:
-                userId = getUserIdFromEvent(event);
                 updateItemCommand = new UpdateItemCommand({
                     TableName: process.env.THREAD_TABLE_NAME + "",
                     Key: marshall({ id: request.parameters.path.id }),
-                    UpdateExpression: "SET #sessionRequired = :sessionRequired",
+                    UpdateExpression: "SET #sessionRequired = :sessionRequired, #sessionRequiredTill = :sessionRequiredTill",
                     ExpressionAttributeNames: {
-                        "#sessionRequired": "sessionRequired"
+                        "#sessionRequired": "sessionRequired",
+                        "#sessionRequiredTill": "sessionRequiredTill"
                     },
                     ExpressionAttributeValues: {
-                        ":sessionRequired": convertToAttr(request.body.sessionRequired)
+                        ":sessionRequired": convertToAttr(request.body.sessionRequired),
+                        ":sessionRequiredTill": convertToAttr(request.body.sessionRequiredTill)
                     }
                 });
                 return [4 /*yield*/, dynamodb.send(updateItemCommand)];
             case 1:
-                _b.sent();
-                _b.label = 2;
-            case 2:
-                _b.trys.push([2, 4, , 5]);
-                return [4 /*yield*/, putMessage((_a = process.env.MESSAGE_BOX_TABLE_NAME) !== null && _a !== void 0 ? _a : "", userId, {
-                        id: v1().split("-").join(""),
-                        type: "control",
-                        action: "sessionRequirementChange",
-                        from: userId,
-                        message: JSON.stringify(request.body.sessionRequired),
-                        sentAt: Date.now(),
-                        threadId: request.parameters.path.id
-                    })];
-            case 3:
-                _b.sent();
-                return [3 /*break*/, 5];
-            case 4:
-                e_1 = _b.sent();
-                // eslint-disable-next-line no-console
-                console.error(e_1);
-                return [3 /*break*/, 5];
-            case 5: return [2 /*return*/, {
-                    statusCode: 200,
-                    headers: { "Content-Type": "application/json; charset=utf-8" },
-                    body: JSON.stringify({ message: "Thread updated successfully" })
-                }];
+                _a.sent();
+                return [2 /*return*/, {
+                        statusCode: 200,
+                        headers: { "Content-Type": "application/json; charset=utf-8" },
+                        body: JSON.stringify({ message: "Thread updated successfully" })
+                    }];
         }
     });
 }); };

package/build/serverless/functions/wsOnMessage.js

@@ -26,7 +26,8 @@ builder.add("$default", function (message, event) { return __awaiter(void 0, voi
                             headers: { "Content-Type": "application/json; charset=utf-8" },
                             body: JSON.stringify({
                                 message: sessionIdResult.error,
-                                threadId: message.body.threadId
+                                threadId: message.body.threadId,
+                                sessionRequiredTill: sessionIdResult.sessionRequiredTill
                             })
                         }];
                 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "somod-chat-service",
-  "version": "0.6.3",
+  "version": "0.7.0",
   "description": "Serverless Chat Service from SOMOD",
   "scripts": {
     "prettier": "npx prettier --check --ignore-unknown --no-error-on-unmatched-pattern ./**/*",