feat: Move out new apis to the v4

.gitignore

@@ -1,9 +1,9 @@
 **/target
 # Ignore rust files in the root folder
-*.rs
+/*.rs
 # no OpenPolicyAgent data
 bundle.tar.gz
-./*.rego
+/*.rego
 policy.wasm
 .manifest
 

src/api/error.rs

@@ -253,12 +253,24 @@ pub enum TokenError {
         source: crate::api::v3::auth::token::types::TokenBuilderError,
     },
 
+    #[error("error building token data: {}", source)]
+    Builder4 {
+        #[from]
+        source: crate::api::v4::auth::token::types::TokenBuilderError,
+    },
+
     #[error("error building token user data: {}", source)]
     UserBuilder {
         #[from]
         source: crate::api::v3::auth::token::types::UserBuilderError,
     },
 
+    #[error("error building token user data: {}", source)]
+    UserBuilder4 {
+        #[from]
+        source: crate::api::v4::auth::token::types::UserBuilderError,
+    },
+
     #[error("error building token user data: {}", source)]
     ProjectBuilder {
         #[from]

src/api/mod.rs

@@ -31,16 +31,17 @@ pub(crate) mod common;
 pub mod error;
 pub mod types;
 pub mod v3;
+pub mod v4;
 
 use crate::api::types::*;
 
 #[derive(OpenApi)]
 #[openapi(
-    info(version = "3.14.0"),
+    info(version = "4.0.1"),
     modifiers(&SecurityAddon),
     tags(
-        (name="identity_providers", description=v3::federation::identity_provider::DESCRIPTION),
-        (name="mappings", description=v3::federation::mapping::DESCRIPTION)
+        (name="identity_providers", description=v4::federation::identity_provider::DESCRIPTION),
+        (name="mappings", description=v4::federation::mapping::DESCRIPTION)
     )
 )]
 pub struct ApiDoc;
@@ -61,6 +62,7 @@ impl Modify for SecurityAddon {
 pub fn openapi_router() -> OpenApiRouter<ServiceState> {
     OpenApiRouter::new()
         .nest("/v3", v3::openapi_router())
+        .nest("/v4", v4::openapi_router())
         .routes(routes!(version))
 }
 
@@ -80,20 +82,24 @@ async fn version(headers: HeaderMap) -> Result<impl IntoResponse, KeystoneApiErr
         .and_then(|header| header.to_str().ok())
         .unwrap_or("localhost");
 
-    let link = Link {
-        rel: "self".into(),
-        href: format!("http://{host}/v3"),
-    };
-    let version = Version {
-        id: "v3.14".into(),
-        status: VersionStatus::Stable,
-        links: Some(vec![link]),
-        media_types: Some(vec![MediaType::default()]),
-        ..Default::default()
-    };
     let res = Versions {
         versions: Values {
-            values: vec![version],
+            values: vec![
+                Version {
+                    id: "v3.14".into(),
+                    status: VersionStatus::Stable,
+                    links: Some(vec![Link::new(format!("http://{host}/v3"))]),
+                    media_types: Some(vec![MediaType::default()]),
+                    ..Default::default()
+                },
+                Version {
+                    id: "v4.0".into(),
+                    status: VersionStatus::Experimental,
+                    links: Some(vec![Link::new(format!("http://{host}/v4"))]),
+                    media_types: Some(vec![MediaType::default()]),
+                    ..Default::default()
+                },
+            ],
         },
     };
     Ok(res)

src/api/types.rs

@@ -69,6 +69,8 @@ pub enum VersionStatus {
     #[default]
     #[serde(rename = "stable")]
     Stable,
+    #[serde(rename = "experimental")]
+    Experimental,
 }
 
 #[derive(Clone, Debug, Default, Deserialize, PartialEq, Serialize, ToSchema)]
@@ -77,6 +79,15 @@ pub struct Link {
     pub href: String,
 }
 
+impl Link {
+    pub fn new(href: String) -> Self {
+        Self {
+            rel: "self".into(),
+            href,
+        }
+    }
+}
+
 #[derive(Clone, Debug, Deserialize, PartialEq, Serialize, ToSchema)]
 pub struct MediaType {
     pub base: String,

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

@@ -22,6 +22,10 @@ use axum::{
 use utoipa_axum::{router::OpenApiRouter, routes};
 
 use crate::api::types::Scope;
+use crate::api::v3::auth::token::types::{
+    AuthRequest, CreateTokenParameters, Token as ApiResponseToken, TokenResponse,
+    ValidateTokenParameters,
+};
 use crate::api::{
     Catalog,
     auth::Auth,
@@ -33,10 +37,6 @@ use crate::catalog::CatalogApi;
 use crate::identity::IdentityApi;
 use crate::keystone::ServiceState;
 use crate::token::TokenApi;
-use types::{
-    AuthRequest, CreateTokenParameters, Token as ApiResponseToken, TokenResponse,
-    ValidateTokenParameters,
-};
 
 mod common;
 pub mod types;

src/api/v3/group/mod.rs

@@ -28,7 +28,7 @@ use types::{Group, GroupCreateRequest, GroupList, GroupListParameters, GroupResp
 
 pub mod types;
 
-pub(super) fn openapi_router() -> OpenApiRouter<ServiceState> {
+pub(crate) fn openapi_router() -> OpenApiRouter<ServiceState> {
     OpenApiRouter::new()
         .routes(routes!(list, create))
         .routes(routes!(show, remove))

src/api/v3/mod.rs

@@ -25,7 +25,6 @@ use crate::api::error::KeystoneApiError;
 use crate::keystone::ServiceState;
 
 pub mod auth;
-pub mod federation;
 pub mod group;
 pub mod role;
 pub mod role_assignment;
@@ -37,7 +36,6 @@ pub(super) fn openapi_router() -> OpenApiRouter<ServiceState> {
     OpenApiRouter::new()
         .nest("/auth", auth::openapi_router())
         .nest("/groups", group::openapi_router())
-        .nest("/federation", federation::openapi_router())
         .nest("/role_assignments", role_assignment::openapi_router())
         .nest("/roles", role::openapi_router())
         .nest("/users", user::openapi_router())
@@ -57,9 +55,8 @@ pub(super) fn openapi_router() -> OpenApiRouter<ServiceState> {
 async fn version(
     headers: HeaderMap,
     OriginalUri(uri): OriginalUri,
-    req: Request,
+    _req: Request,
 ) -> Result<impl IntoResponse, KeystoneApiError> {
-    println!("Request: {req:?}, uri: {uri:?}");
     let host = headers
         .get(header::HOST)
         .and_then(|header| header.to_str().ok())

src/api/v3/role/mod.rs

@@ -26,7 +26,7 @@ use types::{Role, RoleList, RoleListParameters, RoleResponse};
 
 pub mod types;
 
-pub(super) fn openapi_router() -> OpenApiRouter<ServiceState> {
+pub(crate) fn openapi_router() -> OpenApiRouter<ServiceState> {
     OpenApiRouter::new()
         .routes(routes!(list))
         .routes(routes!(show))

src/api/v3/role_assignment/mod.rs

@@ -24,9 +24,9 @@ use crate::assignment::AssignmentApi;
 use crate::keystone::ServiceState;
 use types::{Assignment, AssignmentList, RoleAssignmentListParameters};
 
-mod types;
+pub mod types;
 
-pub(super) fn openapi_router() -> OpenApiRouter<ServiceState> {
+pub(crate) fn openapi_router() -> OpenApiRouter<ServiceState> {
     OpenApiRouter::new().routes(routes!(list))
 }
 

src/api/v3/user/mod.rs

@@ -27,15 +27,13 @@ use crate::identity::IdentityApi;
 use crate::keystone::ServiceState;
 use types::{User, UserCreateRequest, UserList, UserListParameters, UserResponse};
 
-pub mod passkey;
 pub mod types;
 
 pub(super) fn openapi_router() -> OpenApiRouter<ServiceState> {
     OpenApiRouter::new()
         .routes(routes!(list, create))
         .routes(routes!(show, remove))
         .routes(routes!(groups))
-        .nest("/{user_id}/passkeys", passkey::openapi_router())
 }
 
 /// List users

src/api/v4/auth/mod.rs

@@ -0,0 +1,23 @@
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+// SPDX-License-Identifier: Apache-2.0
+
+use utoipa_axum::router::OpenApiRouter;
+
+use crate::keystone::ServiceState;
+
+pub mod token;
+
+pub(super) fn openapi_router() -> OpenApiRouter<ServiceState> {
+    OpenApiRouter::new().nest("/tokens", token::openapi_router())
+}