PR feedback

mattermost · Nov 13, 2024 · 2575c22 · 2575c22
1 parent 8fb3ac4
commit 2575c22
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/src/app/serverViewState.test.js b/src/app/serverViewState.test.js
@@ -449,6 +449,13 @@ describe('app/serverViewState', () => {
             expect(result.status).toBe(URLValidationStatus.OK);
         });
 
+        it('should update the URL if the user is typing something other than http', async () => {
+            let result = await serverViewState.handleServerURLValidation({}, 'abchttp');
+            expect(result.status).toBe(URLValidationStatus.OK);
+            result = await serverViewState.handleServerURLValidation({}, 'abchttps');
+            expect(result.status).toBe(URLValidationStatus.OK);
+        });
+
         it('should attempt HTTP when HTTPS fails, and generate a warning', async () => {
             ServerInfo.mockImplementation(({url}) => ({
                 fetchConfigData: jest.fn().mockImplementation(() => {

diff --git a/src/app/serverViewState.ts b/src/app/serverViewState.ts
@@ -241,7 +241,7 @@ export class ServerViewState {
             // If it already includes the protocol, force it to HTTPS
             if (isValidURI(url) && !url.startsWith('http')) {
                 httpUrl = url.replace(/^((.+):\/\/)?/, 'https://');
-            } else if (!url.match(/^(h|ht|htt|http|https):?\/?\/?$/)) {
+            } else if (!'https://'.startsWith(url) && !'http://'.startsWith(url)) {
                 // Check if they're starting to type `http(s)`, otherwise add HTTPS for them
                 httpUrl = `https://${url}`;
             }