alex/Zeus
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dev' of https://github.com/synebula/zeus into dev

Browse Source
This commit is contained in:
alex
2020-11-04 21:56:27 +08:00
parent f192a4d6ba ac3dadfc90
commit 1b31013257
7 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/zeus.domain/src/main/kotlin/com/synebula/zeus/domain/model/rbac/resource/Permission.kt
View File

@@ -8,5 +8,5 @@ class Permission(override var id: String? = null) : AggregateRoot<String>() {
var role = ""
var resource = ""
var type: ResourceType? = null
var authorization = PermissionType.Allow
var authority = PermissionType.Allow
}

2
src/zeus.domain/src/main/kotlin/com/synebula/zeus/domain/service/cmd/rbac/resource/PermissionCmd.kt
View File

@@ -9,5 +9,5 @@ class PermissionCmd : Command() {
var role = ""
var resource = ""
var type: ResourceType? = null
var authorization = PermissionType.Allow
var authority = PermissionType.Allow
}

2
src/zeus.query/src/main/kotlin/com/synebula/zeus/query/impl/resouce/InterfaceQuery.kt
View File

@@ -32,7 +32,7 @@ class InterfaceQuery(template: MongoTemplate, var permissionQuery: IPermissionQu
val permissions = this.permissionQuery.resourcePermissions(ResourceType.Interface, role)
return interfaces.filter { i ->
val permission = permissions.find { p -> i.id == p.resource }
permission == null || permission.authorization == PermissionType.Allow
permission == null || permission.authority == PermissionType.Allow
}
}

2
src/zeus.query/src/main/kotlin/com/synebula/zeus/query/impl/resouce/PageQuery.kt
View File

@@ -31,7 +31,7 @@ class PageQuery(template: MongoTemplate, var permissionQuery: IPermissionQuery,
val permissions = this.permissionQuery.resourcePermissions(ResourceType.Page, role)
return pages.filter { i ->
val permission = permissions.find { p -> i.id == p.resource }
permission == null || permission.authorization == PermissionType.Allow
permission == null || permission.authority == PermissionType.Allow
}
}

2
src/zeus.query/src/main/kotlin/com/synebula/zeus/query/impl/resouce/PermissionQuery.kt
View File

@@ -28,6 +28,6 @@ class PermissionQuery(template: MongoTemplate) : MongoQuery(template), IPermissi
.and("resource").`is`(resource)
.and("role").`is`(role)
), this.clazz, this.collection)
return permission?.authorization
return permission?.authority
}
}

2
src/zeus.query/src/main/kotlin/com/synebula/zeus/query/impl/resouce/SystemQuery.kt
View File

@@ -13,7 +13,7 @@ class SystemQuery(template: MongoTemplate, var permissionQuery: PermissionQuery)
override fun withPermission(role: String): List<SystemView> {
val systems = this.list(mapOf(), this.clazz)
val permissions = this.permissionQuery.resourcePermissions(ResourceType.System, role)
return systems.filter { i -> permissions.find { p -> i.id == p.resource }?.authorization == PermissionType.Allow }
return systems.filter { i -> permissions.find { p -> i.id == p.resource }?.authority == PermissionType.Allow }
}
override fun authentication(resource: String, role: String): PermissionType? {

2
src/zeus.query/src/main/kotlin/com/synebula/zeus/query/view/resource/PermissionView.kt
View File

@@ -8,5 +8,5 @@ class PermissionView() {
var role = ""
var resource = ""
var type: ResourceType? = null
var authorization = PermissionType.Allow
var authority = PermissionType.Allow
}