Merge branch '6.4' into ag-backport-6-4-5-to-6-5

okta · May 5, 2022 · 5a43bdb · 5a43bdb
2 parents b747841 + 445b4fb
commit 5a43bdb
Show file tree

Hide file tree

Showing 4 changed files with 43 additions and 14 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -20,8 +20,16 @@
 ### Fixes
 
 - [#1189](https://github.com/okta/okta-auth-js/pull/1189) IDX: fixes `input` type indicator's field name for `username` and `authenticator`. Before the indicator was named as `key`, now it's fixed to `type` to follow input metadata with all other inputs.
+## 6.4.5
+
+### Fixes
+
+- [#1240](https://github.com/okta/okta-auth-js/pull/1204) Fixes Apple SSO flow: includes `stepUp` on returned `IdxTransaction`
+
 ## 6.4.4
 
+### Fixes
+
 - [#1199](https://github.com/okta/okta-auth-js/pull/1199) Fixes webauthn enrollment/verification to accept `credentials` object
 
 ## 6.4.3

diff --git a/lib/idx/run.ts b/lib/idx/run.ts
@@ -363,8 +363,8 @@ export async function run(
     }
   }
 
-  // from idx-js, used by the widget
-  const { actions, context, neededToProceed, proceed, rawIdxState, requestDidSucceed } = idxResponse || {};
+  // copy all fields from idxResponse which are needed by the widget
+  const { actions, context, neededToProceed, proceed, rawIdxState, requestDidSucceed, stepUp } = idxResponse || {};
   return {
     status: status!,
     ...(meta && { meta }),
@@ -374,6 +374,7 @@ export async function run(
     ...(nextStep && { nextStep }),
     ...(messages && messages.length && { messages }),
     ...(error && { error }),
+    ...(stepUp && { stepUp }),
     interactionCode, // if options.exchangeCodeForTokens is false
 
     // from idx-js

diff --git a/lib/idx/types/api.ts b/lib/idx/types/api.ts
@@ -99,7 +99,8 @@ export interface IdxTransaction {
   enabledFeatures?: IdxFeature[];
   availableSteps?: NextStep[];
   requestDidSucceed?: boolean;
-
+  stepUp?: boolean;
+
   // from idx-js, used by signin widget
   proceed: (remediationName: string, params: unknown) => Promise<IdxResponse>;
   neededToProceed: IdxRemediation[];

diff --git a/test/spec/idx/run.ts b/test/spec/idx/run.ts
@@ -390,20 +390,39 @@ describe('idx/run', () => {
         expect(authClient.transactionManager.clear).not.toHaveBeenCalled();
       });
 
+      it('does not include "stepUp" on the returned transaction', async () => {
+        const { authClient } = testContext;
+        const res = await run(authClient);
+        expect(res.stepUp).toBe(undefined);
+      });
+
       // Special case of an error response that can be continued
-      it('does save the idxResponse if stepUp is true', async () =>{
-        const { authClient, idxResponse, transactionMeta } = testContext;
-        idxResponse.requestDidSucceed = false;
-        idxResponse.stepUp = true;
-        jest.spyOn(authClient.transactionManager, 'saveIdxResponse');
-        await run(authClient);
-        expect(authClient.transactionManager.saveIdxResponse).toHaveBeenCalledWith({
-          rawIdxResponse: idxResponse.rawIdxState,
-          requestDidSucceed: false,
-          stateHandle: idxResponse.context.stateHandle,
-          interactionHandle: transactionMeta.interactionHandle
+      describe('stepUp', () => {
+        beforeEach(() => {
+          const { idxResponse } = testContext;
+          idxResponse.stepUp = true;
         });
+
+        it('does save the idxResponse', async () =>{
+          const { authClient, idxResponse, transactionMeta } = testContext;
+          jest.spyOn(authClient.transactionManager, 'saveIdxResponse');
+          await run(authClient);
+          expect(authClient.transactionManager.saveIdxResponse).toHaveBeenCalledWith({
+            rawIdxResponse: idxResponse.rawIdxState,
+            requestDidSucceed: false,
+            stateHandle: idxResponse.context.stateHandle,
+            interactionHandle: transactionMeta.interactionHandle
+          });
+        });
+
+        it('includes "stepUp" on the returned transaction', async () => {
+          const { authClient } = testContext;
+          const res = await run(authClient);
+          expect(res.stepUp).toBe(true);
+        });
+
       });
+
     });
   });