Merge pull request #346 from sasjs/issue-345

fix: clientID should default to clientID1 for serverType sasjs
sasjs · Sep 5, 2022 · 36fcb86 · 36fcb86
2 parents 34326ae + 2fb0e19
commit 36fcb86
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 5 deletions.
diff --git a/src/commands/execute-code/internal/configuration.ts b/src/commands/execute-code/internal/configuration.ts
@@ -43,7 +43,10 @@ export const getAuthConfig = async (
     debug: true
   })
 
-  const clientId = await getClientId()
+  const defaultClientID =
+    target.serverType === ServerType.Sasjs ? 'clientID1' : undefined
+
+  const clientId = await getClientId(defaultClientID)
   let clientSecret = ''
   if (target.serverType === ServerType.SasViya) {
     clientSecret = await getClientSecret()

diff --git a/src/utils/auth.ts b/src/utils/auth.ts
@@ -102,7 +102,10 @@ export const authenticateTarget = async (
     serverType: targetJson.serverType
   })
 
-  const clientId = await getClientId()
+  const defaultClientID =
+    targetJson.serverType === ServerType.Sasjs ? 'clientID1' : undefined
+
+  const clientId = await getClientId(defaultClientID)
   const clientSecret =
     targetJson.serverType === ServerType.SasViya ? await getClientSecret() : ''
 

diff --git a/src/utils/input.ts b/src/utils/input.ts
@@ -53,10 +53,12 @@ export const getServerType = async () => {
   return serverType
 }
 
-export const getClientId = async () => {
+export const getClientId = async (defaultClientID?: string) => {
   const clientId = await getTextInput(
     'Please enter your Client ID',
-    (value: string) => (value ? null : 'Client ID can not be empty')
+    (value: string) => (value ? null : 'Client ID can not be empty'),
+    false,
+    defaultClientID
   )
 
   return clientId
@@ -101,9 +103,11 @@ export const getPassword = async () => {
 export const getTextInput = async (
   placeHolder: string,
   validator: (value: string) => string | null,
-  password: boolean = false
+  password: boolean = false,
+  value?: string
 ) => {
   const input = await window.showInputBox({
+    value,
     placeHolder,
     ignoreFocusOut: true,
     password,