Epitech/ratrapage_T-WEB
1
0
Fork 0
Code Issues Pull Requests 2 Actions Packages Projects Releases 1 Wiki Activity

fix: correction prod docker #15

Merged
Clement merged 1 commits from fix/-correction-prod into master 2024-05-21 08:40:14 +00:00
Conversation 1 Commits 1 Files Changed 3 +2 -8
3 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 7fbdb16462 - Show all commits

3
Express/barAndCafe/Dockerfile
View File

@ -47,7 +47,8 @@ WORKDIR /home/node
EXPOSE 3000 EXPOSE 3000
# Add Healthcheck # Add Healthcheck
HEALTHCHECK --interval=10s --timeout=10s --start-period=5s --retries=3 CMD wget --no-verbose --tries=1 --spider http://localhost:3000 || exit 1 # FIXME: faire en sorte que le healthcheck fonctionne
# HEALTHCHECK --interval=10s --timeout=10s --start-period=5s --retries=3 CMD wget --no-verbose --tries=1 --spider http://localhost:3000 || exit 1
# copy from build image # copy from build image
COPY --chown=node:node --from=BUILD_IMAGE /home/node/node_modules ./node_modules COPY --chown=node:node --from=BUILD_IMAGE /home/node/node_modules ./node_modules

1
Express/barAndCafe/src/openTripMaps.ts
View File

@ -190,4 +190,3 @@ export async function getBox(req:express.Request, res: express.Response) {
res.send( await callBox(lon1, lat1, lon2, lat2)) res.send( await callBox(lon1, lat1, lon2, lat2))
} }
//TODO: fair une route ou l'on donne 2 coordonée

6
front/src/pages/account/oauth.astro
View File

@ -4,9 +4,6 @@ const redirectUrl = Astro.url.protocol + "//" + Astro.url.host + '/account/oauth
const params = Astro.url.searchParams const params = Astro.url.searchParams
const code = params.get('code') const code = params.get('code')
console.log(redirectUrl)
console.log(Astro.request.headers.get('cookie'))
//TODO socké dans les cookies
// load the previously stored provider's data // load the previously stored provider's data
const providerstr = Astro.cookies.get('provider') const providerstr = Astro.cookies.get('provider')
@ -42,9 +39,6 @@ await pb.collection('users').authWithOAuth2Code(
).then((authData) => { ).then((authData) => {
//REDIRECT //REDIRECT
console.log("oauth OK !!"); console.log("oauth OK !!");
console.log(JSON.stringify(authData, null, 2));
console.log(pb.authStore.isValid);
console.log(pb.authStore.isValid);
authenticated = true authenticated = true
}).catch((err) => { }).catch((err) => {
console.log("oauth fail !!"); console.log("oauth fail !!");