Skip to content

Commit 5b5523a

Browse files
authored
Link to commercial license (#8575)
1 parent 06723e1 commit 5b5523a

File tree

4 files changed

+20
-17
lines changed

4 files changed

+20
-17
lines changed

build/secrets/.secrets.baseline

Lines changed: 6 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -94,6 +94,10 @@
9494
"path": "detect_secrets.filters.common.is_baseline_file",
9595
"filename": "build/secrets/.secrets.baseline"
9696
},
97+
{
98+
"path": "detect_secrets.filters.common.is_ignored_due_to_verification_policies",
99+
"min_level": 2
100+
},
97101
{
98102
"path": "detect_secrets.filters.heuristic.is_indirect_reference"
99103
},
@@ -930,7 +934,7 @@
930934
{
931935
"type": "Hex High Entropy String",
932936
"filename": "product.json",
933-
"hashed_secret": "293e6cd3b4633dad82e367b11bb7ad31bfe0c669",
937+
"hashed_secret": "82e88fe5fef547ff71ab465da7ff410e61e78610",
934938
"is_verified": false,
935939
"line_number": 114,
936940
"is_secret": false
@@ -986,7 +990,7 @@
986990
{
987991
"type": "Hex High Entropy String",
988992
"filename": "product.json",
989-
"hashed_secret": "57174a282ac64974893e5f2de95f1bae40679007",
993+
"hashed_secret": "c30044e72c0bb24ce02121d2fcd5c42b271cbfaa",
990994
"is_verified": false,
991995
"line_number": 273,
992996
"is_secret": false
@@ -1416,16 +1420,6 @@
14161420
"is_secret": false
14171421
}
14181422
],
1419-
"src/vs/workbench/services/extensions/browser/webWorkerExtensionHost.ts": [
1420-
{
1421-
"type": "IBM Cloud IAM Key",
1422-
"filename": "src/vs/workbench/services/extensions/browser/webWorkerExtensionHost.ts",
1423-
"hashed_secret": "0d43d6e259826e4ecbda1644424b26de54faa665",
1424-
"is_verified": false,
1425-
"line_number": 96,
1426-
"is_secret": false
1427-
}
1428-
],
14291423
"src/vs/workbench/services/extensions/worker/webWorkerExtensionHostIframe.html": [
14301424
{
14311425
"type": "Base64 High Entropy String",

product.json

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
"win32MutexName": "positron",
1010
"licenseName": "Software Evaluation License",
1111
"licenseUrl": "https://github.com/posit-dev/positron/tree/main?tab=License-1-ov-file",
12-
"serverLicenseUrl": "https://github.com/posit-dev/positron/tree/main?tab=License-1-ov-file",
12+
"serverLicenseUrl": "https://posit.co/about/eula/",
1313
"serverGreeting": [],
1414
"serverLicense": [],
1515
"serverLicensePrompt": "",
@@ -300,7 +300,8 @@
300300
"https://login.posit.cloud",
301301
"https://connect.posit.cloud",
302302
"https://login.staging.posit.cloud",
303-
"https://staging.connect.posit.cloud"
303+
"https://staging.connect.posit.cloud",
304+
"https://posit.co"
304305
],
305306
"extensionsEnabledWithApiProposalVersion": [
306307
"GitHub.copilot-chat"

src/vs/platform/product/common/product.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,12 +83,13 @@ else {
8383
reportIssueUrl: 'https://github.com/posit-dev/positron/issues/new',
8484
licenseName: 'Software Evaluation License',
8585
licenseUrl: 'https://github.com/posit-dev/positron/tree/main?tab=License-1-ov-file',
86-
serverLicenseUrl: 'https://github.com/posit-dev/positron/tree/main?tab=License-1-ov-file',
86+
serverLicenseUrl: 'https://posit.co/about/eula/',
8787
linkProtectionTrustedDomains: [
8888
'https://open-vsx.org',
8989
'https://github.com/posit-dev/positron',
9090
'https://positron.posit.co',
9191
'https://github.com/login/device',
92+
'https://posit.co'
9293
]
9394
// --- End Positron ---
9495
});

src/vs/workbench/browser/actions/helpActions.ts

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -242,7 +242,10 @@ class OpenRequestFeatureUrlAction extends Action2 {
242242
class OpenLicenseUrlAction extends Action2 {
243243

244244
static readonly ID = 'workbench.action.openLicenseUrl';
245-
static readonly AVAILABLE = !!(isWeb ? product.serverLicense : product.licenseUrl);
245+
// --- Start Positron ---
246+
// modify to be available in web by checking product.serverLicenseUrl instead of product.serverLicense
247+
static readonly AVAILABLE = !!(isWeb ? product.serverLicenseUrl : product.licenseUrl);
248+
// --- End Positron ---
246249

247250
constructor() {
248251
super({
@@ -267,12 +270,16 @@ class OpenLicenseUrlAction extends Action2 {
267270
const url = isWeb ? productService.serverLicenseUrl : productService.licenseUrl;
268271

269272
if (url) {
270-
if (language) {
273+
// --- Start Positron ---
274+
// we don't need the language but it's kept here to make merge conflicts easier to resolve
275+
// checks !productService to never enter that code path since we don't need language
276+
if (language && !productService) {
271277
const queryArgChar = url.indexOf('?') > 0 ? '&' : '?';
272278
openerService.open(URI.parse(`${url}${queryArgChar}lang=${language}`));
273279
} else {
274280
openerService.open(URI.parse(url));
275281
}
282+
// --- End Positron ---
276283
}
277284
}
278285
}

0 commit comments

Comments
 (0)