From 8688f3b48f2c6fa27e1eed55c6e555b71cabc16b Mon Sep 17 00:00:00 2001 From: Me Date: Thu, 8 Dec 2022 17:04:50 +0100 Subject: [PATCH] pushing to master, only minor changes --- .../api_back/src/users/users.controller.ts | 3 +- .../api_front/old_unused/loginStatusStore.js | 2 +- .../src/pages/profile/ProfileDisplay.svelte | 3 +- .../src/pages/profile/ProfileSettings.svelte | 31 +++++++++++++------ .../svelte/api_front/src/pieces/Header.svelte | 2 ++ 5 files changed, 29 insertions(+), 12 deletions(-) diff --git a/srcs/requirements/nestjs/api_back/src/users/users.controller.ts b/srcs/requirements/nestjs/api_back/src/users/users.controller.ts index 452690a4..fe0594b0 100644 --- a/srcs/requirements/nestjs/api_back/src/users/users.controller.ts +++ b/srcs/requirements/nestjs/api_back/src/users/users.controller.ts @@ -75,7 +75,8 @@ export class UsersController { console.log("On est dans la boucle de redirection 2FA / Au niveau de l'update du user") return response.status(200).redirect("http://transcendance:8080/#/2fa"); } - return response.status(200).redirect("http://transcendance:8080/#/profile") + return response.status(200).redirect("http://transcendance:8080/#/profile"); + // return response.status(200); } @UseGuards(AuthenticateGuard) diff --git a/srcs/requirements/svelte/api_front/old_unused/loginStatusStore.js b/srcs/requirements/svelte/api_front/old_unused/loginStatusStore.js index 91b928c1..0e5420d0 100644 --- a/srcs/requirements/svelte/api_front/old_unused/loginStatusStore.js +++ b/srcs/requirements/svelte/api_front/old_unused/loginStatusStore.js @@ -7,7 +7,7 @@ import { writable } from "svelte/store"; let _user = localStorage.getItem('42User'); // turns out a simple store is actually the easiest :) -export const userStore = writable(_user ? JSON.parse(_user) : null); // we start with no user, but go get one if one exists +// export const userStore = writable(_user ? JSON.parse(_user) : null); // we start with no user, but go get one if one exists // export const userStore = writable(null); // ok so this will happen no matter what, basically we are telling it what to do if the store containing the user changes diff --git a/srcs/requirements/svelte/api_front/src/pages/profile/ProfileDisplay.svelte b/srcs/requirements/svelte/api_front/src/pages/profile/ProfileDisplay.svelte index 9bbb5c3f..e7095d88 100644 --- a/srcs/requirements/svelte/api_front/src/pages/profile/ProfileDisplay.svelte +++ b/srcs/requirements/svelte/api_front/src/pages/profile/ProfileDisplay.svelte @@ -26,10 +26,11 @@ // i think i don't need to do this once i sort out the {wrap} conditions: in theory i could pass values to the Route // once the async authentication check is done onMount( async() => { - // so ideally i wouldn't do this + // console.log('mounting profile display') user = await fetch('http://transcendance:8080/api/v2/user') .then( (x) => x.json() ); + // console.log('profile display did my fetch') // should i be updating the userStore or is that unnecessary? if (user.loseGame > user.winGame) { 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 24477e6c..81752e98 100644 --- a/srcs/requirements/svelte/api_front/src/pages/profile/ProfileSettings.svelte +++ b/srcs/requirements/svelte/api_front/src/pages/profile/ProfileSettings.svelte @@ -24,7 +24,7 @@ } // i don't unerstand why this is necessary but it really doesn't like it otherwise nameTmp = user.username; - // console.log(user.username) + console.log(user.username) set.tfa = user.isEnabledTwoFactorAuth; @@ -54,7 +54,9 @@ // I don't really care which i use at this point... // if (set.username === nameTmp) { - if (set.username === user.username || (set.username !== '' && set.username.trim() === '')) { + // if (set.username === user.username || (set.username !== '' && set.username.trim() === '')) { + // if (set.username !== '' && set.username.trim() === '') { + if (set.username === undefined || (set.username !== '' && set.username.trim() === '')) { errors.username = 'Invalid new username'; valid = false; } else { @@ -62,24 +64,35 @@ valid = true; } if (set.username === '') { - set.username === nameTmp; - // set.username === user.username; + // set.username = nameTmp; + set.username = user.username; } + console.log("valid is " + valid) + console.log("username is " + set.username) + if (valid) { - await fetch('http://transcendance:8080/api/v2/user',{ + console.log('settings valid about to fetch') + const response = await fetch('http://transcendance:8080/api/v2/user', + { method: 'PATCH', headers: { 'Content-Type': 'application/json' }, body: JSON.stringify({ "username": set.username, - "isEnabledTwoFactorAuth": set.tfa + "isEnabledTwoFactorAuth": set.tfa }) - }) - .then(response => response.json()) - // .then((result) => console.log(result)) + }) + // .then(() => push('/profile')) + // .then(response => response.json()) + // .then((result) => console.log("this is result " + result)) // .then(() => console.log('successful sub of new settings')) + console.log('end of settings is valid') + // if (response.status === 200) { + // push('/profile'); + // console.log('valid Code for 2FA') + // } } }; diff --git a/srcs/requirements/svelte/api_front/src/pieces/Header.svelte b/srcs/requirements/svelte/api_front/src/pieces/Header.svelte index 40fbf5df..2804b2f5 100644 --- a/srcs/requirements/svelte/api_front/src/pieces/Header.svelte +++ b/srcs/requirements/svelte/api_front/src/pieces/Header.svelte @@ -10,6 +10,8 @@ await fetch('http://transcendance:8080/api/v2/auth/logout', { method: 'POST', }) + // .then(resp => resp.json) + // .then((resp) => console.log(resp)) .then( () => push('/') ) // i think for TS reasons it has to be a func not direclty push('/') or whatever console.log('clicked logout header') };