Use token roles in controllers #1211
Conversation
andchiind
added
feature
|
🔔 Changes in database folder detected 🔔 |
andchiind
force-pushed
the
read-token
branch
7 times, most recently
from
fb90f1f to
f1eeb1f
Compare
andchiind
force-pushed
the
read-token
branch
3 times, most recently
from
f591391 to
8e791f0
Compare
andchiind
force-pushed
the
read-token
branch
2 times, most recently
from
4947cbe to
a24c520
Compare
|
🔔 Migrations changes detected 🔔 |
tsundvoll
force-pushed
the
read-token
branch
from
a9ba9e7 to
bfab212
Compare
| @@ -169,7 +169,7 @@ private IQueryable<MissionRun> GetMissionRunsWithSubModels() | |||
| .ThenInclude(robot => robot.Model) | |||
| .Include(missionRun => missionRun.Tasks) | |||
| .ThenInclude(task => task.Inspections) | |||
| .Where((m) => accessibleInstallationCodes.Result.Contains(m.Area.Installation.InstallationCode)); ; | |||
| .Where((m) => m.Area == null || accessibleInstallationCodes.Result.Contains(m.Area.Installation.InstallationCode.ToUpper())); ; | |||
There was a problem hiding this comment.
Will installation1 users get all missions from installation2 without an area? (Applies for the change in MissionDefinitionService.cs as well)
There was a problem hiding this comment.
If a missionRun does not have an area it also does not have an installation. We can enforce the use of Area in missionRun maybe but I think this will require some refactoring for the localisation code
| @@ -133,8 +133,8 @@ public async Task<MissionRun> Update(MissionRun missionRun) | |||
| if (missionRun.Area is not null) { context.Entry(missionRun.Area).State = EntityState.Unchanged; } | |||
|
|
|||
| var entry = context.Update(missionRun); | |||
| await context.SaveChangesAsync(); | |||
| _ = signalRService.SendMessageAsync("Mission run updated", new MissionRunResponse(missionRun)); | |||
| await ApplyDatabaseUpdate(missionRun.Area?.Installation); | |||
There was a problem hiding this comment.
Is this not updated from the mqtt? Do we need to check this?
There was a problem hiding this comment.
I think it is good to collect all the updates to one function so that it is easier to debug and protect in the future. It can get messy otherwise. The function should be able to handle not being called from a HTTP request
andchiind
force-pushed
the
read-token
branch
2 times, most recently
from
d238431 to
b4d91ff
Compare
|
I think it is ready to merge, but I'll wait to add new missions to huldra in echo before merging it |
andchiind
force-pushed
the
read-token
branch
2 times, most recently
from
b6cc9d2 to
ad56069
Compare
|
/UpdateDatabase |
|
👀 Running migration command... 👀 |
|
❌ Migration failed, please see action log below for details ❌ |
|
/UpdateDatabase |
|
👀 Running migration command... 👀 |
|
❌ Migration failed, please see action log below for details ❌ |
Also add access roles as migrations
Also add mocked tokens to make tests pass Also made Installation an object ref in Robot
|
/UpdateDatabase |
|
👀 Running migration command... 👀 |
|
✨ Successfully ran migration command! ✨ |
Makes it so that data models that have an associated installation are only returned or able to be set in requests when the user has the associated role in their bearer token. If the user has a generic role, such as Role.User or Role.Admin, then all data models are available.
Things that are currently missing which need to be added before merging: