Added use of queryKey, switched to static fns

Author: lobrien

quickstart/AzureSearchClient.js

@@ -1,9 +1,11 @@
 const fetch = require('node-fetch');
 
 class AzureSearchClient {
-    constructor(searchServiceName, apiKey, indexName) {
+    constructor(searchServiceName, adminKey, queryKey, indexName) {
         this.searchServiceName = searchServiceName;
-        this.apiKey = apiKey;
+        this.adminKey = adminKey;
+        // The query key is used for read-only requests and so can be distributed with less risk of abuse.
+        this.queryKey = queryKey;
         this.indexName = indexName;
         this.apiVersion = '2019-05-06';
     }
@@ -43,7 +45,6 @@ class AzureSearchClient {
 
     static throwOnHttpError(response) {
         const statusCode = response.status;
-        console.log(`Response Status: ${statusCode}`);
         if (statusCode >= 300){
             console.log(`Request failed: ${JSON.stringify(response, null, 4)}`);
             throw new Error(`Failure in request. HTTP Status was ${statusCode}`);
@@ -53,7 +54,7 @@ class AzureSearchClient {
     async indexExistsAsync() { 
         console.log("\n Checking if index exists...");
         const endpoint = this.getIndexUrl();
-        const response = await this.request(endpoint, "GET", this.apiKey);
+        const response = await AzureSearchClient.request(endpoint, "GET", this.queryKey);
         // Success has a few likely status codes: 200 or 204 (No Content), but accept all in 200 range...
         const exists = response.status >= 200 && response.status < 300;
         return exists;
@@ -62,32 +63,32 @@ class AzureSearchClient {
     async deleteIndexAsync() {
         console.log("\n Deleting existing index...");
         const endpoint = this.getIndexUrl();
-        const response = await this.request(endpoint, "DELETE", this.apiKey);
-        this.throwOnHttpError(response);
+        const response = await AzureSearchClient.request(endpoint, "DELETE", this.adminKey);
+        AzureSearchClient.throwOnHttpError(response);
         return this;
     }
 
     async createIndexAsync(definition) {
         console.log("\n Creating index...");
         const endpoint = this.getIndexUrl();
-        const response = await this.request(endpoint, "PUT", this.apiKey, definition);
-        this.throwOnHttpError(response);
+        const response = await AzureSearchClient.request(endpoint, "PUT", this.adminKey, definition);
+        AzureSearchClient.throwOnHttpError(response);
         return this;
     }
 
     async postDataAsync(hotelsData) {
         console.log("\n Adding hotel data...");
         const endpoint = this.getPostDataUrl();
-        const response = await this.request(endpoint,"POST", this.apiKey, hotelsData);
-        this.throwOnHttpError(response);
+        const response = await AzureSearchClient.request(endpoint,"POST", this.adminKey, hotelsData);
+        AzureSearchClient.throwOnHttpError(response);
         return this;
     }
 
     async queryAsync(searchTerm) {
         console.log("\n Querying...")
         const endpoint = this.getSearchUrl(searchTerm);
-        const response = await this.request(endpoint, "GET", this.apiKey);
-        this.throwOnHttpError(response);
+        const response = await AzureSearchClient.request(endpoint, "GET", this.queryKey);
+        AzureSearchClient.throwOnHttpError(response);
         return response;
     }
 }

quickstart/azure_search_config.json

@@ -1,4 +1,5 @@
 {
     "serviceName" : "[SEARCH_SERVICE_NAME]",
-    "apiKey" : "[SEARCH_SERVICE_API_KEY]"
+    "adminKey" : "[SEARCH_SERVICE_ADMIN_KEY]",
+    "queryKey" : "[SEARCH_SERVICE_QUERY_KEY"]""
 }

quickstart/index.js

@@ -5,7 +5,7 @@ const AzureSearchClient = require('./AzureSearchClient.js');
 
 function getAzureConfiguration() {
     const config = nconf.file({ file: 'azure_search_config.json' });
-    if (config.get('serviceName') == '[SEARCH_SERVICE_NAME' || config.get('apiKey') == '[SEARCH_SERVICE_API_KEY]') {
+    if (config.get('serviceName') == '[SEARCH_SERVICE_NAME' || config.get('adminKey') == '[SEARCH_SERVICE_API_KEY]') {
         throw new Error("You have not set the values in your azure_search_config.json file. Please change them to match your search service's values.");
     }
     return config;
@@ -47,7 +47,7 @@ async function doQueries(client) {
 const run = async () => {
     try {
         const cfg = getAzureConfiguration();
-        const client = new AzureSearchClient(cfg.get("serviceName"), cfg.get("apiKey"), "hotels");
+        const client = new AzureSearchClient(cfg.get("serviceName"), cfg.get("adminKey"), cfg.get("queryKey"), "hotels");
 
         const exists = await client.indexExistsAsync();
         await exists ? client.deleteIndexAsync() : Promise.resolve();