chore: Deduplicate token types

src/api/error.rs

@@ -189,11 +189,6 @@ pub enum TokenError {
         #[from]
         source: crate::api::v3::auth::token::types::ProjectBuilderError,
     },
-    #[error("error building token data: {}", source)]
-    TokenBuilder {
-        #[from]
-        source: crate::api::v3::types::TokenBuilderError,
-    },
 }
 
 #[derive(Error, Debug)]

src/api/v3/auth/token/types.rs

@@ -22,8 +22,10 @@ use derive_builder::Builder;
 use serde::{Deserialize, Serialize};
 use utoipa::ToSchema;
 
+use crate::api::error::TokenError;
 use crate::api::v3::role::types::Role;
 use crate::resource::types as resource_provider_types;
+use crate::token::Token as BackendToken;
 
 /// Authorization token
 #[derive(Builder, Clone, Debug, Default, Deserialize, PartialEq, Serialize, ToSchema)]
@@ -130,3 +132,16 @@ impl From<resource_provider_types::Domain> for Domain {
         }
     }
 }
+
+impl TryFrom<&BackendToken> for Token {
+    type Error = TokenError;
+
+    fn try_from(value: &BackendToken) -> Result<Self, Self::Error> {
+        let mut token = TokenBuilder::default();
+        token.user(UserBuilder::default().id(value.user_id()).build()?);
+        token.methods(value.methods().clone());
+        token.audit_ids(value.audit_ids().clone());
+        token.expires_at(*value.expires_at());
+        Ok(token.build()?)
+    }
+}

src/api/v3/mod.rs

@@ -20,7 +20,6 @@ pub mod auth;
 pub mod group;
 pub mod role;
 pub mod role_assignment;
-pub mod types;
 pub mod user;
 
 pub(super) fn openapi_router() -> OpenApiRouter<ServiceState> {

src/api/v3/user/passkey/mod.rs

@@ -25,7 +25,7 @@ use webauthn_rs::prelude::*;
 
 use crate::api::{
     error::{KeystoneApiError, WebauthnError},
-    v3::types::Token as ApiToken,
+    v3::auth::token::types::Token as ApiToken,
 };
 use crate::identity::IdentityApi;
 use crate::keystone::ServiceState;