Improve permission.State

This commit is contained in:
Yang Luo 2023-11-22 00:03:18 +08:00
parent 23d4488b64
commit 192968bac8
3 changed files with 9 additions and 2 deletions

View File

@ -368,7 +368,7 @@ func CheckLoginPermission(userId string, application *Application) (bool, error)
allowCount := 0 allowCount := 0
denyCount := 0 denyCount := 0
for _, permission := range permissions { for _, permission := range permissions {
if !permission.IsEnabled || permission.ResourceType != "Application" || !permission.isResourceHit(application.Name) { if !permission.IsEnabled || permission.State != "Approved" || permission.ResourceType != "Application" || !permission.isResourceHit(application.Name) {
continue continue
} }

View File

@ -396,15 +396,22 @@ func initBuiltInPermission() {
Name: "permission-built-in", Name: "permission-built-in",
CreatedTime: util.GetCurrentTime(), CreatedTime: util.GetCurrentTime(),
DisplayName: "Built-in Permission", DisplayName: "Built-in Permission",
Description: "Built-in Permission",
Users: []string{"built-in/*"}, Users: []string{"built-in/*"},
Groups: []string{},
Roles: []string{}, Roles: []string{},
Domains: []string{}, Domains: []string{},
Model: "model-built-in", Model: "model-built-in",
Adapter: "",
ResourceType: "Application", ResourceType: "Application",
Resources: []string{"app-built-in"}, Resources: []string{"app-built-in"},
Actions: []string{"Read", "Write", "Admin"}, Actions: []string{"Read", "Write", "Admin"},
Effect: "Allow", Effect: "Allow",
IsEnabled: true, IsEnabled: true,
Submitter: "admin",
Approver: "admin",
ApproveTime: util.GetCurrentTime(),
State: "Approved",
} }
_, err = AddPermission(permission) _, err = AddPermission(permission)
if err != nil { if err != nil {

View File

@ -44,7 +44,7 @@ class PermissionListPage extends BaseListPage {
submitter: this.props.account.name, submitter: this.props.account.name,
approver: "", approver: "",
approveTime: "", approveTime: "",
state: "Pending", state: Setting.isLocalAdminUser(this.props.account) ? "Approved" : "Pending",
}; };
} }