diff --git a/src/background.ts b/src/background.ts index 14a8525..e0f8c11 100644 --- a/src/background.ts +++ b/src/background.ts @@ -1,4 +1,4 @@ -import { LoginMessage, LoginResponse, Message, MessageType } from './message'; +import { LoginMessage, ErrorResponse, Message, MessageType } from './message'; import { optionsStorage } from './options-storage'; import { decrypt, encrypt } from './crypto'; @@ -14,7 +14,7 @@ chrome.runtime.onMessage.addListener( await handleLogin(message); } } catch (err: any) { - sendResponse({ error: err.message } as LoginResponse); + sendResponse({ error: err.message } as ErrorResponse); } } ); @@ -36,7 +36,9 @@ const handleLogin = async (message: LoginMessage) => { const sidFromApi = await getSid(message.server); if (sidFromApi.length > 0) { - await setSid(message.url, sidFromApi); + try { + await setSid(message.url, sidFromApi); + } catch (e) {} if (await tryOpenOverview(message.url)) { await openOverview(message.url); return; diff --git a/src/content.ts b/src/content.ts index 558df93..96790e7 100644 --- a/src/content.ts +++ b/src/content.ts @@ -1,4 +1,4 @@ -import { LoginMessage, LoginResponse, MessageType } from './message'; +import { LoginMessage, ErrorResponse, MessageType } from './message'; let isLoggingIn = false; @@ -45,7 +45,7 @@ const handleClick = async (e: MouseEvent) => { loginUrl: url.toString(), url: url.protocol + '//' + url.host.replace('www', server), } as LoginMessage) - .then((resp: LoginResponse) => { + .then((resp: ErrorResponse) => { isLoggingIn = false; if (!resp?.error) { return; diff --git a/src/message.ts b/src/message.ts index b48140f..69c2b0a 100644 --- a/src/message.ts +++ b/src/message.ts @@ -11,6 +11,6 @@ export type LoginMessage = { export type Message = LoginMessage; -export type LoginResponse = { +export type ErrorResponse = { error?: string; };