diff --git a/src/zeus.domain/src/main/kotlin/com/synebula/zeus/domain/model/rbac/resource/Permission.kt b/src/zeus.domain/src/main/kotlin/com/synebula/zeus/domain/model/rbac/resource/Permission.kt index 53f8541..e07d0a7 100644 --- a/src/zeus.domain/src/main/kotlin/com/synebula/zeus/domain/model/rbac/resource/Permission.kt +++ b/src/zeus.domain/src/main/kotlin/com/synebula/zeus/domain/model/rbac/resource/Permission.kt @@ -8,5 +8,5 @@ class Permission(override var id: String? = null) : AggregateRoot() { var role = "" var resource = "" var type: ResourceType? = null - var authorization = PermissionType.Allow + var authority = PermissionType.Allow } \ No newline at end of file diff --git a/src/zeus.domain/src/main/kotlin/com/synebula/zeus/domain/service/cmd/rbac/resource/PermissionCmd.kt b/src/zeus.domain/src/main/kotlin/com/synebula/zeus/domain/service/cmd/rbac/resource/PermissionCmd.kt index 6ba3acb..b23a80b 100644 --- a/src/zeus.domain/src/main/kotlin/com/synebula/zeus/domain/service/cmd/rbac/resource/PermissionCmd.kt +++ b/src/zeus.domain/src/main/kotlin/com/synebula/zeus/domain/service/cmd/rbac/resource/PermissionCmd.kt @@ -9,5 +9,5 @@ class PermissionCmd : Command() { var role = "" var resource = "" var type: ResourceType? = null - var authorization = PermissionType.Allow + var authority = PermissionType.Allow } \ No newline at end of file diff --git a/src/zeus.query/src/main/kotlin/com/synebula/zeus/query/impl/resouce/InterfaceQuery.kt b/src/zeus.query/src/main/kotlin/com/synebula/zeus/query/impl/resouce/InterfaceQuery.kt index 20efd67..b8d2252 100644 --- a/src/zeus.query/src/main/kotlin/com/synebula/zeus/query/impl/resouce/InterfaceQuery.kt +++ b/src/zeus.query/src/main/kotlin/com/synebula/zeus/query/impl/resouce/InterfaceQuery.kt @@ -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 } } diff --git a/src/zeus.query/src/main/kotlin/com/synebula/zeus/query/impl/resouce/PageQuery.kt b/src/zeus.query/src/main/kotlin/com/synebula/zeus/query/impl/resouce/PageQuery.kt index 190f8e2..9c4d6b1 100644 --- a/src/zeus.query/src/main/kotlin/com/synebula/zeus/query/impl/resouce/PageQuery.kt +++ b/src/zeus.query/src/main/kotlin/com/synebula/zeus/query/impl/resouce/PageQuery.kt @@ -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 } } diff --git a/src/zeus.query/src/main/kotlin/com/synebula/zeus/query/impl/resouce/PermissionQuery.kt b/src/zeus.query/src/main/kotlin/com/synebula/zeus/query/impl/resouce/PermissionQuery.kt index 93597d4..520a5d3 100644 --- a/src/zeus.query/src/main/kotlin/com/synebula/zeus/query/impl/resouce/PermissionQuery.kt +++ b/src/zeus.query/src/main/kotlin/com/synebula/zeus/query/impl/resouce/PermissionQuery.kt @@ -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 } } \ No newline at end of file diff --git a/src/zeus.query/src/main/kotlin/com/synebula/zeus/query/impl/resouce/SystemQuery.kt b/src/zeus.query/src/main/kotlin/com/synebula/zeus/query/impl/resouce/SystemQuery.kt index 154dc4e..3610547 100644 --- a/src/zeus.query/src/main/kotlin/com/synebula/zeus/query/impl/resouce/SystemQuery.kt +++ b/src/zeus.query/src/main/kotlin/com/synebula/zeus/query/impl/resouce/SystemQuery.kt @@ -13,7 +13,7 @@ class SystemQuery(template: MongoTemplate, var permissionQuery: PermissionQuery) override fun withPermission(role: String): List { 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? { diff --git a/src/zeus.query/src/main/kotlin/com/synebula/zeus/query/view/resource/PermissionView.kt b/src/zeus.query/src/main/kotlin/com/synebula/zeus/query/view/resource/PermissionView.kt index 770c065..2031afd 100644 --- a/src/zeus.query/src/main/kotlin/com/synebula/zeus/query/view/resource/PermissionView.kt +++ b/src/zeus.query/src/main/kotlin/com/synebula/zeus/query/view/resource/PermissionView.kt @@ -8,5 +8,5 @@ class PermissionView() { var role = "" var resource = "" var type: ResourceType? = null - var authorization = PermissionType.Allow + var authority = PermissionType.Allow } \ No newline at end of file