toki/mattermost-mobile
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Disallow connecting to the same server from the multi-server selection (#6355)

Browse source
This commit is contained in:
Elias Nahum 2022-06-06 09:22:08 -04:00 committed by GitHub
parent 81357d8a0e
commit e01d8f46c2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 25 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
app/screens/home/channel_list/servers/servers_list/server_item/server_item.tsx
View file

@ -23,10 +23,11 @@ import {useTheme} from '@context/theme';
import DatabaseManager from '@database/manager';
import {subscribeServerUnreadAndMentions, UnreadObserverArgs} from '@database/subscription/unreads';
import {useIsTablet} from '@hooks/device';
import {queryServerByIdentifier} from '@queries/app/servers';
import {dismissBottomSheet} from '@screens/navigation';
import EphemeralStore from '@store/ephemeral_store';
import {alertPushProxyError, alertPushProxyUnknown} from '@utils/push_proxy';
import {alertServerError, alertServerLogout, alertServerRemove, editServer, loginToServer} from '@utils/server';
import {alertServerAlreadyConnected, alertServerError, alertServerLogout, alertServerRemove, editServer, loginToServer} from '@utils/server';
import {changeOpacity, makeStyleSheetFromTheme} from '@utils/theme';
import {typography} from '@utils/typography';
import {removeProtocol, stripTrailingSlashes} from '@utils/url';
@ -234,6 +235,19 @@ const ServerItem = ({
return;
}
const data = await fetchConfigAndLicense(server.url, true);
if (data.error) {
alertServerError(intl, data.error as ClientErrorProps);
setSwitching(false);
return;
}
const existingServer = await queryServerByIdentifier(DatabaseManager.appDatabase!.database, data.config!.DiagnosticId);
if (existingServer && existingServer.lastActiveAt > 0) {
alertServerAlreadyConnected(intl);
setSwitching(false);
return;
}
switch (result.canReceiveNotifications) {
case PUSH_PROXY_RESPONSE_NOT_AVAILABLE:
EphemeralStore.setPushProxyVerificationState(server.url, PUSH_PROXY_STATUS_NOT_AVAILABLE);
@ -247,12 +261,6 @@ const ServerItem = ({
EphemeralStore.setPushProxyVerificationState(server.url, PUSH_PROXY_STATUS_VERIFIED);
}
const data = await fetchConfigAndLicense(server.url, true);
if (data.error) {
alertServerError(intl, data.error as ClientErrorProps);
setSwitching(false);
return;
}
loginToServer(theme, server.url, displayName, data.config!, data.license!);
}, [server, theme, intl]);

10
app/utils/server/index.ts
View file

@ -170,6 +170,16 @@ export function alertServerError(intl: IntlShape, error: ClientErrorProps) {
);
}
export function alertServerAlreadyConnected(intl: IntlShape) {
Alert.alert(
'',
intl.formatMessage({
id: 'mobile.server_identifier.exists',
defaultMessage: 'You are already connected to this server.',
}),
);
}
function unsupportedServerAdminAlert(intl: IntlShape) {
const title = intl.formatMessage({id: 'mobile.server_upgrade.title', defaultMessage: 'Server upgrade required'});