Merge pull request #2121 from Bilb/no-delete-auth-token-pysogs

No delete auth token pysogs + update electron

_locales/en/messages.json

@@ -19,6 +19,8 @@
   "editMenuPaste": "Paste",
   "editMenuPasteAndMatchStyle": "Paste and Match Style",
   "editMenuDelete": "Delete",
+  "editMenuDeleteContact": "Delete Contact",
+  "editMenuDeleteGroup": "Delete Group",
   "editMenuSelectAll": "Select all",
   "windowMenuClose": "Close Window",
   "windowMenuMinimize": "Minimize",

ts/components/menu/Menu.tsx

@@ -196,7 +196,9 @@ export function getDeleteContactMenuItem(
     if (isPublic) {
       menuItemText = window.i18n('leaveGroup');
     } else {
-      menuItemText = window.i18n('delete');
+      menuItemText = isGroup
+        ? window.i18n('editMenuDeleteGroup')
+        : window.i18n('editMenuDeleteContact');
     }
 
     const onClickClose = () => {

ts/session/apis/open_group_api/opengroupV2/ApiAuth.ts

@@ -84,35 +84,6 @@ export async function getAuthToken({
   return oneAtATimeGetAuth({ roomId, serverUrl });
 }
 
-export type DeleteAuthTokenRequest = OpenGroupRequestCommonType & { token: string };
-export const deleteAuthToken = async ({
-  serverUrl,
-  roomId,
-  token,
-}: DeleteAuthTokenRequest): Promise<void> => {
-  const request: OpenGroupV2Request = {
-    method: 'DELETE',
-    room: roomId,
-    server: serverUrl,
-    isAuthRequired: true,
-    endpoint: 'auth_token',
-    forcedTokenToUse: token,
-  };
-  try {
-    const result = await sendApiV2Request(request);
-    const statusCode = parseStatusCodeFromOnionRequest(result);
-    if (statusCode !== 200) {
-      // FIXME not yet sure why this call always return 401
-      // window?.log?.warn(`Could not deleteAuthToken, status code: ${statusCode}`);
-      return;
-    }
-    return;
-  } catch (e) {
-    window?.log?.error('deleteAuthToken failed:', e);
-    return;
-  }
-};
-
 // tslint:disable: member-ordering
 export async function requestNewAuthToken({
   serverUrl,

ts/session/apis/open_group_api/opengroupV2/OpenGroupManagerV2.ts

@@ -14,7 +14,6 @@ import { openGroupV2GetRoomInfo } from './OpenGroupAPIV2';
 import { OpenGroupServerPoller } from './OpenGroupServerPoller';
 
 import _ from 'lodash';
-import { deleteAuthToken, DeleteAuthTokenRequest } from './ApiAuth';
 import autoBind from 'auto-bind';
 
 let instance: OpenGroupManagerV2 | undefined;
@@ -129,13 +128,6 @@ export class OpenGroupManagerV2 {
           try {
             const roomConvoId = getOpenGroupV2ConversationId(infos.serverUrl, infos.roomId);
             if (!allConvos.get(roomConvoId)) {
-              // leave the group on the remote server
-              // this request doesn't throw
-              if (infos.token) {
-                await deleteAuthToken(
-                  _.pick(infos, 'serverUrl', 'roomId', 'token') as DeleteAuthTokenRequest
-                );
-              }
               // remove the roomInfos locally for this open group room
               await removeV2OpenGroupRoom(roomConvoId);
               getOpenGroupManager().removeRoomFromPolledRooms(infos);

ts/session/conversations/ConversationController.ts

@@ -12,10 +12,7 @@ import { actions as conversationActions } from '../../state/ducks/conversations'
 import { getV2OpenGroupRoom, removeV2OpenGroupRoom } from '../../data/opengroups';
 import _ from 'lodash';
 import { getOpenGroupManager } from '../apis/open_group_api/opengroupV2/OpenGroupManagerV2';
-import {
-  deleteAuthToken,
-  DeleteAuthTokenRequest,
-} from '../apis/open_group_api/opengroupV2/ApiAuth';
+
 import { deleteAllMessagesByConvoIdNoConfirmation } from '../../interactions/conversationInteractions';
 
 let instance: ConversationController | null;
@@ -201,12 +198,6 @@ export class ConversationController {
       window?.log?.info('leaving open group v2', conversation.id);
       const roomInfos = await getV2OpenGroupRoom(conversation.id);
       if (roomInfos) {
-        if (roomInfos.token) {
-          // leave the group on the remote server
-          await deleteAuthToken(
-            _.pick(roomInfos, 'serverUrl', 'roomId', 'token') as DeleteAuthTokenRequest
-          );
-        }
         getOpenGroupManager().removeRoomFromPolledRooms(roomInfos);
 
         // remove the roomInfos locally for this open group room

ts/types/LocalizerKeys.ts

@@ -214,6 +214,7 @@ export type LocalizerKeys =
   | 'groupNamePlaceholder'
   | 'stagedPreviewThumbnail'
   | 'helpUsTranslateSession'
+  | 'editMenuDeleteGroup'
   | 'unreadMessages'
   | 'documents'
   | 'audioPermissionNeededTitle'
@@ -250,6 +251,7 @@ export type LocalizerKeys =
   | 'previewThumbnail'
   | 'photo'
   | 'setPassword'
+  | 'editMenuDeleteContact'
   | 'hideMenuBarTitle'
   | 'imageCaptionIconAlt'
   | 'blockAll'