From 7abb66b86f2a156bb260fe7a14fcefe09558288a Mon Sep 17 00:00:00 2001
From: Zoe Roux <zoe.roux@zoriya.dev>
Date: Thu, 7 Mar 2024 00:51:56 +0100
Subject: [PATCH] Fix oidc routing

---
 front/packages/primitives/src/links.tsx    | 8 ++++++--
 front/packages/ui/src/login/oidc.tsx       | 1 +
 front/packages/ui/src/login/server-url.tsx | 1 +
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/front/packages/primitives/src/links.tsx b/front/packages/primitives/src/links.tsx
index 10942d2e..4d3d8d12 100644
--- a/front/packages/primitives/src/links.tsx
+++ b/front/packages/primitives/src/links.tsx
@@ -24,6 +24,7 @@ import { TextLink, useLink } from "solito/link";
 import { useTheme, useYoshiki } from "yoshiki/native";
 import type { UrlObject } from "url";
 import { alpha } from "./themes";
+import { parseNextPath } from "solito/router";
 
 export const A = ({
 	href,
@@ -114,8 +115,11 @@ export const Link = ({
 			onPress={(e?: any) => {
 				props?.onPress?.(e);
 				if (e?.defaultPrevented) return;
-				if (Platform.OS !== "web" && typeof href === "string" && href?.includes("://"))
-					Linking.openURL(href);
+				if (
+					(Platform.OS !== "web" && typeof href === "string" && href?.includes("://")) ||
+					(typeof href === "object" && href?.pathname?.includes("://"))
+				)
+					Linking.openURL(typeof href === "object" ? parseNextPath(href) : href);
 				else linkProps.onPress(e);
 			}}
 		>
diff --git a/front/packages/ui/src/login/oidc.tsx b/front/packages/ui/src/login/oidc.tsx
index 43b38772..90eebdbb 100644
--- a/front/packages/ui/src/login/oidc.tsx
+++ b/front/packages/ui/src/login/oidc.tsx
@@ -50,6 +50,7 @@ export const OidcLogin = ({ apiUrl }: { apiUrl?: string }) => {
 					<Button
 						as={Link}
 						href={{ pathname: x.link, query: { apiUrl } }}
+						target="_blank"
 						key={x.displayName}
 						licon={
 							x.logoUrl != null && (
diff --git a/front/packages/ui/src/login/server-url.tsx b/front/packages/ui/src/login/server-url.tsx
index ccedcd94..c58079d1 100644
--- a/front/packages/ui/src/login/server-url.tsx
+++ b/front/packages/ui/src/login/server-url.tsx
@@ -72,6 +72,7 @@ export const ServerUrlPage: QueryPage = () => {
 							<Link
 								key={x.displayName}
 								href={{ pathname: x.link, query: { apiUrl } }}
+								target="_blank"
 								{...css({ justifyContent: "center" })}
 							>
 								{x.logoUrl != null ? (