Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Connexion à l'espace utilisateur (mode distant) #421

Draft
wants to merge 32 commits into
base: main
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
32 commits
Select commit Hold shift + click to select a range
7fb737c
test sso
lowzonenose Oct 30, 2024
711b00f
impl. iam
lowzonenose Oct 31, 2024
f6d2fe5
Merge branch 'main' into feature/connexion
lowzonenose Oct 31, 2024
0f31c4c
Environnement + fonction generique fetch
lowzonenose Nov 3, 2024
6453a05
gestion env + https
lowzonenose Nov 4, 2024
6e6615b
mode bouchon en attendant de resoudre le token
lowzonenose Nov 5, 2024
0419bfd
refactor avec routes Login & Logout
lowzonenose Nov 11, 2024
ade1b17
refactor
lowzonenose Nov 13, 2024
11d1d75
Mode mock sur les appels IAM ou API
lowzonenose Nov 15, 2024
5c0ed38
Merge branch 'main' into feature/connexion
lowzonenose Nov 15, 2024
75d1ec2
Storage session token
lowzonenose Nov 15, 2024
218507a
Service User
lowzonenose Nov 18, 2024
8750f93
Menu des favoris
lowzonenose Nov 18, 2024
a332341
Merge branch 'main' into feature/connexion
lowzonenose Nov 22, 2024
8bc8565
Fix
lowzonenose Nov 26, 2024
e456289
Fix server vite + server aleternatif
lowzonenose Nov 26, 2024
df27cef
Fix response UsersMe
lowzonenose Nov 27, 2024
fea010e
utilisation du client oauth2
lowzonenose Dec 3, 2024
e118f32
Optimisation du code
lowzonenose Dec 3, 2024
790e0cd
fix header ref
lowzonenose Dec 3, 2024
f00a438
fix header ref
lowzonenose Dec 3, 2024
1b2447e
Merge branch 'main' into feature/connexion
lowzonenose Dec 3, 2024
0b92502
Fix garde la connexion sur plusieurs onglets
lowzonenose Dec 7, 2024
bd75b7d
fix masque l'utilisateur si souci de connexion
lowzonenose Dec 7, 2024
a362712
Fix message type alerte (warning) si exception dans la connexion
lowzonenose Dec 7, 2024
79191bd
Fix message type alerte (error)
lowzonenose Dec 7, 2024
fb19189
Secrets de connexion pour le deploiement sur la demo et docker
lowzonenose Dec 8, 2024
13a8e6b
Cohabiter les 2 modes d'authentification : local et remote (cartes.go…
lowzonenose Dec 11, 2024
539c749
fixme pour le refreshtoken
lowzonenose Dec 11, 2024
50914ce
token expire 12h..., refresh ?
lowzonenose Dec 12, 2024
4bec864
Fix logout
lowzonenose Dec 13, 2024
0b3e6a7
fix sur l'appel d'un nouveau token
lowzonenose Dec 13, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/build-site.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:
run: npm install

- name: Build
run: npm run build-only -- --mode=demo
run: IAM_CLIENT_ID=${{ secrets.IAM_CLIENT_ID }} IAM_CLIENT_SECRET=${{ secrets.IAM_CLIENT_SECRET }} npm run build-only -- --mode=demo

- name: Upload Binary artifacts
uses: actions/upload-artifact@v4
Expand Down
3 changes: 3 additions & 0 deletions .github/workflows/docker-build-publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,9 @@ jobs:
context: .
file: .docker/Dockerfile
build-args: MODE_ENV=production
secrets: |
"IAM_CLIENT_ID=${{ secrets.IAM_CLIENT_ID }}"
"IAM_CLIENT_SECRET=${{ secrets.IAM_CLIENT_SECRET }}"
pull: true
push: true
tags: ${{ steps.meta.outputs.tags }}
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -243,6 +243,7 @@ web_modules/
.env.test.local
.env.production.local
.env.local
.env.*.local

# parcel-bundler cache (https://parceljs.org/)
.cache
Expand Down
3 changes: 3 additions & 0 deletions DRAFT_CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@ Version 1.0.1 de l'entrée cartographique de la Géoplateforme.

#### [Ajout]

* Ajout d'un module de connexion à la GeoPlateforme [#361](https://github.com/IGNF/cartes.gouv.fr-entree-carto/pull/361)

* Ajout du widget d'import de données [#324](https://github.com/IGNF/cartes.gouv.fr-entree-carto/pull/324)

* Ajout du widget de getFeatureInfo pour récupérer les informations attributaires des couches au clic [#354](https://github.com/IGNF/cartes.gouv.fr-entree-carto/pull/354)
Expand Down Expand Up @@ -53,4 +55,5 @@ Version 1.0.1 de l'entrée cartographique de la Géoplateforme.
* Ouverture responsive des panels des widgets sur petits écrans [#360](https://github.com/IGNF/cartes.gouv.fr-entree-carto/pull/360)

#### 🔒 [Sécurité]

---
8 changes: 8 additions & 0 deletions env/.env.development
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,14 @@ VITE_GPF_CONF_TECH_URL="https://raw.githubusercontent.com/IGNF/geoportal-configu
VITE_GPF_CONF_EDITO_URL="data/edito.json"
VITE_GPF_BASE_URL_EXTERNAL=

VITE_HTTP_MOCK_REQUEST=0
VITE_HTTP_MOCK_REQUEST_SCENARIO=error # success|error

IAM_URL="https://sso.geopf.fr"
IAM_REALM="geoplateforme"
IAM_CLIENT_ID=
IAM_CLIENT_SECRET=

# variable non lu nativement par vitejs
# uniquement pour information par nodejs lors du build
# ex. BASE_URL="/carto" npm run build-only
Expand Down
10 changes: 9 additions & 1 deletion env/.env.production
Original file line number Diff line number Diff line change
@@ -1,8 +1,16 @@
# variables are statically replaced at build time !
VITE_GPF_CONF_TECH_URL="https://raw.githubusercontent.com/IGNF/geoportal-configuration/new-url/dist/fullConfig.json"
VITE_GPF_CONF_EDITO_URL="data/edito.json"
VITE_GPF_CONF_EDITO_URL="https://data.geopf.fr/annexes/cartes.gouv.fr-config/public/edito.json"
VITE_GPF_BASE_URL_EXTERNAL=

VITE_HTTP_MOCK_REQUEST=0
VITE_HTTP_MOCK_REQUEST_SCENARIO=error # success|error

IAM_URL="https://sso.geopf.fr"
IAM_REALM="geoplateforme"
IAM_CLIENT_ID=
IAM_CLIENT_SECRET=

# variable non lu nativement par vitejs
# uniquement pour information par nodejs lors du build
# ex. BASE_URL="/carto" npm run build-only
Expand Down
13 changes: 12 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,8 @@
"format": "eslint ./src --fix",
"lint": "eslint ./src",
"preview": "vite preview",
"type-check": "vue-tsc --build --force"
"type-check": "vue-tsc --build --force",
"serve": "BASE_URL=/ vite build --mode stage && serve -s dist/"
},
"dependencies": {
"@gouvfr/dsfr": "^1.11.2",
Expand All @@ -44,15 +45,18 @@
"@vueuse/core": "^10.9.0",
"geopf-extensions-openlayers": "./geopf-extensions-openlayers-1.0.0-beta.0-291.tgz",
"ol": "8.2.0",
"serve": "^14.2.4",
"vue": "^3.4.21",
"vue-router": "^4.3.0"
},
"devDependencies": {
"@antfu/eslint-config": "2.21.3",
"@badgateway/oauth2-client": "^2.4.2",
"@rushstack/eslint-patch": "^1.6.0",
"@tsconfig/node20": "^20.1.2",
"@types/jsdom": "^21.1.6",
"@types/node": "^20.10.4",
"@vitejs/plugin-basic-ssl": "^1.1.0",
"@vitejs/plugin-vue": "^5.0.0",
"@vitejs/plugin-vue-jsx": "^3.1.0",
"@vue/eslint-config-typescript": "^13.0.0",
Expand All @@ -62,9 +66,11 @@
"eslint-plugin-vue": "^9.19.2",
"focus-trap": "^7.5.4",
"focus-trap-vue": "^4.0.3",
"msw": "2.6.4",
"npm-run-all2": "^6.1.2",
"oh-vue-icons": "1.0.0-rc3",
"pinia": "^2.1.7",
"pinia-plugin-store": "^2.2.9",
"rimraf": "^5.0.5",
"sass": "^1.76.0",
"typescript": "~5.4.0",
Expand All @@ -75,5 +81,10 @@
"vue-logger-plugin": "^2.2.3",
"vue-router": "^4.3.0",
"vue-tsc": "^2.0.6"
},
"msw": {
"workerDirectory": [
"./public"
]
}
}
Loading