tom/METH_Transcendence
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Site

Browse Source 
- fix login with 42
This commit is contained in:
Kum1ta
2024-09-12 16:28:22 +02:00
parent 17487197ac
commit 90e9de59bc
2 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
docker-compose/requirements/djangoserver/file/server/server/typeRequests/createAccount.py
View File

@ -6,7 +6,7 @@
# By: edbernar <edbernar@student.42angouleme. +#+ +:+ +#+ # # By: edbernar <edbernar@student.42angouleme. +#+ +:+ +#+ #
# +#+#+#+#+#+ +#+ # # +#+#+#+#+#+ +#+ #
# Created: 2024/08/09 08:08:00 by edbernar #+# #+# # # Created: 2024/08/09 08:08:00 by edbernar #+# #+# #
# Updated: 2024/09/12 01:03:04 by tomoron ### ########.fr # # Updated: 2024/09/12 16:27:52 by edbernar ### ########.fr #
# # # #
# **************************************************************************** # # **************************************************************************** #
@ -14,6 +14,7 @@ from email.mime.multipart import MIMEMultipart
from ..models import User, MailVerify from ..models import User, MailVerify
from ..data import ICLOUD_USER, ICLOUD_PASS, SERVER_URL from ..data import ICLOUD_USER, ICLOUD_PASS, SERVER_URL
from email.mime.text import MIMEText from email.mime.text import MIMEText
from email.mime.image import MIMEImage
import smtplib import smtplib
import random import random
import re import re

8
docker-compose/requirements/nginx/static/javascript/login/main.js
View File

@ -6,7 +6,7 @@
/* By: edbernar <edbernar@student.42angouleme. +#+ +:+ +#+ */ /* By: edbernar <edbernar@student.42angouleme. +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2024/08/07 17:40:15 by edbernar #+# #+# */ /* Created: 2024/08/07 17:40:15 by edbernar #+# #+# */
/* Updated: 2024/09/12 01:35:44 by edbernar ### ########.fr */ /* Updated: 2024/09/12 12:58:13 by edbernar ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
@ -26,7 +26,6 @@ class Login
const button42 = document.getElementsByClassName('login-42-btn')[0]; const button42 = document.getElementsByClassName('login-42-btn')[0];
const registerForm = document.getElementById('registerForm'); const registerForm = document.getElementById('registerForm');
const loginBackButton = document.getElementsByClassName('old-player')[0]; const loginBackButton = document.getElementsByClassName('old-player')[0];
const popMenuLoginButton = document.getElementById('popMenuLoginButton');
registerButton.addEventListener('click', changeWindowLogin); registerButton.addEventListener('click', changeWindowLogin);
loginBackButton.addEventListener('click', changeWindowLoginBack); loginBackButton.addEventListener('click', changeWindowLoginBack);
@ -100,13 +99,14 @@ function hideMenu()
popMenuLoginButton.style.display = 'none'; popMenuLoginButton.style.display = 'none';
document.removeEventListener('click', hideMenu); document.removeEventListener('click', hideMenu);
loginButton.addEventListener('click', showMenu); loginButton.addEventListener('click', showMenu);
console.log("ehh2");
} }
function redirection(e) function redirection(e)
{ {
const button42 = document.getElementsByClassName('login-42-btn')[0];
e.preventDefault(); e.preventDefault();
window.location.replace('https://api.intra.42.fr/oauth/authorize?client_id=u-s4t2ud-d9d6d46bd0be36dc13718981df4bfcf37e574ea364a07fcb5c39658be0f5706c&redirect_uri=https://localhost:8000/login42&response_type=code&scope=public'); window.location.replace(button42.getAttribute('href'));
} }
function createAccount(e) function createAccount(e)