Skip to content

Chore: Migrate REST API - e2eResetOwnKey to Typescript #3888

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
reinaldonetof merged 3 commits into from
Mar 14, 2022
Merged

Chore: Migrate REST API - e2eResetOwnKey to Typescript #3888

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
879518d
Chore: Migrate REST API - e2eResetOwnKey to Typescript
reinaldonetof Mar 12, 2022
9746f45
Update app/lib/rocketchat/services/restApi.ts
dnlsilva Mar 14, 2022
2139549
Merge branch 'develop' into chore.ts-e2eresetownkey
reinaldonetof Mar 14, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion app/definitions/IRocketChat.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import rocketchat from '../lib/rocketchat';

type TRocketChat = typeof rocketchat;
export type TRocketChat = typeof rocketchat;

export interface IRocketChat extends TRocketChat {
closeListener: any;
Expand Down
7 changes: 0 additions & 7 deletions app/lib/rocketchat/rocketchat.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -198,13 +198,6 @@ const RocketChat = {
}
return result;
},
e2eResetOwnKey() {
this.unsubscribeRooms();

// RC 0.72.0
return this.methodCallWrapper('e2e.resetOwnE2EKey');
},

loginTOTP,
loginWithPassword,
loginOAuthOrSso,
Expand Down
10 changes: 9 additions & 1 deletion app/lib/rocketchat/services/restApi.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import sdk from './sdk';
import { TEAM_TYPE } from '../../../definitions/ITeam';
import roomTypeToApiType, { RoomTypes } from '../methods/roomTypeToApiType';
import { SubscriptionType, INotificationPreferences, IRoomNotifications } from '../../../definitions';
import { SubscriptionType, INotificationPreferences, IRoomNotifications, TRocketChat } from '../../../definitions';
import { ISpotlight } from '../../../definitions/ISpotlight';
import { IAvatarSuggestion, IParams } from '../../../definitions/IProfileViewInterfaces';

Expand Down Expand Up @@ -743,3 +743,11 @@ export const useInviteToken = (token: string): any =>
// TODO: missing definitions from server
// @ts-ignore
sdk.post('useInviteToken', { token });

export function e2eResetOwnKey(this: TRocketChat): Promise<boolean | {}> {
// {} when TOTP is enabled
this.unsubscribeRooms();
Comment thread
dnlsilva marked this conversation as resolved.

// RC 0.72.0
return sdk.methodCallWrapper('e2e.resetOwnE2EKey');
}