matrix/matrix-js-sdk
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-js-sdk.git synced 2025-09-03 08:42:03 +03:00
Code Activity

camels

Browse Source
This commit is contained in:
David Baker
2015-07-16 10:20:31 +01:00
parent ff1b137750
commit 7b26a64617
1 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
lib/client.js
View File

@@ -926,16 +926,16 @@ MatrixClient.prototype.login = function(loginType, data, callback) {
/** /**
* @param {string} username * @param {string} username
* @param {string} password * @param {string} password
* @param {string} session_id * @param {string} sessionId
* @param {Object} auth * @param {Object} auth
* @param {module:client.callback} callback Optional. * @param {module:client.callback} callback Optional.
* @return {module:client.Promise} Resolves: TODO * @return {module:client.Promise} Resolves: TODO
* @return {module:http-api.MatrixError} Rejects: with an error response. * @return {module:http-api.MatrixError} Rejects: with an error response.
*/ */
MatrixClient.prototype.register = function(username, password, MatrixClient.prototype.register = function(username, password,
session_id, auth, callback) { sessionId, auth, callback) {
if (auth === undefined) { auth = {}; } if (auth === undefined) { auth = {}; }
if (session_id) { auth.session = session_id; } if (sessionId) { auth.session = sessionId; }
var params = { var params = {
auth: auth auth: auth
@@ -1390,20 +1390,20 @@ function _PojoToMatrixEventMapper(plainOldJsObject) {
/** /**
* @param {string} email * @param {string} email
* @param {string} client_secret * @param {string} clientSecret
* @param {string} send_attempt * @param {string} sendAttempt
* @param {string} next_link Optional * @param {string} nextLink Optional
* @param {module:client.callback} callback Optional. * @param {module:client.callback} callback Optional.
* @return {module:client.Promise} Resolves: TODO * @return {module:client.Promise} Resolves: TODO
* @return {module:http-api.MatrixError} Rejects: with an error response. * @return {module:http-api.MatrixError} Rejects: with an error response.
*/ */
MatrixClient.prototype.requestEmailToken = function(email, client_secret, MatrixClient.prototype.requestEmailToken = function(email, clientSecret,
send_attempt, next_link, callback) { sendAttempt, nextLink, callback) {
var params = { var params = {
client_secret: client_secret, client_secret: clientSecret,
email: email, email: email,
send_attempt: send_attempt, send_attempt: sendAttempt,
next_link: next_link next_link: nextLink
}; };
return this._http.idServerRequest( return this._http.idServerRequest(
callback, "POST", "/validate/email/requestToken", callback, "POST", "/validate/email/requestToken",