Fixed conflicts

EasyMicroservices · Aug 9, 2023 · b27981c · b27981c
1 parent ecf59bb
commit b27981c
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 70 deletions.
diff --git a/...ationsMicroservice.Clients/Connected Services/AuthenticationsGeneratedServices/OpenAPI.cs b/...ationsMicroservice.Clients/Connected Services/AuthenticationsGeneratedServices/OpenAPI.cs
@@ -104,7 +104,7 @@ public virtual async System.Threading.Tasks.Task<Int64MessageContract> RegisterA
                         var status_ = (int)response_.StatusCode;
                         if (status_ == 200)
                         {
-                            var objectResponse_ = await ReadObjectResponseAsync<UserResponseContractMessageContract>(response_, headers_, cancellationToken).ConfigureAwait(false);
+                            var objectResponse_ = await ReadObjectResponseAsync<Int64MessageContract>(response_, headers_, cancellationToken).ConfigureAwait(false);
                             if (objectResponse_.Object == null)
                             {
                                 throw new ApiException("Response was null which was not expected.", status_, objectResponse_.Text, headers_, null);
@@ -133,15 +133,15 @@ public virtual async System.Threading.Tasks.Task<Int64MessageContract> RegisterA
 
         /// <returns>Success</returns>
         /// <exception cref="ApiException">A server side error occurred.</exception>
-        public virtual System.Threading.Tasks.Task<UserResponseContractMessageContract> LoginAsync(UserSummaryContract body)
+        public virtual System.Threading.Tasks.Task<UserResponseContractMessageContract> LoginAsync(UserClaimContract body)
         {
             return LoginAsync(body, System.Threading.CancellationToken.None);
         }
 
         /// <param name="cancellationToken">A cancellation token that can be used by other objects or threads to receive notice of cancellation.</param>
         /// <returns>Success</returns>
         /// <exception cref="ApiException">A server side error occurred.</exception>
-        public virtual async System.Threading.Tasks.Task<UserResponseContractMessageContract> LoginAsync(UserSummaryContract body, System.Threading.CancellationToken cancellationToken)
+        public virtual async System.Threading.Tasks.Task<UserResponseContractMessageContract> LoginAsync(UserClaimContract body, System.Threading.CancellationToken cancellationToken)
         {
             var urlBuilder_ = new System.Text.StringBuilder();
             urlBuilder_.Append(BaseUrl != null ? BaseUrl.TrimEnd('/') : "").Append("/api/Users/Login");
@@ -1646,52 +1646,6 @@ protected virtual void RaisePropertyChanged([System.Runtime.CompilerServices.Cal
         }
     }
 
-    [System.CodeDom.Compiler.GeneratedCode("NJsonSchema", "13.19.0.0 (NJsonSchema v10.9.0.0 (Newtonsoft.Json v13.0.3.0))")]
-    public partial class UserSummaryContract : System.ComponentModel.INotifyPropertyChanged
-    {
-        private string _userName;
-        private string _password;
-
-        [Newtonsoft.Json.JsonProperty("userName", Required = Newtonsoft.Json.Required.Default, NullValueHandling = Newtonsoft.Json.NullValueHandling.Ignore)]
-        public string UserName
-        {
-            get { return _userName; }
-
-            set
-            {
-                if (_userName != value)
-                {
-                    _userName = value;
-                    RaisePropertyChanged();
-                }
-            }
-        }
-
-        [Newtonsoft.Json.JsonProperty("password", Required = Newtonsoft.Json.Required.Default, NullValueHandling = Newtonsoft.Json.NullValueHandling.Ignore)]
-        public string Password
-        {
-            get { return _password; }
-
-            set
-            {
-                if (_password != value)
-                {
-                    _password = value;
-                    RaisePropertyChanged();
-                }
-            }
-        }
-
-        public event System.ComponentModel.PropertyChangedEventHandler PropertyChanged;
-
-        protected virtual void RaisePropertyChanged([System.Runtime.CompilerServices.CallerMemberName] string propertyName = null)
-        {
-            var handler = PropertyChanged;
-            if (handler != null)
-                handler(this, new System.ComponentModel.PropertyChangedEventArgs(propertyName));
-        }
-    }
-
     [System.CodeDom.Compiler.GeneratedCode("NJsonSchema", "13.19.0.0 (NJsonSchema v10.9.0.0 (Newtonsoft.Json v13.0.3.0))")]
     public partial class ValidationContract : System.ComponentModel.INotifyPropertyChanged
     {

diff --git a/...croservice.Clients/Connected Services/AuthenticationsGeneratedServices/OpenAPI.nswag.json b/...croservice.Clients/Connected Services/AuthenticationsGeneratedServices/OpenAPI.nswag.json
@@ -126,12 +126,12 @@
               "text/json": {
                 "schema": {
                   "type": "string"
+                }
               }
             }
           }
         }
       }
-      }
     },
     "/api/Users/GetById": {
       "get": {
@@ -683,20 +683,6 @@
           }
         }
       },
-      "UserSummaryContract": {
-        "type": "object",
-        "additionalProperties": false,
-        "properties": {
-          "userName": {
-            "type": "string",
-            "nullable": true
-          },
-          "password": {
-            "type": "string",
-            "nullable": true
-          }
-        }
-      },
       "ValidationContract": {
         "type": "object",
         "additionalProperties": false,

diff --git a/...CSharp/EasyMicroservices.AuthenticationsMicroservice.WebApi/Controllers/UserController.cs b/...CSharp/EasyMicroservices.AuthenticationsMicroservice.WebApi/Controllers/UserController.cs
@@ -48,12 +48,12 @@ public async Task<MessageContract<UserResponseContract>> Login(UserClaimContract
             return response;
         }
 
-        [HttpGet]
-        [Authorize]
-        public string Test()
-        {
-            return "test";
-        }
+        //[HttpGet]
+        //[Authorize]
+        //public string Test()
+        //{
+        //    return "test";
+        //}
 
     }
 }