fix: inability to log in if an encryption password is incorrect
This commit is contained in:
parent
0146a726bd
commit
f71c352d7d
|
@ -1,4 +1,4 @@
|
||||||
import { LoginMessage, LoginResponse, Message, MessageType } from './message';
|
import { LoginMessage, ErrorResponse, Message, MessageType } from './message';
|
||||||
import { optionsStorage } from './options-storage';
|
import { optionsStorage } from './options-storage';
|
||||||
import { decrypt, encrypt } from './crypto';
|
import { decrypt, encrypt } from './crypto';
|
||||||
|
|
||||||
|
@ -14,7 +14,7 @@ chrome.runtime.onMessage.addListener(
|
||||||
await handleLogin(message);
|
await handleLogin(message);
|
||||||
}
|
}
|
||||||
} catch (err: any) {
|
} 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);
|
const sidFromApi = await getSid(message.server);
|
||||||
if (sidFromApi.length > 0) {
|
if (sidFromApi.length > 0) {
|
||||||
await setSid(message.url, sidFromApi);
|
try {
|
||||||
|
await setSid(message.url, sidFromApi);
|
||||||
|
} catch (e) {}
|
||||||
if (await tryOpenOverview(message.url)) {
|
if (await tryOpenOverview(message.url)) {
|
||||||
await openOverview(message.url);
|
await openOverview(message.url);
|
||||||
return;
|
return;
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
import { LoginMessage, LoginResponse, MessageType } from './message';
|
import { LoginMessage, ErrorResponse, MessageType } from './message';
|
||||||
|
|
||||||
let isLoggingIn = false;
|
let isLoggingIn = false;
|
||||||
|
|
||||||
|
@ -45,7 +45,7 @@ const handleClick = async (e: MouseEvent) => {
|
||||||
loginUrl: url.toString(),
|
loginUrl: url.toString(),
|
||||||
url: url.protocol + '//' + url.host.replace('www', server),
|
url: url.protocol + '//' + url.host.replace('www', server),
|
||||||
} as LoginMessage)
|
} as LoginMessage)
|
||||||
.then((resp: LoginResponse) => {
|
.then((resp: ErrorResponse) => {
|
||||||
isLoggingIn = false;
|
isLoggingIn = false;
|
||||||
if (!resp?.error) {
|
if (!resp?.error) {
|
||||||
return;
|
return;
|
||||||
|
|
|
@ -11,6 +11,6 @@ export type LoginMessage = {
|
||||||
|
|
||||||
export type Message = LoginMessage;
|
export type Message = LoginMessage;
|
||||||
|
|
||||||
export type LoginResponse = {
|
export type ErrorResponse = {
|
||||||
error?: string;
|
error?: string;
|
||||||
};
|
};
|
||||||
|
|
Loading…
Reference in New Issue