Aelita4
/
AstroCol
1
0
Fork 0
Code Issues 2 Pull Requests Packages Projects 1 Releases Wiki Activity

Change planetid cookie to currentPlanet

This commit is contained in:
Aelita4 2024-11-03 23:22:21 +01:00
parent 91cafb2bf3
commit 1bbc55563d
Signed by: Aelita4
GPG Key ID: E44490C2025906C1
8 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/components/ResourceBar.astro
View File

@ -9,7 +9,7 @@ const resourceTypes = await getAllResources();
const lang = await getLocales(Astro.cookies.get('language')?.value ?? await getHighestWeightedLanguage(Astro.request.headers.get('accept-language'))); const lang = await getLocales(Astro.cookies.get('language')?.value ?? await getHighestWeightedLanguage(Astro.request.headers.get('accept-language')));
const planetId = new ObjectId(Astro.cookies.get('planetid')?.value ?? ''); const planetId = new ObjectId(Astro.cookies.get('currentPlanet')?.value ?? '');
const planet = locationManager.getPlanet(planetId); const planet = locationManager.getPlanet(planetId);

2
src/pages/game/buildings.astro
View File

@ -23,7 +23,7 @@ const locale = Astro.cookies.get('language')?.value ?? await getHighestWeightedL
const lang = await getLocales(locale); const lang = await getLocales(locale);
const planetId = Astro.cookies.get('planetid')?.value ?? ""; const planetId = Astro.cookies.get('currentPlanet')?.value ?? "";
if(planetId === "") return "No planet selected"; if(planetId === "") return "No planet selected";
const planet = locationManager.getPlanet(new ObjectId(planetId)); const planet = locationManager.getPlanet(new ObjectId(planetId));

2
src/pages/game/fleet.astro
View File

@ -19,7 +19,7 @@ if(checkUser === null || checkUser.username !== username) return Astro.redirect(
const user = locationManager.getUser(checkUser._id); const user = locationManager.getUser(checkUser._id);
if(!user) return Astro.redirect('/logout'); if(!user) return Astro.redirect('/logout');
const planetId = Astro.cookies.get('planetid')?.value ?? ""; const planetId = Astro.cookies.get('currentPlanet')?.value ?? "";
if(planetId === "") return "No planet selected"; if(planetId === "") return "No planet selected";
const planet = locationManager.getPlanet(new ObjectId(planetId)); const planet = locationManager.getPlanet(new ObjectId(planetId));

2
src/pages/game/index.astro
View File

@ -13,8 +13,8 @@ if(loggedToken === null || username === "") return Astro.redirect('/logout');
const checkUser = await getUserByAccessToken(loggedToken); const checkUser = await getUserByAccessToken(loggedToken);
if(checkUser === null || checkUser.username !== username) return Astro.redirect('/logout'); if(checkUser === null || checkUser.username !== username) return Astro.redirect('/logout');
const currentPlanetId = Astro.cookies.get('planetid')?.value ?? null;
if(currentPlanetId === null) return Astro.redirect('/game/logout'); if(currentPlanetId === null) return Astro.redirect('/game/logout');
const currentPlanetId = Astro.cookies.get('currentPlanet')?.value ?? null;
const currentPlanet = locationManager.getPlanet(new ObjectId(currentPlanetId)); const currentPlanet = locationManager.getPlanet(new ObjectId(currentPlanetId));
if(currentPlanet === undefined) { if(currentPlanet === undefined) {
Astro.cookies.delete('planetid'); Astro.cookies.delete('planetid');

2
src/pages/game/research.astro
View File

@ -16,7 +16,7 @@ if(loggedToken === null || username === "") return Astro.redirect('/logout');
const checkUser = await getUserByAccessToken(loggedToken); const checkUser = await getUserByAccessToken(loggedToken);
if(checkUser === null || checkUser.username !== username) return Astro.redirect('/logout'); if(checkUser === null || checkUser.username !== username) return Astro.redirect('/logout');
const planetId = Astro.cookies.get('planetid')?.value ?? ""; const planetId = Astro.cookies.get('currentPlanet')?.value ?? "";
if(planetId === "") return Astro.redirect('/logout'); if(planetId === "") return Astro.redirect('/logout');
if(Astro.request.method === "POST") { if(Astro.request.method === "POST") {

2
src/pages/game/ships.astro
View File

@ -18,7 +18,7 @@ if(checkUser === null || checkUser.username !== username) return Astro.redirect(
const ships = await getAllShips(); const ships = await getAllShips();
const planetId = Astro.cookies.get('planetid')?.value ?? ""; const planetId = Astro.cookies.get('currentPlanet')?.value ?? "";
if(planetId === "") { if(planetId === "") {
console.error("No planet selected"); console.error("No planet selected");
return Astro.redirect('/logout'); return Astro.redirect('/logout');

2
src/pages/game/systemManager/index.astro
View File

@ -28,7 +28,7 @@ if(Astro.request.method === "POST") {
const selectedPlanetId = (await Astro.request.formData()).get('planetId') as string | null; const selectedPlanetId = (await Astro.request.formData()).get('planetId') as string | null;
if(selectedPlanetId !== null) { if(selectedPlanetId !== null) {
Astro.cookies.set('planetid', selectedPlanetId, { Astro.cookies.set('currentPlanet', selectedPlanetId, {
path: '/', path: '/',
expires: new Date(Date.now() + 1000 * 60 * 60 * 24 * 7), expires: new Date(Date.now() + 1000 * 60 * 60 * 24 * 7),
sameSite: 'lax', sameSite: 'lax',

2
src/pages/login.astro
View File

@ -71,7 +71,7 @@ if(Astro.request.method === "POST") {
secure: true secure: true
}); });
Astro.cookies.set("planetid", user.mainPlanet._id, { Astro.cookies.set("currentPlanet", user.mainPlanet._id, {
path: "/", path: "/",
maxAge: sessionTime, maxAge: sessionTime,
sameSite: "lax", sameSite: "lax",