Merge from 'develop', Set version to 2.1.0-beta2

Author: AndreasZirngibl

.editorconfig

@@ -0,0 +1,217 @@
+# Entfernen Sie die folgende Zeile, wenn Sie EDITORCONFIG-Einstellungen von höheren Verzeichnissen vererben möchten.
+root = true
+
+# C#-Dateien
+[*.cs]
+
+#### Wichtige EditorConfig-Optionen ####
+
+# Einzüge und Abstände
+indent_size = 4
+indent_style = space
+tab_width = 4
+
+# Einstellungen für neue Zeilen
+end_of_line = crlf
+insert_final_newline = false
+
+#### .NET-Codierungskonventionen ####
+
+# Using-Direktiven organisieren
+dotnet_separate_import_directive_groups = false
+dotnet_sort_system_directives_first = false
+file_header_template = unset
+
+# this.- und Me.-Einstellungen
+dotnet_style_qualification_for_event = false
+dotnet_style_qualification_for_field = false
+dotnet_style_qualification_for_method = false
+dotnet_style_qualification_for_property = false
+
+# Einstellungen für Sprachschlüsselwörter und BCL-Typen
+dotnet_style_predefined_type_for_locals_parameters_members = true
+dotnet_style_predefined_type_for_member_access = true
+
+# Einstellungen für Klammern
+dotnet_style_parentheses_in_arithmetic_binary_operators = always_for_clarity
+dotnet_style_parentheses_in_other_binary_operators = always_for_clarity
+dotnet_style_parentheses_in_other_operators = never_if_unnecessary
+dotnet_style_parentheses_in_relational_binary_operators = always_for_clarity
+
+# Einstellungen für Modifizierer
+dotnet_style_require_accessibility_modifiers = for_non_interface_members
+
+# Einstellungen für Ausdrucksebene
+dotnet_style_coalesce_expression = true
+dotnet_style_collection_initializer = true
+dotnet_style_explicit_tuple_names = true
+dotnet_style_namespace_match_folder = true
+dotnet_style_null_propagation = true
+dotnet_style_object_initializer = true
+dotnet_style_operator_placement_when_wrapping = beginning_of_line
+dotnet_style_prefer_auto_properties = true
+dotnet_style_prefer_compound_assignment = true
+dotnet_style_prefer_conditional_expression_over_assignment = true
+dotnet_style_prefer_conditional_expression_over_return = true
+dotnet_style_prefer_inferred_anonymous_type_member_names = true
+dotnet_style_prefer_inferred_tuple_names = true
+dotnet_style_prefer_is_null_check_over_reference_equality_method = true
+dotnet_style_prefer_simplified_boolean_expressions = true
+dotnet_style_prefer_simplified_interpolation = true
+
+# Einstellungen für Felder
+dotnet_style_readonly_field = true
+
+# Einstellungen für Parameter
+dotnet_code_quality_unused_parameters = all
+
+# Unterdrückungseinstellungen
+dotnet_remove_unnecessary_suppression_exclusions = none
+
+# Einstellungen für neue Zeilen
+dotnet_style_allow_multiple_blank_lines_experimental = true
+dotnet_style_allow_statement_immediately_after_block_experimental = true
+
+#### C#-Codierungskonventionen ####
+
+# Var-Einstellungen
+csharp_style_var_elsewhere = false
+csharp_style_var_for_built_in_types = false
+csharp_style_var_when_type_is_apparent = false
+
+# Ausdruckskörpermember
+csharp_style_expression_bodied_accessors = true
+csharp_style_expression_bodied_constructors = false
+csharp_style_expression_bodied_indexers = true
+csharp_style_expression_bodied_lambdas = true
+csharp_style_expression_bodied_local_functions = false
+csharp_style_expression_bodied_methods = false
+csharp_style_expression_bodied_operators = false
+csharp_style_expression_bodied_properties = true
+
+# Einstellungen für den Musterabgleich
+csharp_style_pattern_matching_over_as_with_null_check = true
+csharp_style_pattern_matching_over_is_with_cast_check = true
+csharp_style_prefer_not_pattern = true
+csharp_style_prefer_pattern_matching = true
+csharp_style_prefer_switch_expression = true
+
+# Einstellungen für NULL-Überprüfung
+csharp_style_conditional_delegate_call = true
+
+# Einstellungen für Modifizierer
+csharp_prefer_static_local_function = true
+csharp_preferred_modifier_order = public,private,protected,internal,static,extern,new,virtual,abstract,sealed,override,readonly,unsafe,volatile,async
+
+# Einstellungen für Codeblöcke
+csharp_prefer_braces = true
+csharp_prefer_simple_using_statement = false
+
+# Einstellungen für Ausdrucksebene
+csharp_prefer_simple_default_expression = true
+csharp_style_deconstructed_variable_declaration = true
+csharp_style_implicit_object_creation_when_type_is_apparent = true
+csharp_style_inlined_variable_declaration = true
+csharp_style_pattern_local_over_anonymous_function = true
+csharp_style_prefer_index_operator = false
+csharp_style_prefer_range_operator = true
+csharp_style_throw_expression = true
+csharp_style_unused_value_assignment_preference = discard_variable
+csharp_style_unused_value_expression_statement_preference = discard_variable
+
+# Einstellungen für using-Anweisungen
+csharp_using_directive_placement = outside_namespace
+
+# Einstellungen für neue Zeilen
+csharp_style_allow_blank_line_after_colon_in_constructor_initializer_experimental = true
+csharp_style_allow_blank_lines_between_consecutive_braces_experimental = true
+csharp_style_allow_embedded_statements_on_same_line_experimental = true
+
+#### C#-Formatierungsregeln ####
+
+# Einstellungen für neue Zeilen
+csharp_new_line_before_catch = false
+csharp_new_line_before_else = false
+csharp_new_line_before_finally = false
+csharp_new_line_before_members_in_anonymous_types = true
+csharp_new_line_before_members_in_object_initializers = true
+csharp_new_line_before_open_brace = none
+csharp_new_line_between_query_expression_clauses = true
+
+# Einstellungen für Einrückung
+csharp_indent_block_contents = true
+csharp_indent_braces = false
+csharp_indent_case_contents = true
+csharp_indent_case_contents_when_block = true
+csharp_indent_labels = one_less_than_current
+csharp_indent_switch_labels = true
+
+# Einstellungen für Abstände
+csharp_space_after_cast = false
+csharp_space_after_colon_in_inheritance_clause = true
+csharp_space_after_comma = true
+csharp_space_after_dot = false
+csharp_space_after_keywords_in_control_flow_statements = true
+csharp_space_after_semicolon_in_for_statement = true
+csharp_space_around_binary_operators = before_and_after
+csharp_space_around_declaration_statements = false
+csharp_space_before_colon_in_inheritance_clause = true
+csharp_space_before_comma = false
+csharp_space_before_dot = false
+csharp_space_before_open_square_brackets = false
+csharp_space_before_semicolon_in_for_statement = false
+csharp_space_between_empty_square_brackets = false
+csharp_space_between_method_call_empty_parameter_list_parentheses = false
+csharp_space_between_method_call_name_and_opening_parenthesis = false
+csharp_space_between_method_call_parameter_list_parentheses = false
+csharp_space_between_method_declaration_empty_parameter_list_parentheses = false
+csharp_space_between_method_declaration_name_and_open_parenthesis = false
+csharp_space_between_method_declaration_parameter_list_parentheses = false
+csharp_space_between_parentheses = false
+csharp_space_between_square_brackets = false
+
+# Umbrucheinstellungen
+csharp_preserve_single_line_blocks = true
+csharp_preserve_single_line_statements = true
+
+#### Benennungsstile ####
+
+# Benennungsregeln
+
+dotnet_naming_rule.interface_should_be_begins_with_i.severity = suggestion
+dotnet_naming_rule.interface_should_be_begins_with_i.symbols = interface
+dotnet_naming_rule.interface_should_be_begins_with_i.style = begins_with_i
+
+dotnet_naming_rule.types_should_be_pascal_case.severity = suggestion
+dotnet_naming_rule.types_should_be_pascal_case.symbols = types
+dotnet_naming_rule.types_should_be_pascal_case.style = pascal_case
+
+dotnet_naming_rule.non_field_members_should_be_pascal_case.severity = suggestion
+dotnet_naming_rule.non_field_members_should_be_pascal_case.symbols = non_field_members
+dotnet_naming_rule.non_field_members_should_be_pascal_case.style = pascal_case
+
+# Symbolspezifikationen
+
+dotnet_naming_symbols.interface.applicable_kinds = interface
+dotnet_naming_symbols.interface.applicable_accessibilities = public, internal, private, protected, protected_internal, private_protected
+dotnet_naming_symbols.interface.required_modifiers = 
+
+dotnet_naming_symbols.types.applicable_kinds = class, struct, interface, enum
+dotnet_naming_symbols.types.applicable_accessibilities = public, internal, private, protected, protected_internal, private_protected
+dotnet_naming_symbols.types.required_modifiers = 
+
+dotnet_naming_symbols.non_field_members.applicable_kinds = property, event, method
+dotnet_naming_symbols.non_field_members.applicable_accessibilities = public, internal, private, protected, protected_internal, private_protected
+dotnet_naming_symbols.non_field_members.required_modifiers = 
+
+# Benennungsstile
+
+dotnet_naming_style.pascal_case.required_prefix = 
+dotnet_naming_style.pascal_case.required_suffix = 
+dotnet_naming_style.pascal_case.word_separator = 
+dotnet_naming_style.pascal_case.capitalization = pascal_case
+
+dotnet_naming_style.begins_with_i.required_prefix = I
+dotnet_naming_style.begins_with_i.required_suffix = 
+dotnet_naming_style.begins_with_i.word_separator = 
+dotnet_naming_style.begins_with_i.capitalization = pascal_case

DracoonSdk/DracoonSdk.csproj

@@ -41,8 +41,8 @@
     <Reference Include="BouncyCastle.Crypto, Version=1.8.6.0, Culture=neutral, PublicKeyToken=0e99375e54769942">
       <HintPath>..\packages\BouncyCastle.1.8.6.1\lib\BouncyCastle.Crypto.dll</HintPath>
     </Reference>
-    <Reference Include="Dracoon.Crypto.Sdk, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Dracoon.Crypto.Sdk.2.0.0\lib\net452\Dracoon.Crypto.Sdk.dll</HintPath>
+    <Reference Include="Dracoon.Crypto.Sdk, Version=2.1.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\Dracoon.Crypto.Sdk.2.1.0\lib\net452\Dracoon.Crypto.Sdk.dll</HintPath>
     </Reference>
     <Reference Include="Newtonsoft.Json, Version=12.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
       <HintPath>..\packages\Newtonsoft.Json.12.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
@@ -80,10 +80,12 @@
     <Compile Include="SdkInternal\ApiModel\Settings\ApiAlgorithm.cs" />
     <Compile Include="SdkInternal\ApiModel\Settings\ApiAlgorithms.cs" />
     <Compile Include="SdkInternal\ApiModel\Settings\ApiCharacterRules.cs" />
+    <Compile Include="SdkInternal\ApiModel\Settings\ApiClassificationPolicies.cs" />
     <Compile Include="SdkInternal\ApiModel\Settings\ApiDefaultsSettings.cs" />
     <Compile Include="SdkInternal\ApiModel\Settings\ApiEncryptionPasswordSettings.cs" />
     <Compile Include="SdkInternal\ApiModel\Settings\ApiInfrastructureSettings.cs" />
     <Compile Include="SdkInternal\ApiModel\Settings\ApiPasswordSettings.cs" />
+    <Compile Include="SdkInternal\ApiModel\Settings\ApiShareClassificationPolicy.cs" />
     <Compile Include="SdkInternal\ApiModel\Settings\ApiSharePasswordSettings.cs" />
     <Compile Include="SdkInternal\ApiModel\Shares\ApiDownloadShare.cs" />
     <Compile Include="SdkInternal\ApiModel\Shares\ApiDownloadShareList.cs" />
@@ -198,6 +200,7 @@
     <Compile Include="SdkPublic\Model\AlgorithmState.cs" />
     <Compile Include="SdkPublic\Model\AvatarInfo.cs" />
     <Compile Include="SdkPublic\Model\Classification.cs" />
+    <Compile Include="SdkPublic\Model\ClassificationPolicies.cs" />
     <Compile Include="SdkPublic\Model\CustomerAccount.cs" />
     <Compile Include="SdkPublic\Model\FileKeyAlgorithmData.cs" />
     <Compile Include="SdkPublic\Model\PasswordCharacterPolicies.cs" />
@@ -220,6 +223,7 @@
     <Compile Include="SdkPublic\Model\ServerInfrastructureSettings.cs" />
     <Compile Include="SdkPublic\Model\Attribute.cs" />
     <Compile Include="SdkPublic\Model\AttributeList.cs" />
+    <Compile Include="SdkPublic\Model\ShareClassificationPolicy.cs" />
     <Compile Include="SdkPublic\Model\UserAuthData.cs" />
     <Compile Include="SdkPublic\Model\UserAuthMethod.cs" />
     <Compile Include="SdkPublic\Model\UserKeyPairAlgorithmData.cs" />

DracoonSdk/DracoonSdk.nuspec

@@ -14,7 +14,7 @@
     <copyright>Copyright ©2018 DRACOON GmbH</copyright>
     <tags>DRACOON rest api sdk</tags>
     <dependencies>
-        <dependency id="Dracoon.Crypto.Sdk" version="2.0.0"/>
+        <dependency id="Dracoon.Crypto.Sdk" version="2.1.0"/>
         <dependency id="Newtonsoft.Json" version="12.0.3"/>
         <dependency id="RestSharp" version="106.11.5"/>
     </dependencies>

DracoonSdk/Properties/AssemblyInfo.cs

@@ -32,8 +32,8 @@
 // Sie können alle Werte angeben oder Standardwerte für die Build- und Revisionsnummern verwenden,
 // indem Sie "*" wie unten gezeigt eingeben:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("2.0.0.0")]
-[assembly: AssemblyFileVersion("2.0.0.0")]
-[assembly: AssemblyInformationalVersion("2.1.0-beta1")]
+[assembly: AssemblyVersion("2.1.0.0")]
+[assembly: AssemblyFileVersion("2.1.0.0")]
+[assembly: AssemblyInformationalVersion("2.1.0-beta2")]
 [assembly: InternalsVisibleTo("Dracoon.Sdk.Test")]
 [assembly: InternalsVisibleTo(assemblyName: "Dracoon.Sdk.UnitTest")]

DracoonSdk/SdkInternal/ApiConfig.cs

@@ -2,11 +2,11 @@
 using System.Text;
 
 namespace Dracoon.Sdk.SdkInternal {
-    internal class ApiConfig {
+    internal static class ApiConfig {
         internal const string MinimumApiVersion = "4.23.0";
         internal const string ApiPrefix = "api/v4";
         internal const string AuthorizationHeader = "Authorization";
-        // mediaserver/image/{mediaToken}/{width}x{height}
+        // token template: mediaserver/image/{mediaToken}/{width}x{height}
         internal const string MediaTokenTemplate = "mediaserver/image/{0}/{1}x{2}";
 
 
@@ -182,12 +182,14 @@ internal class ApiConfig {
         internal const string ApiGetDefaultsConfig = ApiPrefix + "/config/info/defaults";
         internal const string ApiGetPasswordPolicies = ApiPrefix + "/config/info/policies/passwords";
         internal const string ApiGetAlgorithms = ApiPrefix + "/config/info/policies/algorithms";
+        internal const string ApiGetClassificationPolicies = ApiPrefix + "/config/info/policies/classifications";
 
         #endregion
 
         #region Minimum version requirements
 
         internal const string ApiGetAlgorithmsMinimumVersion = "4.24.0";
+        internal const string ApiGetClassificationPoliciesMinimumVersion = "4.30.0";
 
         #endregion
 
@@ -218,11 +220,13 @@ internal class ApiConfig {
         #endregion
 
         internal static Uri BuildApiUrl(Uri baseUrl, params string[] pathSegments) {
-            UriBuilder uriBuilder = new UriBuilder(baseUrl);
+            StringBuilder sb = new StringBuilder();
             for (int i = 0; i < pathSegments.Length; i++) {
-                uriBuilder.Path += i != 0 ? "/" + pathSegments[i] : pathSegments[i];
+                sb.Append(i != 0 ? "/" + pathSegments[i] : pathSegments[i]);
             }
 
+            UriBuilder uriBuilder = new UriBuilder(baseUrl);
+            uriBuilder.Path = sb.ToString();
             return uriBuilder.Uri;
         }
     }

DracoonSdk/SdkInternal/ApiModel/Settings/ApiClassificationPolicies.cs

@@ -0,0 +1,8 @@
+using Newtonsoft.Json;
+
+namespace Dracoon.Sdk.SdkInternal.ApiModel {
+    internal class ApiClassificationPolicies {
+        [JsonProperty("shareClassificationPolicies", NullValueHandling = NullValueHandling.Ignore)]
+        public ApiShareClassificationPolicy SharePolicy { get; set; }
+    }
+}

DracoonSdk/SdkInternal/ApiModel/Settings/ApiShareClassificationPolicy.cs

@@ -0,0 +1,8 @@
+using Newtonsoft.Json;
+
+namespace Dracoon.Sdk.SdkInternal.ApiModel {
+    internal class ApiShareClassificationPolicy {
+        [JsonProperty("classificationRequiresSharePassword", NullValueHandling = NullValueHandling.Ignore)]
+        public int PasswordRequirementMinimumClassification { get; set; }
+    }
+}

DracoonSdk/SdkInternal/DracoonAccountImpl.cs

@@ -256,8 +256,6 @@ public AvatarInfo UpdateAvatar(Image newAvatar) {
 
             #region Build multipart
 
-            ImageCodecInfo info = ImageCodecInfo.GetImageDecoders().First(c => c.FormatID == newAvatar.RawFormat.Guid);
-
             string formDataBoundary = "---------------------------" + Guid.NewGuid();
             byte[] packageHeader = ApiConfig.ENCODING.GetBytes(
                 $"--{formDataBoundary}\r\nContent-Disposition: form-data; name=\"{"file"}\"; filename=\"{"avatarImage"}\"\r\n\r\n");