2FA + Add/Remove Auth Providers (#652)

* 2FA + Add/Remove Auth Providers

* fix fmt issue

src/models/threads.rs

@@ -1,9 +1,9 @@
 use super::ids::Base62Id;
+use crate::models::ids::{ProjectId, ReportId};
 use crate::models::projects::ProjectStatus;
 use crate::models::users::{User, UserId};
 use chrono::{DateTime, Utc};
 use serde::{Deserialize, Serialize};
-use crate::models::ids::{ProjectId, ReportId};
 
 #[derive(Copy, Clone, PartialEq, Eq, Serialize, Deserialize)]
 #[serde(from = "Base62Id")]

src/models/users.rs

@@ -1,4 +1,5 @@
 use super::ids::Base62Id;
+use crate::auth::flows::AuthProvider;
 use chrono::{DateTime, Utc};
 use rust_decimal::Decimal;
 use serde::{Deserialize, Serialize};
@@ -39,19 +40,21 @@ pub struct User {
     pub id: UserId,
     pub username: String,
     pub name: Option<String>,
-    pub email: Option<String>,
     pub avatar_url: Option<String>,
     pub bio: Option<String>,
     pub created: DateTime<Utc>,
     pub role: Role,
     pub badges: Badges,
+
     pub payout_data: Option<UserPayoutData>,
+    pub auth_providers: Option<Vec<AuthProvider>>,
+    pub email: Option<String>,
+    pub email_verified: Option<bool>,
+    pub has_password: Option<bool>,
+    pub has_totp: Option<bool>,
+
+    // DEPRECATED. Always returns None
     pub github_id: Option<u64>,
-    // pub discord_id: Option<u64>,
-    // pub google_id: Option<u128>,
-    // pub microsoft_id: Option<u64>,
-    // pub apple_id: Option<u64>,
-    // pub gitlab_id: Option<u64>,
 }
 
 #[derive(Serialize, Deserialize, Clone)]
@@ -138,18 +141,17 @@ impl From<DBUser> for User {
             username: data.username,
             name: data.name,
             email: None,
+            email_verified: None,
             avatar_url: data.avatar_url,
             bio: data.bio,
             created: data.created,
             role: Role::from_string(&data.role),
             badges: data.badges,
             payout_data: None,
+            auth_providers: None,
+            has_password: None,
+            has_totp: None,
             github_id: None,
-            // discord_id: None,
-            // google_id: None,
-            // microsoft_id: None,
-            // apple_id: None,
-            // gitlab_id: None,
         }
     }
 }