You've already forked matrix-js-sdk
mirror of
https://github.com/matrix-org/matrix-js-sdk.git
synced 2025-11-28 05:03:59 +03:00
Talk to the ID server
This commit is contained in:
@@ -45,7 +45,7 @@ var utils = require("./utils");
|
|||||||
function MatrixClient(opts) {
|
function MatrixClient(opts) {
|
||||||
utils.checkObjectHasKeys(opts, ["baseUrl", "request"]);
|
utils.checkObjectHasKeys(opts, ["baseUrl", "request"]);
|
||||||
utils.checkObjectHasNoAdditionalKeys(opts,
|
utils.checkObjectHasNoAdditionalKeys(opts,
|
||||||
["baseUrl", "request", "accessToken", "userId", "store", "scheduler"]
|
["baseUrl", "idBaseUrl", "request", "accessToken", "userId", "store", "scheduler"]
|
||||||
);
|
);
|
||||||
|
|
||||||
this.store = opts.store || new StubStore();
|
this.store = opts.store || new StubStore();
|
||||||
@@ -61,6 +61,7 @@ function MatrixClient(opts) {
|
|||||||
|
|
||||||
var httpOpts = {
|
var httpOpts = {
|
||||||
baseUrl: opts.baseUrl,
|
baseUrl: opts.baseUrl,
|
||||||
|
idBaseUrl: opts.idBaseUrl,
|
||||||
accessToken: opts.accessToken,
|
accessToken: opts.accessToken,
|
||||||
request: opts.request,
|
request: opts.request,
|
||||||
prefix: httpApi.PREFIX_V1,
|
prefix: httpApi.PREFIX_V1,
|
||||||
@@ -1381,6 +1382,42 @@ function _PojoToMatrixEventMapper(plainOldJsObject) {
|
|||||||
return new MatrixEvent(plainOldJsObject);
|
return new MatrixEvent(plainOldJsObject);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Identity Server Operations
|
||||||
|
// ==========================
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @param {string} client_secret
|
||||||
|
* @param {string} email
|
||||||
|
* @param {string} send_attempt
|
||||||
|
* @param {module:client.callback} callback Optional.
|
||||||
|
* @return {module:client.Promise} Resolves: TODO
|
||||||
|
* @return {module:http-api.MatrixError} Rejects: with an error response.
|
||||||
|
*/
|
||||||
|
MatrixClient.prototype.requestEmailToken = function(email, client_secret, send_attempt, callback) {
|
||||||
|
var params = {
|
||||||
|
client_secret: client_secret,
|
||||||
|
email: email,
|
||||||
|
send_attempt: send_attempt
|
||||||
|
};
|
||||||
|
return this._http.idServerRequest(
|
||||||
|
callback, "POST", "/validate/email/requestToken", params, httpApi.PREFIX_IDENTITY_V1
|
||||||
|
);
|
||||||
|
};
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Generates a random string suitable for use as a client secret
|
||||||
|
*/
|
||||||
|
MatrixClient.prototype.generateClientSecret = function() {
|
||||||
|
var ret = "";
|
||||||
|
var chars = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789";
|
||||||
|
|
||||||
|
for (var i = 0; i < 32; i++) {
|
||||||
|
ret += chars.charAt(Math.floor(Math.random() * chars.length));
|
||||||
|
}
|
||||||
|
|
||||||
|
return ret;
|
||||||
|
};
|
||||||
|
|
||||||
/** */
|
/** */
|
||||||
module.exports.MatrixClient = MatrixClient;
|
module.exports.MatrixClient = MatrixClient;
|
||||||
|
|
||||||
|
|||||||
@@ -23,6 +23,11 @@ module.exports.PREFIX_V1 = "/_matrix/client/api/v1";
|
|||||||
*/
|
*/
|
||||||
module.exports.PREFIX_V2_ALPHA = "/_matrix/client/v2_alpha";
|
module.exports.PREFIX_V2_ALPHA = "/_matrix/client/v2_alpha";
|
||||||
|
|
||||||
|
/**
|
||||||
|
* URI path for the identity API
|
||||||
|
*/
|
||||||
|
module.exports.PREFIX_IDENTITY_V1 = "/_matrix/identity/api/v1";
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Construct a MatrixHttpApi.
|
* Construct a MatrixHttpApi.
|
||||||
* @constructor
|
* @constructor
|
||||||
@@ -216,6 +221,36 @@ module.exports.MatrixHttpApi.prototype = {
|
|||||||
return defer.promise;
|
return defer.promise;
|
||||||
},
|
},
|
||||||
|
|
||||||
|
idServerRequest: function(callback, method, path, params, prefix) {
|
||||||
|
var fullUri = this.opts.idBaseUrl + prefix + path;
|
||||||
|
|
||||||
|
if (callback !== undefined && !utils.isFunction(callback)) {
|
||||||
|
throw Error(
|
||||||
|
"Expected callback to be a function but got " + typeof callback
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
var opts = {
|
||||||
|
uri: fullUri,
|
||||||
|
method: method,
|
||||||
|
withCredentials: false,
|
||||||
|
json: false,
|
||||||
|
_matrix_opts: this.opts
|
||||||
|
};
|
||||||
|
if (method == 'GET') {
|
||||||
|
opts.qs = params;
|
||||||
|
} else {
|
||||||
|
opts.form = params;
|
||||||
|
}
|
||||||
|
|
||||||
|
var defer = q.defer();
|
||||||
|
this.opts.request(
|
||||||
|
opts,
|
||||||
|
requestCallback(defer, callback, this.opts.onlyData)
|
||||||
|
);
|
||||||
|
return defer.promise;
|
||||||
|
},
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Perform an authorised request to the homeserver.
|
* Perform an authorised request to the homeserver.
|
||||||
* @param {Function} callback Optional. The callback to invoke on
|
* @param {Function} callback Optional. The callback to invoke on
|
||||||
|
|||||||
Reference in New Issue
Block a user