From 516dff06ee30ad6ea9f7078d49a87fbcf056c5a6 Mon Sep 17 00:00:00 2001
From: "J. Ryan Stinnett" <jryans@gmail.com>
Date: Tue, 30 Jul 2019 10:06:52 +0100
Subject: [PATCH] Rename isAccessToken to identityAccessToken

---
 src/base-apis.js | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/base-apis.js b/src/base-apis.js
index 085db1e11..4a62496f4 100644
--- a/src/base-apis.js
+++ b/src/base-apis.js
@@ -1739,8 +1739,8 @@ MatrixBaseApis.prototype.registerWithIdentityServer = function(hsOpenIdToken) {
  * @param {string} nextLink Optional If specified, the client will be redirected
  *                 to this link after validation.
  * @param {module:client.callback} callback Optional.
- * @param {string} isAccessToken The `access_token` field of the Identity Server
- * `/account/register` response (see {@link registerWithIdentityServer}).
+ * @param {string} identityAccessToken The `access_token` field of the Identity
+ * Server `/account/register` response (see {@link registerWithIdentityServer}).
  *
  * @return {module:client.Promise} Resolves: TODO
  * @return {module:http-api.MatrixError} Rejects: with an error response.
@@ -1752,7 +1752,7 @@ MatrixBaseApis.prototype.requestEmailToken = async function(
     sendAttempt,
     nextLink,
     callback,
-    isAccessToken,
+    identityAccessToken,
 ) {
     const params = {
         client_secret: clientSecret,
@@ -1764,7 +1764,7 @@ MatrixBaseApis.prototype.requestEmailToken = async function(
     try {
         const response = await this._http.idServerRequest(
             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
         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.
  *                 This must be the same value submitted in the requestToken call.
  * @param {string} msisdnToken The MSISDN token, as enetered by the user.
- * @param {string} isAccessToken The `access_token` field of the Identity Server
- * `/account/register` response (see {@link registerWithIdentityServer}).
+ * @param {string} identityAccessToken The `access_token` field of the Identity
+ * Server `/account/register` response (see {@link registerWithIdentityServer}).
  *
  * @return {module:client.Promise} Resolves: Object, currently with no parameters.
  * @return {module:http-api.MatrixError} Rejects: with an error response.
@@ -1807,7 +1807,7 @@ MatrixBaseApis.prototype.submitMsisdnToken = async function(
     sid,
     clientSecret,
     msisdnToken,
-    isAccessToken,
+    identityAccessToken,
 ) {
     const params = {
         sid: sid,
@@ -1818,7 +1818,7 @@ MatrixBaseApis.prototype.submitMsisdnToken = async function(
     try {
         return await this._http.idServerRequest(
             undefined, "POST", "/validate/msisdn/submitToken",
-            params, httpApi.PREFIX_IDENTITY_V2, isAccessToken,
+            params, httpApi.PREFIX_IDENTITY_V2, identityAccessToken,
         );
     } catch (err) {
         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} address The textual address of the threepid
  * @param {module:client.callback} callback Optional.
- * @param {string} isAccessToken The `access_token` field of the Identity Server
- * `/account/register` response (see {@link registerWithIdentityServer}).
+ * @param {string} identityAccessToken The `access_token` field of the Identity
+ * Server `/account/register` response (see {@link registerWithIdentityServer}).
  *
  * @return {module:client.Promise} Resolves: A threepid mapping
  *                                 object or the empty object if no mapping
@@ -1853,7 +1853,7 @@ MatrixBaseApis.prototype.lookupThreePid = async function(
     medium,
     address,
     callback,
-    isAccessToken,
+    identityAccessToken,
 ) {
     const params = {
         medium: medium,
@@ -1863,7 +1863,7 @@ MatrixBaseApis.prototype.lookupThreePid = async function(
     try {
         const response = await this._http.idServerRequest(
             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
         if (callback) callback(null, response);