ref: Move EMPTY_SCOPES to common module

Author: jan-auer

objectstore-server/src/extractors/id.rs

@@ -4,15 +4,12 @@ use axum::extract::rejection::PathRejection;
 use axum::extract::{FromRequestParts, Path};
 use axum::http::request::Parts;
 use objectstore_service::id::{ObjectContext, ObjectId};
-use objectstore_types::scope::{Scope, Scopes};
+use objectstore_types::scope::{EMPTY_SCOPES, Scope, Scopes};
 use serde::{Deserialize, de};
 
 use crate::extractors::Xt;
 use crate::state::ServiceState;
 
-/// Used in place of scopes in the URL to represent an empty set of scopes.
-const EMPTY_SCOPES: &str = "_";
-
 impl FromRequestParts<ServiceState> for Xt<ObjectId> {
     type Rejection = PathRejection;
 

objectstore-types/src/scope.rs

@@ -5,7 +5,7 @@
 //!  - [`Scope`] is a single key-value pair representing one level of hierarchy
 //!  - [`Scopes`] is an ordered collection of [`Scope`]s
 
-use std::fmt::{self, Write};
+use std::fmt;
 
 /// Characters allowed in a Scope's key and value.
 ///
@@ -14,6 +14,9 @@ use std::fmt::{self, Write};
 const ALLOWED_CHARS: &str =
     "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789_-()$!+'";
 
+/// Used in place of scopes in the URL to represent an empty set of scopes.
+pub const EMPTY_SCOPES: &str = "_";
+
 /// A single scope value of an object.
 ///
 /// Scopes are used in a hierarchy in object IDs.
@@ -204,7 +207,7 @@ impl fmt::Display for AsApiPath<'_> {
             }
             Ok(())
         } else {
-            f.write_char('_')
+            f.write_str(EMPTY_SCOPES)
         }
     }
 }
@@ -271,6 +274,6 @@ mod tests {
 
         let empty_scopes = Scopes::empty();
         let api_path = empty_scopes.as_api_path().to_string();
-        assert_eq!(api_path, "_");
+        assert_eq!(api_path, EMPTY_SCOPES);
     }
 }