feat: add missing fields to Casdoor objects (#51)

* fix: added missing field "passwordOptions" to CasdoorOrganization model

* fix: actualized api & added missing fields to models

src/Casdoor.Client/Models/CasdoorApplication.cs

@@ -20,22 +20,22 @@ public class CasdoorProviderItem
 {
     [JsonPropertyName("name")]
     public string? Name { get; set; }
-    
+
     [JsonPropertyName("canSignUp")]
     public bool? CanSignUp { get; set; }
-    
+
     [JsonPropertyName("canSignIn")]
     public bool? CanSignIn { get; set; }
-    
+
     [JsonPropertyName("canUnlink")]
     public bool? CanUnlink { get; set; }
 
     [JsonPropertyName("prompted")]
     public bool? Prompted { get; set; }
-    
+
     [JsonPropertyName("alertType")]
     public string? AlertType { get; set; }
-    
+
     [JsonPropertyName("provider")]
     public CasdoorProvider? Provider { get; set; }
 }
@@ -44,7 +44,7 @@ public class CasdoorSignupItem
 {
     [JsonPropertyName("name")]
     public string? Name { get; set; }
-    
+
     [JsonPropertyName("visible")]
     public bool? Visible { get; set; }
 
@@ -108,18 +108,30 @@ public class CasdoorApplication
     [JsonPropertyName("enableWebAuth")]
     public bool? EnableWebAuth { get; set; }
 
+    [JsonPropertyName("enableLinkWithEmail")]
+    public bool? EnableLinkWithEmail { get; set; }
+
+    [JsonPropertyName("orgChoiceMode")]
+    public string? OrgChoiceMode { get; set; }
+
+    [JsonPropertyName("samlReplyUrl")]
+    public string? SamlReplyUrl { get; set; }
+
     [JsonPropertyName("providers")]
     public CasdoorProviderItem[]? Providers { get; set; }
-    
+
     [JsonPropertyName("signupItems")]
     public CasdoorSignupItem[]? SignupItems { get; set; }
 
-    [JsonPropertyName("grantTypes")] 
+    [JsonPropertyName("grantTypes")]
     public string[]? GrantTypes { get; set; }
 
     [JsonPropertyName("organizationObj")]
     public CasdoorOrganization? OrganizationObj { get; set; }
-
+
+    [JsonPropertyName("tags")]
+    public string[]? Tags { get; set; }
+
     [JsonPropertyName("clientId")]
     public string? ClientId { get; set; }
 
@@ -159,12 +171,18 @@ public class CasdoorApplication
     [JsonPropertyName("signinHtml")]
     public string? SigninHtml { get; set; }
 
+    [JsonPropertyName("themeData")]
+    public CasdoorThemeData? ThemeData { get; set; }
+
     [JsonPropertyName("formCss")]
     public string? FormCss { get; set; }
-
+
+    [JsonPropertyName("formCssMobile")]
+    public string? FormCssMobile { get; set; }
+
     [JsonPropertyName("formOffset")]
     public int? FormOffset { get; set; }
 
     [JsonPropertyName("formBackgroundUrl")]
     public string? FormBackgroundUrl { get; set; }
-}
+}

src/Casdoor.Client/Models/CasdoorEmailForm.cs

@@ -29,4 +29,7 @@ public class CasdoorEmailForm
 
     [JsonPropertyName("receivers")]
     public string[] Receivers { get; set; } = Array.Empty<string>();
+
+    [JsonPropertyName("provider")]
+    public string Provider { get; set; }
 }

src/Casdoor.Client/Models/CasdoorMfaProps.cs

@@ -0,0 +1,27 @@
+using System.Text.Json.Serialization;
+
+namespace Casdoor.Client;
+
+public class CasdoorMfaProps
+{
+    [JsonPropertyName("enabled")]
+    public bool? Enabled { get; set; }
+
+    [JsonPropertyName("isPreferred")]
+    public bool? IsPreferred { get; set; }
+
+    [JsonPropertyName("mfaType")]
+    public string? MfaType { get; set; }
+
+    [JsonPropertyName("secret")]
+    public string? Secret { get; set; }
+
+    [JsonPropertyName("countryCode")]
+    public string? CountryCode { get; set; }
+
+    [JsonPropertyName("url")]
+    public string? Url { get; set; }
+
+    [JsonPropertyName("recoveryCodes")]
+    public string[]? RecoveryCodes { get; set; }
+}

src/Casdoor.Client/Models/CasdoorOrganization.cs

@@ -17,6 +17,15 @@
 namespace Casdoor.Client;
 
 
+public class CasdoorMfaItem
+{
+    [JsonPropertyName("name")]
+    public string? Name { get; set; }
+
+    [JsonPropertyName("rule")]
+    public string? Rule { get; set; }
+}
+
 public class CasdoorAccountItem
 {
     [JsonPropertyName("name")]
@@ -58,8 +67,11 @@ public class CasdoorOrganization
     [JsonPropertyName("passwordSalt")]
     public string? PasswordSalt { get; set; }
 
-    [JsonPropertyName("phonePrefix")]
-    public string? PhonePrefix { get; set; }
+    [JsonPropertyName("passwordOptions")]
+    public string[]? PasswordOptions { get; set; }
+
+    [JsonPropertyName("countryCodes")]
+    public string[]? CountryCodes { get; set; }
 
     [JsonPropertyName("defaultAvatar")]
     public string? DefaultAvatar { get; set; }
@@ -70,15 +82,27 @@ public class CasdoorOrganization
     [JsonPropertyName("tags")]
     public string[]? Tags { get; set; }
 
+    [JsonPropertyName("languages")]
+    public string[]? Languages { get; set; }
+
+    [JsonPropertyName("themeData")]
+    public CasdoorThemeData? ThemeData { get; set; }
+
     [JsonPropertyName("masterPassword")]
     public string? MasterPassword { get; set; }
 
+    [JsonPropertyName("initScore")]
+    public int? InitScore { get; set; }
+
     [JsonPropertyName("enableSoftDeletion")]
     public bool? EnableSoftDeletion { get; set; }
 
     [JsonPropertyName("isProfilePublic")]
     public bool? IsProfilePublic { get; set; }
-
+
+    [JsonPropertyName("mfaItems")]
+    public CasdoorMfaItem[]? MfaItems { get; set; }
+
     [JsonPropertyName("accountItems")]
-    CasdoorAccountItem[]? AccountItems { get; set; }
-}
+    public CasdoorAccountItem[]? AccountItems { get; set; }
+}

src/Casdoor.Client/Models/CasdoorPermission.cs

@@ -34,6 +34,9 @@ public class CasdoorPermission
     [JsonPropertyName("displayName")]
     public string? DisplayName { get; set; }
 
+    [JsonPropertyName("description")]
+    public string? Description { get; set; }
+
     [JsonPropertyName("users")]
     public IEnumerable<string>? Users { get; set; }
 
@@ -75,4 +78,4 @@ public class CasdoorPermission
 
     [JsonPropertyName("isEnabled")]
     public bool IsEnabled { get; set; }
-}
+}

src/Casdoor.Client/Models/CasdoorPermissionRule.cs

@@ -1,14 +1,31 @@
-namespace Casdoor.Client;
+using System.Text.Json.Serialization;
+
+namespace Casdoor.Client;
 
 public class CasdoorPermissionRule
 {
+    [JsonPropertyName("ptype")]
     public string? Ptype { get; set; }
+
+    [JsonPropertyName("v0")]
     public string? V0 { get; set; }
+
+    [JsonPropertyName("v1")]
     public string? V1 { get; set; }
+
+    [JsonPropertyName("v2")]
     public string? V2 { get; set; }
+
+    [JsonPropertyName("v3")]
     public string? V3 { get; set; }
+
+    [JsonPropertyName("v4")]
     public string? V4 { get; set; }
+
+    [JsonPropertyName("v5")]
     public string? V5 { get; set; }
+
+    [JsonPropertyName("id")]
     public string? Id { get; set; }
 }
 

src/Casdoor.Client/Models/CasdoorProvider.cs

@@ -72,6 +72,12 @@ public class CasdoorProvider
     [JsonPropertyName("customLogo")]
     public string? CustomLogo { get; set; }
 
+    [JsonPropertyName("scopes")]
+    public string? Scopes { get; set; }
+
+    [JsonPropertyName("userMapping")]
+    public IDictionary<string, string>? UserMapping { get; set; }
+
     [JsonPropertyName("host")]
     public string? Host { get; set; }
 
@@ -114,6 +120,9 @@ public class CasdoorProvider
     [JsonPropertyName("bucket")]
     public string? Bucket { get; set; }
 
+    [JsonPropertyName("pathPrefix")]
+    public string? PathPrefix { get; set; }
+
     [JsonPropertyName("metadata")]
     public string? Metadata { get; set; }
 
@@ -128,4 +137,4 @@ public class CasdoorProvider
 
     [JsonPropertyName("providerUrl")]
     public string? ProviderUrl { get; set; }
-}
+}

src/Casdoor.Client/Models/CasdoorResponse.cs

@@ -1,11 +1,11 @@
 // Copyright 2022 The Casdoor Authors. All Rights Reserved.
-// 
+//
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
-// 
+//
 //     http://www.apache.org/licenses/LICENSE-2.0
-// 
+//
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -20,6 +20,8 @@ public class CasdoorResponse
 {
     [JsonPropertyName("status")] public string? Status { get; set; }
     [JsonPropertyName("msg")] public string? Msg { get; set; }
+    [JsonPropertyName("sub")] public string? Sub { get; set; }
+    [JsonPropertyName("name")] public string? Name { get; set; }
     [JsonPropertyName("data")] public object? Data { get; set; }
     [JsonPropertyName("data2")] public object? Data2 { get; set; }
 }
@@ -29,6 +31,8 @@ public class CasdoorResponse<T>
 {
     [JsonPropertyName("status")] public string? Status { get; set; }
     [JsonPropertyName("msg")] public string? Msg { get; set; }
+    [JsonPropertyName("sub")] public string? Sub { get; set; }
+    [JsonPropertyName("name")] public string? Name { get; set; }
     [JsonPropertyName("data")] public T? Data { get; set; }
     [JsonPropertyName("data2")] public object? Data2 { get; set; }
 }

src/Casdoor.Client/Models/CasdoorRole.cs

@@ -34,6 +34,9 @@ public class CasdoorRole
     [JsonPropertyName("displayName")]
     public string? DisplayName { get; set; }
 
+    [JsonPropertyName("description")]
+    public string? Description { get; set; }
+
     [JsonPropertyName("users")]
     public IEnumerable<string>? Users { get; set; }
 

src/Casdoor.Client/Models/CasdoorThemeData.cs

@@ -0,0 +1,21 @@
+using System.Text.Json.Serialization;
+
+namespace Casdoor.Client;
+
+public class CasdoorThemeData
+{
+    [JsonPropertyName("themeType")]
+    public string? ThemeType { get; set; }
+
+    [JsonPropertyName("colorPrimary")]
+    public string? ColorPrimary { get; set; }
+
+    [JsonPropertyName("borderRadius")]
+    public int? BorderRadius { get; set; }
+
+    [JsonPropertyName("isCompact")]
+    public bool? IsCompact { get; set; }
+
+    [JsonPropertyName("isEnabled")]
+    public bool? IsEnabled { get; set; }
+}