✨ [#390] Make it possible to redirect to frontend

backend/dotenv.dev.example

@@ -3,12 +3,15 @@ DISABLE_2FA=yes
 ALLOWED_HOSTS=localhost
 CORS_ALLOWED_ORIGINS=http://localhost:8000,http://localhost:3000
 CSRF_TRUSTED_ORIGINS=http://localhost:3000
-CSRF_COOKIE_SAMESITE='None'
+CSRF_COOKIE_SAMESITE='Lax'
 CSRF_COOKIE_SECURE=False
 
-SESSION_COOKIE_SAMESITE='None'
+SESSION_COOKIE_SAMESITE='Lax'
 SESSION_COOKIE_SECURE=False
 
+# For OIDC
+OIDC_REDIRECT_ALLOWED_HOSTS=localhost:3000
+
 # For openzaak being slow
 REQUESTS_READ_TIMEOUT=5000
 

backend/src/openarchiefbeheer/conf/base.py

@@ -633,3 +633,6 @@
 #
 OIDC_AUTHENTICATE_CLASS = "mozilla_django_oidc_db.views.OIDCAuthenticationRequestView"
 OIDC_CALLBACK_CLASS = "mozilla_django_oidc_db.views.OIDCCallbackView"
+OIDC_REDIRECT_ALLOWED_HOSTS = config(
+    "OIDC_REDIRECT_ALLOWED_HOSTS", default="", split=True
+)

frontend/src/pages/login/Login.tsx

@@ -14,6 +14,18 @@ export type LoginProps = React.ComponentProps<"main"> & {
   // Props here.
 };
 
+/*
+ * Add the redirect URL to the callback URL
+ */
+const makeRedirectUrl = (oidcLoginUrl: string) => {
+  const currentUrl = new URL(window.location.href);
+  const redirectUrl = new URL("/", currentUrl);
+  const loginUrl = new URL(oidcLoginUrl);
+  loginUrl.searchParams.set("next", redirectUrl.href);
+
+  return loginUrl.href;
+};
+
 /**
  * Login page
  */
@@ -49,12 +61,10 @@ export function LoginPage({ ...props }: LoginProps) {
 
   const oidcProps: Partial<LoginTemplateProps> = {};
   if (oidc?.enabled) {
-    oidcProps.urlOidcLogin = oidc.loginUrl;
+    oidcProps.urlOidcLogin = makeRedirectUrl(oidc.loginUrl);
     oidcProps.labelOidcLogin = "Organisatie login";
   }
 
-  console.log(oidc, oidcProps, props);
-
   return (
     <LoginTemplate
       slotPrimaryNavigation={<></>} // FIXME: Should be easier to override