piral-oidc 1.9.0-beta.8186 → 1.9.0-beta.8196

package/src/setup.test.ts

@@ -2,7 +2,7 @@
  * @vitest-environment jsdom
  */
 import { describe, it, expect, vitest, beforeAll, beforeEach, afterAll } from 'vitest';
-import { UserManager } from 'oidc-client';
+import { UserManager } from 'oidc-client-ts';
 import { setupOidcClient } from './setup';
 import { OidcConfig, OidcErrorType } from './types';
 

package/src/setup.ts

@@ -1,4 +1,4 @@
-import { Log, User, UserManager } from 'oidc-client';
+import { Log, User, UserManager, Logger } from 'oidc-client-ts';
 import { OidcError } from './OidcError';
 import { AuthenticationResult, LogLevel, OidcClient, OidcConfig, OidcErrorType, OidcProfile } from './types';
 
@@ -67,11 +67,11 @@ export function setupOidcClient(config: OidcConfig): OidcClient {
   });
 
   if (logLevel !== undefined) {
-    Log.logger = console;
-    Log.level = convertLogLevelToOidcClient(logLevel);
+    Log.setLogger(console);
+    Log.setLevel(convertLogLevelToOidcClient(logLevel));
   } else if (process.env.NODE_ENV === 'development') {
-    Log.logger = console;
-    Log.level = Log.DEBUG;
+    Log.setLogger(console);
+    Log.setLevel(Log.DEBUG);
   }
 
   if (doesWindowLocationMatch(userManager.settings.post_logout_redirect_uri)) {
@@ -126,6 +126,7 @@ export function setupOidcClient(config: OidcConfig): OidcClient {
     new Promise(async (resolve, reject) => {
       /** The user that is resolved when finishing the callback  */
       let user: User;
+
       if (
         (doesWindowLocationMatch(userManager.settings.silent_redirect_uri) ||
           doesWindowLocationMatch(userManager.settings.popup_redirect_uri)) &&
@@ -137,10 +138,12 @@ export function setupOidcClient(config: OidcConfig): OidcClient {
          * to update the parent. This is usually due to a timeout from a network error.
          */
         try {
-          user = await userManager.signinSilentCallback();
+          await userManager.signinSilentCallback();
+          user = await userManager.getUser();
         } catch (e) {
           return reject(new OidcError(OidcErrorType.oidcCallback, e));
         }
+
         return resolve({
           shouldRender: false,
           state: user?.state,
@@ -159,8 +162,9 @@ export function setupOidcClient(config: OidcConfig): OidcClient {
         }
 
         if (appUri) {
-          Log.debug(`Redirecting to ${appUri} due to appUri being configured.`);
+          Logger.debug(`Redirecting to ${appUri} due to appUri being configured.`);
           window.location.href = appUri;
+          
           return resolve({
             shouldRender: false,
             state: user?.state,
@@ -220,7 +224,7 @@ export function setupOidcClient(config: OidcConfig): OidcClient {
       return userManager.signoutRedirect();
     },
     revoke() {
-      return userManager.revokeAccessToken();
+      return userManager.revokeTokens();
     },
     handleAuthentication,
     extendHeaders(req) {

package/src/types.ts

@@ -1,5 +1,5 @@
 import type {} from 'piral-core';
-import type { Profile, StateStore } from 'oidc-client';
+import type { UserProfile, StateStore } from 'oidc-client-ts';
 
 /**
  * Available configuration options for the OpenID Connect plugin.
@@ -52,7 +52,7 @@ export interface OidcConfig {
    * via the responseType. By default, the responseType `code` will
    * get `query` and responseType `token` will get `fragment`.
    */
-  responseMode?: string;
+  responseMode?: 'query' | 'fragment';
   /**
    * The scopes to be used. By default, `openid` is used.
    */
@@ -150,7 +150,7 @@ export interface PiralCustomOidcProfile {}
 /**
  * The defined OIDC profile.
  */
-export type OidcProfile = PiralCustomOidcProfile & Profile;
+export type OidcProfile = PiralCustomOidcProfile & UserProfile;
 
 export interface OidcRequest {
   /**