chore(oidc-client): update user.info

Author: ancheetah

e2e/oidc-app/src/ping-am/index.html

@@ -5,7 +5,7 @@
 
     <style>
       #logout,
-      #userinfo {
+      #user-info-btn {
         display: none;
       }
     </style>
@@ -19,7 +19,7 @@ <h1>OIDC App | PingAM Login</h1>
       <button id="get-tokens">Get Tokens</button>
       <button id="renew-tokens">Renew Tokens</button>
       <button id="logout">Logout</button>
-      <button id="userinfo">User Info</button>
+      <button id="user-info-btn">User Info</button>
       <a href="/ping-am/">Start Over</a>
     </div>
     <script type="module" src="./main.ts"></script>

e2e/oidc-app/src/ping-one/index.html

@@ -5,7 +5,7 @@
 
     <style>
       #logout,
-      #userinfo {
+      #user-info-btn {
         display: none;
       }
     </style>
@@ -19,7 +19,7 @@ <h1>OIDC App | P1 Login</h1>
       <button id="get-tokens">Get Tokens</button>
       <button id="renew-tokens">Renew Tokens</button>
       <button id="logout">Logout</button>
-      <button id="userinfo">User Info</button>
+      <button id="user-info-btn">User Info</button>
       <a href="/ping-one/">Start Over</a>
     </div>
     <script type="module" src="./main.ts"></script>

e2e/oidc-app/src/utils/oidc-app.ts

@@ -33,7 +33,7 @@ function displayTokenResponse(
   } else {
     console.log('Token Response:', response);
     document.getElementById('logout').style.display = 'block';
-    document.getElementById('userinfo').style.display = 'block';
+    document.getElementById('user-info-btn').style.display = 'block';
     document.getElementById('login-background').style.display = 'none';
     document.getElementById('login-redirect').style.display = 'none';
 
@@ -108,10 +108,10 @@ export async function oidcApp({ config, urlParams }) {
     displayTokenResponse(response);
   });
 
-  document.getElementById('userinfo').addEventListener('click', async () => {
+  document.getElementById('user-info-btn').addEventListener('click', async () => {
     const userInfo = await oidcClient.user.info();
 
-    if ('error' in userInfo) {
+    if (typeof userInfo === 'object' && 'error' in userInfo) {
       console.error('User Info Error:', userInfo);
       displayError(userInfo);
     } else {
@@ -133,7 +133,7 @@ export async function oidcApp({ config, urlParams }) {
     } else {
       console.log('Logout successful');
       document.getElementById('logout').style.display = 'none';
-      document.getElementById('userinfo').style.display = 'none';
+      document.getElementById('user-info-btn').style.display = 'none';
       document.getElementById('login-background').style.display = 'block';
       document.getElementById('login-redirect').style.display = 'block';
       window.location.assign(window.location.origin + window.location.pathname);

e2e/oidc-suites/src/user.spec.ts

@@ -57,4 +57,29 @@ test.describe('User tests', () => {
     await expect(page.getByText('demouser')).toBeVisible();
     await expect(page.getByText('[email protected]')).toBeVisible();
   });
+
+  test('get user info should error with missing token', async ({ page }) => {
+    const { navigate, clickButton } = asyncEvents(page);
+    await navigate('/ping-am/');
+    expect(page.url()).toBe('http://localhost:8443/ping-am/');
+
+    await clickButton('Login (Background)', 'https://openam-sdks.forgeblocks.com/');
+
+    await page.getByLabel('User Name').fill(pingAmUsername);
+    await page.getByRole('textbox', { name: 'Password' }).fill(pingAmPassword);
+    await page.getByRole('button', { name: 'Next' }).click();
+
+    await page.waitForURL('http://localhost:8443/ping-am/**');
+    expect(page.url()).toContain('code');
+    expect(page.url()).toContain('state');
+    await expect(page.locator('#accessToken-0')).not.toBeEmpty();
+    await expect(page.locator('#accessToken-0')).not.toHaveText('undefined');
+
+    await page.evaluate(() => window.localStorage.clear());
+    await page.getByRole('button', { name: 'User Info' }).click();
+
+    await expect(page.locator('#userInfo')).not.toBeVisible();
+    await expect(page.locator('.error')).toContainText(`"error": "No access token found"`);
+    await expect(page.locator('.error')).toContainText(`"type": "auth_error"`);
+  });
 });

packages/oidc-client/src/lib/client.store.ts

@@ -22,7 +22,7 @@ import type { GenericError, GetAuthorizationUrlOptions } from '@forgerock/sdk-ty
 import type { GetTokensOptions, LogoutResult } from './client.types.js';
 import type { OauthTokens, OidcConfig } from './config.types.js';
 import type { AuthorizationError, AuthorizationSuccess } from './authorize.request.types.js';
-import type { TokenExchangeErrorResponse, TokenExchangeResponse } from './exchange.types.js';
+import type { TokenExchangeErrorResponse } from './exchange.types.js';
 import { isExpiryWithinThreshold } from './token.utils.js';
 import { logoutµ } from './logout.request.js';
 
@@ -305,9 +305,9 @@ export async function oidc<ActionType extends ActionTypes = ActionTypes>({
        * @method info
        * @description Retrieves user information using the userinfo endpoint from the wellknown configuration.
        *              It requires an access token stored in the configured storage.
-       * @returns {Promise<GenericError | TokenExchangeResponse>} - Returns a promise that resolves to user information or an error response.
+       * @returns {Promise<GenericError | unknown>} - Returns a promise that resolves to user information or an error response.
        */
-      info: async (): Promise<GenericError | TokenExchangeResponse> => {
+      info: async (): Promise<GenericError | unknown> => {
         const state = store.getState();
         const wellknown = wellknownSelector(wellknownUrl, state);
 

packages/oidc-client/src/lib/oidc.api.ts

@@ -336,7 +336,7 @@ export const oidcApi = createApi({
         return response as { data: object };
       },
     }),
-    userInfo: builder.mutation<TokenExchangeResponse, { accessToken: string; endpoint: string }>({
+    userInfo: builder.mutation<unknown, { accessToken: string; endpoint: string }>({
       queryFn: async ({ accessToken, endpoint }, api, _, baseQuery) => {
         const { requestMiddleware, logger } = api.extra as Extras;
 
@@ -375,7 +375,7 @@ export const oidcApi = createApi({
 
         logger.debug('OIDC userInfo API response', response);
 
-        return response as { data: TokenExchangeResponse };
+        return response as { data: unknown };
       },
     }),
   }),