eightequal/AstralRinth
1
0
Fork 0
forked from didirus/AstralRinth
Code Pull Requests Activity

User retrieval routes

Browse Source
This commit is contained in:
Jai A
2020-09-28 22:30:13 -07:00
parent 3d32c30d2d
commit 2e514735ec
9 changed files with 115 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/routes/auth.rs
View File

@@ -1,5 +1,5 @@
use crate::auth::get_github_user_from_token;
use crate::database::models::{generate_state_id, User, UserId};
use crate::database::models::{generate_state_id, User};
use crate::models::error::ApiError;
use crate::models::ids::base62_impl::{parse_base62, to_base62};
use crate::models::ids::DecodingError;
@@ -174,16 +174,15 @@ pub async fn auth_callback(
let user = get_github_user_from_token(&*token.access_token).await?;
let user_result = User::get_from_github_id(UserId(user.id as i64), &mut *transaction).await?;
let user_result = User::get_from_github_id(user.id, &mut *transaction).await?;
match user_result {
Some(x) => info!("{:?}", x.id),
None => {
let user_id = crate::database::models::generate_user_id(&mut transaction)
.await?;
let user_id = crate::database::models::generate_user_id(&mut transaction).await?;
User {
id: user_id,
github_id: UserId(user.id as i64),
github_id: user.id as i64,
username: user.login,
name: user.name,
email: user.email,