fixes

Author: refact0r

src/lib/backends/google-tasks-backend.js

@@ -1,4 +1,5 @@
 import TaskBackend from './task-backend.js'
+import { isChrome } from '../browser-detect.js'
 
 /**
  * Google Tasks API client for Chrome Extensions
@@ -12,32 +13,19 @@ class GoogleTasksBackendExtension extends TaskBackend {
 
         this.dataKey = 'google_tasks_data'
         this.tasklistIdKey = 'google_tasks_default_list'
-        this.signedInKey = 'google_tasks_signed_in'
         this.data = JSON.parse(localStorage.getItem(this.dataKey) ?? '{}')
         this.defaultTasklistId =
             localStorage.getItem(this.tasklistIdKey) ?? '@default'
-        this.isSignedIn = localStorage.getItem(this.signedInKey) === 'true'
         this.accessToken = null
         this.tokenPromise = null // Prevent multiple simultaneous token requests
     }
 
-    /**
-     * Check if Chrome Identity API is available
-     */
-    isChromeIdentityAvailable() {
-        return (
-            typeof chrome !== 'undefined' &&
-            chrome.identity &&
-            chrome.identity.getAuthToken
-        )
-    }
-
     /**
      * Get a valid access token using Chrome's identity API
      * This automatically handles token caching and refresh
      */
     async getAuthToken(interactive = false) {
-        if (!this.isChromeIdentityAvailable()) {
+        if (!isChrome()) {
             throw new Error(
                 'Chrome identity API not available. Google Tasks only works in Chrome.'
             )
@@ -55,8 +43,6 @@ class GoogleTasksBackendExtension extends TaskBackend {
                     scopes: this.scopes,
                 },
                 (token) => {
-                    this.tokenPromise = null
-
                     if (chrome.runtime.lastError) {
                         reject(new Error(chrome.runtime.lastError.message))
                         return
@@ -73,37 +59,33 @@ class GoogleTasksBackendExtension extends TaskBackend {
             )
         })
 
-        return this.tokenPromise
+        try {
+            return await this.tokenPromise
+        } finally {
+            this.tokenPromise = null
+        }
     }
 
     /**
      * Sign in using Chrome's identity API
      * This handles OAuth flow automatically and keeps users signed in
      */
     async signIn() {
-        if (!this.isChromeIdentityAvailable()) {
+        if (!isChrome()) {
             throw new Error(
                 'Chrome identity API not available. Google Tasks only works in Chrome.'
             )
         }
 
-        try {
-            await this.getAuthToken(true)
-            this.isSignedIn = true
-            localStorage.setItem(this.signedInKey, 'true')
-            return this.accessToken
-        } catch (error) {
-            this.isSignedIn = false
-            localStorage.setItem(this.signedInKey, 'false')
-            throw error
-        }
+        await this.getAuthToken(true)
+        return this.accessToken
     }
 
     /**
      * Sign out and clear cached tokens
      */
     async signOut() {
-        if (!this.isChromeIdentityAvailable()) {
+        if (!isChrome()) {
             throw new Error(
                 'Chrome identity API not available. Google Tasks only works in Chrome.'
             )
@@ -122,27 +104,15 @@ class GoogleTasksBackendExtension extends TaskBackend {
         }
 
         this.accessToken = null
-        this.isSignedIn = false
-        localStorage.setItem(this.signedInKey, 'false')
         this.clearLocalData()
     }
 
-    /**
-     * Check if signed in
-     */
-    getIsSignedIn() {
-        return this.isSignedIn
-    }
 
     /**
      * Make an authenticated API request
      * Chrome identity API automatically handles token refresh
      */
     async apiRequest(endpoint, options = {}) {
-        if (!this.isSignedIn) {
-            throw new Error('Not signed in')
-        }
-
         // Get a fresh token (Chrome caches it and auto-refreshes as needed)
         let token = await this.getAuthToken(false)
 
@@ -192,8 +162,7 @@ class GoogleTasksBackendExtension extends TaskBackend {
                     return retryResponse.json()
                 } catch (error) {
                     // Token refresh failed, user needs to sign in again
-                    this.isSignedIn = false
-                    localStorage.setItem(this.signedInKey, 'false')
+                    this.clearLocalData()
                     throw new Error(
                         'Authentication expired. Please sign in again.'
                     )
@@ -212,10 +181,6 @@ class GoogleTasksBackendExtension extends TaskBackend {
      * Sync tasks from Google Tasks API
      */
     async sync(resourceTypes = ['tasklists', 'tasks']) {
-        if (!this.isSignedIn) {
-            throw new Error('Not signed in to Google account')
-        }
-
         try {
             // Get task lists
             if (resourceTypes.includes('tasklists')) {

src/lib/backends/localstorage-backend.js

@@ -163,7 +163,6 @@ class LocalStorageBackend extends TaskBackend {
      * Delete a task
      */
     async deleteTask(taskId) {
-        throw new Error('test error')
         const idx = this.data.items.findIndex((item) => item.id === taskId)
         if (idx !== -1) {
             this.data.items.splice(idx, 1)
@@ -176,7 +175,6 @@ class LocalStorageBackend extends TaskBackend {
      * Add a new task
      */
     async addTask(content, due) {
-        throw new Error('test error')
         const newTask = {
             id: crypto.randomUUID(),
             content: content,

src/lib/components/Tasks.svelte

@@ -79,13 +79,6 @@
         try {
             if (backend === 'google-tasks') {
                 api = createTaskBackend(backend)
-
-                if (!api.getIsSignedIn()) {
-                    settings.googleTasksSignedIn = false
-                    error = 'google sign in expired'
-                    syncing = false
-                    return
-                }
             } else {
                 api = createTaskBackend(backend, { token })
             }
@@ -109,7 +102,16 @@
             await api.sync()
             tasks = api.getTasks()
         } catch (err) {
-            error = `failed to sync tasks`
+            // Check if this is an auth error for Google Tasks
+            if (
+                settings.taskBackend === 'google-tasks' &&
+                err.message?.includes('Authentication expired')
+            ) {
+                settings.googleTasksSignedIn = false
+                error = 'google sign in expired'
+            } else {
+                error = `failed to sync tasks`
+            }
             console.error(err)
         } finally {
             if (showSyncing) syncing = false

src/vite-env.d.ts

@@ -1,2 +1,20 @@
 /// <reference types="svelte" />
 /// <reference types="vite/client" />
+
+// Chrome extension API types
+declare namespace chrome {
+    namespace identity {
+        function getAuthToken(
+            details: { interactive: boolean; scopes?: string[] },
+            callback: (token?: string) => void
+        ): void
+        function removeCachedAuthToken(
+            details: { token: string },
+            callback: () => void
+        ): void
+    }
+    namespace runtime {
+        const lastError: { message: string } | undefined
+        const id: string | undefined
+    }
+}