From c5ddfbfc2556adb683d2dce1f118832046c8f7c1 Mon Sep 17 00:00:00 2001
From: Sherwin Varghese <sherwin.varghese@sap.com>
Date: Tue, 1 Aug 2023 22:46:08 +0530
Subject: [PATCH] CXINT-2275: CDC `id_token` missing in the Oauth token request
 (#17712)

---
 integration-libs/cdc/root/service/cdc-js.service.spec.ts | 4 +---
 integration-libs/cdc/root/service/cdc-js.service.ts      | 9 ++++-----
 2 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/integration-libs/cdc/root/service/cdc-js.service.spec.ts b/integration-libs/cdc/root/service/cdc-js.service.spec.ts
index c5744f4d8a4..fe6ce38d4b2 100644
--- a/integration-libs/cdc/root/service/cdc-js.service.spec.ts
+++ b/integration-libs/cdc/root/service/cdc-js.service.spec.ts
@@ -267,7 +267,7 @@ describe('CdcJsService', () => {
         errorCallback: jasmine.any(Function) as any,
       });
       expect(winRef?.nativeWindow['__gigyaConf']).toEqual({
-        include: 'id_token',
+        include: 'id_token, missing-required-fields',
       });
     });
 
@@ -456,7 +456,6 @@ describe('CdcJsService', () => {
         expect(service['gigyaSDK'].accounts.login).toHaveBeenCalledWith({
           loginID: 'uid',
           password: 'password',
-          include: 'missing-required-fields',
           ignoreInterruptions: true,
           sessionExpiry: sampleCdcConfig.cdc[0].sessionExpiration,
           callback: jasmine.any(Function),
@@ -485,7 +484,6 @@ describe('CdcJsService', () => {
           expect(service['gigyaSDK'].accounts.login).toHaveBeenCalledWith({
             loginID: 'uid',
             password: 'password',
-            include: 'missing-required-fields',
             ignoreInterruptions: true,
             context: 'RESET_EMAIL',
             sessionExpiry: sampleCdcConfig?.cdc[0]?.sessionExpiration,
diff --git a/integration-libs/cdc/root/service/cdc-js.service.ts b/integration-libs/cdc/root/service/cdc-js.service.ts
index 3f2e670be38..a86e511b464 100644
--- a/integration-libs/cdc/root/service/cdc-js.service.ts
+++ b/integration-libs/cdc/root/service/cdc-js.service.ts
@@ -36,10 +36,10 @@ import {
 } from 'rxjs';
 import { filter, switchMap, take, tap } from 'rxjs/operators';
 import { CdcConfig } from '../config/cdc-config';
-import { CdcAuthFacade } from '../facade/cdc-auth.facade';
-import { CdcReConsentEvent } from '../events';
-import { CdcSiteConsentTemplate } from '../consent-management/model/index';
 import { CdcConsentsLocalStorageService } from '../consent-management';
+import { CdcSiteConsentTemplate } from '../consent-management/model/index';
+import { CdcReConsentEvent } from '../events';
+import { CdcAuthFacade } from '../facade/cdc-auth.facade';
 
 const defaultSessionTimeOut = 3600;
 const setAccountInfoAPI = 'accounts.setAccountInfo';
@@ -125,7 +125,7 @@ export class CdcJsService implements OnDestroy {
                 (this.winRef.nativeWindow as { [key: string]: any })[
                   '__gigyaConf'
                 ] = {
-                  include: 'id_token',
+                  include: 'id_token, missing-required-fields',
                 };
               }
             }
@@ -266,7 +266,6 @@ export class CdcJsService implements OnDestroy {
         return this.invokeAPI('accounts.login', {
           loginID: email,
           password: password,
-          include: 'missing-required-fields',
           ignoreInterruptions: ignoreInterruptions,
           ...(context && { context: context }),
           sessionExpiry: sessionExpiration,