Fix most tests + bitflags

Cargo.toml

@@ -51,7 +51,7 @@ sha1 = { version = "0.6.1", features = ["std"] }
 sha2 = "0.9.9"
 hmac = "0.11.0"
 argon2 = { version = "0.5.0", features = ["std"] }
-bitflags = { version = "2.4.0", features = ["serde"] }
+bitflags = "2.4.0"
 bitflags-serde-legacy = "0.1.1"
 hex = "0.4.3"
 zxcvbn = "2.2.2"

src/models/pats.rs

@@ -1,4 +1,5 @@
 use super::ids::Base62Id;
+use crate::bitflags_serde_impl;
 use crate::models::ids::UserId;
 use chrono::{DateTime, Utc};
 use serde::{Deserialize, Serialize};
@@ -106,6 +107,8 @@ bitflags::bitflags! {
     }
 }
 
+bitflags_serde_impl!(Scopes, u64);
+
 impl Scopes {
     // these scopes cannot be specified in a personal access token
     pub fn restricted() -> Scopes {
@@ -125,18 +128,6 @@ impl Scopes {
     }
 }
 
-impl serde::Serialize for Scopes {
-    fn serialize<S: serde::Serializer>(&self, serializer: S) -> Result<S::Ok, S::Error> {
-        bitflags_serde_legacy::serialize(self, "Flags", serializer)
-    }
-}
-
-impl<'de> serde::Deserialize<'de> for Scopes {
-    fn deserialize<D: serde::Deserializer<'de>>(deserializer: D) -> Result<Self, D::Error> {
-        bitflags_serde_legacy::deserialize("Flags", deserializer)
-    }
-}
-
 #[derive(Serialize, Deserialize)]
 pub struct PersonalAccessToken {
     pub id: PatId,

src/models/teams.rs

@@ -1,4 +1,5 @@
 use super::ids::Base62Id;
+use crate::bitflags_serde_impl;
 use crate::models::users::User;
 use rust_decimal::Decimal;
 use serde::{Deserialize, Serialize};
@@ -39,17 +40,7 @@ bitflags::bitflags! {
     }
 }
 
-impl serde::Serialize for ProjectPermissions {
-    fn serialize<S: serde::Serializer>(&self, serializer: S) -> Result<S::Ok, S::Error> {
-        bitflags_serde_legacy::serialize(self, "Flags", serializer)
-    }
-}
-
-impl<'de> serde::Deserialize<'de> for ProjectPermissions {
-    fn deserialize<D: serde::Deserializer<'de>>(deserializer: D) -> Result<Self, D::Error> {
-        bitflags_serde_legacy::deserialize("Flags", deserializer)
-    }
-}
+bitflags_serde_impl!(ProjectPermissions, u64);
 
 impl Default for ProjectPermissions {
     fn default() -> ProjectPermissions {
@@ -104,17 +95,7 @@ bitflags::bitflags! {
     }
 }
 
-impl serde::Serialize for OrganizationPermissions {
-    fn serialize<S: serde::Serializer>(&self, serializer: S) -> Result<S::Ok, S::Error> {
-        bitflags_serde_legacy::serialize(self, "Flags", serializer)
-    }
-}
-
-impl<'de> serde::Deserialize<'de> for OrganizationPermissions {
-    fn deserialize<D: serde::Deserializer<'de>>(deserializer: D) -> Result<Self, D::Error> {
-        bitflags_serde_legacy::deserialize("Flags", deserializer)
-    }
-}
+bitflags_serde_impl!(OrganizationPermissions, u64);
 
 impl Default for OrganizationPermissions {
     fn default() -> OrganizationPermissions {

src/models/users.rs

@@ -1,5 +1,6 @@
 use super::ids::Base62Id;
 use crate::auth::flows::AuthProvider;
+use crate::bitflags_serde_impl;
 use chrono::{DateTime, Utc};
 use rust_decimal::Decimal;
 use serde::{Deserialize, Serialize};
@@ -28,17 +29,7 @@ bitflags::bitflags! {
     }
 }
 
-impl serde::Serialize for Badges {
-    fn serialize<S: serde::Serializer>(&self, serializer: S) -> Result<S::Ok, S::Error> {
-        bitflags_serde_legacy::serialize(self, "Flags", serializer)
-    }
-}
-
-impl<'de> serde::Deserialize<'de> for Badges {
-    fn deserialize<D: serde::Deserializer<'de>>(deserializer: D) -> Result<Self, D::Error> {
-        bitflags_serde_legacy::deserialize("Flags", deserializer)
-    }
-}
+bitflags_serde_impl!(Badges, u64);
 
 impl Default for Badges {
     fn default() -> Badges {

src/util/bitflag.rs

@@ -0,0 +1,19 @@
+#[macro_export]
+macro_rules! bitflags_serde_impl {
+    ($type:ident, $int_type:ident) => {
+        impl serde::Serialize for $type {
+            fn serialize<S: serde::Serializer>(&self, serializer: S) -> Result<S::Ok, S::Error> {
+                serializer.serialize_i64(self.bits() as i64)
+            }
+        }
+
+        impl<'de> serde::Deserialize<'de> for $type {
+            fn deserialize<D: serde::Deserializer<'de>>(deserializer: D) -> Result<Self, D::Error> {
+                let v: i64 = Deserialize::deserialize(deserializer)?;
+
+                println!("{}", v);
+                Ok($type::from_bits_truncate(v as $int_type))
+            }
+        }
+    };
+}

src/util/mod.rs

@@ -1,3 +1,4 @@
+pub mod bitflag;
 pub mod captcha;
 pub mod cors;
 pub mod env;