somod-chat-service 0.6.0 → 0.6.2

package/build/lib/message.js

@@ -28,7 +28,7 @@ export var putMessage = function (tableName, userId, message) { return __awaiter
     });
 }); };
 export var validateIncomingMessage = function (message, userId) { return __awaiter(void 0, void 0, void 0, function () {
-    var errorMessage, thread, sessionActions;
+    var errorMessage, thread;
     return __generator(this, function (_a) {
         switch (_a.label) {
             case 0:
@@ -36,7 +36,6 @@ export var validateIncomingMessage = function (message, userId) { return __await
                 return [4 /*yield*/, threadCache.get(message.threadId)];
             case 1:
                 thread = _a.sent();
-                sessionActions = ["sessionStart", "sessionExtend", "sessionEnd"];
                 if (thread === undefined) {
                     errorMessage = "Invalid threadId : does not exist";
                 }
@@ -46,9 +45,6 @@ export var validateIncomingMessage = function (message, userId) { return __await
                 else if (!typeToAllowedActionsMap[message.type].includes(message.action)) {
                     errorMessage = "Invalid action : action must be '".concat(typeToAllowedActionsMap[message.type].join(","), "' for '").concat(message.type, "' type");
                 }
-                else if (sessionActions.includes(message.action) && !message.sessionToken) {
-                    errorMessage = "Required 'sessionToken' field when action is '".concat(message.action, "'");
-                }
                 if (errorMessage) {
                     return [2 /*return*/, {
                             statusCode: 400,

package/build/lib/sessionUtil.js

@@ -1,6 +1,7 @@
 var _a, _b;
 import { __awaiter, __generator } from "tslib";
 import { verify } from "jsonwebtoken";
+import { sessionRequirement } from "./types";
 import { threadCache } from "./threadCache";
 var sessionJwtSecret = (_a = process.env.SESSION_SECRET) !== null && _a !== void 0 ? _a : "";
 var sessionForce = (_b = process.env.SESSION_FORCE) !== null && _b !== void 0 ? _b : "";
@@ -9,27 +10,31 @@ 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, thread, session, now;
-    var _a;
-    return __generator(this, function (_b) {
-        switch (_b.label) {
+    var result, isSessionRequiredForThisTypeAction, thread, session, now;
+    var _a, _b;
+    return __generator(this, function (_c) {
+        switch (_c.label) {
             case 0:
                 result = { sessionId: "" };
                 if (!sessionJwtSecret) return [3 /*break*/, 6];
                 if (!!sessionToken) return [3 /*break*/, 5];
-                if (!(type === "call")) return [3 /*break*/, 1];
+                isSessionRequiredForThisTypeAction = (_a = sessionRequirement[type]) === null || _a === void 0 ? void 0 : _a[action];
+                if (!(isSessionRequiredForThisTypeAction !== undefined)) return [3 /*break*/, 4];
+                if (!(isSessionRequiredForThisTypeAction === "always")) return [3 /*break*/, 1];
+                result.error = Error.required;
                 return [3 /*break*/, 4];
             case 1:
+                if (!(isSessionRequiredForThisTypeAction === "thread")) return [3 /*break*/, 4];
                 if (!(sessionForce == "true")) return [3 /*break*/, 2];
                 result.error = Error.required;
                 return [3 /*break*/, 4];
             case 2: return [4 /*yield*/, threadCache.get(threadId, -1)];
             case 3:
-                thread = _b.sent();
-                if ((_a = thread === null || thread === void 0 ? void 0 : thread.sessionRequired) === null || _a === void 0 ? void 0 : _a.includes(userId)) {
+                thread = _c.sent();
+                if ((_b = thread === null || thread === void 0 ? void 0 : thread.sessionRequired) === null || _b === void 0 ? void 0 : _b.includes(userId)) {
                     result.error = Error.required;
                 }
-                _b.label = 4;
+                _c.label = 4;
             case 4: return [3 /*break*/, 6];
             case 5:
                 try {
@@ -55,7 +60,7 @@ export var handleSessionToken = function (userId, threadId, type, action, sessio
                         err);
                     result.error = Error.invalid;
                 }
-                _b.label = 6;
+                _c.label = 6;
             case 6: return [2 /*return*/, result];
         }
     });

package/build/lib/types.d.ts

@@ -9,7 +9,7 @@ export type Thread = {
 } & ThreadInput & ThreadSessionRequired;
 export type MessageInput = {
     threadId: string;
-    type: "text" | "image" | "control" | "call";
+    type: "text" | "image" | "control" | "call" | "pooja";
     action: "new" | "edit" | "delete" | "sessionStart" | "sessionExtend" | "sessionEnd" | "sessionRequirementChange" | "initiated" | "connected" | "disconnected" | "ended";
     message: string;
     sessionToken?: string;
@@ -32,4 +32,9 @@ export declare const typeToAllowedActionsMap: {
     image: string[];
     control: string[];
     call: string[];
+    pooja: string[];
 };
+/**
+ * Store the message type and actions for which the session token is required
+ */
+export declare const sessionRequirement: Record<string, Record<string, undefined | "thread" | "always">>;

package/build/lib/types.js

@@ -8,5 +8,18 @@ export var typeToAllowedActionsMap = {
         "sessionEnd",
         "sessionRequirementChange"
     ],
-    call: ["initiated", "connected", "disconnected", "ended"]
+    call: ["initiated", "connected", "disconnected", "ended"],
+    pooja: ["new", "edit"]
+};
+/**
+ * Store the message type and actions for which the session token is required
+ */
+export var sessionRequirement = {
+    text: { new: "thread", edit: "thread" },
+    image: { new: "thread", edit: "thread" },
+    control: {
+        sessionStart: "always",
+        sessionExtend: "always",
+        sessionEnd: "always"
+    }
 };

package/package.json

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