zudoku 0.3.1-dev.20 → 0.3.1-dev.21

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zudoku",
-  "version": "0.3.1-dev.20",
+  "version": "0.3.1-dev.21",
   "type": "module",
   "files": [
     "dist",

package/src/lib/authentication/providers/auth0.tsx

@@ -1,22 +1,17 @@
-import {
-  Auth0AuthenticationConfig,
-  OpenIDAuthenticationConfig,
-} from "../../../config/config.js";
+import { Auth0AuthenticationConfig } from "../../../config/config.js";
 import { AuthenticationProviderInitializer } from "../authentication.js";
 import { useAuthState } from "../state.js";
 import { OpenIDAuthenticationProvider } from "./openid.js";
 
 class Auth0AuthenticationProvider extends OpenIDAuthenticationProvider {
-  constructor(config: OpenIDAuthenticationConfig) {
-    super(config);
-
-    // Prefill the authorization server since we know what Auth0's config is
-    this.authorizationServer = {
-      issuer: config.issuer,
-      authorization_endpoint: `${config.issuer}/authorize`,
-      token_endpoint: `${config.issuer}/oauth/token`,
-      code_challenge_methods_supported: ["S256", "plain"],
-    };
+  constructor(config: Auth0AuthenticationConfig) {
+    super({
+      ...config,
+      type: "openid",
+      issuer: `https://${config.domain}`,
+      clientId: config.clientId,
+      audience: config.audience,
+    });
   }
 
   onAuthorizationUrl = async (
@@ -28,16 +23,6 @@ class Auth0AuthenticationProvider extends OpenIDAuthenticationProvider {
     }
   };
 
-  override async getAuthServer() {
-    this.authorizationServer = {
-      issuer: new URL(this.authorizationEndpoint!).origin,
-      authorization_endpoint: this.authorizationEndpoint,
-      token_endpoint: this.tokenEndpoint,
-      code_challenge_methods_supported: [],
-    };
-    return this.authorizationServer;
-  }
-
   signOut = async (): Promise<void> => {
     useAuthState.setState({
       isAuthenticated: false,
@@ -79,11 +64,6 @@ class Auth0AuthenticationProvider extends OpenIDAuthenticationProvider {
 
 const auth0Auth: AuthenticationProviderInitializer<
   Auth0AuthenticationConfig
-> = ({ domain, ...options }) =>
-  new Auth0AuthenticationProvider({
-    ...options,
-    type: "openid",
-    issuer: `https://${domain}`,
-  });
+> = (options) => new Auth0AuthenticationProvider(options);
 
 export default auth0Auth;

package/src/lib/authentication/providers/openid.tsx

@@ -40,8 +40,6 @@ class OpenIdAuthPlugin extends AuthenticationPlugin {
 export class OpenIDAuthenticationProvider implements AuthenticationProvider {
   protected client: oauth.Client;
   protected issuer: string;
-  protected authorizationEndpoint: string | undefined;
-  protected tokenEndpoint: string | undefined;
 
   protected authorizationServer: oauth.AuthorizationServer | undefined;
 
@@ -59,8 +57,6 @@ export class OpenIDAuthenticationProvider implements AuthenticationProvider {
   constructor({
     issuer,
     audience,
-    authorizationEndpoint,
-    tokenEndpoint,
     clientId,
     redirectToAfterSignUp,
     redirectToAfterSignIn,
@@ -72,8 +68,6 @@ export class OpenIDAuthenticationProvider implements AuthenticationProvider {
     };
     this.audience = audience;
     this.issuer = issuer;
-    this.authorizationEndpoint = authorizationEndpoint;
-    this.tokenEndpoint = tokenEndpoint;
     this.redirectToAfterSignUp = redirectToAfterSignUp ?? "/";
     this.redirectToAfterSignIn = redirectToAfterSignIn ?? "/";
     this.redirectToAfterSignOut = redirectToAfterSignOut ?? "/";
@@ -81,21 +75,12 @@ export class OpenIDAuthenticationProvider implements AuthenticationProvider {
 
   protected async getAuthServer() {
     if (!this.authorizationServer) {
-      if (this.tokenEndpoint && this.authorizationEndpoint) {
-        this.authorizationServer = {
-          issuer: new URL(this.authorizationEndpoint!).origin,
-          authorization_endpoint: this.authorizationEndpoint,
-          token_endpoint: this.tokenEndpoint,
-          code_challenge_methods_supported: [],
-        };
-      } else {
-        const issuerUrl = new URL(this.issuer);
-        const response = await oauth.discoveryRequest(issuerUrl);
-        this.authorizationServer = await oauth.processDiscoveryResponse(
-          issuerUrl,
-          response,
-        );
-      }
+      const issuerUrl = new URL(this.issuer);
+      const response = await oauth.discoveryRequest(issuerUrl);
+      this.authorizationServer = await oauth.processDiscoveryResponse(
+        issuerUrl,
+        response,
+      );
     }
     return this.authorizationServer;
   }