Merge pull request #924 from oracle/merge-from-release-25.1

alisyed-19 · web-flow · commit 1e641e7bb456 · 2025-07-24T13:03:00.000+02:00
restore missing changes from release/25.1
diff --git a/LICENSE.txt b/LICENSE.txt
@@ -1,4 +1,4 @@
-Copyright (c) 2021, 2024 Oracle and/or its affiliates.
+Copyright (c) 2019, 2023 Oracle and/or its affiliates.
 
 The Universal Permissive License (UPL), Version 1.0
 
diff --git a/README.md b/README.md
@@ -39,7 +39,7 @@ Please consult the [security guide](./SECURITY.md) for our responsible security
 
 
 ## License
-Copyright (c) 2022, 2023, 2024, 2025 Oracle and/or its affiliates The Universal Permissive License (UPL), Version 1.0.
+Copyright (c) 2019, 2023 Oracle and/or its affiliates The Universal Permissive License (UPL), Version 1.0.
 
 By installing SuiteCloud CLI for Node.js, you are accepting the installation of the SuiteCloud SDK dependency under the [Oracle Free Use Terms and Conditions](https://www.oracle.com/downloads/licenses/oracle-free-license.html) license.
 
diff --git a/packages/node-cli/README.md b/packages/node-cli/README.md
@@ -101,6 +101,6 @@ To read the 2025.1 NetSuite's release notes and documentation, check the followi
 SuiteCloud CLI for Node.js is an open source project. Pull Requests are currently not being accepted. See [Contributing](/CONTRIBUTING.md) for details.
 
 ## [License](/LICENSE.txt)
-Copyright (c) 2022, 2023, 2024, 2025 Oracle and/or its affiliates The Universal Permissive License (UPL), Version 1.0.
+Copyright (c) 2019, 2023 Oracle and/or its affiliates The Universal Permissive License (UPL), Version 1.0.
 
 By installing SuiteCloud CLI for Node.js, you are accepting the installation of the SuiteCloud SDK dependency under the [Oracle Free Use Terms and Conditions](https://www.oracle.com/downloads/licenses/oracle-free-license.html) license.
diff --git a/packages/node-cli/messages.json b/packages/node-cli/messages.json
@@ -165,7 +165,7 @@
 	"COMMAND_MANAGE_ACCOUNT_QUESTIONS_NEW_NAME": "Enter a new name for the authentication ID:",
 	"COMMAND_MANAGE_ACCOUNT_QUESTIONS_SELECT_CREDENTIALS": "Select an authentication ID (a custom alias you give to a specific account-role combination) to see its details:",
 	"COMMAND_MANAGE_ACCOUNT_QUESTIONS_SELECT_ACTION": "Select one of the following actions:",
-	"COMMAND_MANAGE_ACCOUNT_QUESTIONS_VERIFY_REMOVE": "You will remove the credentials locally, but the TBA tokens will still be valid in the account. Do you want to proceed?",
+	"COMMAND_MANAGE_ACCOUNT_QUESTIONS_VERIFY_REMOVE": "You will remove the credentials locally, but the tokens are not revoked in the account. Do you want to proceed?",
 
 	"COMMAND_OPTIONS_HELP": "Displays help for the command.",
 	"COMMAND_OPTIONS_INTERACTIVE_HELP": "Runs the {0} command in interactive mode.",
@@ -259,7 +259,6 @@
 	"ERRORS_RUN_SETUP_ACCOUNT": "Run \"suitecloud account:setup\" to restore the account configuration for the project.",
 	"ERRORS_SCRUMBOX_URL_NOT_FOUND": "The {0} domain does not exist. Check the NetSuite domain and try again.\n\n{1}",
 	"ERRORS_SDKEXECUTOR_NO_JAR_FILE_FOUND": "There is no JAR file in your CLI for Node.js. Run \"npm install\" from \"{0}\" to install the JAR file.",
-	"ERRORS_SDKEXECUTOR_NO_TBA_FOR_ACCOUNT_AND_ROLE": "The email, NetSuite domain, account ID, and role combination in your account.json file have not been set up for token-based authentication (TBA). Run \"suitecloud account:setup\" to set up TBA.",
 	"ERRORS_SDKEXECUTOR_RUNNING_COMMAND": "There was an internal error while running the command. Details: {0}",
 	"ERRORS_SDKEXECUTOR_SDK_ERROR": "ERROR: SDK exited with code {0}\n{1}",
 	"ERRORS_SDK_SETTINGS_FILE_WRONG_JSON_SYNTAX": "Your {0} file is not valid. Ensure the content of the file is correct, or delete the file.\n{1}",
diff --git a/packages/node-cli/src/SdkErrorCodes.js b/packages/node-cli/src/SdkErrorCodes.js
diff --git a/packages/node-cli/src/SdkExecutor.js b/packages/node-cli/src/SdkExecutor.js
@@ -18,7 +18,6 @@ const EnvironmentInformationService = require('./services/EnvironmentInformation
 const url = require('url');
 const NodeTranslationService = require('./services/NodeTranslationService');
 const { ERRORS } = require('./services/TranslationKeys');
-const SdkErrorCodes = require('./SdkErrorCodes');
 const ExecutionEnvironmentContext = require('./ExecutionEnvironmentContext');
 
 const DATA_EVENT = 'data';
@@ -72,9 +71,6 @@ module.exports = class SdkExecutor {
 			if (code === 0) {
 				try {
 					const output = isIntegrationMode ? JSON.parse(lastSdkOutput) : lastSdkOutput;
-					if (isIntegrationMode && output.errorCode && output.errorCode === SdkErrorCodes.NO_TBA_SET_FOR_ACCOUNT) {
-						reject(NodeTranslationService.getMessage(ERRORS.SDKEXECUTOR.NO_TBA_FOR_ACCOUNT_AND_ROLE));
-					}
 					resolve(output);
 				} catch (error) {
 					reject(NodeTranslationService.getMessage(ERRORS.SDKEXECUTOR.RUNNING_COMMAND, error));
diff --git a/packages/node-cli/src/metadata/SdkCommandsMetadataPatch.json b/packages/node-cli/src/metadata/SdkCommandsMetadataPatch.json
@@ -8,7 +8,7 @@
 				"description": "Prints a list of all the configured authentication IDs. Usage: account:manageauth --list."
 			},
 			"remove": {
-				"description": "Removes an authentication ID. Usage: account:manageauth --remove {authenticationID}."
+				"description": "Removes an authentication ID. The tokens are not revoked in the account. Usage: account:manageauth --remove {authenticationID}."
 			},
 			"rename": {
 				"description": "Renames an authentication ID. You must specify it together with the renameto option. Usage: account:manageauth --rename {authenticationID} --renameto {newAuthenticationID}."
diff --git a/packages/node-cli/src/services/TranslationKeys.js b/packages/node-cli/src/services/TranslationKeys.js
@@ -411,7 +411,6 @@ module.exports = {
 		SCRUMBOX_URL_NOT_FOUND: 'ERRORS_SCRUMBOX_URL_NOT_FOUND',
 		SDKEXECUTOR: {
 			NO_JAR_FILE_FOUND: 'ERRORS_SDKEXECUTOR_NO_JAR_FILE_FOUND',
-			NO_TBA_FOR_ACCOUNT_AND_ROLE: 'ERRORS_SDKEXECUTOR_NO_TBA_FOR_ACCOUNT_AND_ROLE',
 			RUNNING_COMMAND: 'ERRORS_SDKEXECUTOR_RUNNING_COMMAND',
 			SDK_ERROR: 'ERRORS_SDKEXECUTOR_SDK_ERROR',
 		},
diff --git a/packages/unit-testing/README.md b/packages/unit-testing/README.md
@@ -325,4 +325,4 @@ describe('Sample test with user defined http module stub', () => {
 Suitecloud Unit Testing is an open source project. Pull requests are currently not being accepted. See [Contributing](/CONTRIBUTING.md) for details.
 
 ## [License](/LICENSE.txt)
-Copyright (c) 2023, 2024, 2025 Oracle and/or its affiliates The Universal Permissive License (UPL), Version 1.0.
+Copyright (c) 2019, 2023 Oracle and/or its affiliates The Universal Permissive License (UPL), Version 1.0.
diff --git a/packages/vscode-extension/LICENSE b/packages/vscode-extension/LICENSE
@@ -1,4 +1,4 @@
-Copyright (c) 2024, Oracle and/or its affiliates.  All rights reserved.
+Copyright (c) 2021, 2023 Oracle and/or its affiliates.  All rights reserved.
 
 The Universal Permissive License (UPL), Version 1.0
 
diff --git a/packages/vscode-extension/README.md b/packages/vscode-extension/README.md
@@ -26,7 +26,7 @@ The following table shows the extension versions currently available in the Mark
 | Extension Versions Available in the Marketplace | Available Since | Compatible NetSuite Version |
 |:-----------------------------------------------:|:---------------:|:---------------------------:|
 | 3.0.0 | 2025.1 | 2024.2 and 2025.1 |
-| 2.0.X | 2024.2 | 2024.1 and 2024.2 |
+| 2.0.X | 2024.2 | 2024.2 and 2025.1 |
 
 ## Installing SuiteCloud Extension for Visual Studio Code
 To install SuiteCloud Extension for Visual Studio Code, follow these steps:
@@ -124,6 +124,6 @@ To read the 2025.1 NetSuite's release notes and documentation, check the followi
 SuiteCloud Extension for Visual Studio Code is an open source project. Pull Requests are currently not being accepted. See [Contributing](/CONTRIBUTING.md) for details.
 
 ## License
-Copyright (c) 2022, 2023, 2024, 2025 Oracle and/or its affiliates The Universal Permissive License (UPL), version 1.0. See [License](/LICENSE.txt) for details.
+Copyright (c) 2021, 2023 Oracle and/or its affiliates The Universal Permissive License (UPL), version 1.0. See [License](./LICENSE) for details.
 
 By installing SuiteCloud Extension for Visual Studio Code, you are accepting the installation of the SuiteCloud SDK dependency under the [Oracle Free Use Terms and Conditions](https://www.oracle.com/downloads/licenses/oracle-free-license.html) license.
diff --git a/packages/vscode-extension/messages.json b/packages/vscode-extension/messages.json
@@ -12,6 +12,7 @@
 
 	"BUTTONS_RESTART_NOW": "Restart Now",
 	"BUTTONS_SEE_DETAILS": "See Details",
+	"BUTTONS_OK": "Ok",
 
 	"COMMAND_ERROR": "Something went wrong with '{0}'.",
 	"COMMAND_SUCCESS": "'{0}' has been successfully executed.",
@@ -121,7 +122,7 @@
 	"MANAGE_AUTH_GENERAL_SELECT_AUTH_ID_TO_MANAGE": "Select the auth ID you want to manage:",
 	"MANAGE_AUTH_GENERAL_SELECT_OPTION_FOR_AUTH_ID": "Select one of the following options for {0}:",
 	"MANAGE_AUTH_REMOVE_CANCEL": "Cancel",
-	"MANAGE_AUTH_REMOVE_CONFIRMATION_MESSAGE": "This auth ID will be removed locally but still be valid in your account: {0}.",
+	"MANAGE_AUTH_REMOVE_CONFIRMATION_MESSAGE": "The auth ID will be removed locally but the tokens are not revoked in the account.",
 	"MANAGE_AUTH_REMOVE_CONTINUE": "Continue",
 	"MANAGE_AUTH_REMOVE_REMOVING_AUTH_ID": "Removing auhtID...",
 	"MANAGE_AUTH_RENAME_ENTER_NEW_AUTH_ID": "Enter the new auth ID.",
diff --git a/packages/vscode-extension/src/commands/BaseAction.ts b/packages/vscode-extension/src/commands/BaseAction.ts
@@ -54,12 +54,11 @@ export default abstract class BaseAction {
 
 			if (this.commandMetadata.isSetupRequired) {
 				const defaultAuthId = this.getDefaultAuthId();
-				if (defaultAuthId !== '') {
-					await this.checkAndRefreshAuthorizationIfNeeded(defaultAuthId);
-				} else {
+				if (!defaultAuthId) {
 					showSetupAccountWarningMessage();
 					return;
 				}
+				await this.checkAndRefreshAuthorizationIfNeeded(defaultAuthId);
 			}
 
 			return this.execute();
diff --git a/packages/vscode-extension/src/commands/ManageAuth.ts b/packages/vscode-extension/src/commands/ManageAuth.ts
@@ -171,7 +171,7 @@ export default class ManageAuth extends BaseAction {
 			CANCEL: this.translationService.getMessage(MANAGE_AUTH.REMOVE.CANCEL),
 		};
 		const removeAnswer = await window.showQuickPick([REMOVE_ANSWER.CONTINUE, REMOVE_ANSWER.CANCEL], {
-			placeHolder: this.translationService.getMessage(MANAGE_AUTH.REMOVE.CONFIRMATION_MESSAGE, selectedAuhtID.authId),
+			placeHolder: this.translationService.getMessage(MANAGE_AUTH.REMOVE.CONFIRMATION_MESSAGE),
 			ignoreFocusOut: true,
 			canPickMany: false,
 		});
diff --git a/packages/vscode-extension/src/commands/SetupAccount.ts b/packages/vscode-extension/src/commands/SetupAccount.ts
@@ -115,7 +115,7 @@ export default class SetupAccount extends BaseAction {
 		try {
 			validatorFunction();
 		} catch (err: any) {
-			this.messageService.showCommandError(err);
+			this.messageService.showErrorMessage(err);
 			return false;
 		}
 		return true;
@@ -205,7 +205,7 @@ export default class SetupAccount extends BaseAction {
 
 		const warning = ExecutionContextService.getBrowserBasedWarningMessages();
 		if (warning) {
-			this.messageService.showCommandWarning(warning);
+			this.messageService.showWarningMessageWithOk(warning);
 		}
 	}
 
diff --git a/packages/vscode-extension/src/service/MessageService.ts b/packages/vscode-extension/src/service/MessageService.ts
@@ -52,6 +52,12 @@ export default class MessageService {
 			);
 	}
 
+	showWarningMessageWithOk(warningMessage: string, includeProjectName = true) {
+		window.showWarningMessage(
+			includeProjectName ? this.addProjectNameToMessage(warningMessage) : warningMessage,
+			this.translationService.getMessage(BUTTONS.OK));
+	}
+
 	showErrorMessage(errorMessage: string) {
 		window.showErrorMessage(this.addProjectNameToMessage(errorMessage));
 	}
diff --git a/packages/vscode-extension/src/service/TranslationKeys.ts b/packages/vscode-extension/src/service/TranslationKeys.ts
@@ -22,6 +22,7 @@ export const ANSWERS = {
 export const BUTTONS = {
 	RESTART_NOW: 'BUTTONS_RESTART_NOW',
 	SEE_DETAILS: 'BUTTONS_SEE_DETAILS',
+	OK: 'BUTTONS_OK'
 };
 
 export const COMMAND = {

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-Copyright (c) 2021, 2024 Oracle and/or its affiliates.`
	`1`	`+Copyright (c) 2019, 2023 Oracle and/or its affiliates.`
`2`	`2`
`3`	`3`	`The Universal Permissive License (UPL), Version 1.0`
`4`	`4`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.`
	`1`	`+Copyright (c) 2021, 2023 Oracle and/or its affiliates. All rights reserved.`
`2`	`2`
`3`	`3`	`The Universal Permissive License (UPL), Version 1.0`
`4`	`4`