www

commit 4eee369b6642daeaa52f7a4c913e5129d67c89a0
parent ebb2f1667d1d7d3edc8e6456b6705792b02aa07f
Author: Dan Stillman <dstillman@zotero.org>
Date:   Mon, 25 Apr 2016 02:45:03 -0400

Use /keys/current for key requests

Possible after https://github.com/zotero/dataserver/commit/beb38579ca1

Diffstat:
M
chrome/content/zotero/xpcom/sync/syncAPIClient.js
 | 
4
++--
M
test/tests/syncRunnerTest.js
 | 
5
+++--

2 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/chrome/content/zotero/xpcom/sync/syncAPIClient.js b/chrome/content/zotero/xpcom/sync/syncAPIClient.js
@@ -47,7 +47,7 @@ Zotero.Sync.APIClient.prototype = {
 	
 	
 	getKeyInfo: Zotero.Promise.coroutine(function* (options={}) {
-		var uri = this.baseURL + "keys/" + this.apiKey;
+		var uri = this.baseURL + "keys/current";
 		let opts = {};
 		Object.assign(opts, options);
 		opts.successCodes = [200, 404];
@@ -518,7 +518,7 @@ Zotero.Sync.APIClient.prototype = {
 
 	// Deletes current API key
 	deleteAPIKey: Zotero.Promise.coroutine(function* () {
-		yield this.makeRequest("DELETE", this.baseURL + "keys/" + this.apiKey);
+		yield this.makeRequest("DELETE", this.baseURL + "keys/current");
 	}),
 	
 	
diff --git a/test/tests/syncRunnerTest.js b/test/tests/syncRunnerTest.js
@@ -11,7 +11,7 @@ describe("Zotero.Sync.Runner", function () {
 		keyInfo: {
 			fullAccess: {
 				method: "GET",
-				url: "keys/" + apiKey,
+				url: "keys/current",
 				status: 200,
 				json: {
 					key: apiKey,
@@ -729,7 +729,8 @@ describe("Zotero.Sync.Runner", function () {
 
 			server.respond(function (req) {
 				if (req.method == "DELETE") {
-					assert.equal(req.url, baseURL + "keys/" + apiKey);
+					assert.propertyVal(req.requestHeaders, 'Zotero-API-Key', apiKey);
+					assert.equal(req.url, baseURL + "keys/current");
 				}
 				req.respond(204);
 			});