Merge pull request #104 from StuartFerguson/task/#98_estatemerchantlist

StuartFerguson · web-flow · commit aaef10b7d87a · 2020-05-18T13:02:27.000+01:00
Fix GetMerchants bug not using configurable role name
diff --git a/EstateManagement/Controllers/MerchantController.cs b/EstateManagement/Controllers/MerchantController.cs
@@ -152,7 +152,8 @@ public async Task<IActionResult> GetMerchants([FromRoute] Guid estateId, Cancell
             // 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();
             }

Original file line number	Diff line number	Diff line change
`@@ -152,7 +152,8 @@ public async Task<IActionResult> GetMerchants([FromRoute] Guid estateId, Cancell`
`152`	`152`	`// Get the Estate Id claim from the user`
`153`	`153`	`Claim estateIdClaim = ClaimsHelper.GetUserClaim(this.User, "EstateId", estateId.ToString());`
`154`	`154`
`155`		`- if (ClaimsHelper.IsUserRolesValid(this.User, new[] { "Estate" }) == false)`
	`155`	`+ String estateRoleName = Environment.GetEnvironmentVariable("EstateRoleName");`
	`156`	`+ if (ClaimsHelper.IsUserRolesValid(this.User, new[] { String.IsNullOrEmpty(estateRoleName) ? "Estate" : estateRoleName }) == false)`
`156`	`157`	`{`
`157`	`158`	`return this.Forbid();`
`158`	`159`	`}`