Add referrer redirect support to OIDC auth completion (v1.3.0) (#15)

* Bump version to 1.2.0 (minor)

Made-with: Cursor

* Add referrer redirect support to OIDC auth completion (v1.3.0)

After OIDC authentication completes, check for a stored referrer redirect.
If present, navigate to the stored URL (with optional #angie-prompt= hash)
instead of opening the sidebar. This enables prompt-after-redirect flows
where a user is sent through auth and then redirected back with a prompt.

Made-with: Cursor

Author: Omerisra6

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@elementor/angie-sdk",
-  "version": "1.2.0",
+  "version": "1.3.0",
   "description": "TypeScript SDK for Angie AI assistant",
   "main": "dist/index.cjs",
   "module": "dist/index.js",

src/oauth.test.ts

@@ -0,0 +1,146 @@
+import { describe, expect, it, beforeEach, afterEach, jest } from '@jest/globals';
+
+const mockSetupOidcAuthParentListener = jest.fn();
+const mockForwardOidcLoginFlowToWindow = jest.fn();
+
+jest.mock( '@elementor/oidc-auth', () => ( {
+	setupOidcAuthParentListener: mockSetupOidcAuthParentListener,
+	forwardOidcLoginFlowToWindow: mockForwardOidcLoginFlowToWindow,
+} ) );
+
+const mockGetReferrerRedirect = jest.fn();
+const mockClearReferrerRedirect = jest.fn();
+
+jest.mock( './referrer-redirect', () => ( {
+	getReferrerRedirect: mockGetReferrerRedirect,
+	clearReferrerRedirect: mockClearReferrerRedirect,
+} ) );
+
+jest.mock( './config', () => ( {
+	appState: {
+		iframeUrlObject: { origin: 'https://angie.test.com' },
+		iframe: document.createElement( 'iframe' ),
+	},
+} ) );
+
+jest.mock( './logger', () => ( {
+	createChildLogger: () => ( {
+		log: jest.fn(),
+		warn: jest.fn(),
+		error: jest.fn(),
+	} ),
+} ) );
+
+import { listenToOAuthFromIframe, setupOidcLoginFlowHandler } from './oauth';
+
+describe( 'oauth', () => {
+	beforeEach( () => {
+		jest.clearAllMocks();
+		mockGetReferrerRedirect.mockReturnValue( null );
+
+		Object.defineProperty( window, 'toggleAngieSidebar', {
+			value: jest.fn(),
+			writable: true,
+			configurable: true,
+		} );
+	} );
+
+	afterEach( () => {
+		jest.restoreAllMocks();
+	} );
+
+	function getOidcParentCallback(): () => void {
+		listenToOAuthFromIframe();
+		return ( mockSetupOidcAuthParentListener.mock.calls[ 0 ][ 0 ] as any ).onOAuthParamsCleared;
+	}
+
+	function getOidcLoginFlowCallback(): () => void {
+		setupOidcLoginFlowHandler();
+		const lastIdx = mockForwardOidcLoginFlowToWindow.mock.calls.length - 1;
+		return ( mockForwardOidcLoginFlowToWindow.mock.calls[ lastIdx ][ 0 ] as any ).onSuccess;
+	}
+
+	describe( 'listenToOAuthFromIframe', () => {
+		it( 'should setup OIDC auth parent listener', () => {
+			// Act
+			listenToOAuthFromIframe();
+
+			// Assert
+			expect( mockSetupOidcAuthParentListener ).toHaveBeenCalledWith( {
+				trustedOrigin: 'https://angie.test.com',
+				onOAuthParamsCleared: expect.any( Function ),
+			} );
+		} );
+
+		it( 'should open sidebar when auth completes and no referrer redirect', () => {
+			// Arrange
+			jest.useFakeTimers();
+			const callback = getOidcParentCallback();
+
+			// Act
+			callback();
+			jest.advanceTimersByTime( 500 );
+
+			// Assert
+			expect( window.toggleAngieSidebar ).toHaveBeenCalledWith( true );
+
+			jest.useRealTimers();
+		} );
+
+		it( 'should redirect with prompt when referrer redirect with prompt exists', () => {
+			// Arrange
+			const returnUrl = 'http://localhost/wp-admin/post.php?post=123';
+			const prompt = 'Help me create a contact page';
+			mockGetReferrerRedirect.mockReturnValue( { url: returnUrl, prompt } );
+			const callback = getOidcParentCallback();
+
+			// Act
+			callback();
+
+			// Assert
+			expect( mockClearReferrerRedirect ).toHaveBeenCalled();
+			expect( window.toggleAngieSidebar ).not.toHaveBeenCalled();
+		} );
+
+		it( 'should redirect without prompt hash when referrer redirect exists without prompt', () => {
+			// Arrange
+			const returnUrl = 'http://localhost/wp-admin/post.php?post=123';
+			mockGetReferrerRedirect.mockReturnValue( { url: returnUrl } );
+			const callback = getOidcParentCallback();
+
+			// Act
+			callback();
+
+			// Assert
+			expect( mockClearReferrerRedirect ).toHaveBeenCalled();
+			expect( window.toggleAngieSidebar ).not.toHaveBeenCalled();
+		} );
+	} );
+
+	describe( 'setupOidcLoginFlowHandler', () => {
+		it( 'should forward OIDC login flow with redirect callback', () => {
+			// Act
+			setupOidcLoginFlowHandler();
+
+			// Assert
+			expect( mockForwardOidcLoginFlowToWindow ).toHaveBeenCalledWith( {
+				targets: expect.any( Object ),
+				onSuccess: expect.any( Function ),
+			} );
+		} );
+
+		it( 'should redirect when OIDC login succeeds and referrer redirect exists', () => {
+			// Arrange
+			const returnUrl = 'http://localhost/wp-admin/post.php?post=456';
+			const prompt = 'Help me optimize SEO';
+			mockGetReferrerRedirect.mockReturnValue( { url: returnUrl, prompt } );
+			const callback = getOidcLoginFlowCallback();
+
+			// Act
+			callback();
+
+			// Assert
+			expect( mockClearReferrerRedirect ).toHaveBeenCalled();
+		} );
+	} );
+} );

src/oauth.ts

@@ -5,6 +5,7 @@ import {
 } from "@elementor/oidc-auth";
 import { appState } from "./config";
 import { createChildLogger } from "./logger";
+import { clearReferrerRedirect, getReferrerRedirect } from "./referrer-redirect";
 
 declare global {
 	interface Window {
@@ -14,7 +15,22 @@ declare global {
 
 const logger = createChildLogger( 'oauth' );
 
-function openSidebarAfterAuthentication(): void {
+function buildRedirectUrl( url: string, prompt?: string ): string {
+	if ( ! prompt ) {
+		return url;
+	}
+	return `${ url }#angie-prompt=${ encodeURIComponent( prompt ) }`;
+}
+
+function onAuthenticationComplete(): void {
+	const redirectData = getReferrerRedirect();
+
+	if ( redirectData ) {
+		clearReferrerRedirect();
+		window.location.href = buildRedirectUrl( redirectData.url, redirectData.prompt );
+		return;
+	}
+
 	try {
 		localStorage.setItem( 'angie_sidebar_state', 'open' );
 	} catch ( e ) {
@@ -28,7 +44,7 @@ function openSidebarAfterAuthentication(): void {
 export const listenToOAuthFromIframe = (): void => {
 	setupOidcAuthParentListener( {
 		trustedOrigin: appState.iframeUrlObject?.origin ?? '',
-		onOAuthParamsCleared: openSidebarAfterAuthentication,
+		onOAuthParamsCleared: onAuthenticationComplete,
 	} );
 };
 
@@ -37,8 +53,8 @@ export const setupOidcLoginFlowHandler = (): void => {
 
 	window.addEventListener( 'load', () => {
 		logger.log( 'OIDC: Window load event fired, forwarding OIDC state if present' );
-		forwardOidcLoginFlowToWindow( { targets, onSuccess: openSidebarAfterAuthentication } );
+		forwardOidcLoginFlowToWindow( { targets, onSuccess: onAuthenticationComplete } );
 	} );
 
-	forwardOidcLoginFlowToWindow( { targets, onSuccess: openSidebarAfterAuthentication } );
+	forwardOidcLoginFlowToWindow( { targets, onSuccess: onAuthenticationComplete } );
 };