Skip to content

Commit 196bf4b

Browse files
Merge remote-tracking branch 'origin/release/25.1' into bugfix/PDPDEVTOOL-5947_vscode_extension_remove_see_details_warnings_errors
2 parents 5e414f3 + b809cea commit 196bf4b

File tree

6 files changed

+4
-21
lines changed

6 files changed

+4
-21
lines changed

packages/node-cli/messages.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,7 @@
165165
"COMMAND_MANAGE_ACCOUNT_QUESTIONS_NEW_NAME": "Enter a new name for the authentication ID:",
166166
"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:",
167167
"COMMAND_MANAGE_ACCOUNT_QUESTIONS_SELECT_ACTION": "Select one of the following actions:",
168-
"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?",
168+
"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?",
169169

170170
"COMMAND_OPTIONS_HELP": "Displays help for the command.",
171171
"COMMAND_OPTIONS_INTERACTIVE_HELP": "Runs the {0} command in interactive mode.",
@@ -259,7 +259,6 @@
259259
"ERRORS_RUN_SETUP_ACCOUNT": "Run \"suitecloud account:setup\" to restore the account configuration for the project.",
260260
"ERRORS_SCRUMBOX_URL_NOT_FOUND": "The {0} domain does not exist. Check the NetSuite domain and try again.\n\n{1}",
261261
"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.",
262-
"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.",
263262
"ERRORS_SDKEXECUTOR_RUNNING_COMMAND": "There was an internal error while running the command. Details: {0}",
264263
"ERRORS_SDKEXECUTOR_SDK_ERROR": "ERROR: SDK exited with code {0}\n{1}",
265264
"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}",

packages/node-cli/src/SdkErrorCodes.js

Lines changed: 0 additions & 10 deletions
This file was deleted.

packages/node-cli/src/SdkExecutor.js

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ const EnvironmentInformationService = require('./services/EnvironmentInformation
1818
const url = require('url');
1919
const NodeTranslationService = require('./services/NodeTranslationService');
2020
const { ERRORS } = require('./services/TranslationKeys');
21-
const SdkErrorCodes = require('./SdkErrorCodes');
2221
const ExecutionEnvironmentContext = require('./ExecutionEnvironmentContext');
2322

2423
const DATA_EVENT = 'data';
@@ -72,9 +71,6 @@ module.exports = class SdkExecutor {
7271
if (code === 0) {
7372
try {
7473
const output = isIntegrationMode ? JSON.parse(lastSdkOutput) : lastSdkOutput;
75-
if (isIntegrationMode && output.errorCode && output.errorCode === SdkErrorCodes.NO_TBA_SET_FOR_ACCOUNT) {
76-
reject(NodeTranslationService.getMessage(ERRORS.SDKEXECUTOR.NO_TBA_FOR_ACCOUNT_AND_ROLE));
77-
}
7874
resolve(output);
7975
} catch (error) {
8076
reject(NodeTranslationService.getMessage(ERRORS.SDKEXECUTOR.RUNNING_COMMAND, error));

packages/node-cli/src/metadata/SdkCommandsMetadataPatch.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
"description": "Prints a list of all the configured authentication IDs. Usage: account:manageauth --list."
99
},
1010
"remove": {
11-
"description": "Removes an authentication ID. Usage: account:manageauth --remove {authenticationID}."
11+
"description": "Removes an authentication ID. The tokens are not revoked in the account. Usage: account:manageauth --remove {authenticationID}."
1212
},
1313
"rename": {
1414
"description": "Renames an authentication ID. You must specify it together with the renameto option. Usage: account:manageauth --rename {authenticationID} --renameto {newAuthenticationID}."

packages/node-cli/src/services/TranslationKeys.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -411,7 +411,6 @@ module.exports = {
411411
SCRUMBOX_URL_NOT_FOUND: 'ERRORS_SCRUMBOX_URL_NOT_FOUND',
412412
SDKEXECUTOR: {
413413
NO_JAR_FILE_FOUND: 'ERRORS_SDKEXECUTOR_NO_JAR_FILE_FOUND',
414-
NO_TBA_FOR_ACCOUNT_AND_ROLE: 'ERRORS_SDKEXECUTOR_NO_TBA_FOR_ACCOUNT_AND_ROLE',
415414
RUNNING_COMMAND: 'ERRORS_SDKEXECUTOR_RUNNING_COMMAND',
416415
SDK_ERROR: 'ERRORS_SDKEXECUTOR_SDK_ERROR',
417416
},

packages/vscode-extension/src/commands/BaseAction.ts

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -54,12 +54,11 @@ export default abstract class BaseAction {
5454

5555
if (this.commandMetadata.isSetupRequired) {
5656
const defaultAuthId = this.getDefaultAuthId();
57-
if (defaultAuthId !== '') {
58-
await this.checkAndRefreshAuthorizationIfNeeded(defaultAuthId);
59-
} else {
57+
if (!defaultAuthId) {
6058
showSetupAccountWarningMessage();
6159
return;
6260
}
61+
await this.checkAndRefreshAuthorizationIfNeeded(defaultAuthId);
6362
}
6463

6564
return this.execute();

0 commit comments

Comments
 (0)