@tellescope/sdk 0.0.96 → 0.0.97

package/lib/cjs/tests/socket_tests.js

@@ -49,15 +49,17 @@ var get_sha256 = function (s) {
 };
 exports.get_sha256 = get_sha256;
 var VERBOSE = true;
-var AWAIT_SOCKET_DURATION = 150; // 25ms was generally passing for Redis, 1000ms should be upper limit of performance
+var AWAIT_SOCKET_DURATION = 250; // 25ms was generally passing for Redis, 1000ms should be upper limit of performance
 var host = process.env.TEST_URL || 'http://localhost:8080';
 var _a = [process.env.TEST_EMAIL, process.env.TEST_PASSWORD], email = _a[0], password = _a[1];
 var _b = [process.env.TEST_EMAIL_2, process.env.TEST_PASSWORD_2], email2 = _b[0], password2 = _b[1];
+var _c = [process.env.NON_ADMIN_EMAIL, process.env.NON_ADMIN_PASSWORD], nonAdminEmail = _c[0], nonAdminPassword = _c[1];
 var businessId = '60398b1131a295e64f084ff6';
 var user1 = new sdk_1.Session({ host: host, enableSocketLogging: VERBOSE });
 var user2 = new sdk_1.Session({ host: host, enableSocketLogging: VERBOSE });
+var sdkNonAdmin = new sdk_1.Session({ host: host });
 var enduserSDK = new enduser_1.EnduserSession({ host: host, businessId: businessId, enableSocketLogging: VERBOSE });
-if (!(email && password && email2 && password2)) {
+if (!(email && password && email2 && password2 && nonAdminEmail && nonAdminPassword)) {
     console.error("Set TEST_EMAIL and TEST_PASSWORD");
     process.exit(1);
 }
@@ -69,7 +71,7 @@ var basic_tests = function () { return __awaiter(void 0, void 0, void 0, functio
         switch (_e.label) {
             case 0:
                 socket_events = [];
-                user2.subscribe({ 'endusers': 'endusers' }, {
+                user2.handle_events({
                     'created-endusers': function (es) { return socket_events.push(es); },
                     'updated-endusers': function (es) { return socket_events.push(es); },
                     'deleted-endusers': function (es) { return socket_events.push(es); },
@@ -110,106 +112,223 @@ var basic_tests = function () { return __awaiter(void 0, void 0, void 0, functio
     });
 }); };
 var access_tests = function () { return __awaiter(void 0, void 0, void 0, function () {
-    var user1Events, user2Events, user1Id, user2Id, room, sharedRoom, sharedChat, sharedChat2;
-    var _a, _b, _c, _d;
-    return __generator(this, function (_e) {
-        switch (_e.label) {
+    var user1Events, nonAdminEvents, enduserEvents, user1Id, user2Id, room, sharedRoom, sharedChat, sharedChat2, unassignedEnduser, assignedEnduser, roomUnassigned, roomUnassignedWithUser, roomAssigned, userMessage, enduserMessage, nonAdminMessage, _a, _b, _c;
+    return __generator(this, function (_d) {
+        switch (_d.label) {
             case 0:
                 user1Events = [];
-                user2Events = [];
-                // const user1Deletions: string[] = []
-                // const user2Deletions: string[] = []
-                user1.handle_events({
-                    'created-chat_rooms': function (rs) { return user1Events.push.apply(user1Events, rs); },
-                    // 'updated-chat_rooms': rs => user1Events.push(...rs), sent message will create update event as cached messagepreview/sender updated
-                    // 'deleted-chat_rooms': rs => user1Events.push(...rs),
-                });
-                user2.handle_events({
-                    'created-chat_rooms': function (rs) { return user2Events.push.apply(user2Events, rs); },
-                    // 'updated-chat_rooms': rs => user2Events.push(...rs),
-                    // 'deleted-chat_rooms': rs => user2Events.push(...rs),
-                });
+                nonAdminEvents = [];
+                enduserEvents = [];
+                user1.handle_events({ 'created-chat_rooms': function (rs) { return user1Events.push.apply(user1Events, rs); } });
+                sdkNonAdmin.handle_events({ 'created-chat_rooms': function (rs) { return nonAdminEvents.push.apply(nonAdminEvents, rs); } });
                 user1Id = user1.userInfo.id;
-                user2Id = user2.userInfo.id;
+                user2Id = sdkNonAdmin.userInfo.id;
                 return [4 /*yield*/, user1.api.chat_rooms.createOne({ type: 'internal', userIds: [user1Id] })];
             case 1:
-                room = _e.sent();
+                room = _d.sent();
                 return [4 /*yield*/, user1.api.chat_rooms.createOne({ type: 'internal', userIds: [user1Id, user2Id] })];
             case 2:
-                sharedRoom = _e.sent();
+                sharedRoom = _d.sent();
                 return [4 /*yield*/, (0, testing_1.wait)(undefined, AWAIT_SOCKET_DURATION)];
             case 3:
-                _e.sent();
-                (0, testing_1.assert)(user1Events.length === 0, 'bad event distribution for filter', 'verify filter socket no self');
-                (0, testing_1.assert)(user2Events.length === 1 && sharedRoom.id === user2Events[0].id, 'bad event distribution for filter', 'verify filter socket push');
-                user1.removeAllSocketListeners('created-chat_rooms');
-                user1.removeAllSocketListeners('update-chat_rooms');
-                user1.removeAllSocketListeners('deleted-chat_rooms');
-                user2.removeAllSocketListeners('created-chat_rooms');
-                user2.removeAllSocketListeners('update-chat_rooms');
-                user2.removeAllSocketListeners('deleted-chat_rooms');
-                user1.subscribe((_a = {}, _a[room.id] = 'chats', _a));
-                user2.subscribe((_b = {}, _b[room.id] = 'chats', _b)); // connection should be rejected
-                user1.subscribe((_c = {}, _c[sharedRoom.id] = 'chats', _c));
-                user2.subscribe((_d = {}, _d[sharedRoom.id] = 'chats', _d));
+                _d.sent();
+                (0, testing_1.assert)(user1Events.length === 2, 'bad event distribution for filter', 'creator gets socket notifications');
+                (0, testing_1.assert)(nonAdminEvents.length === 1 && sharedRoom.id === nonAdminEvents[0].id, 'bad event distribution for filter', 'verify filter socket push');
                 user1.handle_events({
+                    'created-chat_rooms': function (rs) { return user1Events.push.apply(user1Events, rs); },
                     'created-chats': function (rs) { return user1Events.push.apply(user1Events, rs); },
+                    'created-tickets': function (rs) { return user1Events.push.apply(user1Events, rs); },
+                    'created-endusers': function (rs) { return user1Events.push.apply(user1Events, rs); },
                     'updated-chats': function (rs) { return user1Events.push.apply(user1Events, rs); },
                     'deleted-chats': function (rs) { return user1Events.push.apply(user1Events, rs); },
                 });
-                user2.handle_events({
-                    'created-chats': function (rs) { return user2Events.push.apply(user2Events, rs); },
-                    'updated-chats': function (rs) { return user2Events.push.apply(user2Events, rs); },
-                    'deleted-chats': function (rs) { return user2Events.push.apply(user2Events, rs); },
+                sdkNonAdmin.handle_events({
+                    'created-chat_rooms': function (rs) { return nonAdminEvents.push.apply(nonAdminEvents, rs); },
+                    'created-chats': function (rs) { return nonAdminEvents.push.apply(nonAdminEvents, rs); },
+                    'created-tickets': function (rs) { return nonAdminEvents.push.apply(nonAdminEvents, rs); },
+                    'created-endusers': function (rs) { return nonAdminEvents.push.apply(nonAdminEvents, rs); },
+                    'updated-chats': function (rs) { return nonAdminEvents.push.apply(nonAdminEvents, rs); },
+                    'deleted-chats': function (rs) { return nonAdminEvents.push.apply(nonAdminEvents, rs); },
                 });
                 return [4 /*yield*/, (0, testing_1.wait)(undefined, AWAIT_SOCKET_DURATION)];
             case 4:
-                _e.sent();
+                _d.sent();
                 return [4 /*yield*/, user1.api.chats.createOne({ roomId: room.id, message: "Hello!", })];
             case 5:
-                _e.sent();
+                _d.sent();
                 return [4 /*yield*/, user1.api.chats.createOne({ roomId: room.id, message: "Hello...", })];
             case 6:
-                _e.sent();
+                _d.sent();
                 return [4 /*yield*/, (0, testing_1.wait)(undefined, AWAIT_SOCKET_DURATION)];
             case 7:
-                _e.sent();
-                (0, testing_1.assert)(user1Events.length === 0, 'bad chats subscription', 'verify chats no self');
-                (0, testing_1.assert)(user2Events.length === 1, 'bad chats subscription', 'push only for valid subscribers');
-                return [4 /*yield*/, user1.api.chats.createOne({ roomId: sharedRoom.id, message: "Hello!", })];
+                _d.sent();
+                (0, testing_1.assert)(user1Events.length === 4, 'bad chats self', 'chats to self');
+                (0, testing_1.assert)(nonAdminEvents.length === 1, 'non-admin got chats', 'non admin doesnt get chats for unassigned room');
+                return [4 /*yield*/, user1.api.chats.createOne({ roomId: sharedRoom.id, message: "Hello from admin on shared", })];
             case 8:
-                sharedChat = _e.sent();
-                return [4 /*yield*/, user2.api.chats.createOne({ roomId: sharedRoom.id, message: "Hello there!", })];
+                sharedChat = _d.sent();
+                return [4 /*yield*/, sdkNonAdmin.api.chats.createOne({ roomId: sharedRoom.id, message: "Hello from nonadmin on shared", })];
             case 9:
-                sharedChat2 = _e.sent();
+                sharedChat2 = _d.sent();
                 return [4 /*yield*/, (0, testing_1.wait)(undefined, AWAIT_SOCKET_DURATION)];
             case 10:
-                _e.sent();
-                (0, testing_1.assert)(user1Events.length === 1 && user1Events[0].id === sharedChat2.id, 'bad chats subscription', 'verify chat received');
-                (0, testing_1.assert)(user2Events.length === 2 && user2Events[1].id === sharedChat.id, 'bad chats subscription', 'push only for valid subscribers shared');
+                _d.sent();
+                (0, testing_1.assert)(user1Events.length === 6 && !!user1Events.find(function (r) { return (r === null || r === void 0 ? void 0 : r.id) === sharedChat2.id; }), 'bad chats other', 'verify chat received');
+                (0, testing_1.assert)(nonAdminEvents.length === 3 && !!nonAdminEvents.find(function (e) { return e.id === sharedChat.id; }), 'bad chats self, non-admin', 'push valid for non-admin default access');
+                return [4 /*yield*/, user1.api.endusers.createOne({ email: 'unassigned@tellescope.com' })];
+            case 11:
+                unassignedEnduser = _d.sent();
+                return [4 /*yield*/, user1.api.endusers.createOne({ email: 'assigned@tellescope.com', assignedTo: [user2Id] })];
+            case 12:
+                assignedEnduser = _d.sent();
+                return [4 /*yield*/, (0, testing_1.wait)(undefined, AWAIT_SOCKET_DURATION)];
+            case 13:
+                _d.sent();
+                (0, testing_1.assert)(!!user1Events.find(function (e) { return e.id === unassignedEnduser.id; }) && !!user1Events.find(function (e) { return e.id === assignedEnduser.id; }), 'admin did not get endusers', 'admin got assigned and unassigned endusers');
+                (0, testing_1.assert)(!nonAdminEvents.find(function (e) { return e.id === unassignedEnduser.id; }) && !!nonAdminEvents.find(function (e) { return e.id === assignedEnduser.id; }), 'non-admin got incorrect endusers', 'non-admin got assigned enduser');
+                return [4 /*yield*/, user1.api.endusers.set_password({ id: unassignedEnduser.id, password: 'enduserPassword!' })];
+            case 14:
+                _d.sent();
+                return [4 /*yield*/, enduserSDK.authenticate(unassignedEnduser.email, 'enduserPassword!')];
+            case 15:
+                _d.sent();
+                return [4 /*yield*/, enduserSDK.authenticate_socket()];
+            case 16:
+                _d.sent();
+                enduserSDK.handle_events({
+                    'created-chat_rooms': function (rs) { return enduserEvents.push.apply(enduserEvents, rs); },
+                    'created-chats': function (rs) { return enduserEvents.push.apply(enduserEvents, rs); },
+                    'created-tickets': function (rs) { return enduserEvents.push.apply(enduserEvents, rs); },
+                });
+                return [4 /*yield*/, user1.api.chat_rooms.createOne({ enduserIds: [unassignedEnduser.id] })
+                    // test non-admin user in userIds gets message
+                ];
+            case 17:
+                roomUnassigned = _d.sent();
+                return [4 /*yield*/, user1.api.chat_rooms.createOne({ enduserIds: [unassignedEnduser.id], userIds: [user2Id] })
+                    // test non-admin user who is assigned to enduser gets messages
+                ];
+            case 18:
+                roomUnassignedWithUser = _d.sent();
+                return [4 /*yield*/, user1.api.chat_rooms.createOne({ enduserIds: [assignedEnduser.id] })];
+            case 19:
+                roomAssigned = _d.sent();
+                return [4 /*yield*/, (0, testing_1.wait)(undefined, AWAIT_SOCKET_DURATION)];
+            case 20:
+                _d.sent();
+                (0, testing_1.assert)((!!user1Events.find(function (e) { return e.id === roomUnassigned.id; })
+                    && !!user1Events.find(function (e) { return e.id === roomUnassignedWithUser.id; })
+                    && !!user1Events.find(function (e) { return e.id === roomAssigned.id; })), 'enduser did not get chat rooms', 'enduser got chat rooms');
+                (0, testing_1.assert)((!nonAdminEvents.find(function (e) { return e.id === roomUnassigned.id; }) // shouldn't get as non-admin
+                    && !!nonAdminEvents.find(function (e) { return e.id === roomUnassignedWithUser.id; }) // gets for in room
+                    && !!nonAdminEvents.find(function (e) { return e.id === roomAssigned.id; }) // gets for enduser assignment
+                ), 'non-admin did not get chat rooms', 'non-admin got chat rooms');
+                (0, testing_1.assert)((!!enduserEvents.find(function (e) { return e.id === roomUnassigned.id; })
+                    && !!enduserEvents.find(function (e) { return e.id === roomUnassignedWithUser.id; })
+                    && !enduserEvents.find(function (e) { return e.id === roomAssigned.id; })), 'enduser did not get chat rooms', 'enduser got chat rooms');
+                return [4 /*yield*/, user1.api.chats.createOne({ message: 'user unassigned', roomId: roomUnassigned.id })];
+            case 21:
+                userMessage = _d.sent();
+                return [4 /*yield*/, enduserSDK.api.chats.createOne({ message: 'enduseruser unassigned', roomId: roomUnassigned.id })];
+            case 22:
+                enduserMessage = _d.sent();
+                return [4 /*yield*/, (0, testing_1.wait)(undefined, AWAIT_SOCKET_DURATION)];
+            case 23:
+                _d.sent();
+                (0, testing_1.assert)(!!enduserEvents.find(function (e) { return e.id === userMessage.id; }), 'enduser did not get message', 'enduser got message from user');
+                (0, testing_1.assert)(!!user1Events.find(function (e) { return e.id === enduserMessage.id; }), 'user did not get message', 'user got message from enduser');
+                (0, testing_1.assert)(!nonAdminEvents.find(function (e) { return e.id === enduserMessage.id; }) && !nonAdminEvents.find(function (e) { return e.id === userMessage.id; }), 'non-admin got unexpected message', 'non-admin correctly did not get message from enduser or user');
+                return [4 /*yield*/, user1.api.chats.createOne({ message: 'user unassigned with user', roomId: roomUnassignedWithUser.id })];
+            case 24:
+                userMessage = _d.sent();
+                return [4 /*yield*/, enduserSDK.api.chats.createOne({ message: 'enduser unassigned with user', roomId: roomUnassignedWithUser.id })];
+            case 25:
+                enduserMessage = _d.sent();
+                return [4 /*yield*/, sdkNonAdmin.api.chats.createOne({ message: 'non-admin unassigned with non', roomId: roomUnassignedWithUser.id })];
+            case 26:
+                nonAdminMessage = _d.sent();
+                return [4 /*yield*/, (0, testing_1.wait)(undefined, AWAIT_SOCKET_DURATION)];
+            case 27:
+                _d.sent();
+                (0, testing_1.assert)(!!enduserEvents.find(function (e) { return e.id === userMessage.id; }) && !!enduserEvents.find(function (e) { return e.id === nonAdminMessage.id; }), 'enduser did not get message', 'enduser got message from user');
+                (0, testing_1.assert)(!!user1Events.find(function (e) { return e.id === enduserMessage.id; }) && !!user1Events.find(function (e) { return e.id === nonAdminMessage.id; }), 'user did not get messages', 'user got messages');
+                (0, testing_1.assert)(!!nonAdminEvents.find(function (e) { return e.id === enduserMessage.id; }) && !!nonAdminEvents.find(function (e) { return e.id === userMessage.id; }), 'non-admin didnt get messages', 'non-admin got message from user and enduser');
+                return [4 /*yield*/, user1.api.endusers.set_password({ id: assignedEnduser.id, password: 'enduserPassword!' })];
+            case 28:
+                _d.sent();
+                return [4 /*yield*/, enduserSDK.authenticate(assignedEnduser.email, 'enduserPassword!')];
+            case 29:
+                _d.sent();
+                return [4 /*yield*/, enduserSDK.authenticate_socket()];
+            case 30:
+                _d.sent();
+                enduserSDK.handle_events({
+                    'created-chats': function (rs) { return enduserEvents.push.apply(enduserEvents, rs); },
+                });
+                return [4 /*yield*/, user1.api.chats.createOne({ message: 'user assigned', roomId: roomAssigned.id })];
+            case 31:
+                userMessage = _d.sent();
+                return [4 /*yield*/, enduserSDK.api.chats.createOne({ message: 'enduser assigned', roomId: roomAssigned.id })];
+            case 32:
+                enduserMessage = _d.sent();
+                return [4 /*yield*/, sdkNonAdmin.api.chats.createOne({ message: 'non-admin assigned', roomId: roomAssigned.id })];
+            case 33:
+                nonAdminMessage = _d.sent();
+                return [4 /*yield*/, (0, testing_1.wait)(undefined, AWAIT_SOCKET_DURATION)];
+            case 34:
+                _d.sent();
+                (0, testing_1.assert)(!!enduserEvents.find(function (e) { return e.id === userMessage.id; }) && !!enduserEvents.find(function (e) { return e.id === nonAdminMessage.id; }), 'enduser did not get messages', 'enduser got messages from users');
+                (0, testing_1.assert)(!!user1Events.find(function (e) { return e.id === enduserMessage.id; }) && !!user1Events.find(function (e) { return e.id === nonAdminMessage.id; }), 'user did not get messages', 'user got messages');
+                (0, testing_1.assert)(!!nonAdminEvents.find(function (e) { return e.id === enduserMessage.id; }) && !!nonAdminEvents.find(function (e) { return e.id === userMessage.id; }), 'non-admin didnt get messages', 'non-admin got message from user and enduser');
+                _b = (_a = Promise).all;
+                return [4 /*yield*/, user1.api.endusers.deleteOne(unassignedEnduser.id)];
+            case 35:
+                _c = [
+                    _d.sent()
+                ];
+                return [4 /*yield*/, user1.api.endusers.deleteOne(assignedEnduser.id)];
+            case 36:
+                _c = _c.concat([
+                    _d.sent()
+                ]);
+                return [4 /*yield*/, user1.api.chat_rooms.deleteOne(roomAssigned.id)];
+            case 37:
+                _c = _c.concat([
+                    _d.sent()
+                ]);
+                return [4 /*yield*/, user1.api.chat_rooms.deleteOne(roomUnassigned.id)];
+            case 38:
+                _c = _c.concat([
+                    _d.sent()
+                ]);
+                return [4 /*yield*/, user1.api.chat_rooms.deleteOne(roomUnassignedWithUser.id)];
+            case 39: return [4 /*yield*/, _b.apply(_a, [_c.concat([
+                        _d.sent()
+                    ])])];
+            case 40:
+                _d.sent();
                 return [2 /*return*/];
         }
     });
 }); };
 var enduser_tests = function () { return __awaiter(void 0, void 0, void 0, function () {
     var enduser, userEvents, enduserEvents, room, messageToEnduser, messageToUser, unusedTicket, ticketForEnduser, ticketFromEnduser;
-    var _a, _b;
-    return __generator(this, function (_c) {
-        switch (_c.label) {
+    return __generator(this, function (_a) {
+        switch (_a.label) {
             case 0:
                 (0, testing_1.log_header)("Enduser Tests");
                 return [4 /*yield*/, user1.api.endusers.createOne({ email: "enduser@tellescope.com" })];
             case 1:
-                enduser = _c.sent();
+                enduser = _a.sent();
                 return [4 /*yield*/, user1.api.endusers.set_password({ id: enduser.id, password: 'enduserPassword!' })];
             case 2:
-                _c.sent();
+                _a.sent();
                 return [4 /*yield*/, enduserSDK.authenticate(enduser.email, 'enduserPassword!')];
             case 3:
-                _c.sent();
+                _a.sent();
                 return [4 /*yield*/, enduserSDK.connectSocket()];
             case 4:
-                _c.sent();
+                _a.sent();
                 userEvents = [];
                 enduserEvents = [];
                 user1.handle_events({
@@ -226,59 +345,53 @@ var enduser_tests = function () { return __awaiter(void 0, void 0, void 0, funct
                         enduserIds: [enduser.id],
                     })];
             case 5:
-                room = _c.sent();
-                user1.subscribe((_a = {}, _a[room.id] = 'chats', _a));
-                user1.subscribe({ tickets: 'tickets' });
-                enduserSDK.subscribe((_b = {},
-                    _b[room.id] = 'chats',
-                    _b.dontCache = 'chats',
-                    _b));
+                room = _a.sent();
                 return [4 /*yield*/, (0, testing_1.wait)(undefined, AWAIT_SOCKET_DURATION)];
             case 6:
-                _c.sent();
+                _a.sent();
                 return [4 /*yield*/, user1.api.chats.createOne({ roomId: room.id, message: "Hello!" })];
             case 7:
-                messageToEnduser = _c.sent();
+                messageToEnduser = _a.sent();
                 return [4 /*yield*/, enduserSDK.api.chats.createOne({ roomId: room.id, message: "Hello right back!" })];
             case 8:
-                messageToUser = _c.sent();
+                messageToUser = _a.sent();
                 return [4 /*yield*/, (0, testing_1.wait)(undefined, AWAIT_SOCKET_DURATION)];
             case 9:
-                _c.sent();
-                (0, testing_1.assert)((0, utilities_1.objects_equivalent)(userEvents[0], messageToUser), 'no message on socket', 'push message to user');
-                (0, testing_1.assert)((0, utilities_1.objects_equivalent)(enduserEvents[0], messageToEnduser), 'no message on socket', 'push message to enduser');
+                _a.sent();
+                (0, testing_1.assert)(!!userEvents.find(function (e) { return e.id === messageToUser.id; }), 'no message on socket for user', 'push message to user');
+                (0, testing_1.assert)(!!enduserEvents.find(function (e) { return e.id === messageToEnduser.id; }), 'no message on socket for enduser', 'push message to enduser');
                 return [4 /*yield*/, user1.api.tickets.createOne({ enduserId: constants_1.PLACEHOLDER_ID, title: "For Noone" })]; // should not get pushed to enduser
             case 10:
-                unusedTicket = _c.sent() // should not get pushed to enduser
+                unusedTicket = _a.sent() // should not get pushed to enduser
                 ;
                 return [4 /*yield*/, user1.api.tickets.createOne({ enduserId: enduser.id, title: "For enduser" })];
             case 11:
-                ticketForEnduser = _c.sent();
+                ticketForEnduser = _a.sent();
                 return [4 /*yield*/, enduserSDK.api.tickets.createOne({ enduserId: enduser.id, title: "By enduser" })];
             case 12:
-                ticketFromEnduser = _c.sent();
+                ticketFromEnduser = _a.sent();
                 return [4 /*yield*/, (0, testing_1.wait)(undefined, AWAIT_SOCKET_DURATION)];
             case 13:
-                _c.sent();
-                (0, testing_1.assert)((0, utilities_1.objects_equivalent)(userEvents[1], ticketFromEnduser), 'no ticket on socket for user', 'push ticket to user');
-                (0, testing_1.assert)((0, utilities_1.objects_equivalent)(enduserEvents[1], ticketForEnduser), 'no ticket on socket for enduser', 'push ticket to enduser');
-                (0, testing_1.assert)(enduserEvents[2] === undefined, 'enduser got an orgwide ticket', 'enduser does not receive org-wide ticket');
+                _a.sent();
+                (0, testing_1.assert)(!!userEvents.find(function (t) { return t.id === ticketFromEnduser.id; }), 'no ticket on socket for user', 'push ticket to user');
+                (0, testing_1.assert)(!!enduserEvents.find(function (t) { return t.id === ticketForEnduser.id; }), 'no ticket on socket for enduser', 'push ticket to enduser');
+                (0, testing_1.assert)(!enduserEvents.find(function (t) { return t.id === unusedTicket.id; }), 'enduser got an orgwide ticket', 'enduser does not receive org-wide ticket');
                 return [4 /*yield*/, user1.api.tickets.deleteOne(unusedTicket.id)];
             case 14:
-                _c.sent();
+                _a.sent();
                 return [4 /*yield*/, user1.api.tickets.deleteOne(ticketForEnduser.id)];
             case 15:
-                _c.sent();
+                _a.sent();
                 return [4 /*yield*/, user1.api.tickets.deleteOne(ticketFromEnduser.id)
                     // test enduser logout
                 ];
             case 16:
-                _c.sent();
+                _a.sent();
                 // test enduser logout
                 return [4 /*yield*/, enduserSDK.api.endusers.logout()];
             case 17:
                 // test enduser logout
-                _c.sent();
+                _a.sent();
                 return [4 /*yield*/, (0, testing_1.async_test)("verify enduser logout works", function () { return enduserSDK.api.chats.getOne({}); }, { shouldError: true, onError: function (e) { return e === 'Unauthenticated'; } }
                     // { shouldError: true, onError: (e: string) => !!e }
                     )
@@ -289,7 +402,7 @@ var enduser_tests = function () { return __awaiter(void 0, void 0, void 0, funct
                     // await user1.api.chats.deleteOne(messageToUser.id)
                 ];
             case 18:
-                _c.sent();
+                _a.sent();
                 return [2 /*return*/];
         }
     });
@@ -299,89 +412,86 @@ var SESSION_TIMEOUT_DELAY = 4000; // ms
 var deauthentication_tests = function (byTimeout) {
     if (byTimeout === void 0) { byTimeout = false; }
     return __awaiter(void 0, void 0, void 0, function () {
-        var enduser, room, userEvents, enduserEvents;
-        var _a, _b;
-        return __generator(this, function (_c) {
-            switch (_c.label) {
+        var enduser, room, userEvents, enduserEvents, badChatEnduser, badChat;
+        return __generator(this, function (_a) {
+            switch (_a.label) {
                 case 0:
                     (0, testing_1.log_header)("Unauthenticated Tests ".concat(byTimeout ? '- With Timeout, requires Worker' : '- With Manual Logout'));
                     return [4 /*yield*/, user1.api.endusers.createOne({ email: "socketenduser@tellescope.com" })];
                 case 1:
-                    enduser = _c.sent();
+                    enduser = _a.sent();
                     return [4 /*yield*/, user1.api.endusers.set_password({ id: enduser.id, password: 'enduserPassword!' })];
                 case 2:
-                    _c.sent();
+                    _a.sent();
                     return [4 /*yield*/, enduserSDK.authenticate(enduser.email, 'enduserPassword!', { durationInSeconds: byTimeout ? TEST_SESSION_DURATION : undefined })];
                 case 3:
-                    _c.sent();
+                    _a.sent();
                     return [4 /*yield*/, user1.api.chat_rooms.createOne({
                             type: 'external',
                             userIds: [user1.userInfo.id],
                             enduserIds: [enduser.id],
                         })];
                 case 4:
-                    room = _c.sent();
+                    room = _a.sent();
                     userEvents = [];
                     enduserEvents = [];
-                    user1.subscribe((_a = {}, _a[room.id] = 'chats', _a));
-                    enduserSDK.subscribe((_b = {}, _b[room.id] = 'chats', _b));
                     user1.handle_events({ 'created-chats': function (rs) { return userEvents.push.apply(userEvents, rs); } });
                     enduserSDK.handle_events({ 'created-chats': function (rs) { return enduserEvents.push.apply(enduserEvents, rs); } });
                     return [4 /*yield*/, (0, testing_1.wait)(undefined, AWAIT_SOCKET_DURATION)];
                 case 5:
-                    _c.sent();
+                    _a.sent();
                     if (!!byTimeout) return [3 /*break*/, 7];
                     return [4 /*yield*/, enduserSDK.api.endusers.logout()];
                 case 6:
-                    _c.sent();
+                    _a.sent();
                     return [3 /*break*/, 9];
                 case 7: return [4 /*yield*/, (0, testing_1.wait)(undefined, TEST_SESSION_DURATION * 1000 + SESSION_TIMEOUT_DELAY)];
                 case 8:
-                    _c.sent();
-                    _c.label = 9;
+                    _a.sent();
+                    _a.label = 9;
                 case 9: return [4 /*yield*/, user1.api.chats.createOne({ roomId: room.id, message: "Hello!" })];
                 case 10:
-                    _c.sent();
+                    badChatEnduser = _a.sent();
                     return [4 /*yield*/, (0, testing_1.wait)(undefined, AWAIT_SOCKET_DURATION)];
                 case 11:
-                    _c.sent();
-                    (0, testing_1.assert)((0, utilities_1.objects_equivalent)(enduserEvents[0], undefined), 'enduser got message after logout on socket', 'enduser logged out');
+                    _a.sent();
+                    (0, testing_1.assert)(enduserEvents.find(function (c) { return c.id === badChatEnduser.id; }) === undefined, 'enduser got message after logout on socket', 'enduser logged out');
                     // re-authenticate enduser to send message to user
                     return [4 /*yield*/, enduserSDK.authenticate(enduser.email, 'enduserPassword!')
                         // ensure user logged out appropriately for not receiving message
                     ];
                 case 12:
                     // re-authenticate enduser to send message to user
-                    _c.sent();
+                    _a.sent();
                     // ensure user logged out appropriately for not receiving message
                     return [4 /*yield*/, user1.logout()];
                 case 13:
                     // ensure user logged out appropriately for not receiving message
-                    _c.sent();
+                    _a.sent();
                     if (!byTimeout) return [3 /*break*/, 16];
                     return [4 /*yield*/, user1.authenticate(email, password, { expirationInSeconds: byTimeout ? TEST_SESSION_DURATION : undefined })];
                 case 14:
-                    _c.sent();
+                    _a.sent();
                     return [4 /*yield*/, (0, testing_1.wait)(undefined, TEST_SESSION_DURATION * 1000 + SESSION_TIMEOUT_DELAY)];
                 case 15:
-                    _c.sent();
+                    _a.sent();
                     return [3 /*break*/, 18];
                 case 16: return [4 /*yield*/, (0, testing_1.wait)(undefined, AWAIT_SOCKET_DURATION)];
                 case 17:
-                    _c.sent();
-                    _c.label = 18;
+                    _a.sent();
+                    _a.label = 18;
                 case 18: return [4 /*yield*/, enduserSDK.api.chats.createOne({ roomId: room.id, message: "Hello right back!" })];
                 case 19:
-                    _c.sent();
+                    badChat = _a.sent();
                     return [4 /*yield*/, (0, testing_1.wait)(undefined, AWAIT_SOCKET_DURATION)];
                 case 20:
-                    _c.sent();
-                    (0, testing_1.assert)((0, utilities_1.objects_equivalent)(userEvents[0], undefined), 'user got message after logout', 'user logged out');
+                    _a.sent();
+                    (0, testing_1.assert)(userEvents.find(function (e) { return e.id === badChat.id; }) === undefined, 'user got message after logout', 'user logged out');
                     // must come before cleanup, so cleanup works
                     return [4 /*yield*/, user1.authenticate(email, password)];
                 case 21:
                     // must come before cleanup, so cleanup works
-                    _c.sent();
+                    _a.sent();
                     // cleanup
                     return [4 /*yield*/, Promise.all([
                             user1.api.endusers.deleteOne(enduser.id),
@@ -390,7 +500,7 @@ var deauthentication_tests = function (byTimeout) {
                 case 22:
                     // must come before cleanup, so cleanup works
                     // cleanup
-                    _c.sent();
+                    _a.sent();
                     return [2 /*return*/];
             }
         });
@@ -458,7 +568,7 @@ var calendar_events = function () { return __awaiter(void 0, void 0, void 0, fun
                 return [4 /*yield*/, (0, testing_1.wait)(undefined, AWAIT_SOCKET_DURATION)];
             case 6:
                 _a.sent();
-                (0, testing_1.assert)(userEvents.length === 0, 'creator got calendar event', 'calendar event not gone to creator');
+                (0, testing_1.assert)(userEvents.length === 1, 'creator push bad', 'calendar event gone to creator');
                 (0, testing_1.assert)(enduserEvents.length === 1 && enduserEvents[0].id === event.id, 'enduser did not get calendar event', 'calendar event on create for attending enduser');
                 // cleanup
                 return [4 /*yield*/, user1.api.endusers.deleteOne(enduser.id)];
@@ -477,7 +587,7 @@ var calendar_events = function () { return __awaiter(void 0, void 0, void 0, fun
                 (0, testing_1.log_header)("Sockets");
                 _a.label = 1;
             case 1:
-                _a.trys.push([1, 14, , 15]);
+                _a.trys.push([1, 16, , 17]);
                 return [4 /*yield*/, user1.authenticate(email, password)];
             case 2:
                 _a.sent();
@@ -487,39 +597,45 @@ var calendar_events = function () { return __awaiter(void 0, void 0, void 0, fun
                 return [4 /*yield*/, user2.authenticate(email2, password2)]; // generate authToken + socket connection for API keyj
             case 4:
                 _a.sent(); // generate authToken + socket connection for API keyj
-                return [4 /*yield*/, user1.connectSocket()];
+                return [4 /*yield*/, sdkNonAdmin.authenticate(nonAdminEmail, nonAdminPassword)];
             case 5:
                 _a.sent();
-                return [4 /*yield*/, user2.connectSocket()];
+                return [4 /*yield*/, user1.connectSocket()];
             case 6:
                 _a.sent();
-                return [4 /*yield*/, basic_tests()];
+                return [4 /*yield*/, user2.connectSocket()];
             case 7:
                 _a.sent();
-                return [4 /*yield*/, access_tests()];
+                return [4 /*yield*/, sdkNonAdmin.connectSocket()];
             case 8:
                 _a.sent();
-                return [4 /*yield*/, calendar_events()];
+                return [4 /*yield*/, basic_tests()];
             case 9:
                 _a.sent();
-                return [4 /*yield*/, enduser_tests()];
+                return [4 /*yield*/, access_tests()];
             case 10:
                 _a.sent();
-                return [4 /*yield*/, (0, exports.notification_tests)()];
+                return [4 /*yield*/, calendar_events()];
             case 11:
                 _a.sent();
-                return [4 /*yield*/, deauthentication_tests()]; // should come last!
+                return [4 /*yield*/, enduser_tests()];
             case 12:
+                _a.sent();
+                return [4 /*yield*/, (0, exports.notification_tests)()];
+            case 13:
+                _a.sent();
+                return [4 /*yield*/, deauthentication_tests()]; // should come last!
+            case 14:
                 _a.sent(); // should come last!
                 return [4 /*yield*/, deauthentication_tests(true)]; // should come last!
-            case 13:
+            case 15:
                 _a.sent(); // should come last!
-                return [3 /*break*/, 15];
-            case 14:
+                return [3 /*break*/, 17];
+            case 16:
                 err_1 = _a.sent();
                 console.error(err_1);
-                return [3 /*break*/, 15];
-            case 15:
+                return [3 /*break*/, 17];
+            case 17:
                 process.exit();
                 return [2 /*return*/];
         }