From 25b7903c3778e77e8f77a127e67d58ce69b100ed Mon Sep 17 00:00:00 2001
From: Zoe Roux <zoe.roux@zoriya.dev>
Date: Sun, 10 Mar 2024 15:22:53 +0100
Subject: [PATCH] Fix oidc links opening two times on web

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

diff --git a/front/packages/primitives/src/links.tsx b/front/packages/primitives/src/links.tsx
index 4d3d8d12..b866fb53 100644
--- a/front/packages/primitives/src/links.tsx
+++ b/front/packages/primitives/src/links.tsx
@@ -95,12 +95,13 @@ export const PressableFeedback = forwardRef<View, PressableProps>(function Feedb
 });
 
 export const Link = ({
-	href,
+	href: link,
 	replace,
 	target,
 	children,
 	...props
 }: { href?: string | UrlObject | null; target?: string; replace?: boolean } & PressableProps) => {
+	const href = link && typeof link === "object" ? parseNextPath(link) : link;
 	const linkProps = useLink({
 		href: href ?? "#",
 		replace,
@@ -115,11 +116,7 @@ export const Link = ({
 			onPress={(e?: any) => {
 				props?.onPress?.(e);
 				if (e?.defaultPrevented) return;
-				if (
-					(Platform.OS !== "web" && typeof href === "string" && href?.includes("://")) ||
-					(typeof href === "object" && href?.pathname?.includes("://"))
-				)
-					Linking.openURL(typeof href === "object" ? parseNextPath(href) : href);
+				if (Platform.OS !== "web" && href?.includes("://")) Linking.openURL(href);
 				else linkProps.onPress(e);
 			}}
 		>
diff --git a/front/packages/ui/src/login/oidc.tsx b/front/packages/ui/src/login/oidc.tsx
index 90eebdbb..43b38772 100644
--- a/front/packages/ui/src/login/oidc.tsx
+++ b/front/packages/ui/src/login/oidc.tsx
@@ -50,7 +50,6 @@ 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 2d010acb..28358e70 100644
--- a/front/packages/ui/src/login/server-url.tsx
+++ b/front/packages/ui/src/login/server-url.tsx
@@ -71,7 +71,6 @@ export const ServerUrlPage: QueryPage = () => {
 							<Link
 								key={x.displayName}
 								href={{ pathname: x.link, query: { apiUrl } }}
-								target="_blank"
 								{...css({ justifyContent: "center" })}
 							>
 								{x.logoUrl != null ? (