WIP: OAuth + RBAC #234

Draft

ariasat wants to merge 17 commits from oauth into main

pull from: oauth

merge into: bottin:main

bottin:main

bottin:htmx_refactor

bottin:transaction_htmx

bottin:signalment_htmx

bottin:plura

bottin:export_caisse

Conversation 0 Commits 17 Files changed 35 +1112 -42

ariasat commented 2026-06-11 16:47:00 -04:00

Member

Copy link

closes #123

closes #123

ariasat added 4 commits 2026-06-11 16:47:00 -04:00

feature: ajout de oauth package 54199cf021

feature: auth.go pour fonctionnement de oauth ffb8f379ed

feature: envs, config et flags pour oauth 7e4baa035f

feature: ajout de auth dans server.go et enlevement de basicAuth 4067a7f4c9

ariasat changed title from OAuth + RBAC to WIP: OAuth + RBAC 2026-06-11 16:47:20 -04:00

ariasat added 3 commits 2026-06-12 11:09:04 -04:00

feature: ui pour logout a3bf0584a8

refactor: delete auth.go bouge les methodes dans middleware et handler 25d9af7656

feature: table users et CRUD queries 017a6fb73c

ariasat added 1 commit 2026-06-12 11:40:14 -04:00

feature: api pour CRUD users 215dda153d

ariasat added 1 commit 2026-06-12 11:41:51 -04:00

Merge branch 'main' into oauth fad958732c

ariasat added 3 commits 2026-06-12 13:17:14 -04:00

refactor: CRUD handlers users avec nouveau helpers 7f6114484c

feature: appel clients et seed pour users 677f449926

feature: client tests pour CRUD users d32846c749

ariasat added 3 commits 2026-06-12 15:59:34 -04:00

fix: courriel dans users est unique d03a40ba15

feature: callbackHandler verifie si utilisateurs existe dans la table users a32c632ea6

feature: RBAC avec requireRole dans middleware.go aa2ba9ffe0

ariasat added 2 commits 2026-06-12 17:38:55 -04:00

feature: ajout du email et role dans ui sidebar b703eefc91

progress: readme doc pour auth 79e32816c9

This pull request has changes conflicting with the target branch.

• entity.go
• response.go
• route.go
• server.go

View command line instructions

Manual merge helper

Use this merge commit message when completing the merge manually.

Merge commit title Merge pull request 'WIP: OAuth + RBAC' (#234) from oauth into main

Merge commit body Reviewed-on: https://git.agecem.com/bottin/cms/pulls/234

Merge pull request 'WIP: OAuth + RBAC' (#234) from oauth into main Reviewed-on: https://git.agecem.com/bottin/cms/pulls/234 Copy merge commit message

Checkout

From your project repository, check out a new branch and test the changes.

git fetch -u origin oauth:oauth

git switch oauth

Merge

Merge the changes and update on Forgejo.

Warning: The "Autodetect manual merge" setting is not enabled for this repository, you will have to mark this pull request as manually merged afterwards.

git switch main

git merge --no-ff oauth

git switch oauth

git rebase main

git switch main

git merge --ff-only oauth

git switch oauth

git rebase main

git switch main

git merge --no-ff oauth

git switch main

git merge --squash oauth

git switch main

git merge --ff-only oauth

git switch main

git merge oauth

git push origin main

Sign in to join this conversation.

Reviewers

No reviewers

Labels

Clear labels   

bug

Something is not working

  

duplicate

This issue or pull request already exists

  

enhancement

New feature

  

help wanted

Need some help

  

Important

  

invalid

Something is wrong

  

MVP

  

nice to have

  

optional

  

question

More information is needed

  

wontfix

This won't be fixed

No labels

bug

duplicate

enhancement

help wanted

Important

invalid

MVP

nice to have

optional

question

wontfix

Milestone

Clear milestone

No items

No milestone

Projects

Clear projects

No items

No project

Assignees

Clear assignees

No assignees

1 participant

Notifications

Subscribe

Due date

The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set.

Reference

bottin/cms!234

No description provided.