3 files changed, 45 insertions, 0 deletions
diff --git a/ExamTemplate/Common/ErrorMessages.cs b/ExamTemplate/Common/ErrorMessages.cs
new file mode 100644
index 0000000..fa15b8c
--- /dev/null
+++ b/ExamTemplate/Common/ErrorMessages.cs
@@ -0,0 +1,12 @@
+using System;
+
+namespace ExamTemplate.Common
+{
+	public static class ErrorMessages
+	{
+		public static string NullObject(Type t)
+		{
+			return String.Format("{0} cannot be null!", t);
+		}
+	}
+}
diff --git a/ExamTemplate/Services/Services/BaseService.cs b/ExamTemplate/Services/Services/BaseService.cs
index 89b3239..f2ba34e 100644
--- a/ExamTemplate/Services/Services/BaseService.cs
+++ b/ExamTemplate/Services/Services/BaseService.cs
@@ -6,6 +6,7 @@ using System.Collections.Generic;
 using Microsoft.EntityFrameworkCore;
 using System.Linq;
 using ExamTemplate.Services.Interfaces;
+using ExamTemplate.Common;
 
 namespace ExamTemplate.Services.Services
 {
@@ -24,6 +25,9 @@ namespace ExamTemplate.Services.Services
 
 		public virtual async Task<bool> CreateAsync(ServiceModel serviceModel)
 		{
+			if (serviceModel == null)
+				throw new ArgumentNullException(ErrorMessages.NullObject(typeof(ServiceModel)));
+
 			DbModel newEntity = this._autoMapper.Map<DbModel>(serviceModel);
 
 			await this.GetDbSet()
@@ -34,6 +38,9 @@ namespace ExamTemplate.Services.Services
 
 		public virtual async Task<ServiceModel> GetByIdAsync(Guid id)
 		{
+			if (id == null)
+				throw new ArgumentNullException(ErrorMessages.NullObject(typeof(Guid)));
+
 			DbModel entity = await this.GetDbSet()
 				.FindAsync(id);
 
@@ -49,6 +56,9 @@ namespace ExamTemplate.Services.Services
 
 		public virtual async Task<bool> EditAsync(ServiceModel serviceModel)
 		{
+			if (serviceModel == null)
+				throw new ArgumentNullException(ErrorMessages.NullObject(typeof(ServiceModel)));
+
 			DbModel entity = this._autoMapper.Map<DbModel>(serviceModel);
 
 			this._context.Update(entity);
diff --git a/ExamTemplate/Services/Services/UserService.cs b/ExamTemplate/Services/Services/UserService.cs
index f2a3e9f..4e85688 100644
--- a/ExamTemplate/Services/Services/UserService.cs
+++ b/ExamTemplate/Services/Services/UserService.cs
@@ -31,6 +31,9 @@ namespace ExamTemplate.Services.Services
 
 		public async Task<bool> RegisterUserAsync(RegisterUserServiceModel registerUserServiceModel)
 		{
+			if (registerUserServiceModel == null)
+				throw new ArgumentNullException(ErrorMessages.NullObject(typeof(RegisterUserServiceModel)));
+
 			User user = this._autoMapper.Map<User>(registerUserServiceModel);
 
 			user.PasswordHash = this._userManager.PasswordHasher.HashPassword(user, registerUserServiceModel.Password);
@@ -53,6 +56,9 @@ namespace ExamTemplate.Services.Services
 
 		public async Task<bool> LoginUserAsync(LoginUserServiceModel loginUserServiceModel)
 		{
+			if (loginUserServiceModel == null)
+				throw new ArgumentNullException(ErrorMessages.NullObject(typeof(LoginUserServiceModel)));
+
 			SignInResult result = await this._signInManager.PasswordSignInAsync(loginUserServiceModel.Username, loginUserServiceModel.Password, false, false);
 
 			return result.Succeeded;
@@ -65,6 +71,9 @@ namespace ExamTemplate.Services.Services
 
 		public async Task<UserServiceModel> GetUserByUsernameAsync(string username)
 		{
+			if (username == null)
+				throw new ArgumentNullException(ErrorMessages.NullObject(typeof(string)));
+
 			User user = await this._userManager.Users
 				.FirstOrDefaultAsync(x => x.UserName == username);
 
@@ -73,6 +82,9 @@ namespace ExamTemplate.Services.Services
 
 		public async Task<UserServiceModel> GetUserByClaimsAsync(ClaimsPrincipal claimsPrincipal)
 		{
+			if (claimsPrincipal == null)
+				throw new ArgumentNullException(ErrorMessages.NullObject(typeof(ClaimsPrincipal)));
+
 			User user = await this._userManager.GetUserAsync(claimsPrincipal);
 
 			return this._autoMapper.Map<UserServiceModel>(user);
@@ -80,6 +92,11 @@ namespace ExamTemplate.Services.Services
 
 		public async Task<bool> EditUserAsync(ClaimsPrincipal claimsPrincipal, UserServiceModel userServiceModel)
 		{
+			if (claimsPrincipal == null)
+				throw new ArgumentNullException(ErrorMessages.NullObject(typeof(ClaimsPrincipal)));
+			if (userServiceModel == null)
+				throw new ArgumentNullException(ErrorMessages.NullObject(typeof(UserServiceModel)));
+
 			User user = await this._userManager.GetUserAsync(claimsPrincipal);
 
 			user.UserName = userServiceModel.Username;
@@ -92,6 +109,9 @@ namespace ExamTemplate.Services.Services
 
 		public async Task<bool> DeleteUserAsync(ClaimsPrincipal claimsPrincipal)
 		{
+			if (claimsPrincipal == null)
+				throw new ArgumentNullException(ErrorMessages.NullObject(typeof(ClaimsPrincipal)));
+
 			User user = await this._userManager.GetUserAsync(claimsPrincipal);
 
 			IdentityResult result = await this._userManager.DeleteAsync(user);
@@ -100,6 +120,9 @@ namespace ExamTemplate.Services.Services
 
 		public bool IsSignedIn(ClaimsPrincipal claimsPrincipal)
 		{
+			if (claimsPrincipal == null)
+				throw new ArgumentNullException(ErrorMessages.NullObject(typeof(ClaimsPrincipal)));
+
 			return this._signInManager.IsSignedIn(claimsPrincipal);
 		}
 	}