Merge pull request #102 from StuartFerguson/tasl/#99_roleenvvariables

Minor updates

Author: StuartFerguson

EstateManagement/Controllers/EstateController.cs

@@ -118,7 +118,8 @@ public async Task<IActionResult> GetEstate([FromRoute] Guid estateId,
             // Get the Estate Id claim from the user
             Claim estateIdClaim = ClaimsHelper.GetUserClaim(this.User, "EstateId", estateId.ToString());
 
-            if (ClaimsHelper.IsUserRolesValid(this.User, new[] {"Estate"}) == false)
+            String estateRoleName = Environment.GetEnvironmentVariable("EstateRoleName");
+            if (ClaimsHelper.IsUserRolesValid(this.User, new[] { String.IsNullOrEmpty(estateRoleName) ? "Estate" : estateRoleName }) == false)
             {
                 return this.Forbid();
             }

EstateManagement/Controllers/MerchantController.cs

@@ -93,7 +93,8 @@ public async Task<IActionResult> CreateMerchant([FromRoute] Guid estateId,
             // Get the Estate Id claim from the user
             Claim estateIdClaim = ClaimsHelper.GetUserClaim(this.User, "EstateId", estateId.ToString());
 
-            if (ClaimsHelper.IsUserRolesValid(this.User, new[] { "Estate" }) == false)
+            String estateRoleName = Environment.GetEnvironmentVariable("EstateRoleName");
+            if (ClaimsHelper.IsUserRolesValid(this.User, new[] { String.IsNullOrEmpty(estateRoleName) ? "Estate" : estateRoleName }) == false)
             {
                 return this.Forbid();
             }
@@ -150,7 +151,8 @@ public async Task<IActionResult> GetMerchant([FromRoute] Guid estateId, [FromRou
             // Get the Estate Id claim from the user
             Claim estateIdClaim = ClaimsHelper.GetUserClaim(this.User, "EstateId", estateId.ToString());
 
-            if (ClaimsHelper.IsUserRolesValid(this.User, new[] { "Estate" }) == false)
+            String estateRoleName = Environment.GetEnvironmentVariable("EstateRoleName");
+            if (ClaimsHelper.IsUserRolesValid(this.User, new[] { String.IsNullOrEmpty(estateRoleName) ? "Estate" : estateRoleName }) == false)
             {
                 return this.Forbid();
             }
@@ -188,7 +190,8 @@ public async Task<IActionResult> AssignOperator([FromRoute] Guid estateId,
             // Get the Estate Id claim from the user
             Claim estateIdClaim = ClaimsHelper.GetUserClaim(this.User, "EstateId", estateId.ToString());
 
-            if (ClaimsHelper.IsUserRolesValid(this.User, new[] { "Estate" }) == false)
+            String estateRoleName = Environment.GetEnvironmentVariable("EstateRoleName");
+            if (ClaimsHelper.IsUserRolesValid(this.User, new[] { String.IsNullOrEmpty(estateRoleName) ? "Estate" : estateRoleName }) == false)
             {
                 return this.Forbid();
             }
@@ -224,7 +227,8 @@ public async Task<IActionResult> CreateMerchantUser([FromRoute] Guid estateId,
             // Get the Estate Id claim from the user
             Claim estateIdClaim = ClaimsHelper.GetUserClaim(this.User, "EstateId", estateId.ToString());
 
-            if (ClaimsHelper.IsUserRolesValid(this.User, new[] { "Estate" }) == false)
+            String estateRoleName = Environment.GetEnvironmentVariable("EstateRoleName");
+            if (ClaimsHelper.IsUserRolesValid(this.User, new[] { String.IsNullOrEmpty(estateRoleName) ? "Estate" : estateRoleName }) == false)
             {
                 return this.Forbid();
             }
@@ -264,7 +268,8 @@ public async Task<IActionResult> AddDevice([FromRoute] Guid estateId,
             // Get the Estate Id claim from the user
             Claim estateIdClaim = ClaimsHelper.GetUserClaim(this.User, "EstateId", estateId.ToString());
 
-            if (ClaimsHelper.IsUserRolesValid(this.User, new[] { "Estate" }) == false)
+            String estateRoleName = Environment.GetEnvironmentVariable("EstateRoleName");
+            if (ClaimsHelper.IsUserRolesValid(this.User, new[] { String.IsNullOrEmpty(estateRoleName) ? "Estate" : estateRoleName }) == false)
             {
                 return this.Forbid();
             }