-
Notifications
You must be signed in to change notification settings - Fork 28
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Use fetch for ajax instead of jquery function (#764)
Change to using fetch for ajax instead of jquery function. This adds support for non-GET HTTP verbs as well.
- Loading branch information
Showing
4 changed files
with
131 additions
and
32 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,76 @@ | ||
| /* global QUnit ajax */ | ||
| /* exported codeUrl */ | ||
|
|
||
| let codeUrl = "https://www.dummy.org"; | ||
|
|
||
| QUnit.module("Ajax test", function() { | ||
|
|
||
| QUnit.test("Return correct data", function (assert) { | ||
| function fetchPromise() { | ||
| const blob = new Blob([JSON.stringify({key: "value"})], {type : 'application/json'}); | ||
| const init = {status: 200, headers: {'content-type': 'application/json'}}; | ||
| return Promise.resolve(new Response(blob, init)); | ||
| } | ||
|
|
||
| return ajax("GET", "myUrl", {}, {}, fetchPromise) | ||
| .then(function(data) { | ||
| assert.deepEqual(data, {key: "value"}); | ||
| }); | ||
| }); | ||
|
|
||
| QUnit.test("Wrong type of data", function (assert) { | ||
| function fetchPromise() { | ||
| const blob = new Blob([JSON.stringify("mydata")], {type : 'application/json'}); | ||
| const init = {status: 200, headers: {'content-type': 'text/html'}}; | ||
| return Promise.resolve(new Response(blob, init)); | ||
| } | ||
|
|
||
| return ajax("GET", "myUrl", {}, {}, fetchPromise) | ||
| .then(function() {}, function(data) { | ||
| assert.strictEqual(data, "Incorrect response type"); | ||
| }); | ||
| }); | ||
|
|
||
| QUnit.test("Status 404", function (assert) { | ||
| function fetchPromise() { | ||
| const blob = new Blob([JSON.stringify({error: "not found"})], {type : 'application/json'}); | ||
| const init = {status: 404, headers: {'content-type': 'application/json'}}; | ||
| return Promise.resolve(new Response(blob, init)); | ||
| } | ||
|
|
||
| return ajax("GET", "myUrl", {}, {}, fetchPromise) | ||
| .then(function() {}, function(data) { | ||
| assert.strictEqual(data, "not found"); | ||
| }); | ||
| }); | ||
|
|
||
| QUnit.test("Unknown error", function (assert) { | ||
| function fetchPromise() { | ||
| const blob = new Blob([JSON.stringify("")], {type : 'application/json'}); | ||
| const init = {status: 404, headers: {'content-type': 'application/json'}}; | ||
| return Promise.resolve(new Response(blob, init)); | ||
| } | ||
|
|
||
| return ajax("GET", "myUrl", {}, {}, fetchPromise) | ||
| .then(function() {}, function(data) { | ||
| assert.strictEqual(data, "Unknown error"); | ||
| }); | ||
| }); | ||
|
|
||
| QUnit.test("Check sent data", function (assert) { | ||
| function fetchPromise(url, options) { | ||
| assert.strictEqual(url.href, "https://www.dummy.org/api/index.php?url=myUrl&querykey=queryvalue"); | ||
| assert.strictEqual(options.method, "POST"); | ||
| assert.strictEqual(options.headers['Content-Type'], 'application/json'); | ||
| assert.strictEqual(options.headers["X-API-KEY"], "SESSION"); | ||
| assert.strictEqual(options.headers.Accept, 'application/json'); | ||
| assert.strictEqual(options.body, "{\"datakey\":\"datavalue\"}"); | ||
| const blob = new Blob([JSON.stringify("mydata")], {type : 'application/json'}); | ||
| const init = {status: 200, headers: {'content-type': 'application/json'}}; | ||
| return Promise.resolve(new Response(blob, init)); | ||
| } | ||
|
|
||
| return ajax("POST", "myUrl", {querykey: "queryvalue"}, {datakey: "datavalue"}, fetchPromise) | ||
| .then(); | ||
| }); | ||
| }); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,17 +1,44 @@ | ||
| /*global $ codeUrl */ | ||
| /* exported makeApiAjaxSettings */ | ||
| /*global codeUrl */ | ||
| /* exported ajax */ | ||
|
|
||
| function makeApiAjaxSettings(apiUrl, queryParams) { | ||
| let queryParamString = ""; | ||
| if(queryParams) { | ||
| queryParamString = "&" + $.param(queryParams); | ||
| function ajax(method, apiUrl, queryParams = {}, data = {}, fetchPromise = fetch) { | ||
| let url = new URL("/api/index.php", codeUrl); | ||
| let searchParams = new URLSearchParams(); | ||
| searchParams.append("url", apiUrl); | ||
| for (const key in queryParams) { | ||
| searchParams.append(key, queryParams[key]); | ||
| } | ||
| let settings = { | ||
| "url": codeUrl + "/api/index.php?url=" + apiUrl + queryParamString, | ||
| "dataType": "json", | ||
| "headers": { | ||
| "X-API-KEY": "SESSION" | ||
| } | ||
| url.search = searchParams; | ||
| let upperCaseMethod = method.toUpperCase(); | ||
| let options = { | ||
| headers: {"X-API-KEY": "SESSION", 'Accept': 'application/json'}, | ||
| credentials: "same-origin", | ||
| method: upperCaseMethod, | ||
| }; | ||
| return settings; | ||
| if(upperCaseMethod !== "GET") { | ||
| // POST or PUT | ||
| options.headers['Content-Type'] = 'application/json'; | ||
| options.body = JSON.stringify(data); | ||
| } | ||
| return new Promise(function(resolve, reject) { | ||
| fetchPromise(url, options) | ||
| .then(function(response) { | ||
| const contentType = response.headers.get('content-type'); | ||
| if (!contentType || !contentType.includes('application/json')) { | ||
| reject("Incorrect response type"); | ||
| } else if(response.ok) { | ||
| resolve(response.json()); | ||
| } else { | ||
| response.json() | ||
| .then(function(data) { | ||
| let message = data.error; | ||
| if(!message) { | ||
| message = "Unknown error"; | ||
| } | ||
| reject(message); | ||
| }); | ||
| } | ||
| }) | ||
| .catch(reject); | ||
| }); | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters