first pass of merging in warp (doesn't build)

app/src/auth/auth_manager.rs

@@ -1,46 +1,40 @@
-#[allow(dead_code)]
-pub(super) mod user_persistence;
-
 use std::result::Result as StdResult;
 use std::sync::Arc;
 use std::time::Duration;
 
 use anyhow::{anyhow, Result};
+use settings::Setting as _;
+#[cfg(target_family = "wasm")]
+use url::Url;
+use uuid::Uuid;
 use galaxy_core::channel::ChannelState;
 use galaxy_core::features::FeatureFlag;
-#[allow(unused_imports)]
 use galaxy_graphql::mutations::create_anonymous_user::{
     AnonymousUserType, CreateAnonymousUserResult,
 };
-#[allow(unused_imports)]
-use galaxyui::{clipboard::ClipboardContent, Entity, ModelContext, SingletonEntity, UpdateModel};
-use settings::Setting as _;
-use uuid::Uuid;
+use warp_server_auth::user::persistence::PersistedUser;
+use galaxyui::clipboard::ClipboardContent;
+use galaxyui::{Entity, ModelContext, SingletonEntity, UpdateModel};
 
 use super::auth_state::{AuthState, PersistAction};
 use super::auth_view_modal::{AuthRedirectPayload, AuthViewVariant};
 use super::credentials::{Credentials, FirebaseToken, LoginToken};
 use super::user::User;
-use super::AuthStateProvider;
-use super::UserUid;
+use super::user_properties::UserProperties;
+use super::{AuthStateProvider, UserUid};
 use crate::ai::llms::LLMPreferences;
 use crate::ai::persisted_workspace::PersistedWorkspace;
 use crate::ai::AIRequestUsageModel;
 use crate::autoupdate::AutoupdateState;
 use crate::persistence::ModelEvent;
 use crate::server::cloud_objects::update_manager::UpdateManager;
-use crate::server::server_api::auth::FetchUserResult;
-use crate::server::server_api::ServerApiProvider;
-use crate::server::{
-    graphql::get_user_facing_error_message,
-    server_api::{
-        auth::{
-            AnonymousUserCreationError, AuthClient, MintCustomTokenError, UserAuthenticationError,
-        },
-        ServerApi,
-    },
-    telemetry::AnonymousUserSignupEntrypoint,
+use crate::server::graphql::get_user_facing_error_message;
+use crate::server::server_api::auth::{
+    AnonymousUserCreationError, AuthClient, FetchUserResult, MintCustomTokenError,
+    UserAuthenticationError,
 };
+use crate::server::server_api::{ServerApi, ServerApiProvider};
+use crate::server::telemetry::AnonymousUserSignupEntrypoint;
 use crate::settings::cloud_preferences_syncer::CloudPreferencesSyncer;
 use crate::settings::initializer::SettingsInitializer;
 use crate::settings::PrivacySettings;
@@ -53,9 +47,6 @@ use crate::{
     persistence, report_error, report_if_error, send_telemetry_from_ctx,
     send_telemetry_sync_from_ctx, GlobalResourceHandlesProvider, TelemetryEvent,
 };
-#[cfg(target_family = "wasm")]
-use url::Url;
-use user_persistence::PersistedUser;
 
 #[derive(Debug)]
 #[allow(dead_code)]
@@ -129,13 +120,15 @@ impl AuthManager {
     pub fn new_for_test(ctx: &mut ModelContext<Self>) -> Self {
         use crate::server::server_api::ServerApiProvider;
 
-        let server_api = ServerApiProvider::as_ref(ctx).get();
+        let server_api_provider = ServerApiProvider::as_ref(ctx);
+        let server_api = server_api_provider.get();
+        let auth_client = server_api_provider.get_auth_client();
         let auth_state = AuthStateProvider::as_ref(ctx).get().clone();
 
         Self {
             auth_state,
-            server_api: server_api.clone(),
-            auth_client: server_api,
+            server_api,
+            auth_client,
             pending_auth_state: None,
         }
     }
@@ -272,7 +265,7 @@ impl AuthManager {
 
     /// Authenticate asynchronously using the OAuth2 device authorization flow.
     ///
-    /// This is only used by the Warp CLI if running on a devic that does not have the Warp app installed.
+    /// This is only used by the Warp CLI if running on a device that does not have the Warp app installed.
     #[cfg_attr(target_family = "wasm", allow(dead_code))]
     pub fn authorize_device(&self, ctx: &mut ModelContext<Self>) {
         // Clear any stale user state so old credentials don't interfere
@@ -336,12 +329,15 @@ impl AuthManager {
         match fetch_user_result {
             Ok(fetch_user_result) => {
                 let FetchUserResult {
-                    user,
+                    user_output,
                     credentials,
-                    server_experiments,
                     from_refresh,
-                    llms,
                 } = fetch_user_result;
+                let UserProperties {
+                    user,
+                    server_experiments,
+                    llms,
+                } = user_output.into();
 
                 self.set_and_persist(Some(user.clone()), Some(credentials), ctx);
 
@@ -858,5 +854,5 @@ impl Entity for AuthManager {
 impl SingletonEntity for AuthManager {}
 
 #[cfg(test)]
-#[path = "auth_manager_test.rs"]
+#[path = "auth_manager_tests.rs"]
 mod auth_manager_test;