Chore: Dehydrate login methods from rocketchat.js

app/containers/LoginServices.tsx

@@ -234,7 +234,7 @@ class LoginServices extends React.PureComponent<ILoginServicesProps, any> {
 					AppleAuthentication.AppleAuthenticationScope.EMAIL
 				]
 			});
-
+			// @ts-ignore
 			await RocketChat.loginOAuthOrSso({ fullName, email, identityToken });
 		} catch {
 			logEvent(events.ENTER_WITH_APPLE_F);

app/containers/MessageBox/index.tsx

@@ -49,6 +49,7 @@ import { sanitizeLikeString } from '../../lib/database/utils';
 import { CustomIcon } from '../../lib/Icons';
 import { IMessage } from '../../definitions/IMessage';
 import { forceJpgExtension } from './forceJpgExtension';
+import { IUser } from '../../definitions';
 
 if (isAndroid) {
 	require('./EmojiKeyboard');
@@ -80,12 +81,7 @@ export interface IMessageBoxProps {
 	editing: boolean;
 	threadsEnabled: boolean;
 	isFocused(): boolean;
-	user: {
-		id: string;
-		_id: string;
-		username: string;
-		token: string;
-	};
+	user: IUser;
 	roomType: string;
 	tmid: string;
 	replyWithMention: boolean;

app/definitions/ICredentials.ts

@@ -0,0 +1,15 @@
+export interface ICredentials {
+	user?: string;
+	password?: string;
+	username?: string;
+	ldapPass?: string;
+	ldap?: boolean;
+	ldapOptions?: object;
+	crowdPassword?: string;
+	crowd?: boolean;
+	code?: string;
+	totp?: {
+		login: ICredentials;
+		code: string;
+	};
+}

app/definitions/ILoggedUser.ts

@@ -1,18 +1,38 @@
 import Model from '@nozbe/watermelondb/Model';
 
+import { IUserEmail, IUserSettings } from './IUser';
+import { UserStatus } from './UserStatus';
+
 export interface ILoggedUser {
 	id: string;
 	token: string;
 	username: string;
 	name: string;
 	language?: string;
-	status: string;
+	status: UserStatus;
 	statusText?: string;
+	customFields?: {
+		[key: string]: any;
+	};
+	statusLivechat?: string;
+	emails?: IUserEmail[];
 	roles?: string[];
 	avatarETag?: string;
 	showMessageInMainThread?: boolean;
 	isFromWebView?: boolean;
 	enableMessageParserEarlyAdoption?: boolean;
 }
 
+export interface ILoggedUserResultFromServer
+	extends Omit<ILoggedUser, 'enableMessageParserEarlyAdoption' | 'showMessageInMainThread'> {
+	settings: IUserSettings;
+}
+
+export interface ILoginResultFromServer {
+	status: string;
+	authToken: string;
+	userId: string;
+	me: ILoggedUserResultFromServer;
+}
+
 export type TLoggedUserModel = ILoggedUser & Model;

app/definitions/IRocketChat.ts

@@ -3,6 +3,16 @@ import rocketchat from '../lib/rocketchat';
 type TRocketChat = typeof rocketchat;
 
 export interface IRocketChat extends TRocketChat {
+	closeListener: any;
+	usersListener: any;
+	notifyAllListener: any;
+	rolesListener: any;
+	notifyLoggedListener: any;
+	activeUsers: any;
+	_setUserTimer: any;
+	connectedListener: any;
+	connectingListener: any;
+	connectTimeout: any;
 	sdk: any;
 	activeUsersSubTimeout: any;
 	roomsSub: any;

app/definitions/index.ts

@@ -24,6 +24,7 @@ export * from './IServerHistory';
 export * from './IRocketChat';
 export * from './ICertificate';
 export * from './IUrl';
+export * from './ICredentials';
 export * from './ISearch';
 
 export interface IBaseScreen<T extends Record<string, object | undefined>, S extends string> {

app/lib/methods/logout.ts

@@ -12,6 +12,7 @@ import log from '../../utils/log';
 import { E2E_PRIVATE_KEY, E2E_PUBLIC_KEY, E2E_RANDOM_PASSWORD_KEY } from '../encryption/constants';
 import UserPreferences from '../userPreferences';
 import { ICertificate, IRocketChat } from '../../definitions';
+import sdk from '../rocketchat/services/sdk';
 
 async function removeServerKeys({ server, userId }: { server: string; userId?: string | null }) {
 	await UserPreferences.removeItem(`${RocketChat.TOKEN_KEY}-${server}`);
@@ -116,13 +117,13 @@ export default async function logout(this: IRocketChat, { server }: { server: st
 
 	try {
 		// RC 0.60.0
-		await this.sdk.logout();
+		await sdk.current.logout();
 	} catch (e) {
 		log(e);
 	}
 
-	if (this.sdk) {
-		this.sdk = null;
+	if (sdk.current) {
+		sdk.disconnect();
 	}
 
 	await removeServerData({ server });