chore(auth): consolidate start url validation (#5429)

Author: hayemaxi

packages/core/src/auth/sso/constants.ts

@@ -0,0 +1,15 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/**
+ * For compatibility, this file should not import anything that cannot be used in
+ * web, node, or vue.
+ */
+
+export const ssoUrlFormatRegex =
+    /^(https?:\/\/(.+)\.awsapps\.com\/start|https?:\/\/identitycenter\.amazonaws\.com\/ssoins-[\da-zA-Z]{16})\/?$/
+
+export const ssoUrlFormatMessage =
+    'URLs must start with http:// or https://. Example: https://d-xxxxxxxxxx.awsapps.com/start'

packages/core/src/auth/sso/validation.ts

@@ -6,19 +6,15 @@ import * as vscode from 'vscode'
 import { UnknownError } from '../../shared/errors'
 import { AuthType } from '../auth'
 import { SsoConnection, hasScopes, isAnySsoConnection } from '../connection'
+import { ssoUrlFormatMessage, ssoUrlFormatRegex } from './constants'
 
-export function validateSsoUrl(auth: AuthType, url: string, requiredScopes?: string[]) {
-    const urlFormatError = validateSsoUrlFormat(url)
-    if (urlFormatError) {
-        return urlFormatError
-    }
-
-    return validateIsNewSsoUrlAsync(auth, url, requiredScopes)
-}
-
+/**
+ * Returns an error message if the url is not properly formatted.
+ * Otherwise, returns undefined.
+ */
 export function validateSsoUrlFormat(url: string) {
-    if (!url.match(/^(http|https):\/\//i)) {
-        return 'URLs must start with http:// or https://. Example: https://d-xxxxxxxxxx.awsapps.com/start'
+    if (!ssoUrlFormatRegex.test(url)) {
+        return ssoUrlFormatMessage
     }
 }
 

packages/core/src/login/webview/vue/login.vue

@@ -278,18 +278,13 @@ import { LoginOption } from './types'
 import { CommonAuthWebview } from './backend'
 import { WebviewClientFactory } from '../../../webviews/client'
 import { Region } from '../../../shared/regions/endpoints'
+import { ssoUrlFormatRegex, ssoUrlFormatMessage } from '../../../auth/sso/constants'
 
 const client = WebviewClientFactory.create<CommonAuthWebview>()
 
 /** Where the user is currently in the builder id setup process */
 type Stage = 'START' | 'SSO_FORM' | 'CONNECTED' | 'AUTHENTICATING' | 'AWS_PROFILE'
 
-function validateSsoUrlFormat(url: string) {
-    const regex =
-        /^(https?:\/\/(.+)\.awsapps\.com\/start|https?:\/\/identitycenter\.amazonaws\.com\/ssoins-[\da-zA-Z]{16})\/?$/
-    return regex.test(url)
-}
-
 function getCredentialId(loginOption: LoginOption) {
     switch (loginOption) {
         case LoginOption.BUILDER_ID:
@@ -481,9 +476,8 @@ export default defineComponent({
             }
         },
         handleUrlInput() {
-            if (this.startUrl && !validateSsoUrlFormat(this.startUrl)) {
-                this.startUrlError =
-                    'URLs must start with http:// or https://. Example: https://d-xxxxxxxxxx.awsapps.com/start'
+            if (this.startUrl && !ssoUrlFormatRegex.test(this.startUrl)) {
+                this.startUrlError = ssoUrlFormatMessage
             } else if (this.startUrl && this.existingStartUrls.some((url) => url === this.startUrl)) {
                 this.startUrlError =
                     'A connection for this start URL already exists. Sign out before creating a new one.'