Remove role management from AuthHex; update documentation and user handling to reflect ERP ownership of roles.
CI/CD - erp auth / Build & Deploy (pull_request) Failing after 15m9s
CI/CD - erp auth / Build & Deploy (pull_request) Failing after 15m9s
This commit is contained in:
@@ -65,8 +65,7 @@ public class UserManagerService
|
||||
|
||||
var deviceName = data.ContainsKey("deviceName") ? data["deviceName"].GetString() : "Unknown Device";
|
||||
|
||||
if (!data.ContainsKey("roleId") || !Guid.TryParse(data["roleId"].GetString(), out var RoleId))
|
||||
throw new ArgumentException("Invalid roleId");
|
||||
// A "roleId" in the payload (old ERP builds still send one) is accepted and ignored: roles are the ERP's business.
|
||||
|
||||
if (!data.ContainsKey("userTypeId") || !Guid.TryParse(data["userTypeId"].GetString(), out var UserTypeId))
|
||||
throw new ArgumentException("Invalid userTypeId");
|
||||
@@ -80,7 +79,6 @@ public class UserManagerService
|
||||
Email = Email,
|
||||
MobileNumber = MobileNumber,
|
||||
Nic = Nic,
|
||||
RoleId = RoleId,
|
||||
UserTypeId = UserTypeId
|
||||
};
|
||||
bool canSave = await CanRegisterUser(userToCheck);
|
||||
@@ -110,7 +108,6 @@ public class UserManagerService
|
||||
Nic = Nic,
|
||||
Email = Email,
|
||||
MobileNumber = MobileNumber,
|
||||
RoleId = RoleId,
|
||||
UserTypeId = UserTypeId,
|
||||
CreatedAt = DateTime.UtcNow,
|
||||
IsActive = true,
|
||||
@@ -194,7 +191,6 @@ public class UserManagerService
|
||||
user.EmailVerified,
|
||||
user.MobileNumberVerified,
|
||||
user.IsMfaEnabled,
|
||||
RoleId = user.RoleId,
|
||||
UserTypeId = user.UserTypeId
|
||||
}
|
||||
};
|
||||
@@ -303,7 +299,6 @@ public class UserManagerService
|
||||
user.EmailVerified,
|
||||
user.MobileNumberVerified,
|
||||
user.IsMfaEnabled,
|
||||
RoleId = user.RoleId,
|
||||
UserTypeId = user.UserTypeId
|
||||
}
|
||||
};
|
||||
@@ -412,7 +407,6 @@ public class UserManagerService
|
||||
user.EmailVerified,
|
||||
user.MobileNumberVerified,
|
||||
user.IsMfaEnabled,
|
||||
RoleId = user.RoleId,
|
||||
UserTypeId = user.UserTypeId
|
||||
}
|
||||
}
|
||||
@@ -505,7 +499,6 @@ public class UserManagerService
|
||||
user.EmailVerified,
|
||||
user.MobileNumberVerified,
|
||||
user.IsMfaEnabled,
|
||||
RoleId = user.RoleId,
|
||||
UserTypeId = user.UserTypeId
|
||||
}
|
||||
};
|
||||
@@ -552,12 +545,6 @@ public class UserManagerService
|
||||
user.IsActive,
|
||||
user.IsLocked,
|
||||
user.CreatedAt,
|
||||
Role = new
|
||||
{
|
||||
user.Role?.RoleId,
|
||||
user.Role?.Code,
|
||||
user.Role?.Name
|
||||
},
|
||||
UserType = new
|
||||
{
|
||||
user.UserType?.UserTypeId,
|
||||
@@ -1215,9 +1202,6 @@ public class UserManagerService
|
||||
if (user.UserTypeId == userToCheck.UserTypeId)
|
||||
return false;
|
||||
|
||||
if (user.RoleId == userToCheck.RoleId)
|
||||
return false;
|
||||
|
||||
if (user.IsLocked == false)
|
||||
return false;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user