From c0f402455c370e9484002da25af20a3de23c3b4e Mon Sep 17 00:00:00 2001 From: kinou-p Date: Tue, 9 May 2023 16:49:00 +0200 Subject: [PATCH] change dir name frontend -> react and api/profile on the way --- api/src/app.controller.ts | 43 +++++--- api/src/auth/auth.service.ts | 4 + api/src/auth/jwt.strategy.ts | 2 +- api/src/auth/login42.ts | 98 ++++++------------ api/src/auth/login42old.ts | 95 +++++++++++++++++ api/src/model/base.entity.ts | 6 ++ docker-compose.yml | 2 +- frontend/src/AxiosInstance.js | 11 -- frontend/src/components/Login42.js | 82 --------------- frontend/src/script/login.js | 14 --- frontend/src/script/login42.js | 91 ---------------- {frontend => react}/.gitignore | 0 {frontend => react}/README.md | 0 {frontend => react}/package-lock.json | 0 {frontend => react}/package.json | 0 {frontend => react}/public/favicon.ico | Bin {frontend => react}/public/index.html | 0 {frontend => react}/public/logo192.png | Bin {frontend => react}/public/logo512.png | Bin {frontend => react}/public/manifest.json | 0 {frontend => react}/public/robots.txt | 0 {frontend => react}/src/components/App.js | 0 {frontend => react}/src/components/Chat.js | 0 {frontend => react}/src/components/Field.js | 0 {frontend => react}/src/components/Footer.js | 0 {frontend => react}/src/components/Head.js | 0 {frontend => react}/src/components/Header.js | 0 {frontend => react}/src/components/Home.js | 9 +- .../src/components/PlayButton.js | 0 .../src/components/SetAuthCookie.js | 0 {frontend => react}/src/components/canvas.js | 0 {frontend => react}/src/index.js | 4 +- {frontend => react}/src/logo.svg | 0 {frontend => react}/src/reportWebVitals.js | 0 {frontend => react}/src/script/axiosApi.js | 9 +- .../src/script/tokenSuccess.js | 7 +- {frontend => react}/src/styles/App.css | 0 {frontend => react}/src/styles/chat.css | 0 {frontend => react}/src/styles/field.css | 0 {frontend => react}/src/styles/index.css | 0 {frontend => react}/src/styles/old.css | 0 41 files changed, 187 insertions(+), 290 deletions(-) create mode 100644 api/src/auth/login42old.ts delete mode 100644 frontend/src/AxiosInstance.js delete mode 100644 frontend/src/components/Login42.js delete mode 100644 frontend/src/script/login.js delete mode 100644 frontend/src/script/login42.js rename {frontend => react}/.gitignore (100%) rename {frontend => react}/README.md (100%) rename {frontend => react}/package-lock.json (100%) rename {frontend => react}/package.json (100%) rename {frontend => react}/public/favicon.ico (100%) rename {frontend => react}/public/index.html (100%) rename {frontend => react}/public/logo192.png (100%) rename {frontend => react}/public/logo512.png (100%) rename {frontend => react}/public/manifest.json (100%) rename {frontend => react}/public/robots.txt (100%) rename {frontend => react}/src/components/App.js (100%) rename {frontend => react}/src/components/Chat.js (100%) rename {frontend => react}/src/components/Field.js (100%) rename {frontend => react}/src/components/Footer.js (100%) rename {frontend => react}/src/components/Head.js (100%) rename {frontend => react}/src/components/Header.js (100%) rename {frontend => react}/src/components/Home.js (93%) rename {frontend => react}/src/components/PlayButton.js (100%) rename {frontend => react}/src/components/SetAuthCookie.js (100%) rename {frontend => react}/src/components/canvas.js (100%) rename {frontend => react}/src/index.js (91%) rename {frontend => react}/src/logo.svg (100%) rename {frontend => react}/src/reportWebVitals.js (100%) rename {frontend => react}/src/script/axiosApi.js (61%) rename {frontend => react}/src/script/tokenSuccess.js (80%) rename {frontend => react}/src/styles/App.css (100%) rename {frontend => react}/src/styles/chat.css (100%) rename {frontend => react}/src/styles/field.css (100%) rename {frontend => react}/src/styles/index.css (100%) rename {frontend => react}/src/styles/old.css (100%) diff --git a/api/src/app.controller.ts b/api/src/app.controller.ts index 45f312d7..7f7c1675 100644 --- a/api/src/app.controller.ts +++ b/api/src/app.controller.ts @@ -6,6 +6,7 @@ import { AuthService } from './auth/auth.service'; // import { Login42 } from './auth/login42' import { loginClass } from './auth/login42' +// import { loginClass } from './auth/test' @Controller('/api') @@ -16,32 +17,48 @@ export class AppController { // @Post('auth/login') // async login() { // const user = Login42(); -// return this.authService.login(user); +// return this.authService.login5(user); // } @Redirect('http://localhost/token', 302) @Get('auth/login') async login2(@Req() request: Request) { const url = request.url; - console.log("login function"); - console.log(`url = ${url}`); + const user = await this.loginClass.Login42(url); + console.log(`user in auth/login= ${user}`); + const data = this.authService.login(user); + console.log(`all data in api = ${data}`) + + const myJSON = JSON.stringify(data); + console.log(`response2= ${myJSON}`) + + console.log(`data in api = ${(await data).access_token}`) + const token = (await data).access_token; + return { url: `http://localhost/token?data=${encodeURIComponent(JSON.stringify(token))}` }; + // console.log("login function"); + // console.log(`url = ${url}`); // const user = this.loginClass.Login42(url); - const user = this.loginClass.Login42(url); - console.log("login42 done"); - console.log(`user= ${user}`); - const data2 = this.authService.login(user); - const data = (await data2).access_token; - console.log(`dataaaa = ${data}`); - console.log("before return"); + // console.log("login42 done"); + // console.log(`user= ${user}`); + // console.log(`dataaaa = ${data}`); + // console.log("before return"); // return { data }; - return { url: `http://localhost/token?data=${encodeURIComponent(JSON.stringify(data))}` }; } @UseGuards(JwtAuthGuard) @Get('profile') getProfile(@Request() req) { - console.log("in profile get") - return req.user; + // const myJSON = JSON.stringify(req.user); + // console.log(`req user api= ${req.user}`) + // console.log(`json user api= ${myJSON}`) + return req.user; + // const user = req.user; + // const returned = { + // username: user.username, + // sub: user.sub, + // }; + // console.log(`user in api = ${returned}`) + // return returned; } @Get(`conversation/:id`) diff --git a/api/src/auth/auth.service.ts b/api/src/auth/auth.service.ts index aba7afbd..ab5aeb47 100644 --- a/api/src/auth/auth.service.ts +++ b/api/src/auth/auth.service.ts @@ -20,8 +20,12 @@ export class AuthService { } async login(user: any) { + console.log(`in login user= ${user.username}`) const payload = { username: user.username, sub: user.userId }; + console.log(`in login payload name= ${payload.username}`) + console.log(`in login payload sub= ${payload.sub}`) return { + username: user.username, access_token: this.jwtService.sign(payload), }; } diff --git a/api/src/auth/jwt.strategy.ts b/api/src/auth/jwt.strategy.ts index 24500b15..695b0c58 100644 --- a/api/src/auth/jwt.strategy.ts +++ b/api/src/auth/jwt.strategy.ts @@ -14,6 +14,6 @@ export class JwtStrategy extends PassportStrategy(Strategy) { } async validate(payload: any) { - return { userId: payload.sub, username: payload.username }; + return { userId: payload.userId, username: payload.nickname }; } } \ No newline at end of file diff --git a/api/src/auth/login42.ts b/api/src/auth/login42.ts index c7e41132..5cfd4003 100644 --- a/api/src/auth/login42.ts +++ b/api/src/auth/login42.ts @@ -9,31 +9,18 @@ import { User } from '../model/item.entity'; @Injectable() export class loginClass { - // const userService = new UsersService(); constructor(private readonly usersService: UsersService) {}; async Login42(url: string) { - // const [token, setToken] = useState(null); - // const [userId, setUserId] = useState(null); - // const [userName, setUserName] = useState(null); - // const usersService = UsersService; - // constructor(private readonly usersService: UsersService) {} - let token = null; - let userId = null; + let userId = 0; let userName = null; + // let = null; - // const usersService = UsersService; - // const private , usersService: UsersService - - // const url = new URL(urlString); - console.log("you said yes to connect with 42"); + const params = new URLSearchParams(url.split('?')[1]); - // const params = new URLSearchParams(url); - console.log(`params is= ${params}`); const code = params.get('code'); - console.log(`code is= ${code}`); const data = { grant_type: 'authorization_code', @@ -43,73 +30,46 @@ export class loginClass { redirect_uri: 'http://localhost:80/api/auth/login', }; - axios.post('https://api.intra.42.fr/oauth/token', data) - .then(response => { - // handle success response - // console.log(response); - token = response.data.access_token; - // setToken(token); - // console.log(`token= ${token}`); - axios.get('https://api.intra.42.fr/oauth/token/info', { - headers: { - Authorization: `Bearer ${token}` - } - }) - .then(response => { - // console.log(response) - userId = response.data.resource_owner_id; - // setUserId(userId); - // console.log(userId); - // axios.get(`https://api.intra.42.fr/v2/users/${userId}`) - // axios.get(`https://api.intra.42.fr/v2/me`) - axios.get('https://api.intra.42.fr/v2/me', { - headers: { - Authorization: `Bearer ${token}` - } - }) - .then(response => { - // console.log(response); - // const login = response.data.login; - // console.log(`login= ${login}`); - // setUserName(response.data.login); - userName = response.data.login + try { + const response = await axios.post('https://api.intra.42.fr/oauth/token', data); + token = response.data.access_token; - // console.log(`username= ${userName}`); - // Gérer les données de réponse ici - }) - .catch(error => { - console.error(error); - // Gérer les erreurs ici - }); - }) - .catch(error => { - console.error(error); - }); - - }) - .catch(error => { - // handle error response - console.error(error); + const response2 = await axios.get('https://api.intra.42.fr/v2/me', { + headers: { + Authorization: `Bearer ${token}` + } }); - - - // async findOne(username: string): Promise { + userName = response2.data.login; + console.log(`all user data= ${response2.data}`) + } + catch(error) + { + console.log(error); + return ; + } + console.log(`username before serach= ${userName}`) let user = await this.usersService.findOne(userName); if (!user) { - // throw new NotFoundException(`User with username '${userName}' not found`); - // user = { nickname: userName}; - const user = { + console.log(`no user, creating one`) + user = { name: null, description: null, id: null, password: null, + username: userName, nickname: userName, win: 0, loose: 0, rank: 0, + userId: userId, }; await this.usersService.create(user); } - return user; + console.log(`in login42 user= ${user}`) + const myJSON = JSON.stringify(user); + console.log(`in login42 user2= ${myJSON}`) + + console.log("end of login"); + return (await this.usersService.findOne(userName)); } } \ No newline at end of file diff --git a/api/src/auth/login42old.ts b/api/src/auth/login42old.ts new file mode 100644 index 00000000..32f9bdb4 --- /dev/null +++ b/api/src/auth/login42old.ts @@ -0,0 +1,95 @@ +// import React, { useEffect, useState } from 'react'; +import axios from 'axios'; +import { UsersService } from '../users/users.service'; +import { Injectable } from '@nestjs/common'; + +import { Repository } from 'typeorm'; + +import { User } from '../model/item.entity'; + +@Injectable() +export class loginClass { + constructor(private readonly usersService: UsersService) {}; + + async Login42(url: string) + { + let token = null; + let userId = 0; + let userName = null; + // let = null; + + console.log("you said yes to connect with 42"); + const params = new URLSearchParams(url.split('?')[1]); + console.log(`params is= ${params}`); + const code = params.get('code'); + console.log(`code is= ${code}`); + + const data = { + grant_type: 'authorization_code', + client_id: 'u-s4t2ud-6d29dfa49ba7146577ffd8bf595ae8d9e5aaa3e0a9615df18777171ebf836a41', + client_secret: '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', + code: code, + redirect_uri: 'http://localhost:80/api/auth/login', + }; + + await axios.post('https://api.intra.42.fr/oauth/token', data) + .then(response => { + token = response.data.access_token; + console.log("HEEEEEEEERRREEEEEEE") + axios.get('https://api.intra.42.fr/oauth/token/info', { + headers: { + Authorization: `Bearer ${token}` + } + }) + .then(response => { + userId = response.data.resource_owner_id; + axios.get('https://api.intra.42.fr/v2/me', { + headers: { + Authorization: `Bearer ${token}` + } + }) + .then(response => { + console.log(`data get success data= ${response.data}`) + userName = response.data.login + }) + .catch(error => { + console.log("ERROR BITCH"); + console.error(error); + }); + }) + .catch(error => { + console.log("ERROR BITCH"); + console.error(error); + }); + + }) + .catch(error => { + console.log("ERROR BITCH"); + console.error(error); + }); + console.log(`username before serach= ${userName}`) + let user = await this.usersService.findOne(userName); + if (!user) { + console.log(`no user, creating one`) + user = { + name: null, + description: null, + id: null, + password: null, + username: userName, + nickname: userName, + win: 0, + loose: 0, + rank: 0, + userId: userId, + }; + await this.usersService.create(user); + } + console.log(`in login42 user= ${user}`) + const myJSON = JSON.stringify(user); + console.log(`in login42 user2= ${myJSON}`) + + console.log("end of login"); + return (await this.usersService.findOne(userName)); + } +} \ No newline at end of file diff --git a/api/src/model/base.entity.ts b/api/src/model/base.entity.ts index 9f7f7f88..e2036017 100644 --- a/api/src/model/base.entity.ts +++ b/api/src/model/base.entity.ts @@ -63,6 +63,9 @@ export abstract class BaseEntity { @Column({ nullable: true }) nickname: string; + @Column({ nullable: true }) + username: string; + @Column({ nullable: true }) password: string; @@ -80,4 +83,7 @@ export abstract class BaseEntity { @Column({ default: 0 }) rank: number; + + @Column({ default: 0 }) + userId: number; } \ No newline at end of file diff --git a/docker-compose.yml b/docker-compose.yml index fbd8edb7..2c717c58 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -25,7 +25,7 @@ services: ports: - 8080:8080 volumes: - - ./frontend:/app + - ./react:/app networks: - pongNetwork entrypoint: ["sh", "-c" , "npm install && npm run start:dev"] diff --git a/frontend/src/AxiosInstance.js b/frontend/src/AxiosInstance.js deleted file mode 100644 index 49f188a9..00000000 --- a/frontend/src/AxiosInstance.js +++ /dev/null @@ -1,11 +0,0 @@ -import axios from 'axios'; - -const api = axios.create({ - baseURL: 'https://localhost/api', - withCredentials: true, - headers: { - Authorization: 'Bearer My token here', - }, -}); - -export default api; \ No newline at end of file diff --git a/frontend/src/components/Login42.js b/frontend/src/components/Login42.js deleted file mode 100644 index ce6bff65..00000000 --- a/frontend/src/components/Login42.js +++ /dev/null @@ -1,82 +0,0 @@ -// import GoogleLogin from 'react-google-login'; -import React, { useEffect, useState } from 'react'; -import axios from 'axios'; -// import setupLogin from '../script/login42'; -// import React, { useEffect } from 'react'; - -function Login42() -{ - const [token, setToken] = useState(null); - const [userId, setUserId] = useState(null); - const [userName, setUserName] = useState(null); - - useEffect(() => { - console.log("you said yes to connect with 42"); - const url = new URL(window.location.href); - const code = url.searchParams.get('code'); - console.log(`code is= ${code}`); - - const data = { - grant_type: 'authorization_code', - client_id: 'u-s4t2ud-6d29dfa49ba7146577ffd8bf595ae8d9e5aaa3e0a9615df18777171ebf836a41', - client_secret: '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', - code: code, - redirect_uri: 'http://localhost:8080/login42', - }; - - axios.post('https://api.intra.42.fr/oauth/token', data) - .then(response => { - // handle success response - console.log(response); - const token = response.data.access_token; - setToken(token); - console.log(`token= ${token}`); - axios.get('https://api.intra.42.fr/oauth/token/info', { - headers: { - Authorization: `Bearer ${token}` - } - }) - .then(response => { - console.log(response) - const userId = response.data.resource_owner_id; - setUserId(userId); - console.log(userId); - // axios.get(`https://api.intra.42.fr/v2/users/${userId}`) - // axios.get(`https://api.intra.42.fr/v2/me`) - axios.get('https://api.intra.42.fr/v2/me', { - headers: { - Authorization: `Bearer ${token}` - } - }) - .then(response => { - console.log(response); - const login = response.data.login; - console.log(`login= ${login}`); - setUserName(response.data.login); - console.log(`username= ${userName}`); - // Gérer les données de réponse ici - }) - .catch(error => { - console.error(error); - // Gérer les erreurs ici - }); - }) - .catch(error => { - console.error(error); - }); - - }) - .catch(error => { - // handle error response - console.error(error); - }); - }, []); - - return ( -
-

Le token d'accès est : {userName}

-
- ); -} - -export default Login42; \ No newline at end of file diff --git a/frontend/src/script/login.js b/frontend/src/script/login.js deleted file mode 100644 index ee25d501..00000000 --- a/frontend/src/script/login.js +++ /dev/null @@ -1,14 +0,0 @@ -// export const login() -// { -// alert("Le bouton a été cliqué !"); -// var formulaire = document.getElementById("loginForm"); -// formulaire.submit(); -// } - -export const login = () => { - console.log('Hello from myFunction'); - // alert("Le bouton a été cliqué !"); - var formulaire = document.getElementById("loginForm"); - formulaire.submit(); - } - diff --git a/frontend/src/script/login42.js b/frontend/src/script/login42.js deleted file mode 100644 index 42c20bf2..00000000 --- a/frontend/src/script/login42.js +++ /dev/null @@ -1,91 +0,0 @@ -// function setupLogin() -// { -// // alert("Le bouton a été cliqué !"); -// console.log('Hello from login42'); -// } - -// export default setupLogin; - -function Login42() -{ - const [token, setToken] = useState(null); - const [userId, setUserId] = useState(null); - const [login, setLogin] = useState(null); - - useEffect(() => { - console.log("you said yes to connect with 42"); - const url = new URL(window.location.href); - const code = url.searchParams.get('code'); - console.log(`code is= ${code}`); - - const data = { - grant_type: 'authorization_code', - client_id: 'u-s4t2ud-6d29dfa49ba7146577ffd8bf595ae8d9e5aaa3e0a9615df18777171ebf836a41', - client_secret: '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', - code: code, - redirect_uri: 'http://localhost:8080/login42', - }; - - axios.post('https://api.intra.42.fr/oauth/token', data) - .then(response => { - // handle success response - console.log(response); - const token = response.data.access_token; - setToken(token); - console.log(`token= ${token}`); - axios.get('https://api.intra.42.fr/oauth/token/info', { - headers: { - Authorization: `Bearer ${token}` - } - }) - .then(response => { - console.log(response) - const userId = response.data.resource_owner_id; - setUserId(userId); - console.log(userId); - // axios.get(`https://api.intra.42.fr/v2/users/${userId}`) - // axios.get(`https://api.intra.42.fr/v2/me`) - axios.get('https://api.intra.42.fr/v2/me', { - headers: { - Authorization: `Bearer ${token}` - } - }) - .then(response => { - console.log(response); - const login = response.data.login; - setLogin(login); - // Gérer les données de réponse ici - }) - .catch(error => { - console.error(error); - // Gérer les erreurs ici - }); - }) - .catch(error => { - console.error(error); - }); - - }) - .catch(error => { - // handle error response - console.error(error); - }); - }, []); - - return ( -
-

Menu

 -
- PONG -
- -

{login}

- {/* profile picture */} - logo - -
- ); -} - -export default Login42; \ No newline at end of file diff --git a/frontend/.gitignore b/react/.gitignore similarity index 100% rename from frontend/.gitignore rename to react/.gitignore diff --git a/frontend/README.md b/react/README.md similarity index 100% rename from frontend/README.md rename to react/README.md diff --git a/frontend/package-lock.json b/react/package-lock.json similarity index 100% rename from frontend/package-lock.json rename to react/package-lock.json diff --git a/frontend/package.json b/react/package.json similarity index 100% rename from frontend/package.json rename to react/package.json diff --git a/frontend/public/favicon.ico b/react/public/favicon.ico similarity index 100% rename from frontend/public/favicon.ico rename to react/public/favicon.ico diff --git a/frontend/public/index.html b/react/public/index.html similarity index 100% rename from frontend/public/index.html rename to react/public/index.html diff --git a/frontend/public/logo192.png b/react/public/logo192.png similarity index 100% rename from frontend/public/logo192.png rename to react/public/logo192.png diff --git a/frontend/public/logo512.png b/react/public/logo512.png similarity index 100% rename from frontend/public/logo512.png rename to react/public/logo512.png diff --git a/frontend/public/manifest.json b/react/public/manifest.json similarity index 100% rename from frontend/public/manifest.json rename to react/public/manifest.json diff --git a/frontend/public/robots.txt b/react/public/robots.txt similarity index 100% rename from frontend/public/robots.txt rename to react/public/robots.txt diff --git a/frontend/src/components/App.js b/react/src/components/App.js similarity index 100% rename from frontend/src/components/App.js rename to react/src/components/App.js diff --git a/frontend/src/components/Chat.js b/react/src/components/Chat.js similarity index 100% rename from frontend/src/components/Chat.js rename to react/src/components/Chat.js diff --git a/frontend/src/components/Field.js b/react/src/components/Field.js similarity index 100% rename from frontend/src/components/Field.js rename to react/src/components/Field.js diff --git a/frontend/src/components/Footer.js b/react/src/components/Footer.js similarity index 100% rename from frontend/src/components/Footer.js rename to react/src/components/Footer.js diff --git a/frontend/src/components/Head.js b/react/src/components/Head.js similarity index 100% rename from frontend/src/components/Head.js rename to react/src/components/Head.js diff --git a/frontend/src/components/Header.js b/react/src/components/Header.js similarity index 100% rename from frontend/src/components/Header.js rename to react/src/components/Header.js diff --git a/frontend/src/components/Home.js b/react/src/components/Home.js similarity index 93% rename from frontend/src/components/Home.js rename to react/src/components/Home.js index 7fba6841..bce60857 100644 --- a/frontend/src/components/Home.js +++ b/react/src/components/Home.js @@ -14,7 +14,14 @@ function Home() const login2 = () => { console.log('Hello from myFunction'); api.get('/profile').then((response) => { - console.log(`response= ${response}`) + const data = response; + // const parsedData = JSON.parse(response.data); + // console.log(`response= ${parsedData}`) + + const myJSON = JSON.stringify(data); + console.log(`response2= ${myJSON}`) + console.log(`response= ${data}`) + }); // alert("Le bouton a été cliqué !"); // var formulaire = document.getElementById("loginForm"); diff --git a/frontend/src/components/PlayButton.js b/react/src/components/PlayButton.js similarity index 100% rename from frontend/src/components/PlayButton.js rename to react/src/components/PlayButton.js diff --git a/frontend/src/components/SetAuthCookie.js b/react/src/components/SetAuthCookie.js similarity index 100% rename from frontend/src/components/SetAuthCookie.js rename to react/src/components/SetAuthCookie.js diff --git a/frontend/src/components/canvas.js b/react/src/components/canvas.js similarity index 100% rename from frontend/src/components/canvas.js rename to react/src/components/canvas.js diff --git a/frontend/src/index.js b/react/src/index.js similarity index 91% rename from frontend/src/index.js rename to react/src/index.js index eb421915..49703533 100644 --- a/frontend/src/index.js +++ b/react/src/index.js @@ -5,7 +5,7 @@ import './styles/index.css'; import App from './components/App'; import Header from './components/Header'; import Home from './components/Home'; -import Login42 from './components/Login42'; +// import Login42 from './components/Login42'; import Head from './components/Head'; import Field from './components/Field'; import PlayButton from './components/PlayButton'; @@ -23,7 +23,7 @@ root.render( }/> }/> }/> - }/> + {/* }/> */} }/> diff --git a/frontend/src/logo.svg b/react/src/logo.svg similarity index 100% rename from frontend/src/logo.svg rename to react/src/logo.svg diff --git a/frontend/src/reportWebVitals.js b/react/src/reportWebVitals.js similarity index 100% rename from frontend/src/reportWebVitals.js rename to react/src/reportWebVitals.js diff --git a/frontend/src/script/axiosApi.js b/react/src/script/axiosApi.js similarity index 61% rename from frontend/src/script/axiosApi.js rename to react/src/script/axiosApi.js index 6c93aeda..987d8359 100644 --- a/frontend/src/script/axiosApi.js +++ b/react/src/script/axiosApi.js @@ -7,15 +7,20 @@ import axios from 'axios'; function getToken() { // your code to retrieve the token from localStorage or any other source const token = localStorage.getItem('token'); + if (typeof token === 'string') { + console.log("is a string !!!") + } return token; } console.log(`getToken = ${getToken()}`) +console.log(`Bearer ${localStorage.getItem("token")}`) -const api = axios.create({ +let api = axios.create({ baseURL: 'http://localhost/api', headers: { - Authorization: `Bearer ${getToken()}`, + // Authorization: `Bearer ${getToken()}`, + Authorization : `Bearer ${localStorage.getItem("token")}` }, withCredentials: true, }); diff --git a/frontend/src/script/tokenSuccess.js b/react/src/script/tokenSuccess.js similarity index 80% rename from frontend/src/script/tokenSuccess.js rename to react/src/script/tokenSuccess.js index d1a136b4..09e08189 100644 --- a/frontend/src/script/tokenSuccess.js +++ b/react/src/script/tokenSuccess.js @@ -5,10 +5,11 @@ function SuccessToken() { const location = useLocation(); const { data } = queryString.parse(location.search); // localStorage data.token; - console.log(`prout token= ${data}`) - localStorage.setItem('token', `${data}`); + const cleanData = data.slice(1, -1); +// console.log(`prout token= ${cleanData}`) + localStorage.setItem('token', `${cleanData}`); console.log(`prout token2= ${localStorage.getItem('token')}`) -// window.location.replace("http://localhost/pong"); + window.location.replace("http://localhost/pong"); // return ( //
diff --git a/frontend/src/styles/App.css b/react/src/styles/App.css similarity index 100% rename from frontend/src/styles/App.css rename to react/src/styles/App.css diff --git a/frontend/src/styles/chat.css b/react/src/styles/chat.css similarity index 100% rename from frontend/src/styles/chat.css rename to react/src/styles/chat.css diff --git a/frontend/src/styles/field.css b/react/src/styles/field.css similarity index 100% rename from frontend/src/styles/field.css rename to react/src/styles/field.css diff --git a/frontend/src/styles/index.css b/react/src/styles/index.css similarity index 100% rename from frontend/src/styles/index.css rename to react/src/styles/index.css diff --git a/frontend/src/styles/old.css b/react/src/styles/old.css similarity index 100% rename from frontend/src/styles/old.css rename to react/src/styles/old.css