matrix/matrix-js-sdk
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-js-sdk.git synced 2025-11-25 05:23:13 +03:00
Code Activity

Rename isAccessToken to identityAccessToken

Browse Source
This commit is contained in:
J. Ryan Stinnett
2019-07-30 10:06:52 +01:00
parent 6f042a2142
commit 516dff06ee
1 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/base-apis.js
View File

@@ -1739,8 +1739,8 @@ MatrixBaseApis.prototype.registerWithIdentityServer = function(hsOpenIdToken) {
* @param {string} nextLink Optional If specified, the client will be redirected * @param {string} nextLink Optional If specified, the client will be redirected
* to this link after validation. * to this link after validation.
* @param {module:client.callback} callback Optional. * @param {module:client.callback} callback Optional.
* @param {string} isAccessToken The `access_token` field of the Identity Server * @param {string} identityAccessToken The `access_token` field of the Identity
* `/account/register` response (see {@link registerWithIdentityServer}). * Server `/account/register` response (see {@link registerWithIdentityServer}).
* *
* @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.
@@ -1752,7 +1752,7 @@ MatrixBaseApis.prototype.requestEmailToken = async function(
sendAttempt, sendAttempt,
nextLink, nextLink,
callback, callback,
isAccessToken, identityAccessToken,
) { ) {
const params = { const params = {
client_secret: clientSecret, client_secret: clientSecret,
@@ -1764,7 +1764,7 @@ MatrixBaseApis.prototype.requestEmailToken = async function(
try { try {
const response = await this._http.idServerRequest( const response = await this._http.idServerRequest(
undefined, "POST", "/validate/email/requestToken", undefined, "POST", "/validate/email/requestToken",
params, httpApi.PREFIX_IDENTITY_V2, isAccessToken, params, httpApi.PREFIX_IDENTITY_V2, identityAccessToken,
); );
// TODO: Fold callback into above call once v1 path below is removed // TODO: Fold callback into above call once v1 path below is removed
if (callback) callback(null, response); if (callback) callback(null, response);
@@ -1796,8 +1796,8 @@ MatrixBaseApis.prototype.requestEmailToken = async function(
* @param {string} clientSecret A secret binary string generated by the client. * @param {string} clientSecret A secret binary string generated by the client.
* This must be the same value submitted in the requestToken call. * This must be the same value submitted in the requestToken call.
* @param {string} msisdnToken The MSISDN token, as enetered by the user. * @param {string} msisdnToken The MSISDN token, as enetered by the user.
* @param {string} isAccessToken The `access_token` field of the Identity Server * @param {string} identityAccessToken The `access_token` field of the Identity
* `/account/register` response (see {@link registerWithIdentityServer}). * Server `/account/register` response (see {@link registerWithIdentityServer}).
* *
* @return {module:client.Promise} Resolves: Object, currently with no parameters. * @return {module:client.Promise} Resolves: Object, currently with no parameters.
* @return {module:http-api.MatrixError} Rejects: with an error response. * @return {module:http-api.MatrixError} Rejects: with an error response.
@@ -1807,7 +1807,7 @@ MatrixBaseApis.prototype.submitMsisdnToken = async function(
sid, sid,
clientSecret, clientSecret,
msisdnToken, msisdnToken,
isAccessToken, identityAccessToken,
) { ) {
const params = { const params = {
sid: sid, sid: sid,
@@ -1818,7 +1818,7 @@ MatrixBaseApis.prototype.submitMsisdnToken = async function(
try { try {
return await this._http.idServerRequest( return await this._http.idServerRequest(
undefined, "POST", "/validate/msisdn/submitToken", undefined, "POST", "/validate/msisdn/submitToken",
params, httpApi.PREFIX_IDENTITY_V2, isAccessToken, params, httpApi.PREFIX_IDENTITY_V2, identityAccessToken,
); );
} catch (err) { } catch (err) {
if (err.cors === "rejected" || err.httpStatus === 404) { if (err.cors === "rejected" || err.httpStatus === 404) {
@@ -1841,8 +1841,8 @@ MatrixBaseApis.prototype.submitMsisdnToken = async function(
* @param {string} medium The medium of the threepid, eg. 'email' * @param {string} medium The medium of the threepid, eg. 'email'
* @param {string} address The textual address of the threepid * @param {string} address The textual address of the threepid
* @param {module:client.callback} callback Optional. * @param {module:client.callback} callback Optional.
* @param {string} isAccessToken The `access_token` field of the Identity Server * @param {string} identityAccessToken The `access_token` field of the Identity
* `/account/register` response (see {@link registerWithIdentityServer}). * Server `/account/register` response (see {@link registerWithIdentityServer}).
* *
* @return {module:client.Promise} Resolves: A threepid mapping * @return {module:client.Promise} Resolves: A threepid mapping
* object or the empty object if no mapping * object or the empty object if no mapping
@@ -1853,7 +1853,7 @@ MatrixBaseApis.prototype.lookupThreePid = async function(
medium, medium,
address, address,
callback, callback,
isAccessToken, identityAccessToken,
) { ) {
const params = { const params = {
medium: medium, medium: medium,
@@ -1863,7 +1863,7 @@ MatrixBaseApis.prototype.lookupThreePid = async function(
try { try {
const response = await this._http.idServerRequest( const response = await this._http.idServerRequest(
undefined, "GET", "/lookup", undefined, "GET", "/lookup",
params, httpApi.PREFIX_IDENTITY_V2, isAccessToken, params, httpApi.PREFIX_IDENTITY_V2, identityAccessToken,
); );
// TODO: Fold callback into above call once v1 path below is removed // TODO: Fold callback into above call once v1 path below is removed
if (callback) callback(null, response); if (callback) callback(null, response);