no need to deleteAuthToken anymore for opengroupv2 servers

pull/2121/head
Audric Ackermann 3 years ago
parent 7b103226be
commit 1a8a839ba3
No known key found for this signature in database
GPG Key ID: 999F434D76324AD4

@ -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,

@ -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);

@ -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

Loading…
Cancel
Save