Adam
/
TourIAm
1
0
Fork 0
Code Issues 1 Pull Requests Projects Releases Wiki Activity

Compare commits

base: Adam:2ce0890f1298fd023e94a3c5eb8d34cea4e6f164
Branches Tags
Adam:master
Adam:TIAM_v0.0.6.0
Adam:v0.0.5.1
Adam:Fullepi_Sandbox
..
compare: Adam:c5273f467e2f56da85e3d1236909e27d98a96d82
Branches Tags
Adam:TIAM_v0.0.6.0
Adam:v0.0.5.1
Adam:master
Adam:Fullepi_Sandbox

No commits in common. "2ce0890f1298fd023e94a3c5eb8d34cea4e6f164" and "c5273f467e2f56da85e3d1236909e27d98a96d82" have entirely different histories.
2ce0890f12 ... c5273f467e

25 changed files with 438 additions and 652 deletions
Show Stats Expand all files Collapse all files

2
TIAM.Database.Test/DatabaseTest.cs
View File

@ -5,7 +5,7 @@ using TIAM.Database.DbContexts;
namespace TIAM.Database.Test namespace TIAM.Database.Test
{ {
[TestClass] [TestClass]
public class DatabaseTest //: DatabaseTestModelBase<TiamDbContextBase> public class DatabaseTest : DatabaseTestModelBase
{ {
[TestInitialize] [TestInitialize]

40
TIAM.Database.Test/ServiceProviderDalTest.cs
View File

@ -1,40 +0,0 @@
using AyCode.Database.Tests;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using AyCode.Database.DataLayers.Users;
using TIAM.Database.DataLayers.ServiceProviders;
using TIAM.Database.DataLayers.Users;
using TIAM.Database.DbContexts;
namespace TIAM.Database.Test
{
[TestClass]
public class ServiceProviderDalTest : DatabaseTestModelBase<ServiceProviderDbContext>
{
private ServiceProviderDal _serviceProviderDal;
[TestInitialize]
public void Setup()
{
_serviceProviderDal = new ServiceProviderDal();
}
[TestCleanup]
public void TearDown()
{ }
[TestMethod]
//[DataRow(Guid.Parse("540271F6-C604-4C16-8160-D5A7CAFEDF00")]
public async Task GetPermissionContextMappingByContext_ReturnsPermissionContextMapping_WhenPermissionContextMappingExists()//(Guid contextId)
{
var contextId = Guid.Parse("540271F6-C604-4C16-8160-D5A7CAFEDF00");
var permMapping = await _serviceProviderDal.GetPermissionContextMappingByContextIdAsync(contextId);
Assert.IsNotNull(permMapping);
}
}
}

193
TIAM.Database.Test/UserDalTests.cs
View File

@ -1,5 +1,4 @@
using AyCode.Database.DataLayers; using AyCode.Database.Tests;
using AyCode.Database.Tests;
using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore;
using Microsoft.VisualStudio.TestPlatform.ObjectModel; using Microsoft.VisualStudio.TestPlatform.ObjectModel;
using Microsoft.VisualStudio.TestTools.UnitTesting; using Microsoft.VisualStudio.TestTools.UnitTesting;
@ -11,7 +10,7 @@ using TIAM.Entities.Users;
namespace TIAM.Database.Test namespace TIAM.Database.Test
{ {
[TestClass] [TestClass]
public class UserDalTests : DatabaseTestModelBase<UserDbContext> public class UserDalTests : DatabaseTestModelBase
{ {
private Mock<UserDbContext> _mockContext; private Mock<UserDbContext> _mockContext;
private UserDal _userDal; private UserDal _userDal;
@ -19,143 +18,109 @@ namespace TIAM.Database.Test
[TestInitialize] [TestInitialize]
public void TestInitialize() public void TestInitialize()
{ {
//var options = new DbContextOptionsBuilder<UserDbContext>() var options = new DbContextOptionsBuilder<UserDbContext>()
// .UseInMemoryDatabase(databaseName: "UserDatabase") .UseInMemoryDatabase(databaseName: "UserDatabase")
// .Options; .Options;
//_mockContext = new Mock<UserDbContext>(options); _mockContext = new Mock<UserDbContext>(options);
//var mockSet = new Mock<DbSet<User>>(); var mockSet = new Mock<DbSet<User>>();
//_mockContext.Setup(c => c.Users).Returns(mockSet.Object); _mockContext.Setup(c => c.Users).Returns(mockSet.Object);
//_userDal = new UserDal(_mockContext.Object); _userDal = new UserDal(_mockContext.Object);
_userDal = PooledDal.CreateDal<UserDal>();
}
[TestMethod]
[DataRow("test@tiam.hu")]
public void GetUserByEmail_ReturnsUser_WhenUserExists(string email)
{
//var userDal = PooledDal.CreateDal<UserDal>();
var user = _userDal.GetUserByEmail(email);
Assert.IsNotNull(user);
Assert.AreEqual(email, user.EmailAddress);
} }
[TestMethod] [TestMethod]
[DataRow("test@tiam.hu")] [DataRow("test@tiam.hu")]
public async Task GetUserByEmailAsync_ReturnsUser_WhenUserExists(string email) public async Task GetUserByEmailAsync_ReturnsUser_WhenUserExists(string email)
{ {
User? user = null; // Arrange
//var userDal = PooledDal.CreateDal<UserDal>(); var user = new User { Email = email };
var users = new[] { user }.AsQueryable();
user = await _userDal.GetUserByEmailAsync(email).ConfigureAwait(false); var mockSet = new Mock<DbSet<User>>();
mockSet.As<IQueryable<User>>().Setup(m => m.Provider).Returns(users.Provider);
mockSet.As<IQueryable<User>>().Setup(m => m.Expression).Returns(users.Expression);
mockSet.As<IQueryable<User>>().Setup(m => m.ElementType).Returns(users.ElementType);
mockSet.As<IQueryable<User>>().Setup(m => m.GetEnumerator()).Returns(users.GetEnumerator());
//user = await _userDal.SessionAsync(ctx => ctx.Users.FirstOrDefault(x => x.EmailAddress == email)).ConfigureAwait(false); _mockContext.Setup(c => c.Users).Returns(mockSet.Object);
//await using (var ctx = _userDal.Context) // Act
//{ var result = await _userDal.GetUserByEmailAsync(email);
// user = await ctx.Users.FirstOrDefaultAsync(x => x.EmailAddress == email).ConfigureAwait(false);
//}
// Assert
Assert.IsNotNull(user); Assert.IsNotNull(result);
Assert.AreEqual(email, user.EmailAddress); Assert.AreEqual(email, result.Email);
} }
//[TestMethod] [TestMethod]
//[DataRow("test@tiam.hu")] [DataRow("test@test.hu")]
//public async Task GetUserByEmailAsync_ReturnsUser_WhenUserExists(string email) public async Task GetUserByEmailAsync_ReturnsNull_WhenUserDoesNotExist(string email)
//{ {
// // Arrange // Arrange
// var user = new User { EmailAddress = email }; var users = new User[0].AsQueryable();
// var users = new[] { user }.AsQueryable();
// var mockSet = new Mock<DbSet<User>>(); var mockSet = new Mock<DbSet<User>>();
// mockSet.As<IQueryable<User>>().Setup(m => m.Provider).Returns(users.Provider); mockSet.As<IQueryable<User>>().Setup(m => m.Provider).Returns(users.Provider);
// mockSet.As<IQueryable<User>>().Setup(m => m.Expression).Returns(users.Expression); mockSet.As<IQueryable<User>>().Setup(m => m.Expression).Returns(users.Expression);
// mockSet.As<IQueryable<User>>().Setup(m => m.ElementType).Returns(users.ElementType); mockSet.As<IQueryable<User>>().Setup(m => m.ElementType).Returns(users.ElementType);
// mockSet.As<IQueryable<User>>().Setup(m => m.GetEnumerator()).Returns(users.GetEnumerator()); mockSet.As<IQueryable<User>>().Setup(m => m.GetEnumerator()).Returns(users.GetEnumerator());
// _mockContext.Setup(c => c.Users).Returns(mockSet.Object); _mockContext.Setup(c => c.Users).Returns(mockSet.Object);
// // Act // Act
// var result = await _userDal.GetUserByEmailAsync(email); var result = await _userDal.GetUserByEmailAsync(email);
// // Assert // Assert
// Assert.IsNotNull(result); Assert.IsNull(result);
// Assert.AreEqual(email, result.EmailAddress); }
//}
//[TestMethod] [TestMethod]
//[DataRow("TEST@TEST.COM")] [DataRow("test@test.com", "+1234567890", "password")]
//public async Task GetUserByEmailAsync_ReturnsNull_WhenUserDoesNotExist(string email) public async Task CreateUserAsync_ShouldReturnTrue_WhenUserIsCreated(string email, string phoneNumbr, string password)
//{ {
// // Arrange // Arrange
// var users = new User[0].AsQueryable(); var user = new User
{
Id = Guid.NewGuid(),
Email = email,
PhoneNumber = phoneNumbr,
Password = password
};
// var mockSet = new Mock<DbSet<User>>(); var mockSet = new Mock<DbSet<User>>();
// mockSet.As<IQueryable<User>>().Setup(m => m.Provider).Returns(users.Provider); _mockContext.Setup(x => x.Users).Returns(mockSet.Object);
// mockSet.As<IQueryable<User>>().Setup(m => m.Expression).Returns(users.Expression); _mockContext.Setup(x => x.Users.Add(user)).Returns(() => null);
// mockSet.As<IQueryable<User>>().Setup(m => m.ElementType).Returns(users.ElementType);
// mockSet.As<IQueryable<User>>().Setup(m => m.GetEnumerator()).Returns(users.GetEnumerator());
// _mockContext.Setup(c => c.Users).Returns(mockSet.Object); _mockContext.Setup(x => x.SaveChangesAsync(It.IsAny<CancellationToken>()))
.ReturnsAsync(1)
.Verifiable();
// // Act // Act
// var result = await _userDal.GetUserByEmailAsync(email); var result = await _userDal.CreateUserAsync(user);
// // Assert // Assert
// Assert.IsNull(result); Assert.IsTrue(result);
//} }
//[TestMethod] [TestMethod]
//[DataRow("TEST@TEST.COM", "+1234567890", "password")] [DataRow("test@test.com", "+1234567890", "password")]
//public async Task CreateUserAsync_ShouldReturnTrue_WhenUserIsCreated(string email, string phoneNumbr, string password) public async Task UpdateUserAsync_ShouldUpdateUser(string email, string phoneNumbr, string password)
//{ {
// // Arrange // Arrange
// var user = new User var user = new User(Guid.NewGuid(), email, phoneNumbr, password);
// { _mockContext.Object.Users.Add(user);
// Id = Guid.NewGuid(), await _mockContext.Object.SaveChangesAsync();
// EmailAddress = email,
// PhoneNumber = phoneNumbr,
// Password = password
// };
// var mockSet = new Mock<DbSet<User>>(); // Act
// _mockContext.Setup(x => x.Users).Returns(mockSet.Object); user.Email = email;
// _mockContext.Setup(x => x.Users.Add(user)).Returns(() => null); var result = await _userDal.UpdateUserAsync(user);
// _mockContext.Setup(x => x.SaveChangesAsync(It.IsAny<CancellationToken>())) // Assert
// .ReturnsAsync(1) Assert.IsTrue(result);
// .Verifiable(); var updatedUser = _mockContext.Object.Users.Single(u => u.Email == user.Email);
Assert.AreEqual(email, updatedUser.Email);
// // Act }
// var result = await _userDal.CreateUserAsync(user);
// // Assert
// Assert.IsTrue(result);
//}
//[TestMethod]
//[DataRow("TEST@TEST.COM", "+1234567890", "password")]
//public async Task UpdateUserAsync_ShouldUpdateUser(string email, string phoneNumbr, string password)
//{
// // Arrange
// var user = new User(Guid.NewGuid(), email, phoneNumbr, password);
// _mockContext.Object.Users.Add(user);
// await _mockContext.Object.SaveChangesAsync();
// // Act
// user.EmailAddress = email;
// var result = await _userDal.UpdateUserAsync(user);
// // Assert
// Assert.IsTrue(result);
// var updatedUser = _mockContext.Object.Users.Single(u => u.EmailAddress == user.EmailAddress);
// Assert.AreEqual(email, updatedUser.EmailAddress);
//}
} }
} }

16
TIAM.Database/DataLayers/Admins/AdminDal.cs
View File

@ -18,34 +18,34 @@ namespace TIAM.Database.DataLayers.Users
public Task<List<User>> GetUsersAsync() public Task<List<User>> GetUsersAsync()
{ {
return Context.Users.ToListAsync(); return Ctx.Users.ToListAsync();
} }
public Task<User?> GetUserByEmailAsync(string email) public Task<User?> GetUserByEmailAsync(string email)
{ {
Console.WriteLine($"Getting user from db {email}"); Console.WriteLine($"Getting user from db {email}");
var emailLower = email.ToLower(); var emailLower = email.ToLower();
return Context.Users.SingleOrDefaultAsync(x=>x.EmailAddress.ToLower() == emailLower); return Ctx.Users.SingleOrDefaultAsync(x=>x.Email.ToLower() == emailLower);
} }
public Task<bool> CreateUserAsync(User user) public Task<bool> CreateUserAsync(User user)
{ {
user.Created = DateTime.UtcNow; user.Created = DateTime.UtcNow;
user.Modified = DateTime.UtcNow; user.Modified = DateTime.UtcNow;
Context.Users.Add(user); Ctx.Users.Add(user);
Console.WriteLine($"Saving user to db {user.Id}, {user.EmailAddress}, {user.PhoneNumber}, {user.Password}"); Console.WriteLine($"Saving user to db {user.Id}, {user.Email}, {user.PhoneNumber}, {user.Password}");
return Context.SaveChangesAsync().ContinueWith(x=>x.Result > 0); return Ctx.SaveChangesAsync().ContinueWith(x=>x.Result > 0);
} }
public Task<bool> UpdateUserAsync(User user) public Task<bool> UpdateUserAsync(User user)
{ {
var existingUser = Context.Users.FirstOrDefault(u => u.EmailAddress == user.EmailAddress); var existingUser = Ctx.Users.FirstOrDefault(u => u.Email == user.Email);
if (existingUser != null) if (existingUser != null)
{ {
//user.Modified = DateTime.UtcNow; //ezt nem kell megadni, a háttérben ezt magától megcsinálja a DbContextBase - J. //user.Modified = DateTime.UtcNow; //ezt nem kell megadni, a háttérben ezt magától megcsinálja a DbContextBase - J.
existingUser = user; existingUser = user;
Context.Users.Update(existingUser); Ctx.Users.Update(existingUser);
return Context.SaveChangesAsync().ContinueWith(x => x.Result > 0); return Ctx.SaveChangesAsync().ContinueWith(x => x.Result > 0);
} }
else else
{ {

14
TIAM.Database/DataLayers/Auctions/AuctionDal.cs
View File

@ -18,37 +18,37 @@ namespace TIAM.Database.DataLayers.Users
public Task<List<AuctionBid>> GetBids() public Task<List<AuctionBid>> GetBids()
{ {
return Context.AuctionBids.ToListAsync(); return Ctx.AuctionBids.ToListAsync();
} }
public Task<List<AuctionBid>> GetBidsByEmail(string email) public Task<List<AuctionBid>> GetBidsByEmail(string email)
{ {
Console.WriteLine($"Getting bid from db {email}"); Console.WriteLine($"Getting bid from db {email}");
var emailLower = email.ToLower(); var emailLower = email.ToLower();
return Context.AuctionBids.Where(x => x.Email.ToLower() == emailLower).ToListAsync(); return Ctx.AuctionBids.Where(x => x.Email.ToLower() == emailLower).ToListAsync();
} }
public async Task<AuctionBid?> GetBidById(Guid id) public async Task<AuctionBid?> GetBidById(Guid id)
{ {
Console.WriteLine($"Getting bid from db {id}"); Console.WriteLine($"Getting bid from db {id}");
return Context.AuctionBids.FirstOrDefault(x => x.Id == id); return Ctx.AuctionBids.FirstOrDefault(x => x.Id == id);
} }
public Task<bool> CreateBidAsync(AuctionBid auctionBid) public Task<bool> CreateBidAsync(AuctionBid auctionBid)
{ {
auctionBid.Created = DateTime.UtcNow; auctionBid.Created = DateTime.UtcNow;
auctionBid.Modified = DateTime.UtcNow; auctionBid.Modified = DateTime.UtcNow;
Context.AuctionBids.Add(auctionBid); Ctx.AuctionBids.Add(auctionBid);
Console.WriteLine($"Saving user to db {auctionBid.Id}, {auctionBid.Email}, {auctionBid.PhoneNumber}"); Console.WriteLine($"Saving user to db {auctionBid.Id}, {auctionBid.Email}, {auctionBid.PhoneNumber}");
return Context.SaveChangesAsync().ContinueWith(x => x.Result > 0); return Ctx.SaveChangesAsync().ContinueWith(x => x.Result > 0);
} }
public Task<bool> UpdateBidAsync(AuctionBid auctionBid) public Task<bool> UpdateBidAsync(AuctionBid auctionBid)
{ {
auctionBid.Modified = DateTime.UtcNow; auctionBid.Modified = DateTime.UtcNow;
Context.AuctionBids.Update(auctionBid); Ctx.AuctionBids.Update(auctionBid);
return Context.SaveChangesAsync().ContinueWith(x => x.Result > 0); return Ctx.SaveChangesAsync().ContinueWith(x => x.Result > 0);
} }
} }
} }

381
TIAM.Database/DataLayers/ServiceProviders/ServiceProviderDal.cs
View File

@ -31,29 +31,29 @@ namespace TIAM.Database.DataLayers.ServiceProviders
//16. (IServiceProviderDataService) get all service providers //16. (IServiceProviderDataService) get all service providers
public Task<List<TiamServiceProvider>> GetServiceProvidersAsync() public Task<List<TiamServiceProvider>> GetServiceProvidersAsync()
{ {
return Context.ServiceProviders.ToListAsync(); return Ctx.ServiceProviders.ToListAsync();
} }
//18. (IServiceProviderDataService) get serviceProvider by Id //18. (IServiceProviderDataService) get serviceProvider by Id
public virtual Task<TiamServiceProvider?> GetServiceProviderByIdAsync(Guid id) public virtual Task<TiamServiceProvider?> GetServiceProviderByIdAsync(Guid id)
{ {
Console.WriteLine($"Getting serviceProvider from db {id}"); Console.WriteLine($"Getting serviceProvider from db {id}");
return Context.ServiceProviders.SingleOrDefaultAsync(x=>x.Id == id); return Ctx.ServiceProviders.SingleOrDefaultAsync(x=>x.Id == id);
} }
//15. (IServiceProviderDataService) Create service provider //15. (IServiceProviderDataService) Create service provider
public Task<bool> CreateServiceProviderAsync(TiamServiceProvider serviceProvider) public Task<bool> CreateServiceProviderAsync(TiamServiceProvider serviceProvider)
{ {
if(serviceProvider.Name == Context.ServiceProviders.FirstOrDefault(x=>x.Name == serviceProvider.Name)?.Name) if(serviceProvider.Name == Ctx.ServiceProviders.FirstOrDefault(x=>x.Name == serviceProvider.Name)?.Name)
{ {
throw new Exception("ServiceProvider already exists"); throw new Exception("ServiceProvider already exists");
} }
else else
{ {
Context.ServiceProviders.Add(serviceProvider); Ctx.ServiceProviders.Add(serviceProvider);
Console.WriteLine($"Saving serviceProvider to db {serviceProvider.Id}, {serviceProvider.Name}, {serviceProvider.OwnerId}"); Console.WriteLine($"Saving serviceProvider to db {serviceProvider.Id}, {serviceProvider.Name}, {serviceProvider.OwnerId}");
return Context.SaveChangesAsync().ContinueWith(x=>x.Result > 0); return Ctx.SaveChangesAsync().ContinueWith(x=>x.Result > 0);
} }
} }
@ -61,12 +61,12 @@ namespace TIAM.Database.DataLayers.ServiceProviders
//14. (IserviceProviderDataService) Update service provider //14. (IserviceProviderDataService) Update service provider
public Task<bool> UpdateServiceProviderAsync(TiamServiceProvider serviceProvider) public Task<bool> UpdateServiceProviderAsync(TiamServiceProvider serviceProvider)
{ {
var dbServiceProvider = Context.ServiceProviders.FirstOrDefault(u => u.Id == serviceProvider.Id); var dbServiceProvider = Ctx.ServiceProviders.FirstOrDefault(u => u.Id == serviceProvider.Id);
if (dbServiceProvider != null) if (dbServiceProvider != null)
{ {
dbServiceProvider = serviceProvider; dbServiceProvider = serviceProvider;
Context.ServiceProviders.Update(dbServiceProvider); Ctx.ServiceProviders.Update(dbServiceProvider);
return Context.SaveChangesAsync().ContinueWith(x => x.Result > 0); return Ctx.SaveChangesAsync().ContinueWith(x => x.Result > 0);
} }
else else
{ {
@ -77,18 +77,18 @@ namespace TIAM.Database.DataLayers.ServiceProviders
//13. (IserviceProviderDataService) delete service provider //13. (IserviceProviderDataService) delete service provider
public Task<bool> DeleteServiceProviderAsync(Guid id) public Task<bool> DeleteServiceProviderAsync(Guid id)
{ {
using (var transaction = Context.Database.BeginTransaction()) using (var transaction = Ctx.Database.BeginTransaction())
{ {
var dbServiceProvider = Context.ServiceProviders.FirstOrDefault(u => u.Id == id); var dbServiceProvider = Ctx.ServiceProviders.FirstOrDefault(u => u.Id == id);
if (dbServiceProvider != null) if (dbServiceProvider != null)
{ {
//get products for this provider //get products for this provider
var products = Context.Products.Where(x => x.OwnerId == id).ToList(); var products = Ctx.Products.Where(x => x.OwnerId == id).ToList();
/*foreach (var productItem in products) /*foreach (var productItem in products)
{ {
//delete products //delete products
var permissionContextMappings = Context.PermissionContextMappings.Where(x => x.ContextId == productItem.Id).ToList(); var permissionContextMappings = Ctx.PermissionContextMappings.Where(x => x.ContextId == productItem.Id).ToList();
//iterate through every row //iterate through every row
foreach (var item in permissionContextMappings) foreach (var item in permissionContextMappings)
{ {
@ -96,20 +96,20 @@ namespace TIAM.Database.DataLayers.ServiceProviders
if (item.SubjectType == (int)PermissionContextMappingSubjectType.Group) if (item.SubjectType == (int)PermissionContextMappingSubjectType.Group)
{ {
//get users in the permissiongroup //get users in the permissiongroup
var permissionGroupUserMapping = Context.PermissionGroupUserMappings.Where(x => x.PermissionContextMappingId == item.Id).ToList(); var permissionGroupUserMapping = Ctx.PermissionGroupUserMappings.Where(x => x.PermissionContextMappingId == item.Id).ToList();
//remove every row (users) from permissiongroup //remove every row (users) from permissiongroup
foreach (var user in permissionGroupUserMapping) foreach (var user in permissionGroupUserMapping)
{ {
Context.PermissionGroupUserMappings.Remove(user); Ctx.PermissionGroupUserMappings.Remove(user);
} }
} }
} }
//remove permissioncontextmappings //remove permissioncontextmappings
Context.PermissionContextMappings.RemoveRange(permissionContextMappings); Ctx.PermissionContextMappings.RemoveRange(permissionContextMappings);
}*/ }*/
Context.Products.RemoveRange(products); Ctx.Products.RemoveRange(products);
Context.ServiceProviders.Remove(dbServiceProvider); Ctx.ServiceProviders.Remove(dbServiceProvider);
return Context.SaveChangesAsync().ContinueWith(x => x.Result > 0); return Ctx.SaveChangesAsync().ContinueWith(x => x.Result > 0);
} }
else else
{ {
@ -135,9 +135,9 @@ namespace TIAM.Database.DataLayers.ServiceProviders
{ {
bool result = false; bool result = false;
using (var transaction = Context.Database.BeginTransaction()) using (var transaction = Ctx.Database.BeginTransaction())
{ {
var existingPermission = Context.PermissionsTypes var existingPermission = Ctx.PermissionsTypes
.FirstOrDefault(x => x.PermissionName == permissionsType.PermissionName)?.PermissionName; .FirstOrDefault(x => x.PermissionName == permissionsType.PermissionName)?.PermissionName;
if (existingPermission == null) if (existingPermission == null)
@ -145,7 +145,7 @@ namespace TIAM.Database.DataLayers.ServiceProviders
//get all the permissiontypes for this context //get all the permissiontypes for this context
var permissionTypes = new List<PermissionsType>(); var permissionTypes = new List<PermissionsType>();
var nextBitValue = 0.0; var nextBitValue = 0.0;
permissionTypes = Context.PermissionsTypes permissionTypes = Ctx.PermissionsTypes
.Where(x => x.ContextId == permissionsType.ContextId) .Where(x => x.ContextId == permissionsType.ContextId)
.ToList(); .ToList();
@ -160,8 +160,8 @@ namespace TIAM.Database.DataLayers.ServiceProviders
nextBitValue = Math.Pow(2,0); nextBitValue = Math.Pow(2,0);
} }
permissionsType.PermissionBit = (int)nextBitValue; permissionsType.PermissionBit = (int)nextBitValue;
Context.PermissionsTypes.Add(permissionsType); Ctx.PermissionsTypes.Add(permissionsType);
Context.SaveChanges(); Ctx.SaveChanges();
transaction.Commit(); transaction.Commit();
result = true; result = true;
} }
@ -178,12 +178,12 @@ namespace TIAM.Database.DataLayers.ServiceProviders
//11. (IPermissionService) get permission types for context //11. (IPermissionService) get permission types for context
public Task<List<PermissionsType>>? GetPermissionTypesByContextIdAsync(Guid contextId) public Task<List<PermissionsType>>? GetPermissionTypesByContextIdAsync(Guid contextId)
{ {
return Context.PermissionsTypes.Where(x => x.ContextId == contextId).ToListAsync(); return Ctx.PermissionsTypes.Where(x => x.ContextId == contextId).ToListAsync();
} }
public Task<int> GetPermissionFromPermissionType(PermissionsType pType) public Task<int> GetPermissionFromPermissionType(PermissionsType pType)
{ {
if(Context.PermissionsTypes.FirstOrDefault(x=>x.Id == pType.Id) != null) if(Ctx.PermissionsTypes.FirstOrDefault(x=>x.Id == pType.Id) != null)
{ {
return Task.FromResult(pType.PermissionBit); return Task.FromResult(pType.PermissionBit);
} }
@ -197,60 +197,57 @@ namespace TIAM.Database.DataLayers.ServiceProviders
#region PermissionMappings #region PermissionMappings
public Task<List<PermissionContextMapping>> GetPermissionContextMappingByContextIdAsync(Guid contextId)
=> SessionAsync(x => x.GetPermissionContextMappingByContextId(contextId).ToList());
//2. get the contexts where the user has permission //2. get the contexts where the user has permission
//public async Task<List<AssignedPermissionModel>> GetPermissionModelByUserIdAsync(Guid UserId) public async Task<List<AssignedPermissionModel>> GetPermissionContextByUserIdAsync(Guid UserId)
//{ {
// List<AssignedPermissionModel> _permissions = new List<AssignedPermissionModel>(); List<AssignedPermissionModel> _permissions = new List<AssignedPermissionModel>();
// //get all assignedUsers //get all assignedUsers
// List<AssignedUser> assignedUsers = await Context.AssignedUsers.Where(x => x.EmployeeUserId == UserId).ToListAsync(); List<AssignedUser> assignedUsers = await Ctx.AssignedUsers.Where(x => x.EmployeeUserId == UserId).ToListAsync();
// //List<PermissionContextMapping> _permissionContextMappings = new List<PermissionContextMapping>(); //List<PermissionContextMapping> _permissionContextMappings = new List<PermissionContextMapping>();
// List<PermissionGroupUserMapping> _permissionGroupUserMappings = new List<PermissionGroupUserMapping>(); List<PermissionGroupUserMapping> _permissionGroupUserMappings = new List<PermissionGroupUserMapping>();
// //get contexts where the user has permission //get contexts where the user has permission
// foreach (var item in assignedUsers) foreach (var item in assignedUsers)
// { {
// //get the product where the permissioncontextmapping is //get the product where the permissioncontextmapping is
// var contextMapping = await Context.PermissionContextMappings.FirstOrDefaultAsync(x => x.SubjectId == item.Id); var contextMapping = await Ctx.PermissionContextMappings.FirstOrDefaultAsync(x => x.SubjectId == item.Id);
// if (contextMapping != null) if (contextMapping != null)
// { {
// _permissions.Add(new AssignedPermissionModel(item.ContextId, item.Id, PermissionContextMappingSubjectType.User, item.Id.ToString(), contextMapping.Permissions)); _permissions.Add(new AssignedPermissionModel(item.ContextId, item.Id, (short)PermissionContextMappingSubjectType.User, item.Id.ToString(), contextMapping.Permissions));
// } }
// //get permissiongroupusermappings where the user is in the group //get permissiongroupusermappings where the user is in the group
// _permissionGroupUserMappings = await Context.PermissionGroupUserMappings.Where(x => x.AssignedUserId == item.Id).ToListAsync(); _permissionGroupUserMappings = await Ctx.PermissionGroupUserMappings.Where(x => x.AssignedUserId == item.Id).ToListAsync();
// foreach (var groupUserMapping in _permissionGroupUserMappings) foreach (var groupUserMapping in _permissionGroupUserMappings)
// { {
// //get the permissioncontextmapping where the permissiongroup is //get the permissioncontextmapping where the permissiongroup is
// var contextMapping2 = await Context.PermissionContextMappings.FirstOrDefaultAsync(x => x.Id == groupUserMapping.PermissionContextMappingId); var contextMapping2 = await Ctx.PermissionContextMappings.FirstOrDefaultAsync(x => x.Id == groupUserMapping.PermissionContextMappingId);
// if (contextMapping2 != null) if (contextMapping2 != null)
// { {
// //get the group so we have the contextId //get the group so we have the contextId
// var group = await Context.PermissionGroups.FirstOrDefaultAsync(x => x.Id == contextMapping2.SubjectId); var group = await Ctx.PermissionGroups.FirstOrDefaultAsync(x => x.Id == contextMapping2.SubjectId);
// _permissions.Add(new AssignedPermissionModel(group.ContextId, contextMapping2.SubjectId, PermissionContextMappingSubjectType.Group, group.GroupName, contextMapping2.Permissions)); _permissions.Add(new AssignedPermissionModel(group.ContextId, contextMapping2.SubjectId, (short)PermissionContextMappingSubjectType.Group, group.GroupName, contextMapping2.Permissions));
// } }
// } }
// } }
// return _permissions; return _permissions;
//} }
//3. (IPermissionService) get permissions of assigned users and groups //3. (IPermissionService) get permissions of assigned users and groups
public Task<List<AssignedPermissionModel>> GetPermissionsOfAssignedUsersAndGroupsAsyncByContextId(Guid contextId) public Task<List<AssignedPermissionModel>> GetPermissionsOfAssignedUsersAndGroupsAsyncByContextId(Guid contextId)
{ {
List<AssignedPermissionModel> result = new List<AssignedPermissionModel>(); List<AssignedPermissionModel> result = new List<AssignedPermissionModel>();
var AssignedUsers = Context.AssignedUsers.Where(x => x.ContextId == contextId).ToListAsync(); var AssignedUsers = Ctx.AssignedUsers.Where(x => x.ContextId == contextId).ToListAsync();
if (AssignedUsers.Result != null) if (AssignedUsers.Result != null)
{ {
foreach (var item in AssignedUsers.Result) foreach (var item in AssignedUsers.Result)
{ {
var mappingRow = Context.PermissionContextMappings.Where(x => x.SubjectId == item.Id).ToListAsync(); var mappingRow = Ctx.PermissionContextMappings.Where(x => x.SubjectId == item.Id).ToListAsync();
if (mappingRow.Result == null) if (mappingRow.Result == null)
{ {
//user has no permission but is assigned... must be banned //user has no permission but is assigned... must be banned
@ -272,13 +269,13 @@ namespace TIAM.Database.DataLayers.ServiceProviders
} }
} }
var AssingedGroups = Context.PermissionGroups.Where(x => x.ContextId == contextId).ToListAsync(); var AssingedGroups = Ctx.PermissionGroups.Where(x => x.ContextId == contextId).ToListAsync();
if (AssingedGroups.Result != null) if (AssingedGroups.Result != null)
{ {
foreach (var group in AssingedGroups.Result) foreach (var group in AssingedGroups.Result)
{ {
var mappingRow = Context.PermissionContextMappings.Where(x => x.SubjectId == group.Id).ToListAsync(); var mappingRow = Ctx.PermissionContextMappings.Where(x => x.SubjectId == group.Id).ToListAsync();
if (mappingRow.Result == null) if (mappingRow.Result == null)
{ {
//group has no permission but is assigned... //group has no permission but is assigned...
@ -313,15 +310,13 @@ namespace TIAM.Database.DataLayers.ServiceProviders
{ {
List<PermissionContextMapping> permissionContextMappings = new List<PermissionContextMapping>(); List<PermissionContextMapping> permissionContextMappings = new List<PermissionContextMapping>();
//get all Groups where the contextId is the same //get all Groups where the contextId is the same
var groups = Context.PermissionGroups.Where(x => x.ContextId == contextId).Select(x=>x.Id).ToHashSet(); var groups = Ctx.PermissionGroups.Where(x => x.ContextId == contextId).ToListAsync();
permissionContextMappings = Context.PermissionContextMappings.Where(x => groups.Contains(x.SubjectId)).ToList(); foreach (var item in groups.Result)
{
//foreach (var item in groups.Result) //get permissioncontextmapping for the group if there is, so we know what permissions the group has
//{ var pCm = Ctx.PermissionContextMappings.FirstOrDefault(x => x.SubjectId == item.Id);
// //get permissioncontextmapping for the group if there is, so we know what permissions the group has permissionContextMappings.Add(pCm);
// var pCm = Context.PermissionContextMappings.FirstOrDefault(x => x.SubjectId == item.Id); }
// permissionContextMappings.Add(pCm);
//}
return Task.FromResult(permissionContextMappings); return Task.FromResult(permissionContextMappings);
} }
@ -329,12 +324,12 @@ namespace TIAM.Database.DataLayers.ServiceProviders
public Task<bool> AddUserToPermissionGroupAsync(Guid permissionGroupId, Guid userId) public Task<bool> AddUserToPermissionGroupAsync(Guid permissionGroupId, Guid userId)
{ {
bool result = false; bool result = false;
using (var transaction = Context.Database.BeginTransaction()) using (var transaction = Ctx.Database.BeginTransaction())
{ {
//do we need to check if PermissionContextMappingId exists? //do we need to check if PermissionContextMappingId exists?
var permissionGroupUserMapping = new PermissionGroupUserMapping(userId, permissionGroupId); var permissionGroupUserMapping = new PermissionGroupUserMapping(userId, permissionGroupId);
Context.PermissionGroupUserMappings.Add(permissionGroupUserMapping); Ctx.PermissionGroupUserMappings.Add(permissionGroupUserMapping);
Context.SaveChanges(); Ctx.SaveChanges();
transaction.Commit(); transaction.Commit();
result = true; result = true;
} }
@ -345,24 +340,24 @@ namespace TIAM.Database.DataLayers.ServiceProviders
public Task<bool> CreatePermissionGroupAsync(PermissionGroup permissionGroup, TiamServiceProvider serviceProvider) public Task<bool> CreatePermissionGroupAsync(PermissionGroup permissionGroup, TiamServiceProvider serviceProvider)
{ {
bool result = false; bool result = false;
using (var transaction = Context.Database.BeginTransaction()) using (var transaction = Ctx.Database.BeginTransaction())
{ {
var existingPermissionGroup = Context.PermissionGroups.FirstOrDefault(x => x.GroupName == permissionGroup.GroupName)?.GroupName; var existingPermissionGroup = Ctx.PermissionGroups.FirstOrDefault(x => x.GroupName == permissionGroup.GroupName)?.GroupName;
if (existingPermissionGroup == null) if (existingPermissionGroup == null)
{ {
//create permission type 1 for the group //create permission type 1 for the group
var permissionType = new PermissionsType(serviceProvider.Id, "View"); var permissionType = new PermissionsType(serviceProvider.Id, "View");
Context.PermissionsTypes.Add(permissionType); Ctx.PermissionsTypes.Add(permissionType);
//Create PermissionContextMapping for the group //Create PermissionContextMapping for the group
//create Id for the group //create Id for the group
Guid Id = Guid.NewGuid(); Guid Id = Guid.NewGuid();
permissionGroup.Id = Id; permissionGroup.Id = Id;
var permissionContextMapping = new PermissionContextMapping(serviceProvider.Id, Id, PermissionContextMappingSubjectType.Group, 1, true); var permissionContextMapping = new PermissionContextMapping(serviceProvider.Id, Id, (short)PermissionContextMappingSubjectType.Group, 1, true);
Context.PermissionContextMappings.Add(permissionContextMapping); Ctx.PermissionContextMappings.Add(permissionContextMapping);
Context.PermissionGroups.Add(permissionGroup); Ctx.PermissionGroups.Add(permissionGroup);
Context.SaveChanges(); Ctx.SaveChanges();
transaction.Commit(); transaction.Commit();
result = true; result = true;
} }
@ -375,27 +370,26 @@ namespace TIAM.Database.DataLayers.ServiceProviders
return Task.FromResult(result); return Task.FromResult(result);
} }
public List<AssignedUser> GetAssingedUsersInPermissionGroupByGroupId(Guid groupId) public Task<List<AssignedUser>> GetAssingedUsersInPermissionGroupByGroupId(Guid groupId)
{ {
return Context.GetAssignedUsersByPermissionGroupId(groupId).ToList(); List<AssignedUser> assignedUsers = new List<AssignedUser>();
//List<AssignedUser> assignedUsers = new List<AssignedUser>();
////let's get the permissioncontextmapping for the group //let's get the permissioncontextmapping for the group
//var pCm = Context.PermissionContextMappings.FirstOrDefault(x => x.SubjectId == groupId); var pCm = Ctx.PermissionContextMappings.FirstOrDefault(x => x.SubjectId == groupId);
//Guid pCmId = pCm.Id; Guid pCmId = pCm.Id;
////let's get the permissiongroupusermappings for the permissioncontextmapping //let's get the permissiongroupusermappings for the permissioncontextmapping
//var pGum = Context.PermissionGroupUserMappings.Where(x => x.PermissionContextMappingId == pCmId).ToList(); var pGum = Ctx.PermissionGroupUserMappings.Where(x => x.PermissionContextMappingId == pCmId).ToList();
//if (pGum.Count > 0) if (pGum.Count > 0)
//{ {
// foreach (var group in pGum) foreach (var group in pGum)
// { {
// assignedUsers.Add(Context.AssignedUsers.FirstOrDefault(x => x.Id == group.AssignedUserId)); assignedUsers.Add(Ctx.AssignedUsers.FirstOrDefault(x => x.Id == group.AssignedUserId));
// } }
//} }
//return Task.FromResult(assignedUsers); return Task.FromResult(assignedUsers);
} }
#endregion #endregion
@ -408,21 +402,21 @@ namespace TIAM.Database.DataLayers.ServiceProviders
Context.Products.Add(product); Ctx.Products.Add(product);
Console.WriteLine($"Saving product to db {product.Id}, {product.Name}, {product.OwnerId}"); Console.WriteLine($"Saving product to db {product.Id}, {product.Name}, {product.OwnerId}");
return Context.SaveChangesAsync().ContinueWith(x => x.Result > 0); return Ctx.SaveChangesAsync().ContinueWith(x => x.Result > 0);
} }
//20. (IServiceProviderDataService) Update product //20. (IServiceProviderDataService) Update product
public Task<bool> UpdateProductAsync(TiamProduct product) public Task<bool> UpdateProductAsync(TiamProduct product)
{ {
var dbProduct = Context.Products.FirstOrDefault(u => u.Id == product.Id); var dbProduct = Ctx.Products.FirstOrDefault(u => u.Id == product.Id);
if (dbProduct != null) if (dbProduct != null)
{ {
dbProduct = product; dbProduct = product;
Context.Products.Update(dbProduct); Ctx.Products.Update(dbProduct);
return Context.SaveChangesAsync().ContinueWith(x => x.Result > 0); return Ctx.SaveChangesAsync().ContinueWith(x => x.Result > 0);
} }
else else
{ {
@ -431,46 +425,44 @@ namespace TIAM.Database.DataLayers.ServiceProviders
} }
//21. (IServiceProviderDataService) delete product //21. (IServiceProviderDataService) delete product
public Task<bool> DeleteProductByIdAsync(Guid productId) public Task<bool> DeleteProductAsync(Guid id)
{ {
return TransactionAsync(ctx => using (var transaction = Ctx.Database.BeginTransaction())
{ {
ctx.DeleteProductById(productId); var dbProduct = Ctx.Products.FirstOrDefault(u => u.Id == id);
if (dbProduct != null)
//var dbProduct = ctx.Products.FirstOrDefault(u => u.Id == id); {
//if (dbProduct != null) //get assignedUsers for this product
//{ var assignedUsers = Ctx.AssignedUsers.Where(x => x.ContextId == id).ToList();
// ctx.CleanUpAndRemoveAssignedUser(); //remove assignedUsers
// //get assignedUsers for this product foreach (var item in assignedUsers)
// var assignedUsers = ctx.AssignedUsers.Where(x => x.ContextId == id).ToList(); {
// //remove assignedUsers RemoveAssignedUserByUserId(item.Id);
// foreach (var item in assignedUsers) }
// { return Ctx.SaveChangesAsync().ContinueWith(x => x.Result > 0);
// await RemoveAssignedUserByUserIdAsync(item.Id); }
// } else
{
// return true; return Task.FromResult(false);
//} }
}
return true;
});
} }
//4. (IPermissionService) AssignPermissionToUserForContextAsync //4. (IPermissionService) AssignPermissionToUserForContextAsync
public Task<bool> AssignPermissionToUserForContextAsync(AssignedUser assignedUser, PermissionsType permission) public Task<bool> AssignPermissionToUserForContextAsync(AssignedUser assignedUser, PermissionsType permission)
{ {
var _assIgnedUser = Context.AssignedUsers.FirstOrDefault(x => x.Id == assignedUser.Id); var _assIgnedUser = Ctx.AssignedUsers.FirstOrDefault(x => x.Id == assignedUser.Id);
if(_assIgnedUser != null) if(_assIgnedUser != null)
{ {
//user exists //user exists
var _permissionInt = GetPermissionFromPermissionType(permission); var _permissionInt = GetPermissionFromPermissionType(permission);
var permissionContextMapping = Context.PermissionContextMappings.FirstOrDefault(x => x.SubjectId == assignedUser.Id); var permissionContextMapping = Ctx.PermissionContextMappings.FirstOrDefault(x => x.SubjectId == assignedUser.Id);
var currentPermissions = permissionContextMapping.Permissions; var currentPermissions = permissionContextMapping.Permissions;
var newPermissions = currentPermissions + _permissionInt.Result; var newPermissions = currentPermissions + _permissionInt.Result;
permissionContextMapping.Permissions = newPermissions; permissionContextMapping.Permissions = newPermissions;
return Context.SaveChangesAsync().ContinueWith(x => x.Result > 0); return Ctx.SaveChangesAsync().ContinueWith(x => x.Result > 0);
} }
else else
{ {
@ -487,108 +479,107 @@ namespace TIAM.Database.DataLayers.ServiceProviders
//22. (IServiceProviderDataService) Create assignedUser //22. (IServiceProviderDataService) Create assignedUser
public Task<AssignedUser> CreateAssignedUserAsync(AssignedUser assignedUser) public Task<AssignedUser> CreateAssignedUserAsync(AssignedUser assignedUser)
{ {
Context.AssignedUsers.Add(assignedUser); Ctx.AssignedUsers.Add(assignedUser);
Console.WriteLine($"Saving assignedUser to db {assignedUser.Id}, {assignedUser.ContextId}, {assignedUser.EmployeeUserId}, {assignedUser.UserRoles}"); Console.WriteLine($"Saving assignedUser to db {assignedUser.Id}, {assignedUser.ContextId}, {assignedUser.EmployeeUserId}, {assignedUser.UserRoles}");
return Context.SaveChangesAsync().ContinueWith(x => assignedUser); return Ctx.SaveChangesAsync().ContinueWith(x => assignedUser);
} }
//23. (IServiceProviderDataService) Get Assigned Users By ProductId //23. (IServiceProviderDataService) Get Assigned Users By ProductId
public Task<List<AssignedUser>> GetAssignedUsersByProductIdAsync(Guid productId) public Task<List<AssignedUser>> GetAssignedUsersByProductIdAsync(Guid productId)
{ {
return Context.AssignedUsers.Where(x => x.ContextId == productId).ToListAsync(); return Ctx.AssignedUsers.Where(x => x.ContextId == productId).ToListAsync();
} }
//24 . (IServiceProviderDataService) Remove Assigned Users By Product Id //24 . (IServiceProviderDataService) Remove Assigned Users By Product Id
public Task RemoveAssignedUsersByContextId(Guid contextId) public Task RemoveAssignedUsersByContextId(Guid contextId)
{ {
using (var transaction = Context.Database.BeginTransaction()) using (var transaction = Ctx.Database.BeginTransaction())
{ {
var assignedUsers = Context.AssignedUsers.Where(x => x.ContextId == contextId).ToList(); var assignedUsers = Ctx.AssignedUsers.Where(x => x.ContextId == contextId).ToList();
//remove assignedUsers //remove assignedUsers
return Context.SaveChangesAsync().ContinueWith(x => x.Result > 0); return Ctx.SaveChangesAsync().ContinueWith(x => x.Result > 0);
} }
} }
//25. (IServiceProviderDataService) Remove Assigned from product by assignedUserId //25. (IServiceProviderDataService) Remove Assigned from product by AssignedUserId
public Task<bool> RemoveAssignedUserAsync(AssignedUser assignedUser, bool removeFromGroups) public Task RemoveAssignedUser(AssignedUser assignedUser, bool removeFromGroups)
{ {
return TransactionAsync(ctx => using (var transaction = Ctx.Database.BeginTransaction())
{ {
var result = false; var assignedUserToRemove = Ctx.AssignedUsers.FirstOrDefault(x => x.Id == assignedUser.Id);
var assignedUserToRemove = ctx.AssignedUsers.FirstOrDefault(x => x.Id == assignedUser.Id);
//remove assignedUsers //remove assignedUsers
if (assignedUserToRemove == null) return false; if (assignedUserToRemove != null)
if (removeFromGroups)
{ {
//remove permissiongroupusermappings if(removeFromGroups)
ctx.RemoveAssingedUserFromPermissionGroups(assignedUserToRemove.Id); {
//remove permissiongroupusermappings
RemoveAssingedUserFromAllProductPermissionGroups(assignedUserToRemove.Id);
}
Ctx.AssignedUsers.Remove(assignedUserToRemove);
} }
return Ctx.SaveChangesAsync().ContinueWith(x => x.Result > 0);
ctx.AssignedUsers.Remove(assignedUserToRemove); }
return result;
});
} }
//public Task RemoveAssignedUserByUserIdAsync(Guid assignedUserId) public Task RemoveAssignedUserByUserId(Guid assignedUserId)
//{ {
// return TransactionAsync(ctx =>
// { using (var transaction = Ctx.Database.BeginTransaction())
// var assignedUser = ctx.AssignedUsers.FirstOrDefault(x => x.Id == assignedUserId); {
// //remove assignedUsers var assignedUser = Ctx.AssignedUsers.FirstOrDefault(x => x.Id == assignedUserId);
// if (assignedUser == null) return false; //remove assignedUsers
if (assignedUser != null)
{
//CleanUp
//remove permissioncontextmappings
RemoveAssignedUserContextMappingByAssignedUserId(assignedUserId);
//remove permissiongroupusermappings
RemoveAssingedUserFromAllProductPermissionGroups(assignedUserId);
// //CleanUp }
// //remove permissioncontextmappings return Ctx.SaveChangesAsync().ContinueWith(x => x.Result > 0);
// ctx.RemoveAssignedUserContextMappingBySubjectId(assignedUserId);
// //remove permissiongroupusermappings
// ctx.RemoveAssingedUserFromAllProductPermissionGroups(assignedUserId);
// return true; }
// }); }
//}
//public Task RemoveAssignedUserContextMappingByAssignedUserId(Guid assignedUserId) public Task RemoveAssignedUserContextMappingByAssignedUserId(Guid AssignedUserId)
//{ {
// using (var transaction = Context.Database.BeginTransaction()) using (var transaction = Ctx.Database.BeginTransaction())
// { {
// PermissionContextMapping? contextMapping = Context.PermissionContextMappings.FirstOrDefault(x => x.SubjectId == assignedUserId); PermissionContextMapping? contextMapping = Ctx.PermissionContextMappings.FirstOrDefault(x => x.SubjectId == AssignedUserId);
// //remove assignedUsers //remove assignedUsers
// if(contextMapping != null) if(contextMapping != null)
// { {
// Context.PermissionContextMappings.Remove(contextMapping); Ctx.PermissionContextMappings.Remove(contextMapping);
// } }
// return Context.SaveChangesAsync().ContinueWith(x => x.Result > 0); return Ctx.SaveChangesAsync().ContinueWith(x => x.Result > 0);
// } }
//} }
//public Task RemoveAssingedUserFromAllProductPermissionGroups(Guid assignedUserId) public Task RemoveAssingedUserFromAllProductPermissionGroups(Guid assignedUserId)
//{ {
// using (var transaction = Context.Database.BeginTransaction()) using (var transaction = Ctx.Database.BeginTransaction())
// { {
// var permissionGroupUserMapping = Context.PermissionGroupUserMappings.Where(x => x.AssignedUserId == assignedUserId); var permissionGroupUserMapping = Ctx.PermissionGroupUserMappings.Where(x => x.AssignedUserId == assignedUserId);
// //remove assignedUsers //remove assignedUsers
// if (permissionGroupUserMapping != null) if (permissionGroupUserMapping != null)
// { {
// foreach (var item in permissionGroupUserMapping) foreach (var item in permissionGroupUserMapping)
// { {
// Context.PermissionGroupUserMappings.Remove(item); Ctx.PermissionGroupUserMappings.Remove(item);
// } }
// } }
// return Context.SaveChangesAsync().ContinueWith(x => x.Result > 0); return Ctx.SaveChangesAsync().ContinueWith(x => x.Result > 0);
// } }
//} }
#endregion #endregion

109
TIAM.Database/DataLayers/ServiceProviders/ServiceProviderDalExtension.cs
View File

@ -1,109 +0,0 @@
using AyCode.Database.DataLayers.Users;
using AyCode.Models.Enums;
using TIAM.Database.DbContexts;
using TIAM.Entities.Permissions;
using TIAM.Entities.Users;
namespace TIAM.Database.DataLayers.ServiceProviders;
public static class ServiceProviderDalExtension
{
public static IQueryable<AssignedUser> GetAssignedUsersByPermissionGroupId(this ServiceProviderDbContext ctx, Guid permissionGroupId)
{
return ctx.AssignedUsers
.Where(user => ctx.PermissionGroupUserMappings
.Where(x => x.PermissionGroupId == permissionGroupId)
.Select(x => x.AssignedUserId)
.Contains(user.Id));
}
//public static IQueryable<PermissionGroup> GetPermissionGroupByContextMapping(this ServiceProviderDbContext ctx, PermissionContextMapping permissionContextMapping)
//{
// if (permissionContextMapping.SubjectType == PermissionContextMappingSubjectType.Group)
// return ctx.PermissionGroups.Where(x => x.Id == permissionContextMapping.SubjectId);
// else if (permissionContextMapping.SubjectType == PermissionContextMappingSubjectType.User)
// return ctx.PermissionGroups.Where(x => x.Id == permissionContextMapping.SubjectId);
//}
public static IQueryable<PermissionContextMapping> GetPermissionContextMappingByContextId(this ServiceProviderDbContext ctx, Guid contextId)
{
var subjectIds = ctx.GetAssignedUsersByContextId(contextId).Select(x => x.Id).
Concat(ctx.PermissionGroups.Where(x => x.ContextId == contextId).Select(x => x.Id)).ToHashSet();
return ctx.GetPermissionContextMappingsBySubjectIds(subjectIds);
}
//public static IQueryable<PermissionContextMapping> GetPermissionContextMappingByAssignedUserId(this ServiceProviderDbContext ctx, Guid assignedUserId)
//{
// var subjectIds = ctx.GetAssignedUsersByContextId(assignedUserId).Select(x => x.Id).
// Concat(ctx.PermissionGroupUserMappings.Where(x => x.AssignedUserId == assignedUserId).Select(x => x.)).ToHashSet();
// return ctx.GetPermissionContextMappingsBySubjectIds(subjectIds);
//}
public static IQueryable<PermissionContextMapping> GetPermissionContextMappingsBySubjectIds(this ServiceProviderDbContext ctx, IEnumerable<Guid> subjectIds)
=> ctx.PermissionContextMappings.Where(x => subjectIds.Contains(x.SubjectId));
public static PermissionContextMapping? GetPermissionContextMappingBySubjectId(this ServiceProviderDbContext ctx, Guid subjectId)
=> ctx.PermissionContextMappings.FirstOrDefault(x => x.SubjectId == subjectId);
public static void RemoveContextMappingBySubjectId(this ServiceProviderDbContext ctx, Guid subjectId)
{
var contextMapping = ctx.GetPermissionContextMappingBySubjectId(subjectId);
if (contextMapping == null) return;
ctx.PermissionContextMappings.Remove(contextMapping);
}
public static IQueryable<PermissionGroupUserMapping> GetAllPermissionGroupsByAssignedUserId(this ServiceProviderDbContext ctx, Guid assignedUserId)
=> ctx.PermissionGroupUserMappings.Where(x => x.AssignedUserId == assignedUserId);
public static void DeleteProductById(this ServiceProviderDbContext ctx, Guid productId)
{
var product = ctx.Products.FirstOrDefault(u => u.Id == productId);
if (product == null) return;
ctx.RemoveAssignedUsers(ctx.GetAssignedUsersByContextId(productId));
ctx.Products.Remove(product);
}
public static void RemoveAssingedUserFromPermissionGroups(this ServiceProviderDbContext ctx, Guid assignedUserId)
{
ctx.PermissionGroupUserMappings.RemoveRange(ctx.GetAllPermissionGroupsByAssignedUserId(assignedUserId));
}
public static void RemoveAssignedUsers(this ServiceProviderDbContext ctx, IEnumerable<AssignedUser> assignedUsers)
{
foreach (var assignedUser in assignedUsers)
{
ctx.CleanUpAndRemoveAssignedUser(assignedUser);
}
}
public static void CleanUpAndRemoveAssignedUser(this ServiceProviderDbContext ctx, AssignedUser assignedUser)
{
ctx.RemoveContextMappingBySubjectId(assignedUser.Id);
ctx.RemoveAssingedUserFromPermissionGroups(assignedUser.Id);
ctx.AssignedUsers.Remove(assignedUser);
}
public static bool RemoveAssignedUserById(this ServiceProviderDbContext ctx, Guid assignedUserId)
{
var assignedUser = ctx.GetAssignedUserById(assignedUserId);
if (assignedUser == null) return false;
ctx.CleanUpAndRemoveAssignedUser(assignedUser);
return true;
}
public static AssignedUser? GetAssignedUserById(this ServiceProviderDbContext ctx, Guid assignedUserId)
=> ctx.AssignedUsers.FirstOrDefault(x => x.Id == assignedUserId);
public static IQueryable<AssignedUser> GetAssignedUsersByContextId(this ServiceProviderDbContext ctx, Guid contextId)
=> ctx.AssignedUsers.Where(x => x.ContextId == contextId);
}

1
TIAM.Database/DataLayers/TiamDalBase.cs
View File

@ -5,7 +5,6 @@ using System.Collections.Generic;
using System.Linq; using System.Linq;
using System.Text; using System.Text;
using System.Threading.Tasks; using System.Threading.Tasks;
using AyCode.Database.DataLayers;
using TIAM.Database.DbContexts; using TIAM.Database.DbContexts;
namespace TIAM.Database.DataLayers; namespace TIAM.Database.DataLayers;

10
TIAM.Database/DataLayers/TransferDestinations/TransferDestinationDal.cs
View File

@ -22,21 +22,21 @@ public class TransferDestinationDal : TiamDalBase<TransferDestinationDbContext>
{ {
//transferDestination.Created = DateTime.UtcNow; //transferDestination.Created = DateTime.UtcNow;
//transferDestination.Modified = DateTime.UtcNow; //transferDestination.Modified = DateTime.UtcNow;
Context.TransferDestinations.Add(transferDestination); Ctx.TransferDestinations.Add(transferDestination);
return Context.SaveChangesAsync().ContinueWith(x => x.Result > 0); return Ctx.SaveChangesAsync().ContinueWith(x => x.Result > 0);
} }
public Task<bool> UpdateTransferDestinationAsync(TransferDestination transferDestination) public Task<bool> UpdateTransferDestinationAsync(TransferDestination transferDestination)
{ {
//transferDestination.Modified = DateTime.UtcNow; //transferDestination.Modified = DateTime.UtcNow;
Context.TransferDestinations.Update(transferDestination); Ctx.TransferDestinations.Update(transferDestination);
return Context.SaveChangesAsync().ContinueWith(x => x.Result > 0); return Ctx.SaveChangesAsync().ContinueWith(x => x.Result > 0);
} }
public Task<List<TransferDestination>> GetTransferDestinations() public Task<List<TransferDestination>> GetTransferDestinations()
{ {
return Context.TransferDestinations.ToListAsync(); return Ctx.TransferDestinations.ToListAsync();
} }
} }

87
TIAM.Database/DataLayers/Users/UserDal.cs
View File

@ -3,16 +3,13 @@ using System.Collections.Generic;
using System.Linq; using System.Linq;
using System.Text; using System.Text;
using System.Threading.Tasks; using System.Threading.Tasks;
using AyCode.Database.DataLayers;
using AyCode.Database.DataLayers.Users;
using AyCode.Entities.Users;
using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore;
using TIAM.Database.DbContexts; using TIAM.Database.DbContexts;
using TIAM.Entities.Users; using TIAM.Entities.Users;
namespace TIAM.Database.DataLayers.Users namespace TIAM.Database.DataLayers.Users
{ {
public class UserDal : UserDalBase<UserDbContext, User, UserTokenBase> public class UserDal : TiamDalBase<UserDbContext>
{ {
public UserDal() : base() public UserDal() : base()
@ -25,72 +22,62 @@ namespace TIAM.Database.DataLayers.Users
public Task<List<User>> GetUsersAsync() public Task<List<User>> GetUsersAsync()
{ {
return Context.Users.ToListAsync(); return Ctx.Users.ToListAsync();
} }
//public Task<User?> GetUserByEmailAsync(string email) public virtual Task<User?> GetUserByEmailAsync(string email)
//{ {
// Console.WriteLine($"Getting user from db {email}"); Console.WriteLine($"Getting user from db {email}");
// //var emailLower = email.ToLower(); var emailLower = email.ToLower();
return Ctx.Users.SingleOrDefaultAsync(x=>x.Email.ToLower() == emailLower);
}
// return Context.GetUserByEmail(email); public virtual Task<User?> GetUserByPhoneNumberAsync(string phoneNumber)
// //return Context.Users.SingleOrDefaultAsync(x=>x.Email.ToLower() == emailLower);
//}
public Task<User?> GetUserByPhoneNumberAsync(string phoneNumber)
{ {
Console.WriteLine($"Getting user from db {phoneNumber}"); Console.WriteLine($"Getting user from db {phoneNumber}");
var phoneNumberLower = phoneNumber.ToLower(); var phoneNumberLower = phoneNumber.ToLower();
return Context.Users.SingleOrDefaultAsync(x=>x.PhoneNumber.Equals(phoneNumberLower, StringComparison.CurrentCultureIgnoreCase)); return Ctx.Users.SingleOrDefaultAsync(x=>x.PhoneNumber.ToLower() == phoneNumberLower);
} }
public Task<User?> GetUserByEmailOrPhoneNumberAsync(string emailOrPhoneNumber) public virtual Task<User?> GetUserByEmailOrPhoneNumberAsync(string emailOrPhoneNumber)
{ {
Console.WriteLine($"Getting user from db {emailOrPhoneNumber}"); Console.WriteLine($"Getting user from db {emailOrPhoneNumber}");
var emailOrPhoneNumberLower = emailOrPhoneNumber.ToLower(); var emailOrPhoneNumberLower = emailOrPhoneNumber.ToLower();
return Context.Users.SingleOrDefaultAsync(x=>x.EmailAddress.Equals(emailOrPhoneNumberLower, StringComparison.CurrentCultureIgnoreCase) || x.PhoneNumber.Equals(emailOrPhoneNumberLower, StringComparison.CurrentCultureIgnoreCase)); return Ctx.Users.SingleOrDefaultAsync(x=>x.Email.ToLower() == emailOrPhoneNumberLower || x.PhoneNumber.ToLower() == emailOrPhoneNumberLower);
} }
////get user by Id //get user by Id
//public Task<User?> GetUserByIdAsync(Guid id) public virtual Task<User?> GetUserByIdAsync(Guid id)
//{
// Console.WriteLine($"Getting user from db {id}");
// return Context.Users.SingleOrDefaultAsync(x=>x.Id == id);
//}
public async Task<bool> CreateUserAsync(User user)
{ {
Context.Users.Add(user); Console.WriteLine($"Getting user from db {id}");
Console.WriteLine($"Saving user to db {user.Id}, {user.EmailAddress}, {user.PhoneNumber}, {user.Password}"); return Ctx.Users.SingleOrDefaultAsync(x=>x.Id == id);
return await Context.SaveChangesAsync() > 0;
} }
public Task<bool> CreateUserAsync(User user)
public async Task<bool> UpdateJwtRefreshTokenAsync(string email, string refreshToken)
{ {
var existingUser = Context.Users.FirstOrDefault(u => u.EmailAddress == email); user.Created = DateTime.UtcNow;
user.Modified = DateTime.UtcNow;
Ctx.Users.Add(user);
Console.WriteLine($"Saving user to db {user.Id}, {user.Email}, {user.PhoneNumber}, {user.Password}");
return Ctx.SaveChangesAsync().ContinueWith(x=>x.Result > 0);
}
public Task<bool> UpdateUserAsyncOld(User user)
{
user.Modified = DateTime.UtcNow;
Ctx.Users.Update(user);
return Ctx.SaveChangesAsync().ContinueWith(x=>x.Result > 0);
}
public Task<bool> UpdateUserAsync(User user)
{
var existingUser = Ctx.Users.FirstOrDefault(u => u.Email == user.Email);
if (existingUser != null) if (existingUser != null)
{ {
//user.Modified = DateTime.UtcNow; //ezt nem kell megadni, a háttérben ezt magától megcsinálja a DbContextBase - J. //user.Modified = DateTime.UtcNow; //ezt nem kell megadni, a háttérben ezt magától megcsinálja a DbContextBase - J.
existingUser.RefreshToken = refreshToken; existingUser = user;
Ctx.Users.Update(existingUser);
Context.Users.Update(existingUser); return Ctx.SaveChangesAsync().ContinueWith(x => x.Result > 0);
return await Context.SaveChangesAsync() > 0;
}
else
{
throw new Exception("User not found");
}
}
public async Task<bool> UpdateUserAsync(User user)
{
var existingUser = await Context.Users.CountAsync(u => u.EmailAddress == user.EmailAddress);
if (existingUser == 1)
{
//user.Modified = DateTime.UtcNow; //ezt nem kell megadni, a háttérben ezt magától megcsinálja a DbContextBase - J.
Context.Users.Update(user);
return await Context.SaveChangesAsync() > 0;
} }
else else
{ {

9
TIAM.Database/DbContexts/ServiceProviderDbContext.cs
View File

@ -4,8 +4,6 @@ using System.Linq;
using System.Text; using System.Text;
using System.Threading.Tasks; using System.Threading.Tasks;
using AyCode.Database.DbContexts; using AyCode.Database.DbContexts;
using AyCode.Database.DbContexts.Users;
using AyCode.Entities.Users;
using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore;
using TIAM.Entities.Permissions; using TIAM.Entities.Permissions;
using TIAM.Entities.Products; using TIAM.Entities.Products;
@ -14,12 +12,8 @@ using TIAM.Entities.Users;
namespace TIAM.Database.DbContexts namespace TIAM.Database.DbContexts
{ {
public class ServiceProviderDbContext : TiamDbContextBase, IUserDbContextBase<User, UserTokenBase> public class ServiceProviderDbContext : TiamDbContextBase
{ {
public DbSet<User> Users { get; set; }
public DbSet<UserTokenBase> UserTokens { get; set; }
public virtual DbSet<TiamServiceProvider> ServiceProviders { get; set; } public virtual DbSet<TiamServiceProvider> ServiceProviders { get; set; }
public virtual DbSet<TiamProduct> Products { get; set; } public virtual DbSet<TiamProduct> Products { get; set; }
public virtual DbSet<AssignedUser> AssignedUsers { get; set; } public virtual DbSet<AssignedUser> AssignedUsers { get; set; }
@ -51,5 +45,6 @@ namespace TIAM.Database.DbContexts
optionsBuilder.EnableDetailedErrors(true); optionsBuilder.EnableDetailedErrors(true);
base.OnConfiguring(optionsBuilder); base.OnConfiguring(optionsBuilder);
} }
} }
} }

10
TIAM.Database/DbContexts/UserDbContext.cs
View File

@ -4,19 +4,15 @@ using System.Linq;
using System.Text; using System.Text;
using System.Threading.Tasks; using System.Threading.Tasks;
using AyCode.Database.DbContexts; using AyCode.Database.DbContexts;
using AyCode.Database.DbContexts.Users;
using AyCode.Entities.Users;
using AyCode.Interfaces.Users;
using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore;
using TIAM.Entities.Permissions; using TIAM.Entities.Permissions;
using TIAM.Entities.Users; using TIAM.Entities.Users;
namespace TIAM.Database.DbContexts namespace TIAM.Database.DbContexts
{ {
public class UserDbContext : TiamDbContextBase, IUserDbContextBase<User, UserTokenBase> public class UserDbContext : TiamDbContextBase
{ {
public virtual DbSet<User> Users { get; set; } public virtual DbSet<User> Users { get; set; }
public DbSet<UserTokenBase> UserTokens { get; set; }
public UserDbContext() //: this(string.Empty) public UserDbContext() //: this(string.Empty)
{ {
@ -41,5 +37,7 @@ namespace TIAM.Database.DbContexts
optionsBuilder.EnableDetailedErrors(true); optionsBuilder.EnableDetailedErrors(true);
base.OnConfiguring(optionsBuilder); base.OnConfiguring(optionsBuilder);
} }
} }
} }

7
TIAM.Entities/Permissions/PermissionContextMapping.cs
View File

@ -2,7 +2,6 @@
using System.ComponentModel.DataAnnotations.Schema; using System.ComponentModel.DataAnnotations.Schema;
using AyCode.Interfaces.Entities; using AyCode.Interfaces.Entities;
using AyCode.Interfaces.TimeStampInfo; using AyCode.Interfaces.TimeStampInfo;
using AyCode.Models.Enums;
namespace TIAM.Entities.Permissions; namespace TIAM.Entities.Permissions;
@ -13,15 +12,15 @@ public class PermissionContextMapping : IEntityGuid, ITimeStampInfo
public Guid Id { get; set; } public Guid Id { get; set; }
public Guid SubjectId { get; set; } //group or user public Guid SubjectId { get; set; } //group or user
public PermissionContextMappingSubjectType SubjectType { get; set; } //1 for user, 2 for group public short SubjectType { get; set; } //1 for user, 2 for group
public int Permissions { get; set; } public int Permissions { get; set; }
public bool IsBuiltin { get; set; } public bool IsBuiltin { get; set; }
public DateTime Created { get; set; } public DateTime Created { get; set; }
public DateTime Modified { get; set; } public DateTime Modified { get; set; }
public PermissionContextMapping(Guid subjectId, PermissionContextMappingSubjectType subjectType, int permissions, bool isBuiltin) : this(Guid.NewGuid(), subjectId, subjectType, permissions, isBuiltin) { } public PermissionContextMapping(Guid subjectId, short subjectType, int permissions, bool isBuiltin) : this(Guid.NewGuid(), subjectId, subjectType, permissions, isBuiltin) { }
public PermissionContextMapping(Guid id, Guid subjectId, PermissionContextMappingSubjectType subjectType, int permissions, bool isBuiltin) public PermissionContextMapping(Guid id, Guid subjectId, short subjectType, int permissions, bool isBuiltin)
{ {
Id = id; Id = id;
SubjectId = subjectId; SubjectId = subjectId;

4
TIAM.Entities/Permissions/PermissionGroup.cs
View File

@ -21,8 +21,10 @@ public class PermissionGroup : GroupBase
IsBuiltin = isBuiltin; IsBuiltin = isBuiltin;
} }
[Key, DatabaseGenerated(DatabaseGeneratedOption.None)]
public Guid Id { get; set; }
public Guid ContextId { get; set; } public Guid ContextId { get; set; }
public bool IsPublic { get; set; }
public string? GroupName { get; set; } public string? GroupName { get; set; }
public bool IsBuiltin { get; set; } public bool IsBuiltin { get; set; }
} }

6
TIAM.Entities/Permissions/PermissionGroupUserMapping.cs
View File

@ -11,7 +11,7 @@ public class PermissionGroupUserMapping : IEntityGuid, ITimeStampInfo
[Key, DatabaseGenerated(DatabaseGeneratedOption.None)] [Key, DatabaseGenerated(DatabaseGeneratedOption.None)]
public Guid Id { get; set; } public Guid Id { get; set; }
public Guid AssignedUserId { get; set; } public Guid AssignedUserId { get; set; }
public Guid PermissionGroupId { get; set; } public Guid PermissionContextMappingId { get; set; }
public DateTime Created { get; set; } public DateTime Created { get; set; }
public DateTime Modified { get; set; } public DateTime Modified { get; set; }
@ -19,11 +19,11 @@ public class PermissionGroupUserMapping : IEntityGuid, ITimeStampInfo
public PermissionGroupUserMapping(Guid assignedUserId, Guid permissionContextMappingId) : this (Guid.NewGuid(), assignedUserId, permissionContextMappingId) public PermissionGroupUserMapping(Guid assignedUserId, Guid permissionContextMappingId) : this (Guid.NewGuid(), assignedUserId, permissionContextMappingId)
{ } { }
public PermissionGroupUserMapping(Guid id, Guid assignedUserId, Guid permissionGroupId) public PermissionGroupUserMapping(Guid id, Guid assignedUserId, Guid permissionContextMappingId)
{ {
Id = id; Id = id;
AssignedUserId = assignedUserId; AssignedUserId = assignedUserId;
PermissionGroupId = permissionGroupId; PermissionContextMappingId = permissionContextMappingId;
Created = DateTime.UtcNow; Created = DateTime.UtcNow;
Modified = DateTime.UtcNow; Modified = DateTime.UtcNow;

7
TIAM.Entities/Products/DTOs/AssignedPermissionModel.cs
View File

@ -1,5 +1,4 @@
using AyCode.Models.Enums; using System;
using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
using System.Security.AccessControl; using System.Security.AccessControl;
@ -12,11 +11,11 @@ namespace TIAM.Entities.Products.DTOs
{ {
public Guid ContextId { get; set; } public Guid ContextId { get; set; }
public Guid SubjectId { get; set; } //user or group id public Guid SubjectId { get; set; } //user or group id
public PermissionContextMappingSubjectType SubjectType { get; set; } //user or group public short SubjectType { get; set; } //user or group
public string Name { get; set; } //user email or group name public string Name { get; set; } //user email or group name
public int PermissionsValue { get; set; } public int PermissionsValue { get; set; }
public AssignedPermissionModel(Guid contextId, Guid subjectId, PermissionContextMappingSubjectType subjectType, string name, int permissionsValue) public AssignedPermissionModel(Guid contextId, Guid subjectId, short subjectType, string name, int permissionsValue)
{ {
ContextId = contextId; ContextId = contextId;
SubjectId = subjectId; SubjectId = subjectId;

1
TIAMMobileApp/MauiProgram.cs
View File

@ -2,6 +2,7 @@
using TIAMMobileApp.Services; using TIAMMobileApp.Services;
using TIAMWebApp.Shared.Application.Interfaces; using TIAMWebApp.Shared.Application.Interfaces;
using DevExpress.Blazor; using DevExpress.Blazor;
using TIAMMobilApp.Services;
using System.Resources; using System.Resources;
using AyCode.Interfaces.StorageHandlers; using AyCode.Interfaces.StorageHandlers;

33
TIAMMobileApp/Services/UserDataServiceMobile.cs
View File

@ -1,28 +1,29 @@
using System.Net.Http.Json; using AyCode.Interfaces.StorageHandlers;
using System.Text; using Microsoft.EntityFrameworkCore.Infrastructure;
using AyCode.Interfaces.StorageHandlers; using Microsoft.JSInterop;
using Newtonsoft.Json; using Newtonsoft.Json;
using System.Net.Http.Json;
using System.Text;
using TIAM.Entities.Users; using TIAM.Entities.Users;
using TIAMWebApp.Shared.Application.Interfaces; using TIAMWebApp.Shared.Application.Interfaces;
using TIAMWebApp.Shared.Application.Models; using TIAMWebApp.Shared.Application.Models;
using TIAMWebApp.Shared.Application.Models.ClientSide; using TIAMWebApp.Shared.Application.Models.ClientSide;
using TIAMWebApp.Shared.Application.Models.PageModels; using TIAMWebApp.Shared.Application.Models.PageModels;
using TIAMWebApp.Shared.Application.Utility;
namespace TIAMMobileApp.Services namespace TIAMMobilApp.Services
{ {
public class UserDataServiceMobile : IUserDataService public class UserDataServiceMobile : IUserDataService
{ {
private readonly HttpClient http; private readonly HttpClient http;
private readonly ISecureStorageHandler secureStorageHandler; private readonly ISecureStorageHandler secureStorageHandler;
private readonly IServiceProviderDataService _serviceProviderDataService;
public Dictionary<int, string> userRoleTypes { get => throw new NotImplementedException(); set => throw new NotImplementedException(); } public Dictionary<int, string> userRoleTypes { get => throw new NotImplementedException(); set => throw new NotImplementedException(); }
public UserDataServiceMobile(HttpClient http, ISecureStorageHandler secureStorageHandler, IServiceProviderDataService serviceProviderDataService) public UserDataServiceMobile(HttpClient http, ISecureStorageHandler secureStorageHandler)
{ {
this.http = http; this.http = http;
this.secureStorageHandler = secureStorageHandler; this.secureStorageHandler = secureStorageHandler;
_serviceProviderDataService = serviceProviderDataService;
} }
@ -43,23 +44,25 @@ namespace TIAMMobileApp.Services
public async Task<UserSessionModel> IsLoggedInAsync(Guid id) public async Task<UserSessionModel> IsLoggedInAsync(Guid id)
{ {
var dbUser = await GetUserByIdAsync(id); UserSessionModel User = null;
var dbUser = await GetUserByIdAsync(id);
if (dbUser != null) if (dbUser != null)
{ {
var hasProperties = await _serviceProviderDataService.GetPropertiesByOwnerIdAsync(dbUser.Id); User = new UserSessionModel(dbUser.Id, UserType.User, dbUser.Email, 1);
var user = new UserSessionModel(dbUser.Id, UserType.User, dbUser.EmailAddress, hasProperties, 1); return User;
return user;
} }
else else
{ {
return null; return null;
} }
} }
public async Task<string> TestUserApi(int Param) public async Task<string> TestUserApi(int Param)
{ {
var url = APIUrls.UserTest; var url = APIUrls.UserTest;

2
TIAMMobileApp/TIAMMobileApp.csproj.user
View File

@ -2,7 +2,7 @@
<Project ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Project ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup> <PropertyGroup>
<IsFirstTimeProjectOpen>False</IsFirstTimeProjectOpen> <IsFirstTimeProjectOpen>False</IsFirstTimeProjectOpen>
<ActiveDebugFramework>net8.0-windows10.0.19041.0</ActiveDebugFramework> <ActiveDebugFramework>net7.0-windows10.0.19041.0</ActiveDebugFramework>
<ActiveDebugProfile>Windows Machine</ActiveDebugProfile> <ActiveDebugProfile>Windows Machine</ActiveDebugProfile>
<SelectedPlatformGroup>PhysicalDevice</SelectedPlatformGroup> <SelectedPlatformGroup>PhysicalDevice</SelectedPlatformGroup>
<DefaultDevice>pixel_5_-_api_31</DefaultDevice> <DefaultDevice>pixel_5_-_api_31</DefaultDevice>

2
TIAMSharedUI/Pages/DbTestComponent.razor
View File

@ -11,7 +11,7 @@ else
@foreach (var dest in Users) @foreach (var dest in Users)
{ {
<p>@dest.EmailAddress</p> <p>@dest.Email</p>
} }
</div> </div>

2
TIAMWebApp/Client/Services/UserDataServiceWeb.cs
View File

@ -60,7 +60,7 @@ namespace TIAMWebApp.Client.Services
//get user's properties //get user's properties
var hasProperties = await serviceProviderDataService.GetPropertiesByOwnerIdAsync(dbUser.Id); var hasProperties = await serviceProviderDataService.GetPropertiesByOwnerIdAsync(dbUser.Id);
//create user session model //create user session model
User = new UserSessionModel(dbUser.Id, UserType.User, dbUser.EmailAddress, hasProperties, 1); User = new UserSessionModel(dbUser.Id, UserType.User, dbUser.Email, hasProperties, 1);
return User; return User;
} }
else else

8
TIAMWebApp/Server/Controllers/TransferDataAPIController.cs
View File

@ -48,7 +48,7 @@ namespace TIAMWebApp.Server.Controllers
[Route("GetTransferDestinations")] [Route("GetTransferDestinations")]
public async Task<IEnumerable<TransferDestination>> GetTransferDestinations() public async Task<IEnumerable<TransferDestination>> GetTransferDestinations()
{ {
return await _transferDestinationDal.Context.TransferDestinations.ToListAsync(); return await _transferDestinationDal.Ctx.TransferDestinations.ToListAsync();
} }
[AllowAnonymous] [AllowAnonymous]
@ -56,7 +56,7 @@ namespace TIAMWebApp.Server.Controllers
[Route("GetTransferDestinationByCoordinates")] [Route("GetTransferDestinationByCoordinates")]
public async Task<TransferDestination?> GetTransferDestinationByCoordinates(double latitude, double longitude) public async Task<TransferDestination?> GetTransferDestinationByCoordinates(double latitude, double longitude)
{ {
return await _transferDestinationDal.Context.TransferDestinations.FirstOrDefaultAsync(x => x.Latitude == latitude && x.Longitude == longitude); return await _transferDestinationDal.Ctx.TransferDestinations.FirstOrDefaultAsync(x => x.Latitude == latitude && x.Longitude == longitude);
} }
[AllowAnonymous] [AllowAnonymous]
@ -64,7 +64,7 @@ namespace TIAMWebApp.Server.Controllers
[Route("GetTransferDestinationByAddress")] [Route("GetTransferDestinationByAddress")]
public async Task<TransferDestination?> GetTransferDestinationByAddress(string address) public async Task<TransferDestination?> GetTransferDestinationByAddress(string address)
{ {
return await _transferDestinationDal.Context.TransferDestinations.FirstOrDefaultAsync(x => x.Address == address); return await _transferDestinationDal.Ctx.TransferDestinations.FirstOrDefaultAsync(x => x.Address == address);
} }
[AllowAnonymous] [AllowAnonymous]
@ -102,7 +102,7 @@ namespace TIAMWebApp.Server.Controllers
Console.WriteLine($"TransferDestination to be created: {Longitude}"); Console.WriteLine($"TransferDestination to be created: {Longitude}");
Console.WriteLine($"TransferDestination to be created: {Address}"); Console.WriteLine($"TransferDestination to be created: {Address}");
//await _transferDestinationDal.Context.TransferDestinations.AddAsync(transferDestination); //await _transferDestinationDal.Ctx.TransferDestinations.AddAsync(transferDestination);
await _transferDestinationDal.CreateTransferDestinationAsync(transferDestination); await _transferDestinationDal.CreateTransferDestinationAsync(transferDestination);
return Ok("yes"); return Ok("yes");
} }

132
TIAMWebApp/Server/Controllers/UserAPIController.cs
View File

@ -32,8 +32,8 @@ namespace TIAMWebApp.Server.Controllers
private UserDal _userDal; private UserDal _userDal;
private readonly IConfiguration _configuration; private readonly IConfiguration _configuration;
private readonly IWebHostEnvironment _webHostEnvironment; private readonly IWebHostEnvironment _webHostEnvironment;
readonly PasswordHasher _hasher = new(); PasswordHasher hasher = new PasswordHasher();
/*private UserModel[] users = new UserModel[] /*private UserModel[] users = new UserModel[]
{ {
@ -48,7 +48,7 @@ namespace TIAMWebApp.Server.Controllers
{ {
_logger = logger; _logger = logger;
_configuration = configuration; _configuration = configuration;
_webHostEnvironment = webHostEnvironment; _webHostEnvironment = webHostEnvironment;
_userDal = userDal; _userDal = userDal;
} }
@ -77,9 +77,9 @@ namespace TIAMWebApp.Server.Controllers
{ {
return Unauthorized(); return Unauthorized();
} }
else else
{ {
var isValidUser = false; bool isValidUser = false;
if (dbUser.Password == authenticateUser.Password) if (dbUser.Password == authenticateUser.Password)
{ {
@ -91,12 +91,12 @@ namespace TIAMWebApp.Server.Controllers
if (isValidUser) if (isValidUser)
{ {
Console.WriteLine("UserModel authenticated, let's start JWT"); Console.WriteLine("UserModel authenticated, let's start JWT");
var accessToken = GenerateAccessToken(dbUser); string accessToken = GenerateAccessToken(dbUser);
Console.WriteLine("Generate refresh token"); Console.WriteLine("Generate refresh token");
var refreshToken = GenerateRefreshToken(); var refreshToken = GenerateRefreshToken();
dbUser.RefreshToken = refreshToken; dbUser.RefreshToken = refreshToken;
//Update userModel with refreshToken!! //Update userModel with refreshToken!!
await _userDal.UpdateJwtRefreshTokenAsync(dbUser.EmailAddress, dbUser.RefreshToken); await _userDal.UpdateUserAsync(dbUser);
var response = new MainResponse var response = new MainResponse
{ {
@ -115,23 +115,23 @@ namespace TIAMWebApp.Server.Controllers
return Unauthorized(); return Unauthorized();
} }
} }
} }
private string GenerateAccessToken(User user) private string GenerateAccessToken(User user)
{ {
var tokenHandler = new JwtSecurityTokenHandler(); var tokenHandler = new JwtSecurityTokenHandler();
var token = new JwtSecurityToken();
Console.WriteLine("----------------------------------------------------------"); Console.WriteLine("----------------------------------------------------------");
var keyDetail = Encoding.UTF8.GetBytes(_configuration["JWT:Key"]);
if (_configuration["JWT:Key"] == null)
throw new SecurityTokenException("Token is null");
var keyDetail = Encoding.UTF8.GetBytes(_configuration["JWT:Key"] ?? string.Empty);
Console.WriteLine(_configuration["JWT:Key"]); Console.WriteLine(_configuration["JWT:Key"]);
var claims = new List<Claim> var claims = new List<Claim>
{ {
new(ClaimTypes.NameIdentifier, user.Id.ToString()), new Claim(ClaimTypes.NameIdentifier, user.Id.ToString()),
new(ClaimTypes.Email, user.EmailAddress) new Claim(ClaimTypes.Email, user.Email)
}; };
var tokenDescriptor = new SecurityTokenDescriptor var tokenDescriptor = new SecurityTokenDescriptor
@ -142,21 +142,18 @@ namespace TIAMWebApp.Server.Controllers
Subject = new ClaimsIdentity(claims), Subject = new ClaimsIdentity(claims),
SigningCredentials = new SigningCredentials(new SymmetricSecurityKey(keyDetail), SecurityAlgorithms.HmacSha256Signature) SigningCredentials = new SigningCredentials(new SymmetricSecurityKey(keyDetail), SecurityAlgorithms.HmacSha256Signature)
}; };
token = tokenHandler.CreateToken(tokenDescriptor) as JwtSecurityToken;
var token = tokenHandler.CreateToken(tokenDescriptor) as JwtSecurityToken; string writtenToken = tokenHandler.WriteToken(token);
var writtenToken = tokenHandler.WriteToken(token);
Console.WriteLine(writtenToken); Console.WriteLine(writtenToken);
return writtenToken; return writtenToken;
} }
[AllowAnonymous] [AllowAnonymous]
[HttpPost] [HttpPost]
[Route("RefreshToken")] [Route("RefreshToken")]
public async Task<IActionResult> RefreshToken(RefreshTokenRequest? refreshTokenRequest) public async Task<IActionResult> RefreshToken(RefreshTokenRequest refreshTokenRequest)
{ {
Console.WriteLine("RefreshToken called"); Console.WriteLine("RefreshToken called");
var response = new MainResponse(); var response = new MainResponse();
if (refreshTokenRequest is null) if (refreshTokenRequest is null)
{ {
@ -180,7 +177,7 @@ namespace TIAMWebApp.Server.Controllers
{ {
//get user from db //get user from db
dbUser = await _userDal.GetUserByEmailAsync(email.Value); dbUser = await _userDal.GetUserByEmailAsync(email.Value);
Console.WriteLine("DbUser email: " + dbUser?.EmailAddress); Console.WriteLine("DbUser email: " + dbUser?.Email);
} }
//mocking - update userModel with new refreshToken so it returns true after the check below //mocking - update userModel with new refreshToken so it returns true after the check below
@ -193,13 +190,13 @@ namespace TIAMWebApp.Server.Controllers
return BadRequest(response); return BadRequest(response);
} }
var newAccessToken = GenerateAccessToken(dbUser); string newAccessToken = GenerateAccessToken(dbUser);
var refreshToken = GenerateRefreshToken(); string refreshToken = GenerateRefreshToken();
//mocking - update userModel with new refreshToken //mocking - update userModel with new refreshToken
dbUser.RefreshToken = refreshToken; dbUser.RefreshToken = refreshToken;
//TODO await _userManager.UpdateAsync(userModel); //TODO await _userManager.UpdateAsync(userModel);
await _userDal.UpdateJwtRefreshTokenAsync(dbUser.EmailAddress, dbUser.RefreshToken); await _userDal.UpdateUserAsync(dbUser);
response.IsSuccess = true; response.IsSuccess = true;
response.Content = new AuthenticationResponse response.Content = new AuthenticationResponse
@ -207,22 +204,21 @@ namespace TIAMWebApp.Server.Controllers
RefreshToken = refreshToken, RefreshToken = refreshToken,
AccessToken = newAccessToken AccessToken = newAccessToken
}; };
return Ok(response); return Ok(response);
} }
else
{
Console.WriteLine("Principal is null");
return NotFound("Invalid Token Found");
}
Console.WriteLine("Principal is null");
return NotFound("Invalid Token Found");
} }
private ClaimsPrincipal GetPrincipalFromExpiredToken(string token) private ClaimsPrincipal GetPrincipalFromExpiredToken(string token)
{ {
var tokenHandler = new JwtSecurityTokenHandler(); var tokenHandler = new JwtSecurityTokenHandler();
if (_configuration["JWT:Key"] == null) var keyDetail = Encoding.UTF8.GetBytes(_configuration["JWT:Key"]);
throw new SecurityTokenException("Token is null");
var keyDetail = Encoding.UTF8.GetBytes(_configuration["JWT:Key"] ?? string.Empty);
var tokenValidationParameter = new TokenValidationParameters var tokenValidationParameter = new TokenValidationParameters
{ {
@ -235,11 +231,11 @@ namespace TIAMWebApp.Server.Controllers
IssuerSigningKey = new SymmetricSecurityKey(keyDetail), IssuerSigningKey = new SymmetricSecurityKey(keyDetail),
}; };
var principal = tokenHandler.ValidateToken(token, tokenValidationParameter, out var securityToken); SecurityToken securityToken;
var principal = tokenHandler.ValidateToken(token, tokenValidationParameter, out securityToken);
if (securityToken is not JwtSecurityToken jwtSecurityToken || !jwtSecurityToken.Header.Alg.Equals(SecurityAlgorithms.HmacSha256, StringComparison.InvariantCultureIgnoreCase)) var jwtSecurityToken = securityToken as JwtSecurityToken;
if (jwtSecurityToken == null || !jwtSecurityToken.Header.Alg.Equals(SecurityAlgorithms.HmacSha256, StringComparison.InvariantCultureIgnoreCase))
throw new SecurityTokenException("Invalid token"); throw new SecurityTokenException("Invalid token");
return principal; return principal;
} }
@ -261,54 +257,56 @@ namespace TIAMWebApp.Server.Controllers
public async Task<IActionResult> CreateUser([FromBody] JsonElement SerializedRegistrationModel) public async Task<IActionResult> CreateUser([FromBody] JsonElement SerializedRegistrationModel)
{ {
Console.WriteLine("CreateUser called"); Console.WriteLine("CreateUser called");
if (string.IsNullOrEmpty(SerializedRegistrationModel.GetRawText())) if (string.IsNullOrEmpty(SerializedRegistrationModel.GetRawText()))
{ {
return BadRequest("SerializedLoginModel is required"); return BadRequest("SerializedLoginModel is required");
} }
else else
{ {
var user = JObject.Parse(SerializedRegistrationModel.GetRawText()).ToObject<RegistrationModel>(); RegistrationModel? user = JObject.Parse(SerializedRegistrationModel.GetRawText()).ToObject<RegistrationModel>();
if (user != null)
{ if(user != null)
//add userModel to users array
//Array.Resize(ref users, users.Length + 1);
//users[users.Length - 1] = new UserModel(user.Email, user.PhoneNumber, user.Password);
var userId = Guid.NewGuid();
var email = user?.Email;
var phoneNumber = user?.PhoneNumber;
var password = user?.Password;
if (email is null || phoneNumber is null || password is null)
{ {
return BadRequest("Invalid request"); //add userModel to users array
} //Array.Resize(ref users, users.Length + 1);
else //users[users.Length - 1] = new UserModel(user.Email, user.PhoneNumber, user.Password);
{
Console.WriteLine($"User to be created: {userId}");
Console.WriteLine($"User to be created: {email}");
Console.WriteLine($"User to be created: {phoneNumber}");
Console.WriteLine($"User to be created: {password}");
await _userDal.CreateUserAsync(new User(userId, email, phoneNumber, password));
}
}
return Ok("yes"); var userId = Guid.NewGuid();
string? email = user?.Email;
string? phoneNumber = user?.PhoneNumber;
string? password = user?.Password;
if(email is null || phoneNumber is null || password is null)
{
return BadRequest("Invalid request");
}
else
{
Console.WriteLine($"User to be created: {userId}");
Console.WriteLine($"User to be created: {email}");
Console.WriteLine($"User to be created: {phoneNumber}");
Console.WriteLine($"User to be created: {password}");
await _userDal.CreateUserAsync(new User(userId, email, phoneNumber, password));
}
}
return Ok("yes");
} }
} }
[HttpPost] [HttpPost]
[Route("Test1")] [Route("Test1")]
public async Task<IActionResult> TestEndpoint([FromBody] int testParam) public async Task<IActionResult> TestEndpoint([FromBody] int testParam)
{ {
return Ok(testParam.ToString()); return Ok(testParam.ToString());
} }
[HttpGet] [HttpGet]
[Route("Test2")] [Route("Test2")]
public string TestEndpoint2(int testParam) public string TestEndpoint2(int testParam)
@ -347,13 +345,13 @@ namespace TIAMWebApp.Server.Controllers
private bool VerifyPassword(string password, string hashedPassword) private bool VerifyPassword(string password, string hashedPassword)
{ {
var isPasswordValid = _hasher.VerifyPassword(password, hashedPassword); bool isPasswordValid = hasher.VerifyPassword(password, hashedPassword);
return isPasswordValid; return isPasswordValid;
} }
private string HashPassword(string password) private string HashPassword(string password)
{ {
var hashedPassword = _hasher.HashPassword(password); var hashedPassword = hasher.HashPassword(password);
return hashedPassword; return hashedPassword;
} }
} }

6
TIAMWebApp/Server/Controllers/UserPermissionAPIController.cs
View File

@ -47,10 +47,8 @@ namespace TIAMWebApp.Server.Controllers
else else
{ {
Console.WriteLine($"GetPermissionContextByUserId called with userId: {userId}"); Console.WriteLine($"GetPermissionContextByUserId called with userId: {userId}");
//List<AssignedPermissionModel> response = await _serviceProviderDal.GetPermissionModelByUserIdAsync(userId); List<AssignedPermissionModel> response = await _serviceProviderDal.GetPermissionContextByUserIdAsync(userId);
//return Ok(response); return Ok(response);
return Ok();
} }
} }

8
TIAMWebApp/Server/Services/NoticeSenderService.cs
View File

@ -63,8 +63,8 @@ namespace TIAMWebApp.Server.Services
Console.WriteLine($"Sender: {message.SenderId}"); Console.WriteLine($"Sender: {message.SenderId}");
Console.WriteLine($"Message: {message.Message}"); Console.WriteLine($"Message: {message.Message}");
//resolve user!!! //resolve user!!!
var senderUser = _userDal.Context.Users.FirstOrDefault(x => x.Id == message.SenderId); var senderUser = _userDal.Ctx.Users.FirstOrDefault(x => x.Id == message.SenderId);
var receiverUser = _userDal.Context.Users.FirstOrDefault(x => x.Id == message.ReceiverId); var receiverUser = _userDal.Ctx.Users.FirstOrDefault(x => x.Id == message.ReceiverId);
string apiKey = _configuration["SendGrid:Key"]; string apiKey = _configuration["SendGrid:Key"];
var _client = new SendGridClient(apiKey); var _client = new SendGridClient(apiKey);
var _from = new EmailAddress("", ""); var _from = new EmailAddress("", "");
@ -74,10 +74,10 @@ namespace TIAMWebApp.Server.Services
} }
else else
{ {
_from = new EmailAddress(senderUser.EmailAddress, senderUser.EmailAddress); _from = new EmailAddress(senderUser.Email, senderUser.Email);
} }
var _subject = message.Subject; var _subject = message.Subject;
var _to = new EmailAddress(receiverUser.EmailAddress, receiverUser.EmailAddress); var _to = new EmailAddress(receiverUser.Email, receiverUser.Email);
var _plainTextContent = message.Message; var _plainTextContent = message.Message;
var _htmlContent = message.HtmlContent; var _htmlContent = message.HtmlContent;
var _msg = MailHelper.CreateSingleEmail(_from, _to, message.Subject, _plainTextContent, _htmlContent); var _msg = MailHelper.CreateSingleEmail(_from, _to, message.Subject, _plainTextContent, _htmlContent);