fix errors
This commit is contained in:
parent
198858de3e
commit
512080c131
|
@ -1,6 +1,6 @@
|
||||||
CREATE TABLE IF NOT EXISTS gitea_tokens
|
CREATE TABLE IF NOT EXISTS gitea_tokens
|
||||||
( id UUID DEFAULT uuid_generate_v4() NOT NULL
|
( id UUID DEFAULT uuid_generate_v4() NOT NULL
|
||||||
, user_id UUID
|
, user_id UUID NOT NULL
|
||||||
, access_token VARCHAR NOT NULL
|
, access_token VARCHAR NOT NULL
|
||||||
, refresh_token VARCHAR NOT NULL
|
, refresh_token VARCHAR NOT NULL
|
||||||
, PRIMARY KEY (id)
|
, PRIMARY KEY (id)
|
||||||
|
|
14
src/main.rs
14
src/main.rs
|
@ -68,8 +68,7 @@ fn gitea_callback(
|
||||||
.limit(1)
|
.limit(1)
|
||||||
.load::<models::User>(&*conn)
|
.load::<models::User>(&*conn)
|
||||||
{
|
{
|
||||||
Ok(u) => u[0].clone(),
|
Ok(u) => if u.len() == 0 {
|
||||||
Err(why) => {
|
|
||||||
let u = models::User {
|
let u = models::User {
|
||||||
id: uuid::Uuid::new_v4(),
|
id: uuid::Uuid::new_v4(),
|
||||||
salutation: gitea_user.full_name,
|
salutation: gitea_user.full_name,
|
||||||
|
@ -79,7 +78,7 @@ fn gitea_callback(
|
||||||
tier: 0,
|
tier: 0,
|
||||||
};
|
};
|
||||||
|
|
||||||
diesel::insert_into(users_table)
|
let u: models::User = diesel::insert_into(users_table)
|
||||||
.values(&u)
|
.values(&u)
|
||||||
.get_result(&*conn)
|
.get_result(&*conn)
|
||||||
.expect("able to insert user");
|
.expect("able to insert user");
|
||||||
|
@ -91,12 +90,19 @@ fn gitea_callback(
|
||||||
refresh_token: refresh,
|
refresh_token: refresh,
|
||||||
};
|
};
|
||||||
|
|
||||||
diesel::insert_into(gitea_tokens::table)
|
let _: models::GiteaToken = diesel::insert_into(gitea_tokens::table)
|
||||||
.values(&tok)
|
.values(&tok)
|
||||||
.get_result(&*conn)
|
.get_result(&*conn)
|
||||||
.expect("able to insert token");
|
.expect("able to insert token");
|
||||||
|
|
||||||
u
|
u
|
||||||
|
} else {
|
||||||
|
tracing::info!("{} {:?} logged in", u[0].id, u[0].salutation);
|
||||||
|
u[0].clone()
|
||||||
|
},
|
||||||
|
Err(why) => {
|
||||||
|
tracing::error!("error reading from database: {}", why);
|
||||||
|
todo!("error response")
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
table! {
|
table! {
|
||||||
gitea_tokens (id) {
|
gitea_tokens (id) {
|
||||||
id -> Uuid,
|
id -> Uuid,
|
||||||
user_id -> Nullable<Uuid>,
|
user_id -> Uuid,
|
||||||
access_token -> Varchar,
|
access_token -> Varchar,
|
||||||
refresh_token -> Varchar,
|
refresh_token -> Varchar,
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue