Merge branch 'master' into ms-fix-pdf-viewer-pages-error

Scille · Jan 16, 2025 · fa8049b · fa8049b
2 parents 03d00fe + bdf1be4
commit fa8049b
Show file tree

Hide file tree

Showing 231 changed files with 830 additions and 737 deletions.
diff --git a/.github/workflows/ci-rust.yml b/.github/workflows/ci-rust.yml
@@ -63,7 +63,7 @@ jobs:
       TESTBED_SERVER: http://localhost:6777
     services:
       parsec-testbed-server:
-        image: ghcr.io/scille/parsec-cloud/parsec-testbed-server:3.2.4-a.0.dev.20102.1979660
+        image: ghcr.io/scille/parsec-cloud/parsec-testbed-server:3.2.4-a.0.dev.20104.7da2559
         ports:
           - 6777:6777
     steps:

diff --git a/.github/workflows/ci-web.yml b/.github/workflows/ci-web.yml
@@ -36,7 +36,7 @@ jobs:
     # https://github.com/Scille/parsec-cloud/pkgs/container/parsec-cloud%2Fparsec-testbed-server
     services:
       parsec-testbed-server:
-        image: ghcr.io/scille/parsec-cloud/parsec-testbed-server:3.2.4-a.0.dev.20102.1979660
+        image: ghcr.io/scille/parsec-cloud/parsec-testbed-server:3.2.4-a.0.dev.20104.7da2559
         ports:
           - 6777:6777
     steps:

diff --git a/cli/src/testenv_utils.rs b/cli/src/testenv_utils.rs
@@ -6,7 +6,7 @@ use std::{
 };
 
 use libparsec::{
-    authenticated_cmds::{latest::device_create, v4::user_create},
+    authenticated_cmds::{latest::device_create, latest::user_create},
     AuthenticatedCmds, Bytes, CertificateSignerOwned, ClientConfig, DateTime, DeviceAccessStrategy,
     DeviceCertificate, DeviceID, DeviceLabel, DevicePurpose, HumanHandle, LocalDevice,
     MaybeRedacted, OrganizationID, ParsecAddr, PrivateKeyAlgorithm, ProxyConfig, SigningKey,

diff --git a/cli/tests/integration/invitations/cancel.rs b/cli/tests/integration/invitations/cancel.rs
@@ -1,6 +1,6 @@
 use libparsec::{
-    authenticated_cmds::v4::invite_new_device, get_default_config_dir, tmp_path, AuthenticatedCmds,
-    InvitationType, ParsecInvitationAddr, ProxyConfig, TmpPath,
+    authenticated_cmds::latest::invite_new_device, get_default_config_dir, tmp_path,
+    AuthenticatedCmds, InvitationType, ParsecInvitationAddr, ProxyConfig, TmpPath,
 };
 
 use crate::{

diff --git a/cli/tests/integration/invitations/device.rs b/cli/tests/integration/invitations/device.rs
@@ -3,8 +3,8 @@ use std::io::{BufReader, Write};
 use assert_cmd::cargo::CommandCargoExt;
 
 use libparsec::{
-    authenticated_cmds::v4::invite_new_device, get_default_config_dir, tmp_path, AuthenticatedCmds,
-    InvitationType, ParsecInvitationAddr, ProxyConfig, TmpPath,
+    authenticated_cmds::latest::invite_new_device, get_default_config_dir, tmp_path,
+    AuthenticatedCmds, InvitationType, ParsecInvitationAddr, ProxyConfig, TmpPath,
 };
 
 use crate::{

diff --git a/cli/tests/integration/invitations/list.rs b/cli/tests/integration/invitations/list.rs
@@ -1,6 +1,6 @@
 use libparsec::{
-    authenticated_cmds::v4::invite_new_device, get_default_config_dir, tmp_path, AuthenticatedCmds,
-    InvitationToken, ProxyConfig, TmpPath,
+    authenticated_cmds::latest::invite_new_device, get_default_config_dir, tmp_path,
+    AuthenticatedCmds, InvitationToken, ProxyConfig, TmpPath,
 };
 use predicates::prelude::PredicateBooleanExt;
 

diff --git a/cli/tests/integration/invitations/shared_recovery.rs b/cli/tests/integration/invitations/shared_recovery.rs
@@ -1,7 +1,7 @@
 use std::sync::{Arc, Mutex};
 
 use libparsec::{
-    authenticated_cmds::v4::invite_new_shamir_recovery, get_default_config_dir, tmp_path,
+    authenticated_cmds::latest::invite_new_shamir_recovery, get_default_config_dir, tmp_path,
     AuthenticatedCmds, InvitationType, ParsecInvitationAddr, ProxyConfig, TmpPath,
 };
 use rexpect::{session::PtySession, spawn};

diff --git a/cli/tests/integration/invitations/user.rs b/cli/tests/integration/invitations/user.rs
@@ -3,8 +3,8 @@ use std::io::{BufReader, Write};
 use assert_cmd::cargo::CommandCargoExt;
 
 use libparsec::{
-    authenticated_cmds::v4::invite_new_user, get_default_config_dir, tmp_path, AuthenticatedCmds,
-    InvitationType, ParsecInvitationAddr, ProxyConfig, TmpPath,
+    authenticated_cmds::latest::invite_new_user, get_default_config_dir, tmp_path,
+    AuthenticatedCmds, InvitationType, ParsecInvitationAddr, ProxyConfig, TmpPath,
 };
 
 use crate::{

diff --git a/libparsec/crates/client/src/client/recovery_device.rs b/libparsec/crates/client/src/client/recovery_device.rs
@@ -7,7 +7,7 @@ use libparsec_platform_device_loader::{
     get_default_key_file, save_device, PlatformImportRecoveryDeviceError, SaveDeviceError,
 };
 use libparsec_platform_storage::certificates::PerTopicLastTimestamps;
-use libparsec_protocol::authenticated_cmds::v4::device_create;
+use libparsec_protocol::authenticated_cmds::latest::device_create;
 use libparsec_types::prelude::*;
 
 use crate::{

diff --git a/libparsec/crates/client/src/client/tos.rs b/libparsec/crates/client/src/client/tos.rs
@@ -42,15 +42,15 @@ pub async fn get_tos(client_ops: &Client) -> Result<Tos, ClientGetTosError> {
     let request = tos_cmds::latest::tos_get::Req;
     let rep = client_ops.cmds.send(request).await?;
     match rep {
-        tos_cmds::v4::tos_get::Rep::Ok {
+        tos_cmds::latest::tos_get::Rep::Ok {
             updated_on,
             per_locale_urls,
         } => Ok(Tos {
             per_locale_urls,
             updated_on,
         }),
-        tos_cmds::v4::tos_get::Rep::NoTos => Err(ClientGetTosError::NoTos),
-        tos_cmds::v4::tos_get::Rep::UnknownStatus { unknown_status, .. } => {
+        tos_cmds::latest::tos_get::Rep::NoTos => Err(ClientGetTosError::NoTos),
+        tos_cmds::latest::tos_get::Rep::UnknownStatus { unknown_status, .. } => {
             Err(ClientGetTosError::Internal(anyhow::anyhow!(
                 "Unknown error status `{}` from server",
                 unknown_status
@@ -88,17 +88,17 @@ pub async fn accept_tos(
     let request = tos_cmds::latest::tos_accept::Req { tos_updated_on };
     let rep = client_ops.cmds.send(request).await?;
     match rep {
-        tos_cmds::v4::tos_accept::Rep::Ok => {
+        tos_cmds::latest::tos_accept::Rep::Ok => {
             // If TOS acceptance was required, it most likely means the connection
             // monitor is currently polling the server from time to time in order to
             // detect when the TOS have been accepted.
             // So we send a dedicated event to speed up the process.
             client_ops.event_bus.send(&EventShouldRetryConnectionNow);
             Ok(())
         }
-        tos_cmds::v4::tos_accept::Rep::TosMismatch => Err(ClientAcceptTosError::TosMismatch),
-        tos_cmds::v4::tos_accept::Rep::NoTos => Err(ClientAcceptTosError::NoTos),
-        tos_cmds::v4::tos_accept::Rep::UnknownStatus { unknown_status, .. } => {
+        tos_cmds::latest::tos_accept::Rep::TosMismatch => Err(ClientAcceptTosError::TosMismatch),
+        tos_cmds::latest::tos_accept::Rep::NoTos => Err(ClientAcceptTosError::NoTos),
+        tos_cmds::latest::tos_accept::Rep::UnknownStatus { unknown_status, .. } => {
             Err(ClientAcceptTosError::Internal(anyhow::anyhow!(
                 "Unknown error status `{}` from server",
                 unknown_status

diff --git a/libparsec/crates/client/src/invite/claimer.rs b/libparsec/crates/client/src/invite/claimer.rs
@@ -8,7 +8,7 @@ use invited_cmds::latest::invite_claimer_step;
 use libparsec_client_connection::AuthenticatedCmds;
 use libparsec_client_connection::{protocol::invited_cmds, ConnectionError, InvitedCmds};
 use libparsec_protocol::authenticated_cmds;
-use libparsec_protocol::invited_cmds::v4::invite_info::ShamirRecoveryRecipient;
+use libparsec_protocol::invited_cmds::latest::invite_info::ShamirRecoveryRecipient;
 use libparsec_types::prelude::*;
 
 use crate::client::{register_new_device, RegisterNewDeviceError};

diff --git a/libparsec/crates/client/src/monitors/connection.rs b/libparsec/crates/client/src/monitors/connection.rs
@@ -42,7 +42,7 @@ use libparsec_platform_async::{
     channel, pretend_future_is_send_on_web, select2_biased, stream::StreamExt,
 };
 use libparsec_platform_storage::certificates::PerTopicLastTimestamps;
-use libparsec_protocol::authenticated_cmds::v4::events_listen::{APIEvent, Rep, Req};
+use libparsec_protocol::authenticated_cmds::latest::events_listen::{APIEvent, Rep, Req};
 
 use crate::event_bus::*;
 

diff --git a/libparsec/crates/client/tests/unit/invite/claimer.rs b/libparsec/crates/client/tests/unit/invite/claimer.rs
@@ -5,7 +5,7 @@ use std::sync::{Arc, Mutex};
 use libparsec_client_connection::{
     protocol, test_register_send_hook, test_register_sequence_of_send_hooks,
 };
-use libparsec_protocol::invited_cmds::v4::invite_claimer_step::{ClaimerStep, GreeterStep};
+use libparsec_protocol::invited_cmds::latest::invite_claimer_step::{ClaimerStep, GreeterStep};
 use libparsec_tests_fixtures::prelude::*;
 use libparsec_types::prelude::*;
 

diff --git a/libparsec/crates/client/tests/unit/invite/shamir.rs b/libparsec/crates/client/tests/unit/invite/shamir.rs
@@ -3,7 +3,7 @@
 use std::{collections::HashMap, sync::Arc};
 
 use super::utils::client_factory;
-use libparsec_protocol::invited_cmds::v4::invite_info::ShamirRecoveryRecipient;
+use libparsec_protocol::invited_cmds::latest::invite_info::ShamirRecoveryRecipient;
 use libparsec_tests_fixtures::prelude::*;
 use libparsec_types::prelude::*;
 

diff --git a/libparsec/crates/client_connection/tests/unit/anonymous.rs b/libparsec/crates/client_connection/tests/unit/anonymous.rs
@@ -149,9 +149,9 @@ register_rpc_http_hook!(
     rpc_unsupported_api_version_http_codes_422_with_supported_api_versions,
     StatusCode::from_u16(422).unwrap(),
     |err| {
-        p_assert_matches!(err, ConnectionError::UnsupportedApiVersion { api_version, supported_api_versions } if api_version == *API_LATEST_VERSION && supported_api_versions == vec![(5,1).into(), (6,0).into()]);
+        p_assert_matches!(err, ConnectionError::UnsupportedApiVersion { api_version, supported_api_versions } if api_version == *API_LATEST_VERSION && supported_api_versions == vec![(8,1).into(), (9,0).into()]);
     },
-    "Supported-Api-Versions": "5.1;6.0"
+    "Supported-Api-Versions": "8.1;9.0"
 );
 register_rpc_http_hook!(
     rpc_expired_organization_http_codes_460,

diff --git a/libparsec/crates/client_connection/tests/unit/authenticated.rs b/libparsec/crates/client_connection/tests/unit/authenticated.rs
@@ -827,9 +827,9 @@ register_rpc_http_hook!(
     rpc_unsupported_api_version_http_codes_422_with_supported_api_versions,
     StatusCode::from_u16(422).unwrap(),
     |err| {
-        p_assert_matches!(err, ConnectionError::UnsupportedApiVersion { api_version, supported_api_versions } if api_version == *API_LATEST_VERSION && supported_api_versions == vec![(5,1).into(), (6,0).into()]);
+        p_assert_matches!(err, ConnectionError::UnsupportedApiVersion { api_version, supported_api_versions } if api_version == *API_LATEST_VERSION && supported_api_versions == vec![(8,1).into(), (9,0).into()]);
     },
-    "Supported-Api-Versions": "5.1;6.0"
+    "Supported-Api-Versions": "8.1;9.0"
 );
 register_rpc_http_hook!(
     rpc_expired_organization_http_codes_460,
@@ -981,9 +981,9 @@ register_rpc_http_hook!(
     sse_unsupported_api_version_http_codes_422_with_supported_api_versions,
     StatusCode::from_u16(422).unwrap(),
     |err| {
-        p_assert_matches!(err, ConnectionError::UnsupportedApiVersion { api_version, supported_api_versions } if api_version == *API_LATEST_VERSION && supported_api_versions == vec![(5,1).into(), (6,0).into()]);
+        p_assert_matches!(err, ConnectionError::UnsupportedApiVersion { api_version, supported_api_versions } if api_version == *API_LATEST_VERSION && supported_api_versions == vec![(8,1).into(), (9,0).into()]);
     },
-    "Supported-Api-Versions": "5.1;6.0"
+    "Supported-Api-Versions": "8.1;9.0"
 );
 register_sse_http_hook!(
     sse_expired_organization_http_codes_460,

diff --git a/libparsec/crates/client_connection/tests/unit/invited.rs b/libparsec/crates/client_connection/tests/unit/invited.rs
@@ -221,9 +221,9 @@ register_rpc_http_hook!(
     rpc_unsupported_api_version_http_codes_422_with_supported_api_versions,
     StatusCode::from_u16(422).unwrap(),
     |err| {
-        p_assert_matches!(err, ConnectionError::UnsupportedApiVersion { api_version, supported_api_versions } if api_version == *API_LATEST_VERSION && supported_api_versions == vec![(5,1).into(), (6,0).into()]);
+        p_assert_matches!(err, ConnectionError::UnsupportedApiVersion { api_version, supported_api_versions } if api_version == *API_LATEST_VERSION && supported_api_versions == vec![(8,1).into(), (9,0).into()]);
     },
-    "Supported-Api-Versions": "5.1;6.0"
+    "Supported-Api-Versions": "8.1;9.0"
 );
 register_rpc_http_hook!(
     rpc_expired_organization_http_codes_460,

diff --git a/libparsec/crates/protocol/schema/anonymous_cmds/organization_bootstrap.json5 b/libparsec/crates/protocol/schema/anonymous_cmds/organization_bootstrap.json5
@@ -1,7 +1,7 @@
 [
     {
         "major_versions": [
-            4
+            5
         ],
         "req": {
             "cmd": "organization_bootstrap",

diff --git a/libparsec/crates/protocol/schema/anonymous_cmds/ping.json5 b/libparsec/crates/protocol/schema/anonymous_cmds/ping.json5
@@ -1,7 +1,7 @@
 [
     {
         "major_versions": [
-            4
+            5
         ],
         "req": {
             "cmd": "ping",

diff --git a/libparsec/crates/protocol/schema/anonymous_cmds/pki_enrollment_info.json5 b/libparsec/crates/protocol/schema/anonymous_cmds/pki_enrollment_info.json5
@@ -1,7 +1,7 @@
 [
     {
         "major_versions": [
-            4
+            5
         ],
         "req": {
             "cmd": "pki_enrollment_info",

diff --git a/libparsec/crates/protocol/schema/anonymous_cmds/pki_enrollment_submit.json5 b/libparsec/crates/protocol/schema/anonymous_cmds/pki_enrollment_submit.json5
@@ -1,7 +1,7 @@
 [
     {
         "major_versions": [
-            4
+            5
         ],
         "req": {
             "cmd": "pki_enrollment_submit",

diff --git a/libparsec/crates/protocol/schema/authenticated_cmds/block_create.json5 b/libparsec/crates/protocol/schema/authenticated_cmds/block_create.json5
@@ -1,7 +1,7 @@
 [
     {
         "major_versions": [
-            4
+            5
         ],
         "req": {
             "cmd": "block_create",

diff --git a/libparsec/crates/protocol/schema/authenticated_cmds/block_read.json5 b/libparsec/crates/protocol/schema/authenticated_cmds/block_read.json5
@@ -1,7 +1,7 @@
 [
     {
         "major_versions": [
-            4
+            5
         ],
         "req": {
             "cmd": "block_read",

diff --git a/libparsec/crates/protocol/schema/authenticated_cmds/certificate_get.json5 b/libparsec/crates/protocol/schema/authenticated_cmds/certificate_get.json5
@@ -1,7 +1,7 @@
 [
     {
         "major_versions": [
-            4
+            5
         ],
         "req": {
             "cmd": "certificate_get",

diff --git a/libparsec/crates/protocol/schema/authenticated_cmds/device_create.json5 b/libparsec/crates/protocol/schema/authenticated_cmds/device_create.json5
@@ -1,7 +1,7 @@
 [
     {
         "major_versions": [
-            4
+            5
         ],
         "req": {
             "cmd": "device_create",

diff --git a/libparsec/crates/protocol/schema/authenticated_cmds/events_listen.json5 b/libparsec/crates/protocol/schema/authenticated_cmds/events_listen.json5
@@ -1,7 +1,7 @@
 [
     {
         "major_versions": [
-            4
+            5
         ],
         "req": {
             "cmd": "events_listen",

diff --git a/libparsec/crates/protocol/schema/authenticated_cmds/invite_cancel.json5 b/libparsec/crates/protocol/schema/authenticated_cmds/invite_cancel.json5
@@ -1,7 +1,7 @@
 [
     {
         "major_versions": [
-            4
+            5
         ],
         "req": {
             "cmd": "invite_cancel",

diff --git a/libparsec/crates/protocol/schema/authenticated_cmds/invite_complete.json5 b/libparsec/crates/protocol/schema/authenticated_cmds/invite_complete.json5
@@ -1,7 +1,7 @@
 [
     {
         "major_versions": [
-            4
+            5
         ],
         "req": {
             "cmd": "invite_complete",

diff --git a/...ec/crates/protocol/schema/authenticated_cmds/invite_greeter_cancel_greeting_attempt.json5 b/...ec/crates/protocol/schema/authenticated_cmds/invite_greeter_cancel_greeting_attempt.json5
@@ -1,7 +1,7 @@
 [
     {
         "major_versions": [
-            4
+            5
         ],
         "req": {
             "cmd": "invite_greeter_cancel_greeting_attempt",

diff --git a/...sec/crates/protocol/schema/authenticated_cmds/invite_greeter_start_greeting_attempt.json5 b/...sec/crates/protocol/schema/authenticated_cmds/invite_greeter_start_greeting_attempt.json5
@@ -1,7 +1,7 @@
 [
     {
         "major_versions": [
-            4
+            5
         ],
         "req": {
             "cmd": "invite_greeter_start_greeting_attempt",

diff --git a/libparsec/crates/protocol/schema/authenticated_cmds/invite_greeter_step.json5 b/libparsec/crates/protocol/schema/authenticated_cmds/invite_greeter_step.json5
@@ -1,7 +1,7 @@
 [
     {
         "major_versions": [
-            4
+            5
         ],
         "req": {
             "cmd": "invite_greeter_step",

diff --git a/libparsec/crates/protocol/schema/authenticated_cmds/invite_list.json5 b/libparsec/crates/protocol/schema/authenticated_cmds/invite_list.json5
@@ -1,7 +1,7 @@
 [
     {
         "major_versions": [
-            4
+            5
         ],
         "req": {
             "cmd": "invite_list"

diff --git a/libparsec/crates/protocol/schema/authenticated_cmds/invite_new_device.json5 b/libparsec/crates/protocol/schema/authenticated_cmds/invite_new_device.json5
@@ -1,7 +1,7 @@
 [
     {
         "major_versions": [
-            4
+            5
         ],
         "req": {
             "cmd": "invite_new_device",

diff --git a/libparsec/crates/protocol/schema/authenticated_cmds/invite_new_shamir_recovery.json5 b/libparsec/crates/protocol/schema/authenticated_cmds/invite_new_shamir_recovery.json5
@@ -1,7 +1,7 @@
 [
     {
         "major_versions": [
-            4
+            5
         ],
         "req": {
             "cmd": "invite_new_shamir_recovery",

diff --git a/libparsec/crates/protocol/schema/authenticated_cmds/invite_new_user.json5 b/libparsec/crates/protocol/schema/authenticated_cmds/invite_new_user.json5
@@ -1,7 +1,7 @@
 [
     {
         "major_versions": [
-            4
+            5
         ],
         "req": {
             "cmd": "invite_new_user",

diff --git a/libparsec/crates/protocol/schema/authenticated_cmds/list_frozen_users.json5 b/libparsec/crates/protocol/schema/authenticated_cmds/list_frozen_users.json5
@@ -1,7 +1,7 @@
 [
     {
         "major_versions": [
-            4
+            5
         ],
         "req": {
             "cmd": "list_frozen_users"

diff --git a/libparsec/crates/protocol/schema/authenticated_cmds/ping.json5 b/libparsec/crates/protocol/schema/authenticated_cmds/ping.json5
@@ -1,7 +1,7 @@
 [
     {
         "major_versions": [
-            4
+            5
         ],
         "req": {
             "cmd": "ping",

diff --git a/libparsec/crates/protocol/schema/authenticated_cmds/pki_enrollment_accept.json5 b/libparsec/crates/protocol/schema/authenticated_cmds/pki_enrollment_accept.json5
@@ -1,7 +1,7 @@
 [
     {
         "major_versions": [
-            4
+            5
         ],
         "req": {
             "cmd": "pki_enrollment_accept",