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

[MM-55134] Don't blank the Site URL when it's not properly configured on an otherwise working server (#2959)

Browse source
This commit is contained in:
Devin Binnie 2024-02-12 08:44:45 -05:00 committed by GitHub
parent 6664059505
commit 1a7516aac9
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 17 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/app/serverViewState.test.js
View file

@ -446,6 +446,22 @@ describe('app/serverViewState', () => {
expect(result.validatedURL).toBe('https://mainserver.com/');
});
it('should not update the users URL when the Site URL is blank', async () => {
ServerInfo.mockImplementation(() => ({
fetchConfigData: jest.fn().mockImplementation(() => {
return {
serverVersion: '7.8.0',
siteName: 'Mattermost',
siteURL: '',
};
}),
}));
const result = await serverViewState.handleServerURLValidation({}, 'https://server.com');
expect(result.status).toBe(URLValidationStatus.OK);
expect(result.validatedURL).toBe('https://server.com/');
});
it('should warn the user when the Site URL is different but unreachable', async () => {
ServerInfo.mockImplementation(({url}) => ({
fetchConfigData: jest.fn().mockImplementation(() => {

2
src/app/serverViewState.ts
View file

@ -300,7 +300,7 @@ export class ServerViewState {
return {status: URLValidationStatus.URLUpdated, serverVersion: remoteInfo.serverVersion, serverName: remoteInfo.siteName, validatedURL: remoteInfo.siteURL};
}
return {status: URLValidationStatus.OK, serverVersion: remoteInfo.serverVersion, serverName: remoteInfo.siteName, validatedURL: remoteInfo.siteURL};
return {status: URLValidationStatus.OK, serverVersion: remoteInfo.serverVersion, serverName: remoteInfo.siteName, validatedURL: remoteURL.toString()};
};
private handleCloseView = (event: IpcMainEvent, viewId: string) => {