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

Merge remote-tracking branch 'upstream/main'

Browse source
This commit is contained in:
ygg2 2024-07-11 15:50:08 -04:00
commit 78ca0f8b75
3 changed files with 51 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

29
.dist/login.js
View file

@ -145,13 +145,17 @@ if (instancein) {
checkInstance("https://spacebar.chat/");
}
}
async function login(username, password) {
async function login(username, password, captcha) {
if (captcha === "") {
captcha = undefined;
}
const options = {
method: "POST",
body: JSON.stringify({
"login": username,
"password": password,
"undelete": false
"undelete": false,
"captcha_key": captcha
}),
headers: {
"Content-type": "application/json; charset=UTF-8",
@ -168,9 +172,22 @@ async function login(username, password) {
console.log("test");
}
//this.serverurls||!this.email||!this.token
adduser({ serverurls: JSON.parse(localStorage.getItem("instanceinfo")), email: username, token: response.token });
window.location.href = '/channels/@me';
return response.token;
console.log(response);
if (response.captcha_sitekey) {
const capt = document.getElementById("h-captcha");
const capty = document.createElement("div");
capty.classList.add("h-captcha");
capty.setAttribute("data-sitekey", response.captcha_sitekey);
const script = document.createElement("script");
script.src = "https://js.hcaptcha.com/1/api.js";
capt.append(script);
capt.append(capty);
}
else {
adduser({ serverurls: JSON.parse(localStorage.getItem("instanceinfo")), email: username, token: response.token });
window.location.href = '/channels/@me';
return response.token;
}
});
}
catch (error) {
@ -203,7 +220,7 @@ async function setInstance(url) {
}
async function check(e) {
e.preventDefault();
let h = await login(e.srcElement[1].value, e.srcElement[2].value);
let h = await login(e.srcElement[1].value, e.srcElement[2].value, e.srcElement[3].value);
document.getElementById("wrong").textContent = h;
console.log(h);
}

4
webpage/login.html
View file

@ -18,6 +18,10 @@
<label for="psw"><b>Password:</b></label><br>
<input type="password" placeholder="Enter Password" name="psw" required><br><br><br><br>
<p class="wrongred" id="wrong"></p>
<div id="h-captcha">
</div>
<button type="submit">Login</button>
</form>
<a href="/register.html">Don't have an account?</a>

30
webpage/login.ts
View file

@ -144,13 +144,17 @@ if(instancein){
}
async function login(username, password){
async function login(username:string, password:string, captcha:string){
if(captcha===""){
captcha=undefined;
}
const options={
method: "POST",
body:JSON.stringify({
"login": username,
"password": password,
"undelete":false
"undelete":false,
"captcha_key":captcha
}),
headers: {
"Content-type": "application/json; charset=UTF-8",
@ -166,9 +170,23 @@ async function login(username, password){
console.log("test")
}
//this.serverurls||!this.email||!this.token
adduser({serverurls:JSON.parse(localStorage.getItem("instanceinfo")),email:username,token:response.token});
window.location.href = '/channels/@me';
return response.token;
console.log(response);
if(response.captcha_sitekey){
const capt=document.getElementById("h-captcha");
const capty=document.createElement("div");
capty.classList.add("h-captcha");
capty.setAttribute("data-sitekey", response.captcha_sitekey);
const script=document.createElement("script");
script.src="https://js.hcaptcha.com/1/api.js";
capt.append(script);
capt.append(capty);
}else{
adduser({serverurls:JSON.parse(localStorage.getItem("instanceinfo")),email:username,token:response.token});
window.location.href = '/channels/@me';
return response.token;
}
})
}catch(error){
console.error('Error:', error);
@ -202,7 +220,7 @@ async function setInstance(url){
async function check(e){
e.preventDefault();
let h=await login(e.srcElement[1].value,e.srcElement[2].value);
let h=await login(e.srcElement[1].value,e.srcElement[2].value,e.srcElement[3].value);
document.getElementById("wrong").textContent=h;
console.log(h);
}