zudoku 0.3.0-dev.69 → 0.3.0-dev.70

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zudoku",
-  "version": "0.3.0-dev.69",
+  "version": "0.3.0-dev.70",
   "type": "module",
   "files": [
     "dist",

package/src/lib/authentication/Callback.tsx

@@ -5,7 +5,7 @@ import { OAuthAuthorizationError } from "./errors.js";
 export function Callback({
   handleCallback,
 }: {
-  handleCallback: () => Promise<void>;
+  handleCallback: () => Promise<string>;
 }) {
   const didInitialize = useRef(false);
   const [error, setError] = useState<Error | undefined>(undefined);
@@ -20,9 +20,9 @@ export function Callback({
     }
     didInitialize.current = true;
     handleCallback()
-      .then(() => {
+      .then((redirect) => {
         // TODO: Handle return url, state, etc
-        navigate("/");
+        navigate(redirect);
       })
       .catch((err) => {
         setError(err);

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

@@ -44,12 +44,11 @@ class Auth0AuthenticationProvider extends OpenIDAuthenticationProvider {
 
 const auth0Auth: AuthenticationProviderInitializer<
   Auth0AuthenticationConfig
-> = ({ domain, clientId, audience }) =>
+> = ({ domain, ...options }) =>
   new Auth0AuthenticationProvider({
+    ...options,
     type: "openid",
     issuer: `https://${domain}`,
-    clientId: clientId,
-    audience: audience,
   });
 
 export default auth0Auth;

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

@@ -22,7 +22,7 @@ interface TokenState {
 class OpenIdAuthPlugin extends AuthenticationPlugin {
   constructor(
     private callbackUrlPath: string,
-    private handleCallback: () => Promise<void>,
+    private handleCallback: () => Promise<string>,
   ) {
     super();
   }
@@ -48,9 +48,9 @@ export class OpenIDAuthenticationProvider implements AuthenticationProvider {
 
   protected callbackUrlPath = "/oauth/callback";
   protected logoutRedirectUrlPath = "/";
-  private redirectToAfterSignUp?: string;
-  private redirectToAfterSignIn?: string;
-  private redirectToAfterSignOut?: string;
+  private redirectToAfterSignUp: string;
+  private redirectToAfterSignIn: string;
+  private redirectToAfterSignOut: string;
 
   constructor({
     issuer,
@@ -129,6 +129,11 @@ export class OpenIDAuthenticationProvider implements AuthenticationProvider {
   private async authorize(signUp = false): Promise<void> {
     const code_challenge_method = "S256";
     const authorizationServer = await this.getAuthServer();
+    if (signUp) {
+      localStorage.setItem("sign-up", "true");
+    } else {
+      localStorage.removeItem("sign-up");
+    }
 
     if (!authorizationServer.authorization_endpoint) {
       throw new AuthorizationError("No authorization endpoint");
@@ -250,7 +255,7 @@ export class OpenIDAuthenticationProvider implements AuthenticationProvider {
     }
   }
 
-  handleCallback = async (): Promise<void> => {
+  handleCallback = async (): Promise<string> => {
     const url = new URL(window.location.href);
     const state = url.searchParams.get("state");
 
@@ -282,7 +287,7 @@ export class OpenIDAuthenticationProvider implements AuthenticationProvider {
     }
 
     const redirectUrl = new URL(url);
-    redirectUrl.pathname = this.callbackUrlPath;
+    redirectUrl.pathname = this.redirectToAfterSignIn ?? this.callbackUrlPath;
     redirectUrl.search = "";
 
     const response = await oauth.authorizationCodeGrantRequest(
@@ -332,6 +337,12 @@ export class OpenIDAuthenticationProvider implements AuthenticationProvider {
       profile,
     });
 
+    if (localStorage.getItem("sign-up")) {
+      return this.redirectToAfterSignUp;
+    } else {
+      return this.redirectToAfterSignIn;
+    }
+
     // // Remove the query strings so react query doesn't keep retrying
     // // to make the token request
     // history.replaceState({}, "", window.location.pathname);