Upgrade Rust SDK to spec 1.20.7-nightly.28

Author: C0D3-M4513R

.openapi-generator/FILES

@@ -225,12 +225,14 @@ docs/PropUnityPackage.md
 docs/PropsApi.md
 docs/PurchaseProductListingRequest.md
 docs/Region.md
+docs/RegisterUserAccount200Response.md
 docs/RegisterUserAccountRequest.md
 docs/ReleaseStatus.md
 docs/ReportCategory.md
 docs/ReportReason.md
 docs/RepresentedGroup.md
 docs/RequestInviteRequest.md
+docs/RequiresTwoFactorAuth.md
 docs/RespondGroupJoinRequest.md
 docs/RespondNotificationV2Request.md
 docs/Response.md
@@ -260,6 +262,7 @@ docs/TransactionStatus.md
 docs/TransactionSteamInfo.md
 docs/TransactionSteamWalletInfo.md
 docs/TwoFactorAuthCode.md
+docs/TwoFactorAuthType.md
 docs/TwoFactorEmailCode.md
 docs/TwoFactorRecoveryCodes.md
 docs/TwoFactorRecoveryCodesOtpInner.md
@@ -528,12 +531,14 @@ src/models/prop.rs
 src/models/prop_unity_package.rs
 src/models/purchase_product_listing_request.rs
 src/models/region.rs
+src/models/register_user_account_200_response.rs
 src/models/register_user_account_request.rs
 src/models/release_status.rs
 src/models/report_category.rs
 src/models/report_reason.rs
 src/models/represented_group.rs
 src/models/request_invite_request.rs
+src/models/requires_two_factor_auth.rs
 src/models/respond_group_join_request.rs
 src/models/respond_notification_v2_request.rs
 src/models/response.rs
@@ -563,6 +568,7 @@ src/models/transaction_status.rs
 src/models/transaction_steam_info.rs
 src/models/transaction_steam_wallet_info.rs
 src/models/two_factor_auth_code.rs
+src/models/two_factor_auth_type.rs
 src/models/two_factor_email_code.rs
 src/models/two_factor_recovery_codes.rs
 src/models/two_factor_recovery_codes_otp_inner.rs

Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 repository="https://github.com/vrchatapi/vrchatapi-rust"
 name = "vrchatapi"
-version = "1.20.7-nightly.16"
+version = "1.20.7-nightly.28"
 authors = ["vrchatapi.lpv0t@aries.fyi"]
 description = "VRChat API Client for Rust"
 license = "MIT"

docs/AuthenticationApi.md

@@ -298,7 +298,7 @@ This endpoint does not need any parameter.
 
 ## get_current_user
 
-> models::CurrentUser get_current_user()
+> models::RegisterUserAccount200Response get_current_user()
 Login and/or Get Current User Info
 
 This endpoint does the following two operations:   1) Checks if you are already logged in by looking for a valid `auth` cookie. If you are have a valid auth cookie then no additional auth-related actions are taken. If you are **not** logged in then it will log you in with the `Authorization` header and set the `auth` cookie. The `auth` cookie will only be sent once.   2) If logged in, this function will also return the CurrentUser object containing detailed information about the currently logged in user.  The auth string after `Authorization: Basic {string}` is a base64-encoded string of the username and password, both individually url-encoded, and then joined with a colon.  > base64(urlencode(username):urlencode(password))  **WARNING: Session Limit:** Each authentication with login credentials counts as a separate session, out of which you have a limited amount. Make sure to save and reuse the `auth` cookie if you are often restarting the program. The provided API libraries automatically save cookies during runtime, but does not persist during restart. While it can be fine to use username/password during development, expect in production to very fast run into the rate-limit and be temporarily blocked from making new sessions until older ones expire. The exact number of simultaneous sessions is unknown/undisclosed.
@@ -309,7 +309,7 @@ This endpoint does not need any parameter.
 
 ### Return type
 
-[**models::CurrentUser**](CurrentUser.md)
+[**models::RegisterUserAccount200Response**](registerUserAccount_200_response.md)
 
 ### Authorization
 
@@ -440,7 +440,7 @@ This endpoint does not need any parameter.
 
 ## register_user_account
 
-> models::CurrentUser register_user_account(register_user_account_request)
+> models::RegisterUserAccount200Response register_user_account(register_user_account_request)
 Register User Account
 
 ~~Register a new user account.~~  **DEPRECATED:** Automated creation of accounts has no legitimate public third-party use case, and would be in violation of ToS §13.2: *By using the Platform, you agree not to: i. [...] use the Platform in a manner inconsistent with individual human usage* This endpoint is documented in the interest of completeness
@@ -454,7 +454,7 @@ Name | Type | Description  | Required | Notes
 
 ### Return type
 
-[**models::CurrentUser**](CurrentUser.md)
+[**models::RegisterUserAccount200Response**](registerUserAccount_200_response.md)
 
 ### Authorization
 

docs/RegisterUserAccount200Response.md

@@ -0,0 +1,12 @@
+# RegisterUserAccount200Response
+
+## Enum Variants
+
+| Name | Description |
+|---- | -----|
+| CurrentUser |  |
+| RequiresTwoFactorAuth |  |
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
+

docs/RequiresTwoFactorAuth.md

@@ -0,0 +1,11 @@
+# RequiresTwoFactorAuth
+
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**requires_two_factor_auth** | Option<[**Vec<models::TwoFactorAuthType>**](TwoFactorAuthType.md)> |  | [optional]
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
+

docs/TwoFactorAuthType.md

@@ -0,0 +1,14 @@
+# TwoFactorAuthType
+
+## Enum Variants
+
+| Name | Value |
+|---- | -----|
+| EmailOtp | emailOtp |
+| Otp | otp |
+| Totp | totp |
+
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
+

src/apis/authentication_api.rs

@@ -627,7 +627,7 @@ pub async fn enable2_fa(
 /// This endpoint does the following two operations:   1) Checks if you are already logged in by looking for a valid `auth` cookie. If you are have a valid auth cookie then no additional auth-related actions are taken. If you are **not** logged in then it will log you in with the `Authorization` header and set the `auth` cookie. The `auth` cookie will only be sent once.   2) If logged in, this function will also return the CurrentUser object containing detailed information about the currently logged in user.  The auth string after `Authorization: Basic {string}` is a base64-encoded string of the username and password, both individually url-encoded, and then joined with a colon.  > base64(urlencode(username):urlencode(password))  **WARNING: Session Limit:** Each authentication with login credentials counts as a separate session, out of which you have a limited amount. Make sure to save and reuse the `auth` cookie if you are often restarting the program. The provided API libraries automatically save cookies during runtime, but does not persist during restart. While it can be fine to use username/password during development, expect in production to very fast run into the rate-limit and be temporarily blocked from making new sessions until older ones expire. The exact number of simultaneous sessions is unknown/undisclosed.
 pub async fn get_current_user(
     configuration: &configuration::Configuration,
-) -> Result<models::EitherUserOrTwoFactor, Error<GetCurrentUserError>> {
+) -> Result<models::RegisterUserAccount200Response, Error<GetCurrentUserError>> {
     let uri_str = format!("{}/auth/user", configuration.base_path);
     let mut req_builder = configuration.client.request(reqwest::Method::GET, &uri_str);
 
@@ -653,8 +653,8 @@ pub async fn get_current_user(
         let content = resp.text().await?;
         match content_type {
             ContentType::Json => serde_json::from_str(&content).map_err(Error::from),
-            ContentType::Text => return Err(Error::from(serde_json::Error::custom("Received `text/plain` content type response that cannot be converted to `models::CurrentUser`"))),
-            ContentType::Unsupported(unknown_type) => return Err(Error::from(serde_json::Error::custom(format!("Received `{unknown_type}` content type response that cannot be converted to `models::CurrentUser`")))),
+            ContentType::Text => return Err(Error::from(serde_json::Error::custom("Received `text/plain` content type response that cannot be converted to `models::RegisterUserAccount200Response`"))),
+            ContentType::Unsupported(unknown_type) => return Err(Error::from(serde_json::Error::custom(format!("Received `{unknown_type}` content type response that cannot be converted to `models::RegisterUserAccount200Response`")))),
         }
     } else {
         let content = resp.text().await?;
@@ -859,7 +859,7 @@ pub async fn logout(
 pub async fn register_user_account(
     configuration: &configuration::Configuration,
     register_user_account_request: models::RegisterUserAccountRequest,
-) -> Result<models::CurrentUser, Error<RegisterUserAccountError>> {
+) -> Result<models::RegisterUserAccount200Response, Error<RegisterUserAccountError>> {
     // add a prefix to parameters to efficiently prevent name collisions
     let p_body_register_user_account_request = register_user_account_request;
 
@@ -888,8 +888,8 @@ pub async fn register_user_account(
         let content = resp.text().await?;
         match content_type {
             ContentType::Json => serde_json::from_str(&content).map_err(Error::from),
-            ContentType::Text => return Err(Error::from(serde_json::Error::custom("Received `text/plain` content type response that cannot be converted to `models::CurrentUser`"))),
-            ContentType::Unsupported(unknown_type) => return Err(Error::from(serde_json::Error::custom(format!("Received `{unknown_type}` content type response that cannot be converted to `models::CurrentUser`")))),
+            ContentType::Text => return Err(Error::from(serde_json::Error::custom("Received `text/plain` content type response that cannot be converted to `models::RegisterUserAccount200Response`"))),
+            ContentType::Unsupported(unknown_type) => return Err(Error::from(serde_json::Error::custom(format!("Received `{unknown_type}` content type response that cannot be converted to `models::RegisterUserAccount200Response`")))),
         }
     } else {
         let content = resp.text().await?;

src/models/current_user.rs

@@ -346,16 +346,3 @@ impl CurrentUser {
         }
     }
 }
-
-#[derive(Serialize, Deserialize)]
-#[serde(untagged)]
-pub enum EitherUserOrTwoFactor {
-    CurrentUser(CurrentUser),
-    RequiresTwoFactorAuth(RequiresTwoFactorAuth),
-}
-
-#[derive(Clone, Debug, PartialEq, Eq, Default, Serialize, Deserialize)]
-pub struct RequiresTwoFactorAuth {
-    #[serde(rename = "requiresTwoFactorAuth")]
-    pub requires_two_factor_auth: Vec<String>,
-}

src/models/mod.rs

@@ -131,7 +131,7 @@ pub use self::create_instance_request::CreateInstanceRequest;
 pub mod create_world_request;
 pub use self::create_world_request::CreateWorldRequest;
 pub mod current_user;
-pub use self::current_user::{CurrentUser, EitherUserOrTwoFactor};
+pub use self::current_user::CurrentUser;
 pub mod current_user_platform_history_inner;
 pub use self::current_user_platform_history_inner::CurrentUserPlatformHistoryInner;
 pub mod current_user_presence;
@@ -414,6 +414,8 @@ pub mod purchase_product_listing_request;
 pub use self::purchase_product_listing_request::PurchaseProductListingRequest;
 pub mod region;
 pub use self::region::Region;
+pub mod register_user_account_200_response;
+pub use self::register_user_account_200_response::RegisterUserAccount200Response;
 pub mod register_user_account_request;
 pub use self::register_user_account_request::RegisterUserAccountRequest;
 pub mod release_status;
@@ -426,6 +428,8 @@ pub mod represented_group;
 pub use self::represented_group::RepresentedGroup;
 pub mod request_invite_request;
 pub use self::request_invite_request::RequestInviteRequest;
+pub mod requires_two_factor_auth;
+pub use self::requires_two_factor_auth::RequiresTwoFactorAuth;
 pub mod respond_group_join_request;
 pub use self::respond_group_join_request::RespondGroupJoinRequest;
 pub mod respond_notification_v2_request;
@@ -484,6 +488,8 @@ pub mod transaction_steam_wallet_info;
 pub use self::transaction_steam_wallet_info::TransactionSteamWalletInfo;
 pub mod two_factor_auth_code;
 pub use self::two_factor_auth_code::TwoFactorAuthCode;
+pub mod two_factor_auth_type;
+pub use self::two_factor_auth_type::TwoFactorAuthType;
 pub mod two_factor_email_code;
 pub use self::two_factor_email_code::TwoFactorEmailCode;
 pub mod two_factor_recovery_codes;
@@ -552,3 +558,8 @@ pub mod world_metadata;
 pub use self::world_metadata::WorldMetadata;
 pub mod world_publish_status;
 pub use self::world_publish_status::WorldPublishStatus;
+#[deprecated(
+    since = "1.20.7-nightly.28",
+    note = "Use RegisterUserAccount200Response directly. This re-export is only provided as a transition-help!"
+)]
+pub use self::RegisterUserAccount200Response as EitherUserOrTwoFactor;

src/models/register_user_account_200_response.rs

@@ -0,0 +1,23 @@
+/*
+ * VRChat API Documentation
+ *
+ *
+ * Contact: vrchatapi.lpv0t@aries.fyi
+ * Generated by: https://openapi-generator.tech
+ */
+
+use crate::models;
+use serde::{Deserialize, Serialize};
+
+#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
+#[serde(untagged)]
+pub enum RegisterUserAccount200Response {
+    CurrentUser(models::CurrentUser),
+    RequiresTwoFactorAuth(models::RequiresTwoFactorAuth),
+}
+
+impl Default for RegisterUserAccount200Response {
+    fn default() -> Self {
+        Self::CurrentUser(Default::default())
+    }
+}