diff --git a/object/check.go b/object/check.go index 18804428..a6cc2638 100644 --- a/object/check.go +++ b/object/check.go @@ -368,7 +368,7 @@ func CheckLoginPermission(userId string, application *Application) (bool, error) allowCount := 0 denyCount := 0 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 } diff --git a/object/init.go b/object/init.go index 167978bb..3584cb66 100644 --- a/object/init.go +++ b/object/init.go @@ -396,15 +396,22 @@ func initBuiltInPermission() { Name: "permission-built-in", CreatedTime: util.GetCurrentTime(), DisplayName: "Built-in Permission", + Description: "Built-in Permission", Users: []string{"built-in/*"}, + Groups: []string{}, Roles: []string{}, Domains: []string{}, Model: "model-built-in", + Adapter: "", ResourceType: "Application", Resources: []string{"app-built-in"}, Actions: []string{"Read", "Write", "Admin"}, Effect: "Allow", IsEnabled: true, + Submitter: "admin", + Approver: "admin", + ApproveTime: util.GetCurrentTime(), + State: "Approved", } _, err = AddPermission(permission) if err != nil { diff --git a/web/src/PermissionListPage.js b/web/src/PermissionListPage.js index 49777b96..5cf5402a 100644 --- a/web/src/PermissionListPage.js +++ b/web/src/PermissionListPage.js @@ -44,7 +44,7 @@ class PermissionListPage extends BaseListPage { submitter: this.props.account.name, approver: "", approveTime: "", - state: "Pending", + state: Setting.isLocalAdminUser(this.props.account) ? "Approved" : "Pending", }; }