fix: broken desktop login (#162)

src/lib/components/common/Button.svelte

@@ -29,7 +29,7 @@
 		class:icon
 		class:loading
 		class:disabled
-		{href}
+		href={disabled ? '#' : href}
 		target={external ? '_blank' : undefined}
 		rel={external ? 'noreferrer' : undefined}
 		on:click={handleClick}

src/lib/components/dashboard/Banner.svelte

@@ -3,6 +3,7 @@
 	import { cubicInOut } from 'svelte/easing';
 	import { browser } from '$app/environment';
 	import { page } from '$app/stores';
+	import { openDesktopApp } from '~/lib/helpers';
 	import { CrossIcon, ExclamationMarkIcon } from '~/lib/icons';
 	import { DownloadButton } from '../landing';
 
@@ -29,7 +30,7 @@
 			}, 500);
 
 			// Open the app with the access token
-			window.location.href = `gitlight://github_access_token=${githubAccessToken}&gitlab_access_token=${gitlabAccessToken}`;
+			openDesktopApp({ githubAccessToken, gitlabAccessToken });
 		}
 	}
 

src/lib/helpers/createNotificationData.ts

@@ -1,5 +1,5 @@
 import { page } from '$app/stores';
-import { getDiscussionUrl } from '$lib/helpers/searchNotificationHelper';
+import { getDiscussionUrl } from '~/lib/helpers';
 import {
 	ClosedIssueIcon,
 	CommitIcon,

src/lib/helpers/index.ts

@@ -6,7 +6,9 @@ export * from './fetchGitlab';
 export * from './formatRelativeDate';
 export * from './getAppVersion';
 export * from './getIcon';
-export * from './priorities';
 export * from './lightenColor';
+export * from './openDesktopApp';
+export * from './priorities';
 export * from './removeMarkdownSymbols';
+export * from './searchNotificationHelper';
 export * from './storage';

src/lib/helpers/openDesktopApp.ts

@@ -0,0 +1,13 @@
+export function openDesktopApp({
+	githubAccessToken,
+	gitlabAccessToken
+}: {
+	githubAccessToken?: string | null;
+	gitlabAccessToken?: string | null;
+}) {
+	if (githubAccessToken || gitlabAccessToken) {
+		window.location.href = `gitlight://github_access_token=${
+			githubAccessToken || ''
+		}&gitlab_access_token=${gitlabAccessToken || ''}`;
+	}
+}

src/routes/+layout.svelte

@@ -13,7 +13,7 @@
 
 			// Listen for scheme request on desktop app
 			listen('scheme-request', ({ payload }) => {
-				const scheme = (payload as string).split('&');
+				const scheme = (payload as string).replace('gitlight://', '').split('&');
 
 				let githubAccessToken = scheme[0].split('=')[1];
 				if (githubAccessToken) {

src/routes/+layout.ts

@@ -1,6 +1,6 @@
 import { redirect } from '@sveltejs/kit';
 import { browser } from '$app/environment';
-import { fetchGithub, fetchGitlab, storage } from '~/lib/helpers';
+import { fetchGithub, fetchGitlab, openDesktopApp, storage } from '~/lib/helpers';
 import type { GithubUser, GitlabUser } from '~/lib/types';
 
 import '~/styles/_reset.scss';
@@ -48,7 +48,7 @@ export async function load({ url }) {
 
 	// Open the app with the access token
 	if (url.searchParams.has('from_app') && (githubAccessToken || gitlabAccessToken)) {
-		window.location.href = `gitlight://github_access_token=${githubAccessToken}&gitlab_access_token=${gitlabAccessToken}`;
+		openDesktopApp({ githubAccessToken, gitlabAccessToken });
 	}
 
 	// Remove access tokens from the URL