refactor: Introduce administrative permission service #3172
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
seakayone
force-pushed
the
refactor/introduce-administrative-permission-service
branch
from
f623943
to
817e78a
Compare
Codecov ReportAttention: Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## main #3172 +/- ##
===========================================
+ Coverage 13.22% 88.80% +75.57%
===========================================
Files 270 271 +1
Lines 22244 22206 -38
===========================================
+ Hits 2941 19719 +16778
+ Misses 19303 2487 -16816 ☔ View full report in Codecov by Sentry. |
seakayone
force-pushed
the
refactor/introduce-administrative-permission-service
branch
2 times, most recently
from
0e31326
to
06bd4ee
Compare
…nd PermissionsRestService
…#permissionsDataGetADM accept only a KnoraUser
seakayone
force-pushed
the
refactor/introduce-administrative-permission-service
branch
from
e806b4a
to
8f17f68
Compare
BalduinLandolt
approved these changes
Apr 9, 2024
Comment on lines
88
to
96
| ApiRoutes & AdminApiEndpoints & ApiV2Endpoints & AppRouter & AssetPermissionsResponder & Authenticator & | ||
| AuthorizationRestService & CacheServiceRequestMessageHandler & CardinalityHandler & ConstructResponseUtilV2 & | ||
| DspIngestClient & GravsearchTypeInspectionRunner & GroupsResponderADM & GroupsRestService & GroupService & | ||
| HttpServer & IIIFRequestMessageHandler & InferenceOptimizationService & IriConverter & ListsResponder & | ||
| HttpServer & IIIFRequestMessageHandler & InferenceOptimizationService & IriConverter & KnoraUserToUserConverter & ListsResponder & | ||
| ListsResponderV2 & MessageRelay & OntologyCache & OntologyHelpers & OntologyInferencer & OntologyRepo & | ||
| OntologyResponderV2 & PermissionUtilADM & PermissionsResponderADM & PermissionsRestService & ProjectExportService & | ||
| OntologyResponderV2 & PermissionUtilADM & PermissionsResponder & PermissionsRestService & ProjectExportService & | ||
| ProjectExportStorageService & ProjectImportService & ProjectService & ProjectRestService & QueryTraverser & | ||
| RepositoryUpdater & ResourceUtilV2 & ResourcesResponderV2 & RestCardinalityService & SearchApiRoutes & | ||
| SearchResponderV2 & StandoffResponderV2 & StandoffTagUtilV2 & State & TestClientService & TriplestoreService & |
There was a problem hiding this comment.
suggestion: could we put those on one line each? Scalafmt doesn't do it automatically, but it doesn't undo it either, I think. And the diffs would be less nasty.
| import org.knora.webapi.slice.admin.domain.model.UserStatus | ||
| import org.knora.webapi.slice.admin.domain.model.Username | ||
|
|
||
| object KnoraUserToUserConverterSpec extends E2EZSpec { |
There was a problem hiding this comment.
question: in its nature, this test is not an end-to-end test. Should it really be derived from E2EZSpec?
Comment on lines
75
to
82
| CacheServiceRequestMessageHandler & CardinalityHandler & ConstructResponseUtilV2 & | ||
| GravsearchTypeInspectionRunner & GroupsResponderADM & GroupsRestService & GroupService & HttpServer & | ||
| IIIFRequestMessageHandler & InferenceOptimizationService & InstrumentationServerConfig & IriConverter & | ||
| JwtService & ListsResponder & ListsResponderV2 & MessageRelay & OntologyCache & OntologyHelpers & | ||
| OntologyInferencer & OntologyResponderV2 & PermissionsResponderADM & PermissionsRestService & | ||
| JwtService & KnoraUserToUserConverter & ListsResponder & ListsResponderV2 & MessageRelay & OntologyCache & OntologyHelpers & | ||
| OntologyInferencer & OntologyResponderV2 & PermissionsResponder & PermissionsRestService & | ||
| PermissionUtilADM & ProjectService & ProjectExportService & ProjectExportStorageService & | ||
| ProjectImportService & ProjectRestService & QueryTraverser & RepositoryUpdater & ResourcesResponderV2 & | ||
| ResourceUtilV2 & ResourceUtilV2 & RestCardinalityService & SearchApiRoutes & |
Comment on lines
-41
to
+45
| AppConfig & AssetPermissionsResponder & AuthorizationRestService & BaseEndpoints & CacheService & | ||
| AppConfig & AdministrativePermissionService & AssetPermissionsResponder & AuthorizationRestService & BaseEndpoints & CacheService & | ||
| GroupsResponderADM & GroupService & HandlerMapper & KnoraProjectService & KnoraResponseRenderer & | ||
| KnoraUserService & KnoraUserToUserConverter & ListsResponder & MaintenanceService & OntologyCache & | ||
| PasswordService & PermissionsResponderADM & ProjectExportService & ProjectImportService & ProjectService & | ||
| PasswordService & PermissionsResponder & ProjectExportService & ProjectImportService & ProjectService & |
mpro7
approved these changes
Apr 9, 2024
Comment on lines
+89
to
+92
| /* Follow the precedence rule: | ||
| 1. ProjectAdmin > 2. CustomGroups > 3. ProjectMember > 4. KnownUser | ||
| Permissions are added following the precedence level from the highest to the lowest. As soon as one set | ||
| of permissions is written into the buffer, any additionally permissions do not need to be added. */ |
There was a problem hiding this comment.
I would suggest to move it to docsstring above, which will make it visible on function hover.
There was a problem hiding this comment.
TBH, I was even considering to remove it. However it explains why the implementation below is how it is and I think that is the right place.
Comment on lines
-43
to
-51
| def toKnoraGroup(group: Group): KnoraGroup = | ||
| KnoraGroup( | ||
| id = GroupIri.unsafeFrom(group.id), | ||
| groupName = GroupName.unsafeFrom(group.name), | ||
| groupDescriptions = GroupDescriptions.unsafeFrom(group.descriptions), | ||
| status = GroupStatus.from(group.status), | ||
| belongsToProject = group.project.map(it => ProjectIri.unsafeFrom(it.id)), | ||
| hasSelfJoinEnabled = GroupSelfJoin.from(group.selfjoin), | ||
| ) |
There was a problem hiding this comment.
Could you bring it back please? It is unused not, but will be soon - group slice WIP.
There was a problem hiding this comment.
Please readd it yourself when in use and ideally tested.
seakayone
deleted the
refactor/introduce-administrative-permission-service
branch
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Pull Request Checklist
Task Description/Number
Issue Number: DEV-
PR Type
Basic requirements for bug fixes and features
Does this PR introduce a breaking change?
Does this PR change client-test-data?