Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions services/proxy/pkg/config/defaults/defaultconfig.go
Original file line number Diff line number Diff line change
Expand Up @@ -137,6 +137,10 @@ func DefaultPolicies() []config.Policy {
Endpoint: "/branding/logo",
Service: "eu.opencloud.web.web",
},
{
Endpoint: "/announcement",
Service: "eu.opencloud.web.web",
},
{
Endpoint: "/konnect/",
Service: "eu.opencloud.web.idp",
Expand Down
2 changes: 2 additions & 0 deletions services/settings/pkg/store/defaults/defaults.go
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,7 @@ func ServiceAccountBundle() *settingsmsg.Bundle {
},
Settings: []*settingsmsg.Setting{
AccountManagementPermission(All),
AnnouncementReadWritePermission(All),
ChangeLogoPermission(All),
CollaborationPublishNotificationPermission(All),
CollaborationManageFontsPermission(All),
Expand Down Expand Up @@ -117,6 +118,7 @@ func generateBundleAdminRole() *settingsmsg.Bundle {
},
Settings: []*settingsmsg.Setting{
AccountManagementPermission(All),
AnnouncementReadWritePermission(All),
AutoAcceptSharesPermission(Own),
ChangeLogoPermission(All),
CollaborationPublishNotificationPermission(All),
Expand Down
19 changes: 19 additions & 0 deletions services/settings/pkg/store/defaults/permissions.go
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,25 @@ func AccountManagementPermission(c settingsmsg.Permission_Constraint) *settingsm
}
}

// AnnouncementReadWritePermission is the permission to read and manage the web announcement banner
func AnnouncementReadWritePermission(c settingsmsg.Permission_Constraint) *settingsmsg.Setting {
return &settingsmsg.Setting{
Id: "52b1994b-1bdb-4c8d-a887-1967dbe8cb11",
Name: "Announcement.ReadWrite",
DisplayName: "Manage announcement",
Description: "This permission permits to read and manage the announcement banner shown to all users.",
Resource: &settingsmsg.Resource{
Type: settingsmsg.Resource_TYPE_SYSTEM,
},
Value: &settingsmsg.Setting_PermissionValue{
PermissionValue: &settingsmsg.Permission{
Operation: settingsmsg.Permission_OPERATION_READWRITE,
Constraint: c,
},
},
}
}

// AutoAcceptSharesPermission is the permission to enable share auto-accept
func AutoAcceptSharesPermission(c settingsmsg.Permission_Constraint) *settingsmsg.Setting {
return &settingsmsg.Setting{
Expand Down
14 changes: 14 additions & 0 deletions services/web/.mockery.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
# maintain v2 separate mocks dir
dir: "{{.InterfaceDir}}/mocks"
structname: "{{.InterfaceName}}"
filename: "{{.InterfaceName | snakecase }}.go"
pkgname: mocks

template: testify
packages:
github.com/nats-io/nats.go/jetstream:
config:
dir: mocks
interfaces:
KeyValue: {}
KeyValueEntry: {}
Loading