add get token request result call (#143)

Author: sibinlu

package.json

@@ -1,6 +1,6 @@
 {
   "name": "token-io",
-  "version": "1.5.19",
+  "version": "1.5.20",
   "description": "",
   "main": "dist/token-io.min.js",
   "scripts": {

src/http/AuthHttpClient.js

@@ -1294,16 +1294,18 @@ class AuthHttpClient {
     /**
      * Sign with a Token signature a token request state payload.
      *
+     * @param {string} tokenRequestId - token request id
      * @param {string} tokenId - token id
      * @param {string} state - url state
      * @return {Object} response - response to the api call
      */
-    async signTokenRequestState(tokenId, state) {
+    async signTokenRequestState(tokenRequestId, tokenId, state) {
         const req = {
             payload: {
                 tokenId,
                 state,
             },
+            tokenRequestId
         };
 
         const request = {

src/http/HttpClient.js

@@ -319,15 +319,15 @@ class HttpClient {
     }
 
     /**
-     * Get a token ID based on its token request ID.
+     * Get the token request result based on its token request ID.
      *
      * @param {string} tokenRequestId - token request id
      * @return {Object} response - response to the API call
      */
-    async getTokenId(tokenRequestId) {
+    async getTokenRequestResult(tokenRequestId) {
         const request = {
             method: 'get',
-            url: `/token-requests/${tokenRequestId}/token_id`
+            url: `/token-requests/${tokenRequestId}/token_request_result`
         };
         return this._instance(request);
     }

src/main/Member.js

@@ -1025,13 +1025,14 @@ export default class Member {
     /**
      * Sign with a Token signature a token request state payload.
      *
+     * @param {string} tokenRequestId - token request id
      * @param {string} tokenId - token id
      * @param {string} state - url state
      * @return {Object} response - response to the api call
      */
-    signTokenRequestState(tokenId, state) {
+    signTokenRequestState(tokenRequestId, tokenId, state) {
         return Util.callAsync(this.signTokenRequestState, async () => {
-            const res = await this._client.signTokenRequestState(tokenId, state);
+            const res = await this._client.signTokenRequestState(tokenRequestId, tokenId, state);
             return res.data.signature;
         });
     }

src/main/Token.js

@@ -478,15 +478,18 @@ class Token {
     }
 
     /**
-     * Get a token ID based on its token request ID.
+     * Get the token request result based on its token request ID.
      *
      * @param {string} tokenRequestId - token request id
-     * @return {Promise} tokenId - token id
+     * @return {Promise} tokenId - token id and signature
      */
-    getTokenId(tokenRequestId) {
-        return Util.callAsync(this.getTokenId, async () => {
-            const res = await this._unauthenticatedClient.getTokenId(tokenRequestId);
-            return res.data.tokenId;
+    getTokenRequestResult(tokenRequestId) {
+        return Util.callAsync(this.getTokenRequestResult, async () => {
+            const res = await this._unauthenticatedClient.getTokenRequestResult(tokenRequestId);
+            return {
+                tokenId: res.data.tokenId,
+                signature: res.data.signature
+            };
         });
     }
 }

src/sample/TokenRequestUrlSample.js

@@ -34,18 +34,23 @@ class TokenRequestUrlSample {
     /**
      * Generates a callback URL from a token request URL.
      *
+     * @param {string} tokenRequestId - token request id
      * @param {object} grantor - grantor of the token
      * @param {object} grantee - grantee of the token
      * @param {string} tokenRequestUrl - token request URL
      * @return {Promise} promise - promise of callback URL
      */
-    static async getCallbackUrlFromTokenRequestUrl(grantor, grantee, tokenRequestUrl) {
+    static async getCallbackUrlFromTokenRequestUrl(
+        tokenRequestId,
+        grantor,
+        grantee,
+        tokenRequestUrl) {
         const urlParams = Util.parseParamsFromUrl(tokenRequestUrl);
         const state = encodeURIComponent(urlParams.state);
 
         const token = await this.generateValidAccessToken(grantor, grantee);
 
-        const signature = await grantor.signTokenRequestState(token.id, state);
+        const signature = await grantor.signTokenRequestState(tokenRequestId, token.id, state);
         const callbackUrl = `http://localhost/path?tokenId=${token.id}` +
             `&state=${state}&signature=${encodeURIComponent(JSON.stringify(signature))}`;
 

test/sample/TokenRequestUrlSample.spec.js

@@ -26,7 +26,7 @@ describe('TokenRequestUrl test', () => {
         const requestUrl = TokenRequestUrlSample
             .generateTokenRequestUrl(requestId, originalState, csrfToken);
         const callbackUrl = await TokenRequestUrlSample
-            .getCallbackUrlFromTokenRequestUrl(grantor, grantee, requestUrl);
+            .getCallbackUrlFromTokenRequestUrl(requestId, grantor, grantee, requestUrl);
         const callback = await TokenRequestUrlSample
             .parseTokenRequestCallbackUrl(callbackUrl, csrfToken);
         assert.equal(originalState, callback.innerState);
@@ -36,6 +36,7 @@ describe('TokenRequestUrl test', () => {
     it('Should request a signature', async () => {
         if (BROWSER) return;
         const state = Util.generateNonce();
+        const tokenRequestId = Util.generateNonce();
 
         const grantor = await CreateMemberSample();
         const grantee = await CreateMemberSample();
@@ -45,7 +46,7 @@ describe('TokenRequestUrl test', () => {
         });
         const token = await TokenRequestUrlSample.generateValidAccessToken(grantor, grantee);
 
-        const signature = await grantor.signTokenRequestState(token.id, state);
+        const signature = await grantor.signTokenRequestState(tokenRequestId, token.id, state);
 
         const tokenMember = await TokenRequestUrlSample.getTokenMember();
         const signingKey = Util.getSigningKey(tokenMember.keys, signature);