[msal-node][msal-common] Add device code response in DeviceCodeClient.ts

lib/msal-common/src/client/DeviceCodeClient.ts

@@ -13,6 +13,8 @@ import { ClientConfiguration } from "../config/ClientConfiguration";
 import { TimeUtils } from "../utils/TimeUtils";
 import { ServerAuthorizationTokenResponse } from "../server/ServerAuthorizationTokenResponse";
 import { ScopeSet } from "../request/ScopeSet";
+import { ResponseHandler } from "../response/ResponseHandler";
+import { AuthenticationResult } from '../response/AuthenticationResult';
 
 /**
  * OAuth2.0 Device code client
@@ -28,16 +30,29 @@ export class DeviceCodeClient extends BaseClient {
      * polls token endpoint to exchange device code for tokens
      * @param request
      */
-    public async acquireToken(request: DeviceCodeRequest): Promise<string> {
+    public async acquireToken(request: DeviceCodeRequest): Promise<AuthenticationResult> {
 
         const deviceCodeResponse: DeviceCodeResponse = await this.getDeviceCode(request);
         request.deviceCodeCallback(deviceCodeResponse);
         const response: ServerAuthorizationTokenResponse = await this.acquireTokenWithDeviceCode(
             request,
             deviceCodeResponse);
 
-        // TODO handle response
-        return JSON.stringify(response);
+        const responseHandler = new ResponseHandler(
+            this.config.authOptions.clientId,
+            this.cacheManager,
+            this.cryptoUtils,
+            this.logger
+        );
+
+        // Validate response. This function throws a server error if an error is returned by the server.
+        responseHandler.validateTokenResponse(response);
+        const tokenResponse = responseHandler.handleServerTokenResponse(
+            response,
+            this.authority
+        );
+
+        return tokenResponse;
     }
 
     /**
@@ -174,6 +189,7 @@ export class DeviceCodeClient extends BaseClient {
         requestParameters.addDeviceCode(deviceCodeResponse.deviceCode);
         const correlationId = request.correlationId || this.config.cryptoInterface.createNewGuid();
         requestParameters.addCorrelationId(correlationId);
+        requestParameters.addClientInfo();
         return requestParameters.createQueryString();
     }
 }

lib/msal-node/src/client/PublicClientApplication.ts

@@ -3,7 +3,7 @@
  * Licensed under the MIT License.
  */
 
-import { DeviceCodeClient, DeviceCodeRequest } from '@azure/msal-common';
+import { DeviceCodeClient, DeviceCodeRequest, AuthenticationResult } from '@azure/msal-common';
 import { Configuration } from '../config/Configuration';
 import { ClientApplication } from './ClientApplication';
 
@@ -42,7 +42,7 @@ export class PublicClientApplication extends ClientApplication {
      * Since the client cannot receive incoming requests, it polls the authorization server repeatedly
      * until the end-user completes input of credentials.
      */
-    public async acquireTokenByDeviceCode(request: DeviceCodeRequest): Promise<string> {
+    public async acquireTokenByDeviceCode(request: DeviceCodeRequest): Promise<AuthenticationResult> {
         this.logger.info("acquireTokenByDeviceCode called");
         const deviceCodeConfig = await this.buildOauthClientConfiguration(
             request.authority

samples/msal-node-extensions/package.json

@@ -11,7 +11,7 @@
   "author": "Microsoft",
   "license": "MIT",
   "dependencies": {
-    "@azure/msal-node": "^0.1.0",
+    "@azure/msal-node": "^1.0.0-alpha.0",
     "express": "^4.17.1",
     "@azure/msal-node-extensions": "0.1.0"
   }