Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

SLVSCODE-834 store SonarCloud tokens properly #613

Merged
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions src/connected/connectionsetup.ts
Original file line number Diff line number Diff line change
Expand Up @@ -90,22 +90,22 @@ export function confirmConnectionDetailsAndSave(context: vscode.ExtensionContext
if (reply.confirmed) {
if (isSonarCloud) {
const sonarCloudToken = token || await ConnectionSettingsService.instance.getServerToken(serverUrlOrOrganizationKey);
const connection = {
sonarCloudToken,
const connection : SonarCloudConnection = {
token: sonarCloudToken,
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I would suggest the following change (and similar below for the SQ connection):

const connection: SonarCloudConnection = {
  token: sonarCloudToken,
  connectionId: serverUrlOrOrganizationKey,
  disableNotifications: false,
  organizationKey: serverUrlOrOrganizationKey
};

With this explicit type declaration, the TS compiler correctly flags the sonarCloudToken property as invalid for the SonarCloudConnection type, instead of silently accepting it with the as cast.

connectionId: serverUrlOrOrganizationKey,
disableNotifications: false,
organizationKey: serverUrlOrOrganizationKey
} as SonarCloudConnection;
};

return await ConnectionSettingsService.instance.addSonarCloudConnection(connection);
} else if (!isSonarCloud && token) {
// new flow for SonarQube
const connection = {
const connection : SonarQubeConnection = {
token,
connectionId: serverUrlOrOrganizationKey,
disableNotifications: false,
serverUrl: serverUrlOrOrganizationKey
} as SonarQubeConnection;
};
return await ConnectionSettingsService.instance.addSonarQubeConnection(connection);
} else {
// old flow for SonarQube
Expand Down
Loading