access json-schema.org with https, prepare 5.3.8 (#211)

Author: aeschli

package.json

@@ -1,6 +1,6 @@
 {
   "name": "vscode-json-languageservice",
-  "version": "5.3.7",
+  "version": "5.3.8",
   "description": "Language service for JSON",
   "main": "./lib/umd/jsonLanguageService.js",
   "typings": "./lib/umd/jsonLanguageService",

src/services/jsonSchemaService.ts

@@ -390,6 +390,9 @@ export class JSONSchemaService implements IJSONSchemaService {
 			const errorMessage = l10n.t('Unable to load schema from \'{0}\'. No schema request service available', toDisplayString(url));
 			return this.promise.resolve(new UnresolvedSchema(<JSONSchema>{}, [errorMessage]));
 		}
+		if (url.startsWith('http://json-schema.org/')) {
+			url = 'https' + url.substring(4); // always access json-schema.org with https. See https://github.com/microsoft/vscode/issues/195189
+		}
 		return this.requestService(url).then(
 			content => {
 				if (!content) {

src/test/schema.test.ts

@@ -1976,4 +1976,29 @@ suite('JSON Schema', () => {
 
 	});
 
+	test('access json-schema.org with https', async function () {
+		const httpUrl = "http://json-schema.org/schema";
+		const httpsUrl = "https://json-schema.org/schema";
+
+		const schemas: { [uri: string]: JSONSchema } = {
+			[httpsUrl]: {
+				type: 'object',
+				properties: {
+					bar: {
+						const: 3
+					}
+				}
+			}
+		};
+		const accesses: string[] = [];
+		const schemaRequestService = newMockRequestService(schemas, accesses);
+
+		const ls = getLanguageService({ workspaceContext, schemaRequestService });
+
+		const testDoc = toDocument(JSON.stringify({ $schema: httpUrl, bar: 2 }));
+		let validation = await ls.doValidation(testDoc.textDoc, testDoc.jsonDoc);
+		assert.deepStrictEqual(validation.map(v => v.message), ['Value must be 3.']);
+		assert.deepStrictEqual([httpsUrl], accesses); 
+	});
+
 });