Add whether the registration is valid or not in the admin API

Author: sandhose

crates/handlers/src/admin/model.rs

@@ -612,6 +612,9 @@ pub struct UserRegistrationToken {
     /// The token string
     token: String,
 
+    /// Whether the token is valid
+    valid: bool,
+
     /// Maximum number of times this token can be used
     usage_limit: Option<u32>,
 
@@ -631,10 +634,11 @@ pub struct UserRegistrationToken {
     revoked_at: Option<DateTime<Utc>>,
 }
 
-impl From<mas_data_model::UserRegistrationToken> for UserRegistrationToken {
-    fn from(token: mas_data_model::UserRegistrationToken) -> Self {
+impl UserRegistrationToken {
+    pub fn new(token: mas_data_model::UserRegistrationToken, now: DateTime<Utc>) -> Self {
         Self {
             id: token.id,
+            valid: token.is_valid(now),
             token: token.token,
             usage_limit: token.usage_limit,
             times_used: token.times_used,
@@ -662,6 +666,7 @@ impl UserRegistrationToken {
             Self {
                 id: Ulid::from_bytes([0x01; 16]),
                 token: "abc123def456".to_owned(),
+                valid: true,
                 usage_limit: Some(10),
                 times_used: 5,
                 created_at: DateTime::default(),
@@ -672,6 +677,7 @@ impl UserRegistrationToken {
             Self {
                 id: Ulid::from_bytes([0x02; 16]),
                 token: "xyz789abc012".to_owned(),
+                valid: false,
                 usage_limit: None,
                 times_used: 0,
                 created_at: DateTime::default(),

crates/handlers/src/admin/v1/user_registration_tokens/add.rs

@@ -9,7 +9,7 @@ use chrono::{DateTime, Utc};
 use hyper::StatusCode;
 use mas_axum_utils::record_error;
 use mas_storage::BoxRng;
-use rand::{Rng, distributions::Alphanumeric};
+use rand::distributions::{Alphanumeric, DistString};
 use schemars::JsonSchema;
 use serde::Deserialize;
 
@@ -79,13 +79,9 @@ pub async fn handler(
     Json(params): Json<Request>,
 ) -> Result<(StatusCode, Json<SingleResponse<UserRegistrationToken>>), RouteError> {
     // Generate a random token if none was provided
-    let token = params.token.unwrap_or_else(|| {
-        (&mut rng)
-            .sample_iter(&Alphanumeric)
-            .take(12)
-            .map(char::from)
-            .collect()
-    });
+    let token = params
+        .token
+        .unwrap_or_else(|| Alphanumeric.sample_string(&mut rng, 12));
 
     let registration_token = repo
         .user_registration_token()
@@ -102,7 +98,10 @@ pub async fn handler(
 
     Ok((
         StatusCode::CREATED,
-        Json(SingleResponse::new_canonical(registration_token.into())),
+        Json(SingleResponse::new_canonical(UserRegistrationToken::new(
+            registration_token,
+            clock.now(),
+        ))),
     ))
 }
 
@@ -137,6 +136,7 @@ mod tests {
             "id": "01FSHN9AG0MZAA6S4AF7CTV32E",
             "attributes": {
               "token": "test_token_123",
+              "valid": true,
               "usage_limit": 5,
               "times_used": 0,
               "created_at": "2022-01-16T14:40:00Z",
@@ -178,6 +178,7 @@ mod tests {
             "id": "01FSHN9AG0QMGC989M0XSFVF2X",
             "attributes": {
               "token": "42oTpLoieH5I",
+              "valid": true,
               "usage_limit": 1,
               "times_used": 0,
               "created_at": "2022-01-16T14:40:00Z",

crates/handlers/src/admin/v1/user_registration_tokens/get.rs

@@ -63,7 +63,9 @@ pub fn doc(operation: TransformOperation) -> TransformOperation {
 
 #[tracing::instrument(name = "handler.admin.v1.user_registration_tokens.get", skip_all)]
 pub async fn handler(
-    CallContext { mut repo, .. }: CallContext,
+    CallContext {
+        mut repo, clock, ..
+    }: CallContext,
     id: UlidPathParam,
 ) -> Result<Json<SingleResponse<UserRegistrationToken>>, RouteError> {
     let token = repo
@@ -73,7 +75,7 @@ pub async fn handler(
         .ok_or(RouteError::NotFound(*id))?;
 
     Ok(Json(SingleResponse::new_canonical(
-        UserRegistrationToken::from(token),
+        UserRegistrationToken::new(token, clock.now()),
     )))
 }
 
@@ -116,13 +118,14 @@ mod tests {
         response.assert_status(StatusCode::OK);
         let body: serde_json::Value = response.json();
 
-        assert_json_snapshot!(body, @r###"
+        assert_json_snapshot!(body, @r#"
         {
           "data": {
             "type": "user-registration_token",
             "id": "01FSHN9AG0MZAA6S4AF7CTV32E",
             "attributes": {
               "token": "test_token_123",
+              "valid": true,
               "usage_limit": 5,
               "times_used": 0,
               "created_at": "2022-01-16T14:40:00Z",
@@ -138,7 +141,7 @@ mod tests {
             "self": "/api/admin/v1/user-registration-tokens/01FSHN9AG0MZAA6S4AF7CTV32E"
           }
         }
-        "###);
+        "#);
     }
 
     #[sqlx::test(migrator = "mas_storage_pg::MIGRATOR")]