From 59bc89317350d409179d9e92bdce011af0f7e800 Mon Sep 17 00:00:00 2001
From: Me <me@Philip.local>
Date: Wed, 7 Dec 2022 18:49:31 +0100
Subject: [PATCH] removed the userStore, didn't make sense and now we don't
 even need to use local storage so no security vulnerability, cool, oh and
 everything still works

---
 .../stores => old_unused}/loginStatusStore.js |  0
 .../api_front/src/pages/SplashPage.svelte     | 43 +++++--------------
 .../api_front/src/pages/TmpTestPage.svelte    | 15 ++++++-
 .../src/pages/TwoFactorAuthentication.svelte  |  5 +--
 .../src/pages/UnauthorizedAccessPage.svelte   |  9 ----
 .../src/pages/profile/ProfilePage.svelte      |  5 +--
 .../src/pages/profile/ProfileSettings.svelte  |  3 +-
 .../svelte/api_front/src/pieces/Header.svelte |  6 +--
 8 files changed, 27 insertions(+), 59 deletions(-)
 rename srcs/requirements/svelte/api_front/{src/stores => old_unused}/loginStatusStore.js (100%)

diff --git a/srcs/requirements/svelte/api_front/src/stores/loginStatusStore.js b/srcs/requirements/svelte/api_front/old_unused/loginStatusStore.js
similarity index 100%
rename from srcs/requirements/svelte/api_front/src/stores/loginStatusStore.js
rename to srcs/requirements/svelte/api_front/old_unused/loginStatusStore.js
diff --git a/srcs/requirements/svelte/api_front/src/pages/SplashPage.svelte b/srcs/requirements/svelte/api_front/src/pages/SplashPage.svelte
index f50bb74a..d803bf9c 100644
--- a/srcs/requirements/svelte/api_front/src/pages/SplashPage.svelte
+++ b/srcs/requirements/svelte/api_front/src/pages/SplashPage.svelte
@@ -2,32 +2,19 @@
   import Canvas from "../pieces/Canvas.svelte";
   import { push } from "svelte-spa-router";
   import { onMount } from 'svelte';
-  import { userStore, userLogout } from '../stores/loginStatusStore.js';
   import { get } from "svelte/store";
 
 
+  let user;
+
 	onMount(async () => {
-    // console.log('SplashPage testing if logged in')
-
-    // hold on, maybe this is all i need?
-    let user = await fetch('http://transcendance:8080/api/v2/user')
+    user = await fetch('http://transcendance:8080/api/v2/user')
       .then((resp) => resp.json())
-      // .then((data) => void userStore.set(data))  // this returns void so local var user is undefined...
-      // .catch( userLogout(); )
-      // yea ok i don't know how to use catch...
 
-    // Testing Svelet get(store)
+    // i mean i could do a failed to load user or some shit, maybe with a .catch or something? but atm why bother
 
-    // let tmp = get(userStore);
-    // console.log('in SplashPage get(store)')
-    // console.log(tmp)
-
-
-      // userStore.set(user);
-      // console.log('user in userStore');
-      // console.log($userStore);
-      // console.log('now user in the local var');
-      // console.log(user);
+      console.log('User var');
+      console.log(user);
       // if (user && user.statusCode && user.statusCode === 403) {
       //   console.log('user not logged in')
       // }
@@ -39,24 +26,14 @@
     // if (user === undefined) {
     if (user && user.statusCode && user.statusCode === 403) {
       console.log('on mount no user, returned status code 403 so logging out of userStore')
-      userLogout(); // which i think should delete any previous local storage
+      // userLogout(); // which i think should delete any previous local storage
     }
 
-    // in theory now we should be logged in...
 	});
 
   const login = async() => {
     window.location.href = 'http://transcendance:8080/api/v2/auth';
-    // await fetch ('http://transcendance:8080/api/v2/auth');
     console.log('you are now logged in');
-
-    await fetch('http://transcendance:8080/api/v2/user')
-      .then((resp) => resp.json())
-      .then((data) => userStore.set(data));
-      // .then((data) => void userStore.set(data));
-
-    // decide if do this here on in backend
-    // push('/profile');
   }
 
 // i could prolly put this in it's own compoent, i seem to use it in several places... or maybe just some JS? like no need for html
@@ -65,8 +42,7 @@
 		await fetch('http://transcendance:8080/api/v2/auth/logout', {
         method: 'POST',
       });
-    // loginStatus.allFalse()
-    userLogout();
+    user = undefined;
 	};
 
 </script>
@@ -75,7 +51,8 @@
 <header class="grid-container">
   <h1>Potato Pong</h1>
   <nav>
-    {#if $userStore !== null}
+    <!-- {#if user !== undefined} -->
+    {#if user && user.username}
       <div on:click={ () => (push('/profile')) }>Profile</div>
       <div on:click={logout}>Logout</div>
     {:else}
diff --git a/srcs/requirements/svelte/api_front/src/pages/TmpTestPage.svelte b/srcs/requirements/svelte/api_front/src/pages/TmpTestPage.svelte
index 3f18e60e..708c9c36 100644
--- a/srcs/requirements/svelte/api_front/src/pages/TmpTestPage.svelte
+++ b/srcs/requirements/svelte/api_front/src/pages/TmpTestPage.svelte
@@ -1,8 +1,19 @@
 <script lang="ts">
 
-
+  import { replace } from "svelte-spa-router";
 
 </script>
 
+<div class="wrapper">
+  <h1>You made it to Test</h1>
+  <button on:click={ () => (replace('/'))}>Go Home</button>
+</div>
 
-<h1>you made it to test</h1>
\ No newline at end of file
+<style>
+
+  div.wrapper{
+    display: flexbox;
+    align-items: center;
+  }
+
+</style>
\ No newline at end of file
diff --git a/srcs/requirements/svelte/api_front/src/pages/TwoFactorAuthentication.svelte b/srcs/requirements/svelte/api_front/src/pages/TwoFactorAuthentication.svelte
index 8d6d3adb..3731a995 100644
--- a/srcs/requirements/svelte/api_front/src/pages/TwoFactorAuthentication.svelte
+++ b/srcs/requirements/svelte/api_front/src/pages/TwoFactorAuthentication.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
   import { onMount } from "svelte";
   import { push } from "svelte-spa-router";
-  import { userStore, userLogout } from "../stores/loginStatusStore";
+  import { userStore, userLogout } from "../../old_unused/loginStatusStore";
 
   // onMount( async() => {
   //  await fetch("http://transcendance:8080/api/v2/auth/2fa/generate",
@@ -19,7 +19,6 @@
   let qrCodeImg;
   let qrCode = "";
   let wrongCode = "";
-  // max try doesn't work if you reste the page
   const fetchQrCodeImg = (async() => {
     await fetch("http://transcendance:8080/api/v2/auth/2fa/generate",
     {
@@ -48,7 +47,6 @@
       wrongCode = `Wrong code`;
     }
     if (response.status === 200) {
-      // userLogout();
       push('/profile');
       console.log('vaid Code for 2FA')
     }
@@ -66,7 +64,6 @@
   <!-- What the hell is data? ask Cherif -->
     <img src={qrCodeImg} alt="A QRCodeImg you must scan with google authenticator" id="qrcodeImg" />
     <form on:submit|preventDefault={submitCode}>
-      <!-- <label for="code">Input Code</label> -->
       <input id="code" bind:value={qrCode} type="text" placeholder="Input Code"/>
       <button type="submit">Send</button>
     </form>
diff --git a/srcs/requirements/svelte/api_front/src/pages/UnauthorizedAccessPage.svelte b/srcs/requirements/svelte/api_front/src/pages/UnauthorizedAccessPage.svelte
index 31e770fc..7b1fca10 100644
--- a/srcs/requirements/svelte/api_front/src/pages/UnauthorizedAccessPage.svelte
+++ b/srcs/requirements/svelte/api_front/src/pages/UnauthorizedAccessPage.svelte
@@ -1,8 +1,5 @@
 <script lang="ts">
   import { replace } from "svelte-spa-router";
-
-
-
 </script>
 
 <div class="wrapper">
@@ -17,10 +14,4 @@
     align-items: center;
   }
 
-  button{
-    /* cursor: pointer;
-    font-weight: bold; */
-    /* rounder edges or something */
-  }
-
 </style>
\ No newline at end of file
diff --git a/srcs/requirements/svelte/api_front/src/pages/profile/ProfilePage.svelte b/srcs/requirements/svelte/api_front/src/pages/profile/ProfilePage.svelte
index 72549c81..4b4f2fcc 100644
--- a/srcs/requirements/svelte/api_front/src/pages/profile/ProfilePage.svelte
+++ b/srcs/requirements/svelte/api_front/src/pages/profile/ProfilePage.svelte
@@ -1,10 +1,7 @@
 <script lang="ts">
 
   import Header from "../../pieces/Header.svelte";
-  import Footer from "../../pieces/Footer.svelte";
-  // import { createEventDispatcher } from "svelte";
-  import { push } from "svelte-spa-router";
-  import Router, { link } from "svelte-spa-router";
+  import Router from "svelte-spa-router";
   import { profileRoutes, prefix } from "../../routes/profileRoutes.js";
 
   // let dispatch = createEventDispatcher();
diff --git a/srcs/requirements/svelte/api_front/src/pages/profile/ProfileSettings.svelte b/srcs/requirements/svelte/api_front/src/pages/profile/ProfileSettings.svelte
index 5a02e587..b59df40b 100644
--- a/srcs/requirements/svelte/api_front/src/pages/profile/ProfileSettings.svelte
+++ b/srcs/requirements/svelte/api_front/src/pages/profile/ProfileSettings.svelte
@@ -6,8 +6,7 @@
   import Button from '../../pieces/Button.svelte';
 
   let user;
-  let avatar, postVar, newAvatar;
-  // postVar means nothing can i get rid of it or do i need it to do something...
+  let avatar, newAvatar;
   let uploadAvatarSuccess = false;
 
   // tbh i might not need this...
diff --git a/srcs/requirements/svelte/api_front/src/pieces/Header.svelte b/srcs/requirements/svelte/api_front/src/pieces/Header.svelte
index c022852a..40fbf5df 100644
--- a/srcs/requirements/svelte/api_front/src/pieces/Header.svelte
+++ b/srcs/requirements/svelte/api_front/src/pieces/Header.svelte
@@ -1,7 +1,6 @@
 <script lang="ts">
   import { push } from "svelte-spa-router";
   import { location } from 'svelte-spa-router';
-  import { userStore, userLogout } from "../stores/loginStatusStore.js";
 
   import active from 'svelte-spa-router/active'
   // or i could leave them all and not display if they're active?
@@ -11,11 +10,8 @@
     await fetch('http://transcendance:8080/api/v2/auth/logout', {
         method: 'POST',
       })
-      .then( () => userLogout() ) // i think for TS reasons it has to be a func not direclty push('/') or whatever
-      .then( () => push('/') )
+      .then( () => push('/') ) // i think for TS reasons it has to be a func not direclty push('/') or whatever
     console.log('clicked logout header')
-    // userLogout();
-    // push('/'); // replace?
   };
 
 </script>