Sequential change ids

crates/http/src/auth/oauth/auth.rs

@@ -4,8 +4,7 @@
  * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-SEL
  */
 
-use std::sync::Arc;
-
+use crate::auth::oauth::OAuthStatus;
 use common::{
     KV_OAUTH, Server,
     auth::{
@@ -13,13 +12,15 @@ use common::{
         oauth::{CLIENT_ID_MAX_LEN, DEVICE_CODE_LEN, USER_CODE_ALPHABET, USER_CODE_LEN},
     },
 };
+use http_proto::*;
 use serde::Deserialize;
 use serde_json::json;
 use std::future::Future;
+use std::sync::Arc;
 use store::{
     Serialize,
     dispatch::lookup::KeyValue,
-    write::{UnversionedArchive, UnversionedArchiver},
+    write::{Archive, Archiver},
 };
 use store::{
     rand::{
@@ -31,9 +32,6 @@ use store::{
 };
 use trc::AddContext;
 
-use crate::auth::oauth::OAuthStatus;
-use http_proto::*;
-
 use super::{DeviceAuthResponse, FormData, MAX_POST_LEN, OAuthCode, OAuthCodeRequest};
 
 #[derive(Debug, serde::Serialize, Deserialize)]
@@ -109,13 +107,14 @@ impl OAuthApiHandler for Server {
                     .collect::<String>();
 
                 // Serialize OAuth code
-                let value = UnversionedArchiver::new(OAuthCode {
+                let value = Archiver::new(OAuthCode {
                     status: OAuthStatus::Authorized,
                     account_id: access_token.primary_id(),
                     client_id,
                     nonce,
                     params: redirect_uri.unwrap_or_default(),
                 })
+                .untrusted()
                 .serialize()
                 .caused_by(trc::location!())?;
 
@@ -151,7 +150,7 @@ impl OAuthApiHandler for Server {
                     .core
                     .storage
                     .lookup
-                    .key_get::<UnversionedArchive<AlignedBytes>>(KeyValue::<()>::build_key(
+                    .key_get::<Archive<AlignedBytes>>(KeyValue::<()>::build_key(
                         KV_OAUTH,
                         code.as_bytes(),
                     ))
@@ -185,7 +184,8 @@ impl OAuthApiHandler for Server {
                                 KeyValue::with_prefix(
                                     KV_OAUTH,
                                     oauth.params.as_bytes(),
-                                    UnversionedArchiver::new(new_oauth_code)
+                                    Archiver::new(new_oauth_code)
+                                        .untrusted()
                                         .serialize()
                                         .caused_by(trc::location!())?,
                                 )
@@ -243,13 +243,14 @@ impl OAuthApiHandler for Server {
         }
 
         // Add OAuth status
-        let oauth_code = UnversionedArchiver::new(OAuthCode {
+        let oauth_code = Archiver::new(OAuthCode {
             status: OAuthStatus::Pending,
             account_id: u32::MAX,
             client_id,
             nonce,
             params: device_code.clone(),
         })
+        .untrusted()
         .serialize()
         .caused_by(trc::location!())?;
 

crates/http/src/auth/oauth/token.rs

@@ -20,7 +20,7 @@ use hyper::StatusCode;
 use std::future::Future;
 use store::{
     dispatch::lookup::KeyValue,
-    write::{AlignedBytes, UnversionedArchive},
+    write::{AlignedBytes, Archive},
 };
 use trc::AddContext;
 
@@ -77,7 +77,7 @@ impl TokenHandler for Server {
                     .core
                     .storage
                     .lookup
-                    .key_get::<UnversionedArchive<AlignedBytes>>(KeyValue::<()>::build_key(
+                    .key_get::<Archive<AlignedBytes>>(KeyValue::<()>::build_key(
                         KV_OAUTH,
                         code.as_bytes(),
                     ))
@@ -149,7 +149,7 @@ impl TokenHandler for Server {
                     .core
                     .storage
                     .lookup
-                    .key_get::<UnversionedArchive<AlignedBytes>>(KeyValue::<()>::build_key(
+                    .key_get::<Archive<AlignedBytes>>(KeyValue::<()>::build_key(
                         KV_OAUTH,
                         device_code.as_bytes(),
                     ))
@@ -329,7 +329,7 @@ impl TokenHandler for Server {
                         nonce,
                         preferred_username: access_token.name.clone().into(),
                         email: access_token.emails.first().cloned(),
-                        description: access_token.description.clone().into(),
+                        description: access_token.description.clone(),
                     },
                 ) {
                     Ok(id_token) => Some(id_token),

crates/http/src/management/report.rs

@@ -18,8 +18,7 @@ use std::future::Future;
 use store::{
     Deserialize, IterateParams, Key, U64_LEN, ValueKey,
     write::{
-        AlignedBytes, BatchBuilder, ReportClass, UnversionedArchive, ValueClass,
-        key::DeserializeBigEndian,
+        AlignedBytes, Archive, BatchBuilder, ReportClass, ValueClass, key::DeserializeBigEndian,
     },
 };
 use trc::AddContext;
@@ -289,7 +288,7 @@ where
 {
     if let Some(tls) = server
         .store()
-        .get_value::<UnversionedArchive<AlignedBytes>>(key)
+        .get_value::<Archive<AlignedBytes>>(key)
         .await?
     {
         tls.deserialize::<T>().map(Some)
@@ -379,8 +378,7 @@ async fn fetch_incoming_reports(
                 last_id = id;
 
                 // TODO: Support filtering chunked records (over 10MB) on FDB
-                let archive =
-                    <UnversionedArchive<AlignedBytes> as Deserialize>::deserialize(value)?;
+                let archive = <Archive<AlignedBytes> as Deserialize>::deserialize(value)?;
                 let matches = if has_filters {
                     match typ {
                         ReportType::Dmarc => {