Andromeda/jank-client-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixed login bug

Browse Source
This commit is contained in:
MathMan05
2024-08-19 11:32:21 -05:00
parent 1506521835
commit ec2fc491d9
2 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
.dist/login.js
View File

@@ -237,7 +237,7 @@ async function login(username, password, captcha) {
try { try {
const info = JSON.parse(localStorage.getItem("instanceinfo")); const info = JSON.parse(localStorage.getItem("instanceinfo"));
const api = info.login + (info.login.startsWith("/") ? "/" : ""); const api = info.login + (info.login.startsWith("/") ? "/" : "");
return await fetch(api + 'auth/login', options).then(response => response.json()) return await fetch(api + '/auth/login', options).then(response => response.json())
.then((response) => { .then((response) => {
console.log(response, response.message); console.log(response, response.message);
if ("Invalid Form Body" === response.message) { if ("Invalid Form Body" === response.message) {
@@ -282,6 +282,8 @@ async function login(username, password, captcha) {
} }
else { else {
console.warn(response); console.warn(response);
if (!response.token)
return;
adduser({ serverurls: JSON.parse(localStorage.getItem("instanceinfo")), email: username, token: response.token }).username = username; adduser({ serverurls: JSON.parse(localStorage.getItem("instanceinfo")), email: username, token: response.token }).username = username;
const redir = new URLSearchParams(window.location.search).get("goback"); const redir = new URLSearchParams(window.location.search).get("goback");
if (redir) { if (redir) {
@@ -296,6 +298,8 @@ async function login(username, password, captcha) {
} }
else { else {
console.warn(response); console.warn(response);
if (!response.token)
return;
adduser({ serverurls: JSON.parse(localStorage.getItem("instanceinfo")), email: username, token: response.token }).username = username; adduser({ serverurls: JSON.parse(localStorage.getItem("instanceinfo")), email: username, token: response.token }).username = username;
const redir = new URLSearchParams(window.location.search).get("goback"); const redir = new URLSearchParams(window.location.search).get("goback");
if (redir) { if (redir) {

4
webpage/login.ts
View File

@@ -233,7 +233,7 @@ async function login(username:string, password:string, captcha:string){
try{ try{
const info=JSON.parse(localStorage.getItem("instanceinfo")); const info=JSON.parse(localStorage.getItem("instanceinfo"));
const api=info.login+(info.login.startsWith("/")?"/":""); const api=info.login+(info.login.startsWith("/")?"/":"");
return await fetch(api+'auth/login',options).then(response=>response.json()) return await fetch(api+'/auth/login',options).then(response=>response.json())
.then((response) => { .then((response) => {
console.log(response,response.message) console.log(response,response.message)
if("Invalid Form Body"===response.message){ if("Invalid Form Body"===response.message){
@@ -278,6 +278,7 @@ async function login(username:string, password:string, captcha:string){
alert(response.message) alert(response.message)
}else{ }else{
console.warn(response); console.warn(response);
if(!response.token) return;
adduser({serverurls:JSON.parse(localStorage.getItem("instanceinfo")),email:username,token:response.token}).username=username; adduser({serverurls:JSON.parse(localStorage.getItem("instanceinfo")),email:username,token:response.token}).username=username;
const redir=new URLSearchParams(window.location.search).get("goback"); const redir=new URLSearchParams(window.location.search).get("goback");
if(redir){ if(redir){
@@ -290,6 +291,7 @@ async function login(username:string, password:string, captcha:string){
}]]).show(); }]]).show();
}else{ }else{
console.warn(response); console.warn(response);
if(!response.token) return;
adduser({serverurls:JSON.parse(localStorage.getItem("instanceinfo")),email:username,token:response.token}).username=username; adduser({serverurls:JSON.parse(localStorage.getItem("instanceinfo")),email:username,token:response.token}).username=username;
const redir=new URLSearchParams(window.location.search).get("goback"); const redir=new URLSearchParams(window.location.search).get("goback");
if(redir){ if(redir){