From 85bc8b919b35960bc2a803ae0fbb5b6b17f44392 Mon Sep 17 00:00:00 2001
From: Kum1ta <eddydhj@gmail.com>
Date: Sat, 10 Aug 2024 00:44:00 +0200
Subject: [PATCH] Websocket     - Continuing 42login but problem with api
 https://api.intra.42.fr/v2/me

---
 site/interface/site/login/connectedWith42.js  |  8 +--
 .../typeRequets/login42/login42.py            | 52 ++++++++++---------
 2 files changed, 31 insertions(+), 29 deletions(-)

diff --git a/site/interface/site/login/connectedWith42.js b/site/interface/site/login/connectedWith42.js
index 308e267..ded2a1c 100644
--- a/site/interface/site/login/connectedWith42.js
+++ b/site/interface/site/login/connectedWith42.js
@@ -3,10 +3,10 @@
 /*                                                        :::      ::::::::   */
 /*   connectedWith42.js                                 :+:      :+:    :+:   */
 /*                                                    +:+ +:+         +:+     */
-/*   By: edbernar <edbernar@student.42.fr>          +#+  +:+       +#+        */
+/*   By: edbernar <edbernar@student.42angouleme.    +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2024/08/09 09:15:24 by edbernar          #+#    #+#             */
-/*   Updated: 2024/08/09 09:18:26 by edbernar         ###   ########.fr       */
+/*   Updated: 2024/08/09 23:23:46 by edbernar         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -16,9 +16,9 @@ function	connectedWith42Func()
 {
 	const	token42 = window.location.search.split('code=')[1];
 
-	console.log("connectedWith42Func");
+	if (!token42)
+		return ;
 	sendRequest("login", {type: "by42", token: token42});
-	console.log(token42);
 }
 
 export { connectedWith42Func };
\ No newline at end of file
diff --git a/websocket-server/typeRequets/login42/login42.py b/websocket-server/typeRequets/login42/login42.py
index 325d588..940b33c 100644
--- a/websocket-server/typeRequets/login42/login42.py
+++ b/websocket-server/typeRequets/login42/login42.py
@@ -3,10 +3,10 @@
 #                                                         :::      ::::::::    #
 #    login42.py                                         :+:      :+:    :+:    #
 #                                                     +:+ +:+         +:+      #
-#    By: edbernar <edbernar@student.42.fr>          +#+  +:+       +#+         #
+#    By: edbernar <edbernar@student.42angouleme.    +#+  +:+       +#+         #
 #                                                 +#+#+#+#+#+   +#+            #
 #    Created: 2024/08/09 09:32:17 by edbernar          #+#    #+#              #
-#    Updated: 2024/08/09 10:03:54 by edbernar         ###   ########.fr        #
+#    Updated: 2024/08/10 00:42:38 by edbernar         ###   ########.fr        #
 #                                                                              #
 # **************************************************************************** #
 
@@ -17,34 +17,36 @@ import os
 UID42 = os.environ.get("uid")
 SECRET42 = os.environ.get("secret")
 TOKENURL = 'https://api.intra.42.fr/oauth/token'
+
 INFOURL = 'https://api.intra.42.fr/v2/me'
 
 access_token = ""
 
+if (UID42 == None or SECRET42 == None):
+	print("Please set the environment variables uid and secret")
+	exit()
+
 def main42login(content):
 	global access_token
 
-	print(UID42)
-	print(SECRET42)
-	data = {
-		'grant_type': 'client_credentials',
-		'client_id': UID42,
-		'client_secret': SECRET42,
-	}
-	response = requests.post(TOKENURL, data=data)
-	access_token = response.json()["access_token"]
-	data = {
-		'grant_type': 'authorization_code',
-		'client_id': UID42,
-		'client_secret': SECRET42,
-		'code': content["token"],
-		'redirect_uri': 'http://localhost:3000',
-	}
-	response = requests.get('https://api.intra.42.fr/v2/me', headers={'Authorization': 'Bearer ' + access_token})
-	
-	if (response.status_code != 200):
-		raise Exception("")
-	
-	response = response.json()
-	print(response)
+
+	try:
+		data = {
+			'grant_type': 'client_credentials',
+			'client_id': UID42,
+			'client_secret': SECRET42,
+		}
+		response = requests.post(TOKENURL, data=data)
+		access_token = response.json()["access_token"]
+		print("Access Token: ", access_token)
+		headers = {
+			'Authorization': 'Bearer ' + access_token,
+		}
+		response = requests.get(INFOURL, headers=headers)
+		print("Code: ", response.status_code)
+		response = response.json()
+		print(response)
+	except Exception as e:
+		print("Error in main42login")
+		print(e)
 	
\ No newline at end of file