Move LoginError to core

onlivfe · Apr 14, 2023 · e40aa2f · e40aa2f
1 parent 3c10453
commit e40aa2f
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 11 deletions.
diff --git a/onlivfe/src/auth.rs b/onlivfe/src/auth.rs
@@ -1,5 +1,15 @@
 use crate::PlatformAccountId;
 
+/// An error that occurred with the login
+#[derive(Debug, Clone)]
+pub enum LoginError {
+	/// An error occurred
+	Error(String),
+	/// The authentication was partially successful, but requires additional
+	/// verification
+	RequiresAdditionalFactor(PlatformAccountId),
+}
+
 crate::platform_enum!(
 	/// Credentials for a platform
 	Authentication {

diff --git a/onlivfe_net/src/lib.rs b/onlivfe_net/src/lib.rs
@@ -29,6 +29,7 @@ use onlivfe::{
 	Instance,
 	InstanceId,
 	LoginCredentials,
+	LoginError,
 	PlatformAccount,
 	PlatformAccountId,
 	PlatformDataAndMetadata,
@@ -43,16 +44,6 @@ mod cvr;
 mod neosvr;
 mod vrchat;
 
-/// An error that occurred with the login
-#[derive(Debug, Clone)]
-pub enum LoginError {
-	/// An error occurred
-	Error(String),
-	/// The authentication was partially successful, but requires additional
-	/// verification
-	RequiresAdditionalFactor(PlatformAccountId),
-}
-
 /// An unified API client interface for the different platforms
 pub struct OnlivfeApiClient {
 	user_agent: String,

diff --git a/onlivfe_wrapper/src/lib.rs b/onlivfe_wrapper/src/lib.rs
@@ -25,14 +25,14 @@ use onlivfe::{
 	Instance,
 	InstanceId,
 	LoginCredentials,
+	LoginError,
 	PlatformAccount,
 	PlatformAccountId,
 	PlatformFriend,
 	PlatformType,
 	Profile,
 	ProfileId,
 };
-use onlivfe_net::LoginError;
 use strum::IntoEnumIterator;
 
 /// Initializes some static global parts of the core, setting up logging &