* Fix 2fa

Makefile

@@ -4,7 +4,7 @@ USER = gavaniwast
 all: clean dev
 
 dev:
-	NODE_ENV="development" docker compose up --build
+	NODE_ENV="development" docker-compose up --build
 
 check:
 	NODE_ENV="check" docker-compose run back --build

back/volume/src/auth/auth.controller.ts

@@ -66,7 +66,6 @@ export class AuthController {
 
   @Get('/verify')
   @UseGuards(AuthenticatedGuard)
-  @Redirect(`http://${frontHost}:${frontPort}`)
   async VerifyEmail (@Profile42() profile: Profile): Promise<void> {
     const ftId: number = profile.id
     const user = await this.usersService.findUser(ftId)

back/volume/src/auth/auth.service.ts

@@ -25,7 +25,6 @@ export class AuthService {
 
   async sendConfirmationEmail (user: User): Promise<void> {
     user.authToken = Math.floor(10000 + Math.random() * 90000).toString()
-    console.log(`email sent to ${user.email}`)
     await this.usersService.save(user)
     try {
       await this.mailerService.sendMail({

front/volume/src/App.svelte

@@ -172,6 +172,7 @@
       >
     </div>
   {:else}
+    {#if !failedGameLogIn && !gamePlaying}
       <Navbar
         {clickProfile}
         {clickHistory}
@@ -252,6 +253,7 @@
           />
         </div>
       {/if}
+    {/if}
     <Pong bind:gamePlaying={gamePlaying} bind:this={pong} bind:failedGameLogIn={failedGameLogIn} {appState} {setAppState} bind:resetGameConnection={resetGameConnection} />
   {/if}
 

front/volume/src/Auth.ts

@@ -31,13 +31,11 @@ export function login() {
 }
 
 export async function verify() {
-  if (get(store).twoFa === true) return;
+  if (get(store).isVerified === true) return;
   let email : string;
   await show_popup("Enter your preferred email adress:\n(defaults to 42 email)")
   email = get(content);
-  if (email == '')
+  if (email !== undefined && email !== '' && email !== 'ok') { 
-    return ;
-  if (email != 'ok') { 
     const response = await fetch(API_URL + "/log/email", {
       method: "POST",
       mode: "cors",
@@ -48,21 +46,16 @@ export async function verify() {
     if (response.ok) {await show_popup("Email set",false)}
     else {await show_popup("Couldn't set Email",false); return }
   }
-  console.log(API_URL)
   const response = await fetch(API_URL + "/log/verify", {
     method: "GET",
     mode: "cors",
     credentials: "include",
   });
-  console.log(response.ok)
   if (response.ok) {
-  console.log("here") 
     await show_popup("We have sent you an email to verify your account. Check your mailbox!.", false);
   } else {
-  console.log("there") 
+    await show_popup("Email doensn't seem valid", false);
-  await show_popup("Email doensn't seem valid", false);}
+  }
-
-
 }
 
 export function logout() {

list

@@ -1,2 +0,0 @@
-- manage users on deleting channel
-- delete