Replace type UserID with a structure

This commit is contained in:
2022-04-19 19:40:36 +02:00
parent feb6db09b9
commit 94aeefe450
8 changed files with 17 additions and 15 deletions

View File

@ -18,7 +18,7 @@ struct FindUserResult {
pub async fn find_username(req: web::Form<FindUserNameReq>, users: web::Data<Addr<UsersActor>>) -> impl Responder {
let res = users.send(FindUserByUsername(req.0.username)).await.unwrap();
HttpResponse::Ok().json(FindUserResult {
user_id: res.0.map(|r| r.uid)
user_id: res.0.map(|r| r.uid.0)
})
}

View File

@ -341,7 +341,7 @@ pub async fn token(req: HttpRequest,
// Generate id token
let id_token = IdToken {
issuer: app_config.website_origin.to_string(),
subject_identifier: session.user,
subject_identifier: session.user.0,
audience: session.client.0.to_string(),
expiration_time: session.access_token_expire_at,
issued_at: time(),
@ -499,7 +499,7 @@ async fn user_info(req: HttpRequest, token: Option<String>,
HttpResponse::Ok()
.json(OpenIDUserInfo {
name: user.full_name(),
sub: user.uid,
sub: user.uid.0,
given_name: user.first_name,
family_name: user.last_name,
preferred_username: user.username,