Merge branch 'develop' into duplicate-image

Rohit3523 · web-flow · commit e4b3090a9849 · 2024-11-13T01:34:11.000+05:30
diff --git a/app/containers/MessageErrorActions.tsx b/app/containers/MessageErrorActions.tsx
@@ -71,7 +71,7 @@ const MessageErrorActions = forwardRef<IMessageErrorActions, { tmid?: string }>(
 				}
 			}
 			await db.write(async () => {
-				await db.batch(...deleteBatch);
+				await db.batch(deleteBatch);
 			});
 		} catch (e) {
 			log(e);
diff --git a/app/lib/encryption/encryption.ts b/app/lib/encryption/encryption.ts
@@ -332,7 +332,7 @@ class Encryption {
 			)) as (TThreadModel | TThreadMessageModel)[];
 
 			await db.write(async () => {
-				await db.batch(...toDecrypt);
+				await db.batch(toDecrypt);
 			});
 		} catch (e) {
 			log(e);
@@ -368,7 +368,7 @@ class Encryption {
 			);
 
 			await db.write(async () => {
-				await db.batch(...subsEncrypted);
+				await db.batch(subsEncrypted);
 			});
 		} catch (e) {
 			log(e);
@@ -417,7 +417,7 @@ class Encryption {
 		}
 
 		try {
-			const batch: (Model | null | void | false)[] = [];
+			const batch: Model[] = [];
 			// If the subscription doesn't exists yet
 			if (!subRecord) {
 				// Let's create the subscription with the data received
@@ -444,7 +444,7 @@ class Encryption {
 			// If batch has some operation
 			if (batch.length) {
 				await db.write(async () => {
-					await db.batch(...batch);
+					await db.batch(batch);
 				});
 			}
 		} catch {
diff --git a/app/lib/methods/getCustomEmojis.ts b/app/lib/methods/getCustomEmojis.ts
@@ -62,7 +62,7 @@ const updateEmojis = async ({ update = [], remove = [], allRecords }: IUpdateEmo
 
 	try {
 		await db.write(async () => {
-			await db.batch(...emojisToCreate, ...emojisToUpdate, ...emojisToDelete);
+			await db.batch(emojisToCreate, ...emojisToUpdate, ...emojisToDelete);
 		});
 		return true;
 	} catch (e) {
diff --git a/app/lib/methods/getPermissions.ts b/app/lib/methods/getPermissions.ts
@@ -147,7 +147,7 @@ const updatePermissions = async ({
 
 	try {
 		await db.write(async () => {
-			await db.batch(...batch);
+			await db.batch(batch);
 		});
 		return true;
 	} catch (e) {
diff --git a/app/lib/methods/getRoles.ts b/app/lib/methods/getRoles.ts
@@ -114,7 +114,7 @@ export function getRoles(): Promise<void> {
 					const allRecords: Model[] = [...rolesToCreate, ...rolesToUpdate];
 
 					try {
-						await db.batch(...allRecords);
+						await db.batch(allRecords);
 					} catch (e) {
 						log(e);
 					}
diff --git a/app/lib/methods/getSettings.ts b/app/lib/methods/getSettings.ts
@@ -225,7 +225,7 @@ export async function getSettings(): Promise<void> {
 			const allRecords = [...settingsToCreateMapped, ...settingsToUpdateMapped];
 
 			try {
-				await db.batch(...allRecords);
+				await db.batch(allRecords);
 			} catch (e) {
 				log(e);
 			}
diff --git a/app/lib/methods/getSlashCommands.ts b/app/lib/methods/getSlashCommands.ts
@@ -63,7 +63,7 @@ export function getSlashCommands() {
 					const allRecords = [...slashCommandsToCreate, ...slashCommandsToUpdate, ...slashCommandsToDelete];
 
 					try {
-						await db.batch(...allRecords);
+						await db.batch(allRecords);
 					} catch (e) {
 						log(e);
 					}
diff --git a/app/lib/methods/handleMediaDownload.ts b/app/lib/methods/handleMediaDownload.ts
@@ -245,7 +245,7 @@ const persistMessage = async (messageId: string, uri: string, encryption: boolea
 	}
 	if (batch.length) {
 		await db.write(async () => {
-			await db.batch(...batch);
+			await db.batch(batch);
 		});
 	}
 };
diff --git a/app/lib/methods/loadThreadMessages.ts b/app/lib/methods/loadThreadMessages.ts
@@ -73,7 +73,7 @@ export function loadThreadMessages({ tmid, rid }: { tmid: string; rid: string })
 					});
 
 					await db.write(async () => {
-						await db.batch(...threadMessagesToCreate, ...threadMessagesToUpdate);
+						await db.batch(threadMessagesToCreate, ...threadMessagesToUpdate);
 					});
 				} catch (e) {
 					log(e);
diff --git a/app/lib/methods/logout.ts b/app/lib/methods/logout.ts
@@ -58,7 +58,7 @@ export async function removeServerData({ server }: { server: string }): Promise<
 		const serverRecord = await serverCollection.find(server);
 		batch.push(serverRecord.prepareDestroyPermanently());
 
-		await serversDB.write(() => serversDB.batch(...batch));
+		await serversDB.write(() => serversDB.batch(batch));
 		await removeSharedCredentials({ server });
 		await removeServerKeys({ server, userId });
 	} catch (e) {
diff --git a/app/lib/methods/sendMessage.ts b/app/lib/methods/sendMessage.ts
@@ -40,7 +40,7 @@ const changeMessageStatus = async (id: string, status: number, tmid?: string, me
 
 	try {
 		await db.write(async () => {
-			await db.batch(...successBatch);
+			await db.batch(successBatch);
 		});
 	} catch (error) {
 		// Do nothing
@@ -223,7 +223,7 @@ export async function sendMessage(
 
 		try {
 			await db.write(async () => {
-				await db.batch(...batch);
+				await db.batch(batch);
 			});
 		} catch (e) {
 			log(e);
diff --git a/app/lib/methods/subscriptions/rooms.ts b/app/lib/methods/subscriptions/rooms.ts
@@ -238,7 +238,7 @@ const createOrUpdateSubscription = async (subscription: ISubscription, room: ISe
 		}
 
 		await db.write(async () => {
-			await db.batch(...batch);
+			await db.batch(batch);
 		});
 	} catch (e) {
 		log(e);
diff --git a/app/lib/methods/updateMessages.ts b/app/lib/methods/updateMessages.ts
@@ -1,4 +1,4 @@
-import { Q } from '@nozbe/watermelondb';
+import { Model, Q } from '@nozbe/watermelondb';
 import { sanitizedRaw } from '@nozbe/watermelondb/RawRecord';
 
 import { MESSAGE_TYPE_ANY_LOAD } from '../constants';
@@ -198,9 +198,9 @@ export default async function updateMessages({
 			...threadsToUpdate,
 			...threadMessagesToCreate,
 			...threadMessagesToUpdate
-		];
+		] as Model[];
 
-		await db.batch(...allRecords);
+		await db.batch(allRecords);
 		return allRecords.length;
 	});
 }
diff --git a/app/sagas/deepLinking.js b/app/sagas/deepLinking.js
@@ -115,15 +115,13 @@ const handleOpen = function* handleOpen({ params }) {
 		yield handleShareExtension({ params });
 		return;
 	}
-
-	let { host } = params;
-
 	if (params.type === 'oauth') {
 		yield handleOAuth({ params });
 		return;
 	}
 
 	// If there's no host on the deep link params and the app is opened, just call appInit()
+	let { host } = params;
 	if (!host) {
 		yield fallbackNavigation();
 		return;
@@ -151,13 +149,10 @@ const handleOpen = function* handleOpen({ params }) {
 	]);
 
 	const serverRecord = yield getServerById(host);
-	if (!serverRecord) {
-		return;
-	}
 
 	// TODO: needs better test
 	// if deep link is from same server
-	if (server === host && user) {
+	if (server === host && user && serverRecord) {
 		const connected = yield select(state => state.server.connected);
 		if (!connected) {
 			yield localAuthenticate(host);
@@ -168,7 +163,7 @@ const handleOpen = function* handleOpen({ params }) {
 	} else {
 		// search if deep link's server already exists
 		try {
-			if (user) {
+			if (user && serverRecord) {
 				yield localAuthenticate(host);
 				yield put(selectServerRequest(host, serverRecord.version, true, true));
 				yield take(types.LOGIN.SUCCESS);
@@ -230,7 +225,7 @@ const handleNavigateCallRoom = function* handleNavigateCallRoom({ params }) {
 	}
 };
 
-const handleClickCallPush = function* handleOpen({ params }) {
+const handleClickCallPush = function* handleClickCallPush({ params }) {
 	let { host } = params;
 
 	if (host.slice(-1) === '/') {
@@ -243,11 +238,8 @@ const handleClickCallPush = function* handleOpen({ params }) {
 	]);
 
 	const serverRecord = yield getServerById(host);
-	if (!serverRecord) {
-		return;
-	}
 
-	if (server === host && user) {
+	if (server === host && user && serverRecord) {
 		const connected = yield select(state => state.server.connected);
 		if (!connected) {
 			yield localAuthenticate(host);
@@ -256,7 +248,7 @@ const handleClickCallPush = function* handleOpen({ params }) {
 		}
 		yield handleNavigateCallRoom({ params });
 	} else {
-		if (user) {
+		if (user && serverRecord) {
 			yield localAuthenticate(host);
 			yield put(selectServerRequest(host, serverRecord.version, true, true));
 			yield take(types.LOGIN.SUCCESS);
diff --git a/app/sagas/login.js b/app/sagas/login.js
@@ -132,7 +132,13 @@ const handleLoginRequest = function* handleLoginRequest({
 			yield put(logoutAction(true, 'Token_expired'));
 		} else {
 			logEvent(events.LOGIN_DEFAULT_LOGIN_F);
-			yield put(loginFailure(e));
+			const currentRoot = yield select(state => state.app.root);
+			const connected = yield select(state => state.meteor.connected);
+			if (currentRoot === RootEnum.ROOT_OUTSIDE || !connected) {
+				yield put(loginFailure(e));
+				return;
+			}
+			yield put(logoutAction(true));
 		}
 	}
 };
diff --git a/app/sagas/rooms.js b/app/sagas/rooms.js
@@ -124,7 +124,7 @@ const handleRoomsRequest = function* handleRoomsRequest({ params }) {
 			];
 
 			yield db.write(async () => {
-				await db.batch(...allRecords);
+				await db.batch(allRecords);
 			});
 		}
 
diff --git a/app/views/RoomMembersView/index.tsx b/app/views/RoomMembersView/index.tsx
@@ -387,7 +387,7 @@ const RoomMembersView = (): React.ReactElement => {
 				renderItem={({ item }) => (
 					<View style={{ backgroundColor: colors.surfaceRoom }}>
 						<UserItem
-							name={item.name as string}
+							name={item.name || item.username}
 							username={item.username}
 							onPress={() => onPressUser(item)}
 							testID={`room-members-view-item-${item.username}`}
diff --git a/e2e/tests/assorted/11-deeplinking.spec.ts b/e2e/tests/assorted/11-deeplinking.spec.ts
@@ -6,8 +6,6 @@ import {
 	tapBack,
 	checkServer,
 	navigateToRegister,
-	platformTypes,
-	TTextMatcher,
 	expectValidRegisterOrRetry,
 	navigateToRoom,
 	checkMessage,
@@ -37,7 +35,6 @@ describe('Deep linking', () => {
 	let userId: string;
 	let authToken: string;
 	let threadId: string;
-	let textMatcher: TTextMatcher;
 	let rid: string;
 	let room: string;
 	const threadMessage = `to-thread-${random()}`;
@@ -49,8 +46,6 @@ describe('Deep linking', () => {
 		({ _id: rid, name: room } = await createRandomRoom(user, 'p'));
 		const loginResult = await login(user.username, user.password);
 		({ userId, authToken } = loginResult);
-		const deviceType = device.getPlatform();
-		({ textMatcher } = platformTypes[deviceType]);
 		// create a thread with api
 		const result = await sendMessage(user, room, threadMessage);
 		threadId = result.message._id;
@@ -87,9 +82,12 @@ describe('Deep linking', () => {
 				delete: true,
 				url: getDeepLink(DEEPLINK_METHODS.AUTH, data.server, `userId=123${amp}token=abc`)
 			});
-			await waitFor(element(by[textMatcher]("You've been logged out by the workspace. Please log in again.")))
-				.toExist()
-				.withTimeout(30000); // TODO: we need to improve this message
+			await waitFor(element(by.id('workspace-view')))
+				.toBeVisible()
+				.withTimeout(30000);
+			// await waitFor(element(by[textMatcher]("You've been logged out by the workspace. Please log in again.")))
+			// 	.toExist()
+			// 	.withTimeout(30000); // TODO: we need to improve this message
 		});
 
 		it('should authenticate and navigate', async () => {

Original file line number	Diff line number	Diff line change
`@@ -71,7 +71,7 @@ const MessageErrorActions = forwardRef<IMessageErrorActions, { tmid?: string }>(`
`71`	`71`	`}`
`72`	`72`	`}`
`73`	`73`	`await db.write(async () => {`
`74`		`- await db.batch(...deleteBatch);`
	`74`	`+ await db.batch(deleteBatch);`
`75`	`75`	`});`
`76`	`76`	`} catch (e) {`
`77`	`77`	`log(e);`
Original file line number	Diff line number	Diff line change
`@@ -114,7 +114,7 @@ export function getRoles(): Promise<void> {`
`114`	`114`	`const allRecords: Model[] = [...rolesToCreate, ...rolesToUpdate];`
`115`	`115`
`116`	`116`	`try {`
`117`		`- await db.batch(...allRecords);`
	`117`	`+ await db.batch(allRecords);`
`118`	`118`	`} catch (e) {`
`119`	`119`	`log(e);`
`120`	`120`	`}`
Original file line number	Diff line number	Diff line change
`@@ -225,7 +225,7 @@ export async function getSettings(): Promise<void> {`
`225`	`225`	`const allRecords = [...settingsToCreateMapped, ...settingsToUpdateMapped];`
`226`	`226`
`227`	`227`	`try {`
`228`		`- await db.batch(...allRecords);`
	`228`	`+ await db.batch(allRecords);`
`229`	`229`	`} catch (e) {`
`230`	`230`	`log(e);`
`231`	`231`	`}`
Original file line number	Diff line number	Diff line change
`@@ -63,7 +63,7 @@ export function getSlashCommands() {`
`63`	`63`	`const allRecords = [...slashCommandsToCreate, ...slashCommandsToUpdate, ...slashCommandsToDelete];`
`64`	`64`
`65`	`65`	`try {`
`66`		`- await db.batch(...allRecords);`
	`66`	`+ await db.batch(allRecords);`
`67`	`67`	`} catch (e) {`
`68`	`68`	`log(e);`
`69`	`69`	`}`
Original file line number	Diff line number	Diff line change
`@@ -245,7 +245,7 @@ const persistMessage = async (messageId: string, uri: string, encryption: boolea`
`245`	`245`	`}`
`246`	`246`	`if (batch.length) {`
`247`	`247`	`await db.write(async () => {`
`248`		`- await db.batch(...batch);`
	`248`	`+ await db.batch(batch);`
`249`	`249`	`});`
`250`	`250`	`}`
`251`	`251`	`};`