Remove :deviceId from /keys/upload/:deviceId as not spec-compliant

spec/unit/crypto/cross-signing.spec.js

@@ -174,7 +174,7 @@ describe("Cross Signing", function() {
             HttpResponse.PUSH_RULES_RESPONSE,
             {
                 method: "POST",
-                path: "/keys/upload/Osborne2",
+                path: "/keys/upload",
                 data: {
                     one_time_key_counts: {
                         curve25519: 100,
@@ -237,7 +237,7 @@ describe("Cross Signing", function() {
             },
             {
                 method: "POST",
-                path: "/keys/upload/Osborne2",
+                path: "/keys/upload",
                 data: {
                     one_time_key_counts: {
                         curve25519: 100,
@@ -429,7 +429,7 @@ describe("Cross Signing", function() {
             HttpResponse.PUSH_RULES_RESPONSE,
             {
                 method: "POST",
-                path: "/keys/upload/Osborne2",
+                path: "/keys/upload",
                 data: {
                     one_time_key_counts: {
                         curve25519: 100,
@@ -487,7 +487,7 @@ describe("Cross Signing", function() {
             },
             {
                 method: "POST",
-                path: "/keys/upload/Osborne2",
+                path: "/keys/upload",
                 data: {
                     one_time_key_counts: {
                         curve25519: 100,

src/base-apis.js

@@ -1698,10 +1698,8 @@ MatrixBaseApis.prototype.search = function(opts, callback) {
  *
  * @param {Object} content  body of upload request
  *
- * @param {Object=} opts
+ * @param {Object=} opts this method no longer takes any opts,
- *
+ *  used to take opts.device_id but this was not removed from the spec as a redundant parameter
- * @param {string=} opts.device_id  explicit device_id to use for upload
- *    (default is to use the same as that used during auth).
  *
  * @param {module:client.callback=} callback
  *
@@ -1709,17 +1707,7 @@ MatrixBaseApis.prototype.search = function(opts, callback) {
  *     an error response ({@link module:http-api.MatrixError}).
  */
 MatrixBaseApis.prototype.uploadKeysRequest = function(content, opts, callback) {
-    opts = opts || {};
+    return this._http.authedRequest(callback, "POST", "/keys/upload", undefined, content);
-    const deviceId = opts.device_id;
-    let path;
-    if (deviceId) {
-        path = utils.encodeUri("/keys/upload/$deviceId", {
-            $deviceId: deviceId,
-        });
-    } else {
-        path = "/keys/upload";
-    }
-    return this._http.authedRequest(callback, "POST", path, undefined, content);
 };
 
 MatrixBaseApis.prototype.uploadKeySignatures = function(content) {

src/crypto/index.js

@@ -1244,10 +1244,6 @@ Crypto.prototype.uploadDeviceKeys = function() {
     return crypto._signObject(deviceKeys).then(() => {
         return crypto._baseApis.uploadKeysRequest({
             device_keys: deviceKeys,
-        }, {
-            // for now, we set the device id explicitly, as we may not be using the
-            // same one as used in login.
-            device_id: deviceId,
         });
     });
 };
@@ -1344,9 +1340,7 @@ function _maybeUploadOneTimeKeys(crypto) {
             return Promise.resolve(crypto._oneTimeKeyCount);
         }
         // ask the server how many keys we have
-        return crypto._baseApis.uploadKeysRequest({}, {
+        return crypto._baseApis.uploadKeysRequest({}).then((res) => {
-            device_id: crypto._deviceId,
-        }).then((res) => {
             return res.one_time_key_counts.signed_curve25519 || 0;
         });
     }).then((keyCount) => {
@@ -1386,10 +1380,6 @@ async function _uploadOneTimeKeys(crypto) {
 
     const res = await crypto._baseApis.uploadKeysRequest({
         one_time_keys: oneTimeJson,
-    }, {
-        // for now, we set the device id explicitly, as we may not be using the
-        // same one as used in login.
-        device_id: crypto._deviceId,
     });
 
     await crypto._olmDevice.markKeysAsPublished();