Address feedback

src/domUtils.ts

@@ -1,11 +1,11 @@
-export const createAnchor = (href: string, target?: string, callback?: () => void) => {
+export const createAnchor = (href: string, target?: string, onclick?: () => void) => {
 	const a = document.createElement('a');
 	a.href = href;
 	if (target) {
 		a.target = target;
 	}
-	if (callback) {
-		a.addEventListener('click', callback);
+	if (onclick) {
+		a.addEventListener('click', onclick);
 	}
 
 	return a;

src/gkApi.ts

@@ -1,4 +1,5 @@
 import { cookies } from 'webextension-polyfill';
+import { checkOrigins } from './permissions-helper';
 import { updateExtensionIcon } from './shared';
 import type { User } from './types';
 
@@ -9,23 +10,19 @@ const accessTokenCookieUrl = 'https://gitkraken.dev';
 const accessTokenCookieName = MODE === 'production' ? 'accessToken' : 'devAccessToken';
 
 const getAccessToken = async () => {
-	try {
+	// Check if the user has granted permission to GitKraken.dev
+	if (!await checkOrigins(['gitkraken.dev'])) {
+		// If not, just assume we're logged out
+		return undefined;
+	}
+
 	// Attempt to get the access token cookie from GitKraken.dev
 	const cookie = await cookies.get({
 		url: accessTokenCookieUrl,
 		name: accessTokenCookieName,
 	});
 
-		return cookie?.value;
-	} catch (e) {
-		if ((e as Error)?.message.includes('No host permissions for cookies at url')) {
-			// ignore as we are waiting for required permissions
-		} else {
-			// otherwise log error and continue as if logged out
-			console.error(e);
-		}
-	}
-	return undefined;
+	return cookie?.value;
 };
 
 export const fetchUser = async () => {

src/permissions-helper.ts

@@ -47,3 +47,9 @@ export async function refreshPermissions(): Promise<PermissionsRequest | undefin
 		}
 		: undefined;
 }
+
+export async function checkOrigins(origins: string[]): Promise<boolean> {
+	return permissions.contains({
+		origins: origins.map(domainToMatchPattern)
+	});
+}