update bruno test

bruno/OpenData datatourisme/Google API.bru

@@ -0,0 +1,30 @@
+meta {
+  name: Google API
+  type: http
+  seq: 3
+}
+
+post {
+  url: https://places.googleapis.com/v1/places:searchNearby
+  body: json
+  auth: none
+}
+
+headers {
+  X-Goog-Api-Key: {{GOOGLE_API_KEY}}
+}
+
+body:json {
+  {
+    "includedTypes": ["restaurant"],
+    "maxResultCount": 10,
+    "locationRestriction": {
+      "circle": {
+        "center": {
+          "latitude": 37.7937,
+          "longitude": -122.3965},
+        "radius": 500.0
+      }
+    }
+  }
+}

bruno/OpenData datatourisme/environments/dev.bru

@@ -1,3 +1,4 @@
 vars:secret [
-  app_key
+  app_key,
+  GOOGLE_API_KEY
 ]

bruno/OpenData datatourisme/list oaut methode.bru

@@ -0,0 +1,11 @@
+meta {
+  name: list oaut methode
+  type: http
+  seq: 5
+}
+
+get {
+  url: https://pb-tweb.cb85.fr/api/collections/users/auth-methods
+  body: none
+  auth: none
+}

bruno/OpenData datatourisme/oauth test.bru

@@ -0,0 +1,18 @@
+meta {
+  name: oauth test
+  type: http
+  seq: 4
+}
+
+post {
+  url: https://pb-tweb.cb85.fr/api/collections/users/auth-with-oauth2
+  body: json
+  auth: none
+}
+
+body:json {
+  {
+    provider: "google"
+    
+  }
+}

front/.eslintignore

@@ -0,0 +1,8 @@
+node_modules
+
+out
+.next
+
+next-env.d.ts
+*.js
+__tests__

front/.eslintrc.json

@@ -0,0 +1,324 @@
+{
+	"env": {
+		"browser": true,
+		"es6": true,
+		"node": true
+	},
+	"extends": [
+		"eslint:recommended",
+		"plugin:astro/recommended",
+		"plugin:@typescript-eslint/strict",
+		"plugin:@typescript-eslint/stylistic"
+	],
+	"globals": {
+		"Atomics": "readonly",
+		"SharedArrayBuffer": "readonly"
+	},
+	"overrides": [
+		{
+			"files": [
+				"*.astro"
+			],
+			"parser": "astro-eslint-parser",
+			"parserOptions": {
+				"extraFileExtensions": [
+					".astro"
+				],
+				"parser": "@typescript-eslint/parser"
+			}
+		},
+		{
+			"files": [
+				"*.ts",
+				"*.tsx",
+				"*.astro"
+			],
+			"rules": {
+				"no-extra-parens": "off",
+				"no-unused-expressions": "off",
+				"no-shadow": "off",
+				"quotes": "off",
+				"semi": "off",
+				"space-before-function-paren": "off"
+			}
+		}
+	],
+	"parser": "@typescript-eslint/parser",
+	"parserOptions": {
+		"ecmaFeatures": {
+			"jsx": true,
+			"project": "tsconfig.json",
+			"sourceType": "module",
+			"ecmaVersion": 2018
+		}
+	},
+	"plugins": [
+		"@typescript-eslint"
+	],
+	"root": true,
+	"rules": {
+		"@typescript-eslint/prefer-for-of": "error",
+		"@typescript-eslint/prefer-function-type": "error",
+		"@typescript-eslint/prefer-namespace-keyword": "error",
+		"@typescript-eslint/space-before-function-paren": [
+			"error",
+			{
+				"anonymous": "never",
+				"asyncArrow": "always",
+				"named": "never"
+			}
+		],
+		"@typescript-eslint/triple-slash-reference": "error",
+		"@typescript-eslint/type-annotation-spacing": "error",
+		"@typescript-eslint/unified-signatures": "error",
+
+		"@typescript-eslint/adjacent-overload-signatures": "error",
+		"@typescript-eslint/array-type": [
+			"error",
+			{
+				"default": "generic"
+			}
+		],
+		"arrow-body-style": "error",
+		"arrow-parens": [
+			"error",
+			"always"
+		],
+		"@typescript-eslint/ban-types": [
+			"error",
+			{
+				"types": {
+					"{}": false
+				}
+			}
+		],
+		"complexity": [
+			"warn",
+			10
+		],
+		"@typescript-eslint/consistent-type-assertions": "error",
+		"@typescript-eslint/consistent-type-definitions": "error",
+		"constructor-super": "error",
+		"curly": "error",
+		"dot-notation": "error",
+		"eol-last": "error",
+		"eqeqeq": [
+			"error",
+			"smart"
+		],
+		"@typescript-eslint/explicit-member-accessibility": [
+			"error",
+			{
+				"accessibility": "explicit"
+			}
+		],
+		"for-direction": "error",
+		"getter-return": "error",
+		"guard-for-in": "error",
+		"id-blacklist": [
+			"error",
+			"any",
+			"Number",
+			"number",
+			"String",
+			"string",
+			"Boolean",
+			"boolean",
+			"Undefined"
+		],
+		"id-length": [
+			"warn",
+			{
+				"exceptions": [
+					"_"
+				]
+			}
+		],
+		"id-match": "error",
+		"indent": [
+			"error",
+			"tab",
+			{
+				"SwitchCase": 1
+			}
+		],
+		"linebreak-style": [
+			"error",
+			"unix"
+		],
+		"max-classes-per-file": [
+			"error",
+			1
+		],
+		"max-depth": [
+			"warn",
+			2
+		],
+		"max-len": [
+			"warn",
+			{
+				"code": 256
+			}
+		],
+		"@typescript-eslint/member-delimiter-style": [
+			"error",
+			{
+				"multiline": {
+					"delimiter": "none",
+					"requireLast": true
+				},
+				"singleline": {
+					"delimiter": "comma",
+					"requireLast": false
+				}
+			}
+		],
+		"@typescript-eslint/member-ordering": "error",
+		"new-parens": "error",
+
+		"no-async-promise-executor": "error",
+		"no-await-in-loop": "warn",
+		"no-bitwise": "error",
+		"no-caller": "error",
+		"no-compare-neg-zero": "error",
+		"no-cond-assign": "error",
+		"no-console": "off",
+		"no-constant-condition": "error",
+		"no-control-regex": "warn",
+		"no-debugger": "error",
+		"no-delete-var": "error",
+		"no-dupe-args": "error",
+		"no-dupe-else-if": "error",
+		"no-dupe-keys": "error",
+		"no-duplicate-case": "error",
+		"no-empty": [
+			"error",
+			{
+				"allowEmptyCatch": true
+			}
+		],
+		"no-empty-character-class": "error",
+		"@typescript-eslint/no-empty-function": "error",
+		"@typescript-eslint/no-empty-interface": "error",
+		"no-eval": "error",
+		"no-ex-assign": "error",
+		"@typescript-eslint/no-explicit-any": "off",
+
+
+		"no-extra-boolean-cast": "error",
+		"no-extra-parens": "off",
+		"@typescript-eslint/no-extra-parens": [
+			"error",
+			"all",
+			{
+				"ignoreJSX": "all"
+			}
+		],
+		"no-extra-semi": "error",
+		"no-fallthrough": "off",
+		"no-func-assign": "error",
+		"no-import-assign": "error",
+		"no-inner-declarations": "error",
+		"no-invalid-regexp": "error",
+		"no-irregular-whitespace": "error",
+		"no-label-var": "error",
+		"no-loss-of-precision": "error",
+		"no-misleading-character-class": "error",
+		"@typescript-eslint/no-misused-new": "error",
+		"no-multiple-empty-lines": "error",
+		"@typescript-eslint/no-namespace": "error",
+		"no-new-wrappers": "error",
+		"no-obj-calls": "error",
+		"no-promise-executor-return": "error",
+		"@typescript-eslint/no-parameter-properties": "off",
+		"no-prototype-builtins": "error",
+		"no-regex-spaces": "error",
+		"no-setter-return": "error",
+		"@typescript-eslint/no-shadow": "error",
+		"no-shadow": [
+			"error",
+			{
+				"builtinGlobals": false,
+				"hoist": "all"
+			}
+		],
+		"no-shadow-restricted-names": "error",
+		"no-sparse-arrays": "error",
+		"no-template-curly-in-string": "warn",
+		"no-throw-literal": "error",
+		"no-trailing-spaces": "error",
+		"no-undef": "error",
+		"no-undef-init": "error",
+		"no-underscore-dangle": "off",
+		"no-unexpected-multiline": "error",
+		"no-unreachable": "warn",
+		"no-unreachable-loop": "warn",
+		"no-unsafe-finally": "error",
+		"no-unsafe-negation": "error",
+		"no-unsafe-optional-chaining": "error",
+		"no-unused-expressions": [
+			"error",
+			{
+				"allowTernary": true
+			}
+		],
+		"@typescript-eslint/no-unused-expressions": [
+			"error",
+			{
+				"allowTernary": true
+			}
+		],
+		"no-unused-labels": "error",
+		"no-unused-vars": "off",
+		"@typescript-eslint/no-unused-vars": ["error", {
+			"args": "all",
+			"argsIgnorePattern": "^_",
+			"caughtErrors": "all",
+			"caughtErrorsIgnorePattern": "^_",
+			"destructuredArrayIgnorePattern": "^_",
+			"varsIgnorePattern": "^_",
+			"ignoreRestSiblings": true
+		}],
+		"@typescript-eslint/no-non-null-assertion": ["warn"],
+		"no-var": "error",
+		"object-shorthand": [
+			"warn",
+			"methods"
+		],
+		"one-var": [
+			"error",
+			"never"
+		],
+		"prefer-const": "error",
+		"quote-props": [
+			"error",
+			"consistent-as-needed"
+		],
+		"quotes": "off",
+		"@typescript-eslint/quotes": [
+			"error",
+			"single",
+			{
+				"avoidEscape": true
+			}
+		],
+		"radix": "error",
+		"require-atomic-updates": "warn",
+		"semi": "off",
+		"@typescript-eslint/semi": [
+			"error",
+			"never"
+		],
+		"space-before-function-paren": [
+			"error",
+			{
+				"anonymous": "never",
+				"asyncArrow": "always",
+				"named": "never"
+			}
+		],
+		"spaced-comment": ["error", "always", { "block": { "exceptions": ["*"] } }],
+		"use-isnan": "error",
+		"valid-typeof": "warn"
+	}
+}

front/.vscode/settings.json

@@ -0,0 +1,9 @@
+{
+	"editor.quickSuggestions": {
+		"strings": "on"
+	},
+	"tailwindCSS.includeLanguages": {
+		"astro": "html"
+	},
+	"typescript.tsdk": "node_modules/typescript/lib"
+}

front/astro.config.mjs

@@ -1,30 +1,29 @@
-import { defineConfig } from 'astro/config';
-import node from '@astrojs/node';
-import tailwind from "@astrojs/tailwind";
+import node from '@astrojs/node'
+import tailwind from '@astrojs/tailwind'
+import { defineConfig } from 'astro/config'
 
-import react from "@astrojs/react";
+import react from '@astrojs/react'
 
 // https://astro.build/config
 export default defineConfig({
-  // integrations: [tailwind(), test, routing(), version(), buildInfos()],
-  compressHTML: true,
-  build: {
-    assets: 'assets',
-    inlineStylesheets: 'auto'
-  },
-  server: {
-    host: true,
-    port: 3000
-  },
-  trailingSlash: 'never',
-  output: 'server',
-  adapter: node({
-    mode: 'standalone'
-  }),
-  integrations: [tailwind(), react()],
-  vite: {
-    optimizeDeps: {
-      include: ['leaflet']
-    }
-  }
-});
+	compressHTML: true,
+	build: {
+		assets: 'assets',
+		inlineStylesheets: 'auto'
+	},
+	server: {
+		host: true,
+		port: 3000
+	},
+	trailingSlash: 'never',
+	output: 'server',
+	adapter: node({
+		mode: 'standalone'
+	}),
+	integrations: [tailwind(), react()],
+	vite: {
+		optimizeDeps: {
+			include: ['leaflet']
+		}
+	}
+})

front/package.json

@@ -19,6 +19,7 @@
     "@types/react": "^18.2.79",
     "@types/react-dom": "^18.2.25",
     "astro": "4.5.12",
+    "cross-fetch": "^4.0.0",
     "leaflet": "^1.9.4",
     "lucide-astro": "^0.372.0",
     "pocketbase": "^0.21.1",
@@ -27,10 +28,11 @@
     "react-leaflet": "^4.2.1",
     "simple-icons-astro": "^11.12.0",
     "tailwindcss": "^3.4.3",
-    "typescript": "^5.2.2"
+    "typescript": "^5"
   },
   "devDependencies": {
     "@astrojs/check": "^0",
+    "@astrojs/ts-plugin": "^1.6.1",
     "@types/leaflet": "^1.9.12",
     "@types/node": "^20",
     "@typescript-eslint/eslint-plugin": "^6.21.0",
@@ -38,6 +40,7 @@
     "@vitest/coverage-v8": "^1",
     "eslint": "^8.57.0",
     "eslint-plugin-astro": "^0.31.4",
+    "eslint-plugin-jsx-a11y": "^6.8.0",
     "typescript": "^5",
     "vitest": "^1"
   }

front/src/env.d.ts

@@ -1 +1,32 @@
+/// <reference path="../.astro/types.d.ts" />
 /// <reference types="astro/client" />
+
+import PocketBase from 'pocketbase'
+export interface ImportMetaEnv {
+    NODE_ENV: string
+    APP_URL: string
+
+    POCKETBASE_URL: string
+
+	GOOGLE_API_KEY: string
+}
+
+interface ImportMeta {
+	readonly env: ImportMetaEnv
+}
+
+
+// declare namespace App {
+// 	interface Locals {
+// 		pb: PocketBase
+// 	}
+// }
+
+
+declare global {
+    namespace App {
+        interface Locals {
+			pb: PocketBase
+        }
+    }
+}

front/src/layouts/Layout.astro

@@ -19,33 +19,4 @@ const { title } = Astro.props;
 	<body>
 		<slot />
 	</body>
-</html>
-<style is:global>
-	:root {
-		--accent: 136, 58, 234;
-		--accent-light: 224, 204, 250;
-		--accent-dark: 49, 10, 101;
-		--accent-gradient: linear-gradient(
-			45deg,
-			rgb(var(--accent)),
-			rgb(var(--accent-light)) 30%,
-			white 60%
-		);
-	}
-	html {
-		font-family: system-ui, sans-serif;
-		background: #13151a;
-		background-size: 224px;
-	}
-	code {
-		font-family:
-			Menlo,
-			Monaco,
-			Lucida Console,
-			Liberation Mono,
-			DejaVu Sans Mono,
-			Bitstream Vera Sans Mono,
-			Courier New,
-			monospace;
-	}
-</style>
+</html>

front/src/libs/AstroUtils.ts

@@ -0,0 +1,5 @@
+export default class AstroUtils {
+	public static async wrap<T = void>(fn: () => T | Promise<T>) {
+		return await fn()
+	}
+}

front/src/libs/AuthUtils.ts

@@ -1,12 +0,0 @@
-
-//référence a loop
-//fonction get user pour récupéré un utilisateur (notament coté client)
-//sessionID = JWS
-
-
-//fonction set user crée un cookies de session
-//passé le cookies astro dans les paramètre
-
-//utiliser cookie.set pour crée un nouveau cookies
-
-

front/src/libs/Env.ts

@@ -0,0 +1,17 @@
+import type { ImportMetaEnv } from 'env'
+
+/**
+ * Get the environment variable
+ *
+ * @param key the env variable key
+ * @param defaultValue a default value if applicable
+ * @returns the environment value or undefined if not found
+ */
+export function getEnv(key: keyof ImportMetaEnv, defaultValue: string): string
+export function getEnv(key: keyof ImportMetaEnv, defaultValue?: string | undefined): string | undefined
+export function getEnv(key: keyof ImportMetaEnv, defaultValue?: string | undefined): string | undefined {
+	// get the env variable through Astro > NodeJS > input
+	const res = import.meta.env[key] ?? process.env[key] ?? defaultValue
+
+	return res ?? undefined
+}

front/src/middleware/index.ts

@@ -0,0 +1,27 @@
+import PocketBase from 'pocketbase'
+
+import { defineMiddleware } from 'astro/middleware'
+import { getEnv } from 'libs/Env'
+
+export const onRequest = defineMiddleware(async ({ locals, request }: any, next: () => any) => {
+	locals.pb = new PocketBase(getEnv('POCKETBASE_URL','http://localhost:8080'))
+
+	// load the store data from the request cookie string
+	locals.pb.authStore.loadFromCookie(request.headers.get('cookie') || '')
+
+	try {
+		// get an up-to-date auth store state by verifying and refreshing the loaded auth model (if any)
+		// eslint-disable-next-line @typescript-eslint/no-unused-expressions
+		locals.pb.authStore.isValid && await locals.pb.collection('users').authRefresh()
+	} catch (_) {
+		// clear the auth store on failed refresh
+		locals.pb.authStore.clear()
+	}
+
+	const response = await next()
+
+	// send back the default 'pb_auth' cookie to the client with the latest store state
+	response.headers.append('set-cookie', locals.pb.authStore.exportToCookie())
+
+	return response
+})

front/src/pages/account/index.astro

@@ -0,0 +1,21 @@
+---
+import Layout from 'layouts/Layout.astro'
+import PocketBase from 'pocketbase'
+
+
+const pb = Astro.locals.pb
+const auth = pb.authStore
+const user = auth.model
+
+if(!auth.isValid){
+    return Astro.redirect("/account/login");
+}
+
+---
+
+<Layout title="Account setting">
+    <h1>Bonjour {user!.name}</h1>
+    <div>
+        <a href="/account/logout">deconnexion</a>
+    </div>
+</Layout>

front/src/pages/account/login.astro

@@ -0,0 +1,40 @@
+---
+import Layout from "layouts/Layout.astro";
+import AstroUtils from "libs/AstroUtils";
+import PocketBase from 'pocketbase'
+
+
+const pb = Astro.locals.pb
+
+if(pb.authStore.isValid){
+    return Astro.redirect("/account")
+}
+
+const res = await AstroUtils.wrap(async () => {
+    if (Astro.request.method !== 'POST') {
+        return
+    }    
+    const form = await Astro.request.formData();
+    const request = {
+        user: form.get("username") as string,
+        password: form.get("password") as string
+    }
+
+    try {
+        await pb.collection('users').authWithPassword(request.user,request.password);
+        return Astro.redirect("/account")
+    } catch (error) {
+        console.log(error)
+        console.warn('user password is incorrect')
+        return Astro.redirect("/account/login");// route('/account/login', {message: 'Compte invalide, valider les identifiants'})) //XXX: comprendre comment le system de route fonctionne
+    }
+})
+---
+
+<Layout title="login">
+    <form id="account-creation" method="post" enctype="multipart/form-data">
+        <input required name="username" placeholder="Pseudo ou email"/>
+        <input required name="password" type="password" placeholder="Mot de passe" />
+        <button>Connection</button>
+    </form>
+</Layout>

front/src/pages/account/logout.astro

@@ -0,0 +1,13 @@
+---
+import PocketBase from 'pocketbase'
+
+
+const pb = Astro.locals.pb
+
+if(pb.authStore.isValid){
+    pb.authStore.clear()
+}
+
+return Astro.redirect('/account/login')
+
+---

front/src/pages/account/register.astro

@@ -0,0 +1,75 @@
+---
+import Layout from 'layouts/Layout.astro';
+import AstroUtils from 'libs/AstroUtils';
+
+const pb = Astro.locals.pb
+
+const oauths = await pb.collection('users').listAuthMethods();
+
+if(pb.authStore.isValid){
+    return Astro.redirect("/account")
+}
+
+await AstroUtils.wrap(async () => {
+    if (Astro.request.method !== 'POST'){
+        return
+    }
+    const form = await Astro.request.formData()
+    if(form.get("type") == "userPassword"){
+        const request = {
+            username: form.get("username") as string,
+            name: form.get("name") as string,
+            email: form.get("email") as string,
+            password: form.get("password") as string,
+            passwordConfirm: form.get("passwordConfirm") as string,
+        }
+        try{
+            await pb.collection('users').create(request)
+            return Astro.redirect('/account/login')
+        }catch(e){
+            console.log(e);
+        }
+    }else if (form.get("type") == "discord2FA") {
+        // console.log("pouet")
+        // await pb.collection('user').authWithOAuth2({provider: 'discord'})
+        // console.log("pouetF");
+        
+    }else{
+        Astro.redirect("/404")
+    }
+})
+---
+
+<Layout title="register">
+    <form id="account-creation" method="post" enctype="multipart/form-data">
+        <input type="hidden" name="type" value="userPassword">
+        <input required name="name" placeholder="Prénom Nom"/>
+        <input required name="username" placeholder="Pseudo"/>
+        <input required name="email" type="email" placeholder="Renseignez votre email" />
+        <input required name="password" type="password" placeholder="Créez un mot de passe" />
+        <input required name="passwordConfirm" type="password" placeholder="Confirmer votre mot de passe" />
+        <button>Créer un compte</button>
+    </form>
+
+    <button id="OauthDiscord">connexion avec discord</button>
+    <form method="post" enctype="multipart/form-data">
+        <input type="hidden" name="type" value="discord2FA">
+    </form>
+    <a href={oauths.authProviders[1].authUrl + "https%3A%2F%2Fpb-tweb.cb85.fr%2Fapi%2Foauth2-redirect"}>discord?</a>
+</Layout>
+
+<script>
+    import 'cross-fetch/polyfill';
+    import PocketBase from "pocketbase"
+    import type { OAuth2UrlCallback } from "pocketbase"
+    const pb = new PocketBase("https://pb-tweb.cb85.fr/")
+    const discordBtn = document.querySelector<HTMLButtonElement>("#OauthDiscord")
+    
+    if (discordBtn) {
+        discordBtn.addEventListener('click', async () =>{
+            const result = await pb.collection('users').listAuthMethods();
+            fetch(result.authProviders[0].authUrl)
+            console.log(result);
+        })
+    }
+</script>

front/tsconfig.json

@@ -5,4 +5,7 @@
 		// hide an issue with typescript
 		"noUnusedLocals": false
 	},
+	"ts-node": {
+		"esm": true
+	}
 }