Skip to content

vingo: Use "bestuur" Role to Check Admin #131

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.

Sign up for GitHub

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

Merged
hanneskt merged 2 commits into from
Sep 28, 2026
Merged

vingo: Use "bestuur" Role to Check Admin #131

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b991c06
vingo: Use "bestuur" Role to Check Admin
Thegamefire Sep 23, 2026
6713edd
vingo: Fix Ask Scopes When Requesting Authorization
Thegamefire Sep 28, 2026
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
8 changes: 5 additions & 3 deletions vingo/src/routes/auth.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ pub async fn login(session: Session) -> ResponseResult<Redirect> {
let zauth_url = ZAUTH_URL.to_string();
let callback_url = CALLBACK_URL.to_string();
let zauth_client_id = ZAUTH_CLIENT_ID.to_string();
Ok(Redirect::to(&format!("{zauth_url}/oauth/authorize?client_id={zauth_client_id}&response_type=code&state={state}&redirect_uri={callback_url}")))
Ok(Redirect::to(&format!("{zauth_url}/oauth/authorize?client_id={zauth_client_id}&scope=roles&response_type=code&state={state}&redirect_uri={callback_url}")))
}

pub async fn logout(session: Session) -> ResponseResult<Json<bool>> {
Expand All @@ -70,6 +70,7 @@ pub struct ZauthToken {
pub struct ZauthUser {
id: i32,
username: String,
roles: Vec<String>,
}

pub async fn callback(
Expand Down Expand Up @@ -135,15 +136,16 @@ pub async fn callback(
let db_user = user::ActiveModel {
id: Set(zauth_user.id),
name: Set(zauth_user.username),
admin: Set(false), // cant insert if not set, even if default
admin: Set(zauth_user.roles.contains(&String::from("bestuur"))), // cant insert if not set, even if default
created_at: Set(Local::now().into()),
};

// update name if user already exists
// update name & admin state if user already exists
let db_user = User::insert(db_user.clone())
.on_conflict(
OnConflict::column(user::Column::Id)
.update_column(user::Column::Name)
.update_column(user::Column::Admin)
.to_owned(),
)
.exec_with_returning(&state.db)
Expand Down
Loading