Leahnaya/juxtaposition-ui
1
0
Fork 0
mirror of https://github.com/PretendoNetwork/juxtaposition-ui.git synced 2026-04-26 01:47:21 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Tweaked auth to make debugging on desktop easier

Browse Source
This commit is contained in:
Jemma 2022-05-31 22:56:55 -05:00
parent 9e6e26e81b
commit 8e74d9982e
3 changed files with 11 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
package-lock.json generated
View File

@ -1716,28 +1716,6 @@
"url": "https://opencollective.com/mongoose"
}
},
"node_modules/mongoose-cache": {
"version": "0.1.5",
"resolved": "https://registry.npmjs.org/mongoose-cache/-/mongoose-cache-0.1.5.tgz",
"integrity": "sha1-YMb8xtOCP+bG7D2AzffvsN2qEQE=",
"dependencies": {
"lru-cache": "4.0.x"
}
},
"node_modules/mongoose-cache/node_modules/lru-cache": {
"version": "4.0.2",
"resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.0.2.tgz",
"integrity": "sha1-HRdnnAac2l0ECZGgnbwsDbN35V4=",
"dependencies": {
"pseudomap": "^1.0.1",
"yallist": "^2.0.0"
}
},
"node_modules/mongoose-cache/node_modules/yallist": {
"version": "2.1.2",
"resolved": "https://registry.npmjs.org/yallist/-/yallist-2.1.2.tgz",
"integrity": "sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI="
},
"node_modules/mongoose-fuzzy-search-next": {
"version": "1.0.13",
"resolved": "https://registry.npmjs.org/mongoose-fuzzy-search-next/-/mongoose-fuzzy-search-next-1.0.13.tgz",
@ -2090,11 +2068,6 @@
"node": ">= 0.10"
}
},
"node_modules/pseudomap": {
"version": "1.0.2",
"resolved": "https://registry.npmjs.org/pseudomap/-/pseudomap-1.0.2.tgz",
"integrity": "sha1-8FKijacOYYkX7wqKw0wa5aaChrM="
},
"node_modules/psl": {
"version": "1.8.0",
"resolved": "https://registry.npmjs.org/psl/-/psl-1.8.0.tgz",
@ -4363,30 +4336,6 @@
}
}
},
"mongoose-cache": {
"version": "0.1.5",
"resolved": "https://registry.npmjs.org/mongoose-cache/-/mongoose-cache-0.1.5.tgz",
"integrity": "sha1-YMb8xtOCP+bG7D2AzffvsN2qEQE=",
"requires": {
"lru-cache": "4.0.x"
},
"dependencies": {
"lru-cache": {
"version": "4.0.2",
"resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.0.2.tgz",
"integrity": "sha1-HRdnnAac2l0ECZGgnbwsDbN35V4=",
"requires": {
"pseudomap": "^1.0.1",
"yallist": "^2.0.0"
}
},
"yallist": {
"version": "2.1.2",
"resolved": "https://registry.npmjs.org/yallist/-/yallist-2.1.2.tgz",
"integrity": "sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI="
}
}
},
"mongoose-fuzzy-search-next": {
"version": "1.0.13",
"resolved": "https://registry.npmjs.org/mongoose-fuzzy-search-next/-/mongoose-fuzzy-search-next-1.0.13.tgz",
@ -4675,11 +4624,6 @@
"ipaddr.js": "1.9.1"
}
},
"pseudomap": {
"version": "1.0.2",
"resolved": "https://registry.npmjs.org/pseudomap/-/pseudomap-1.0.2.tgz",
"integrity": "sha1-8FKijacOYYkX7wqKw0wa5aaChrM="
},
"psl": {
"version": "1.8.0",
"resolved": "https://registry.npmjs.org/psl/-/psl-1.8.0.tgz",

14
src/middleware/auth.js
View File

@ -67,15 +67,20 @@ function auth(request, response, next) {
}
}
else {
if(!request.headers["x-nintendo-parampack"] || !request.headers["x-nintendo-servicetoken"]) {
let token = request.cookies.token || request.headers["x-nintendo-servicetoken"];
if(!token) {
return response.render('portal/ban_notification.ejs', {
user: null,
error: "Missing auth headers"
});
}
else {
let pid = util.data.processServiceToken(request.headers["x-nintendo-servicetoken"]);
let paramPackData = util.data.decodeParamPack(request.headers["x-nintendo-parampack"]);
let pid = util.data.processServiceToken(token);
let paramPackData;
if(request.headers["x-nintendo-parampack"])
paramPackData = util.data.decodeParamPack(request.headers["x-nintendo-parampack"]);
else
paramPackData = null;
if(pid === null) {
return response.render('portal/ban_notification.ejs', {
user: null,
@ -85,7 +90,8 @@ function auth(request, response, next) {
else {
response.header('X-Nintendo-WhiteList', config.whitelist);
request.lang = util.data.processLanguage(request.headers["x-nintendo-parampack"]);
let paramPack = request.headers["x-nintendo-parampack"] || undefined;
request.lang = util.data.processLanguage(paramPack);
request.pid = pid;
request.paramPackData = paramPackData;
request.directory = request.subdomains[1];

2
src/webfiles/admin/admin_login.ejs
View File

@ -79,7 +79,7 @@
var date = new Date();
date.setTime(date.getTime() + (60 * 60 * 1000));
var expires = "expires="+ date.toUTCString();
document.cookie = cname + "=" + cvalue + ";" + expires + date.toGMTString();
document.cookie = cname + "=" + cvalue + ";" + "domain=pretendo.cc;" + expires + date.toGMTString();
}
function getCookie(cname) {
var name = cname + "=";