twhelp
/
sessions-ext
1
0
Fork 0
Code Issues 1 Pull Requests 4 Packages Projects Releases Wiki Activity

fix: inability to log in if an encryption password is incorrect

This commit is contained in:
Dawid Wysokiński 2022-12-02 05:50:41 +01:00
parent 0146a726bd
commit f71c352d7d
Signed by: Kichiyaki
GPG Key ID: B5445E357FB8B892
3 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/background.ts
View File

@ -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;

4
src/content.ts
View File

@ -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;

2
src/message.ts
View File

@ -11,6 +11,6 @@ export type LoginMessage = {
export type Message = LoginMessage;
export type LoginResponse = {
export type ErrorResponse = {
error?: string;
};