Skip to content

Commit b4f4d10

Browse files
danielluo-msftdanielluo-msft
committed
Updated role names in the WebApi code and renamed JOB_CREATOR to JOB_OWNER_WRITER
1 parent 340da8b commit b4f4d10

File tree

8 files changed

+19
-12
lines changed

8 files changed

+19
-12
lines changed

‎Service/GroupMembershipManagement/Hosts/WebApi/WebApi.Models/Roles.cs‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,8 @@ namespace WebApi.Models
55
{
66
public class Roles
77
{
8-
public const string JOB_CREATOR = "Job.Create";
8+
public const string JOB_OWNER_READER = "Job.Read.OwnedBy";
9+
public const string JOB_OWNER_WRITER = "Job.ReadWrite.OwnedBy";
910
public const string JOB_TENANT_READER = "Job.Read.All";
1011
public const string JOB_TENANT_WRITER = "Job.ReadWrite.All";
1112
public const string SUBMISSION_REVIEWER = "Submission.ReadWrite.All";

‎Service/GroupMembershipManagement/Hosts/WebApi/WebApi.Tests/JobDetailsControllerTests.cs‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ private async IAsyncEnumerable<T> GetItemsAsync<T>(List<T> list)
100100
}
101101

102102
[TestMethod]
103-
[DataRow(Roles.JOB_CREATOR)]
103+
[DataRow(Roles.JOB_OWNER_WRITER)]
104104
[DataRow(Roles.JOB_TENANT_READER)]
105105
[DataRow("UserRole")]
106106
public async Task GetJobDetailsTestAsync(string role)
@@ -277,7 +277,7 @@ public async Task PatchNonExistentJob(string role)
277277
}
278278

279279
[TestMethod]
280-
[DataRow(Roles.JOB_CREATOR)]
280+
[DataRow(Roles.JOB_OWNER_WRITER)]
281281
public async Task PatchJobWhenIsNotOwnerOfTheGroup(string role)
282282
{
283283
_isGroupOwner = false;
@@ -321,7 +321,7 @@ public async Task PatchJobWhenIsNotOwnerOfTheGroupButIsJobTenantWriter(string ro
321321
}
322322

323323
[TestMethod]
324-
[DataRow(Roles.JOB_CREATOR)]
324+
[DataRow(Roles.JOB_OWNER_WRITER)]
325325
public async Task PatchJobWhenIsAnOwner(string role)
326326
{
327327
var userId = Guid.NewGuid().ToString();
@@ -355,7 +355,7 @@ public async Task PatchJobWhenIsAnOwner(string role)
355355
}
356356

357357
[TestMethod]
358-
[DataRow(Roles.JOB_CREATOR)]
358+
[DataRow(Roles.JOB_OWNER_WRITER)]
359359
public async Task RemoveGMMAsyncWhenIsAnAuthorizedUser(string role)
360360
{
361361
var syncJobId = Guid.NewGuid();
@@ -404,7 +404,7 @@ public async Task RemoveGMMAsyncWhenIsAnUnauthorizedUser(string role)
404404
}
405405

406406
[TestMethod]
407-
[DataRow(Roles.JOB_CREATOR)]
407+
[DataRow(Roles.JOB_OWNER_WRITER)]
408408
public async Task RemoveGMMAsyncWhenInvalidGroup(string role)
409409
{
410410
var syncJobId = Guid.NewGuid();

‎Service/GroupMembershipManagement/Hosts/WebApi/WebApi.Tests/JobsControllerTests.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -179,7 +179,7 @@ public void Initialize()
179179

180180
[TestMethod]
181181
[DataRow(Roles.JOB_TENANT_READER)]
182-
[DataRow(Roles.JOB_CREATOR)]
182+
[DataRow(Roles.JOB_OWNER_WRITER)]
183183
[DataRow("UserRole")]
184184
public async Task GetJobsTestByRoleAsync(string role)
185185
{

‎Service/GroupMembershipManagement/Hosts/WebApi/WebApi.Tests/RolesControllerTests.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ public void GetAllRolesStatus_ForVariousUsers()
2626
{
2727
var claims = new List<Claim>
2828
{
29-
new Claim(ClaimTypes.Role, Roles.JOB_CREATOR),
29+
new Claim(ClaimTypes.Role, Roles.JOB_OWNER_WRITER),
3030
new Claim(ClaimTypes.Role, Roles.HYPERLINK_ADMINISTRATOR)
3131
};
3232

‎Service/GroupMembershipManagement/Hosts/WebApi/WebApi/Controllers/v1/Jobs/JobDetailsController.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ public async Task<ActionResult> UpdateSyncJobAsync(Guid syncJobId, [FromBody] Js
8181
}
8282
}
8383

84-
[Authorize(Roles = Models.Roles.JOB_TENANT_WRITER + "," + Models.Roles.JOB_CREATOR)]
84+
[Authorize(Roles = Models.Roles.JOB_TENANT_WRITER + "," + Models.Roles.JOB_OWNER_WRITER)]
8585
[HttpPost("{syncJobId}/removeGMM")]
8686
public async Task<ActionResult> RemoveGMMAsync(Guid syncJobId)
8787
{

‎Service/GroupMembershipManagement/Hosts/WebApi/WebApi/Controllers/v1/Jobs/JobsController.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ public JobsController(
3030
_postJobRequestHandler = postJobRequestHandler ?? throw new ArgumentNullException(nameof(postJobRequestHandler));
3131
}
3232

33-
[Authorize(Roles = Models.Roles.JOB_CREATOR + "," + Models.Roles.JOB_TENANT_READER + "," + Models.Roles.JOB_TENANT_WRITER)]
33+
[Authorize(Roles = Models.Roles.JOB_OWNER_WRITER + "," + Models.Roles.JOB_TENANT_READER + "," + Models.Roles.JOB_TENANT_WRITER)]
3434
[HttpGet()]
3535
public async Task<ActionResult<IEnumerable<SyncJob>>> GetJobsAsync(ODataQueryOptions<SyncJobModel> queryOptions)
3636
{
@@ -40,7 +40,7 @@ public async Task<ActionResult<IEnumerable<SyncJob>>> GetJobsAsync(ODataQueryOpt
4040
return Ok(response.Model);
4141
}
4242

43-
[Authorize(Roles = Models.Roles.JOB_CREATOR + "," + Models.Roles.JOB_TENANT_WRITER)]
43+
[Authorize(Roles = Models.Roles.JOB_OWNER_WRITER + "," + Models.Roles.JOB_TENANT_WRITER)]
4444
[HttpPost()]
4545
public async Task<ActionResult> PostJobAsync([FromBody] NewSyncJobDTO newSyncJob)
4646
{

‎Service/GroupMembershipManagement/Hosts/WebApi/WebApi/Controllers/v1/Roles/RolesController.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ public RolesController()
2121
{
2222
var roleStatus = new Models.DTOs.RolesObject
2323
{
24-
IsJobCreator = User.IsInRole(Models.Roles.JOB_CREATOR),
24+
IsJobCreator = User.IsInRole(Models.Roles.JOB_OWNER_WRITER),
2525
IsJobTenantReader = User.IsInRole(Models.Roles.JOB_TENANT_READER),
2626
IsJobTenantWriter = User.IsInRole(Models.Roles.JOB_TENANT_WRITER),
2727
IsSubmissionReviewer = User.IsInRole(Models.Roles.SUBMISSION_REVIEWER),

‎Service/GroupMembershipManagement/Hosts/WebApi/WebApi/WebApi.sln‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Repositories.DataFactory",
4949
EndProject
5050
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SqlMembershipObtainer.Entities", "..\..\SqlMembershipObtainer.Common\SqlMembershipObtainer.Entities\SqlMembershipObtainer.Entities.csproj", "{51E97CCD-AB4E-4294-A8FD-D1F3630C8022}"
5151
EndProject
52+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Services.Entities", "..\..\GraphUpdater\Services.Entities\Services.Entities.csproj", "{3AE58292-C456-4C09-AD12-EC374BA1E4DF}"
53+
EndProject
5254
Global
5355
GlobalSection(SolutionConfigurationPlatforms) = preSolution
5456
Debug|Any CPU = Debug|Any CPU
@@ -147,6 +149,10 @@ Global
147149
{51E97CCD-AB4E-4294-A8FD-D1F3630C8022}.Debug|Any CPU.Build.0 = Debug|Any CPU
148150
{51E97CCD-AB4E-4294-A8FD-D1F3630C8022}.Release|Any CPU.ActiveCfg = Release|Any CPU
149151
{51E97CCD-AB4E-4294-A8FD-D1F3630C8022}.Release|Any CPU.Build.0 = Release|Any CPU
152+
{3AE58292-C456-4C09-AD12-EC374BA1E4DF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
153+
{3AE58292-C456-4C09-AD12-EC374BA1E4DF}.Debug|Any CPU.Build.0 = Debug|Any CPU
154+
{3AE58292-C456-4C09-AD12-EC374BA1E4DF}.Release|Any CPU.ActiveCfg = Release|Any CPU
155+
{3AE58292-C456-4C09-AD12-EC374BA1E4DF}.Release|Any CPU.Build.0 = Release|Any CPU
150156
EndGlobalSection
151157
GlobalSection(SolutionProperties) = preSolution
152158
HideSolutionNode = FALSE

0 commit comments

Comments
 (0)