Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
C
canifa_note
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Vũ Hoàng Anh
canifa_note
Commits
bb076ce4
Commit
bb076ce4
authored
May 12, 2024
by
Steven
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
chore: update list workspace settings
parent
cf7718f8
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
15 additions
and
9 deletions
+15
-9
acl_config.go
server/router/api/v1/acl_config.go
+4
-6
workspace_setting_service.go
server/router/api/v1/workspace_setting_service.go
+11
-3
No files found.
server/router/api/v1/acl_config.go
View file @
bb076ce4
...
...
@@ -4,8 +4,8 @@ var authenticationAllowlistMethods = map[string]bool{
"/memos.api.v1.WorkspaceService/GetWorkspaceProfile"
:
true
,
"/memos.api.v1.WorkspaceSettingService/GetWorkspaceSetting"
:
true
,
"/memos.api.v1.WorkspaceSettingService/ListWorkspaceSettings"
:
true
,
"/memos.api.v1.IdentityProviderService/ListIdentityProviders"
:
true
,
"/memos.api.v1.IdentityProviderService/GetIdentityProvider"
:
true
,
"/memos.api.v1.IdentityProviderService/ListIdentityProviders"
:
true
,
"/memos.api.v1.AuthService/GetAuthStatus"
:
true
,
"/memos.api.v1.AuthService/SignIn"
:
true
,
"/memos.api.v1.AuthService/SignInWithSSO"
:
true
,
...
...
@@ -14,12 +14,9 @@ var authenticationAllowlistMethods = map[string]bool{
"/memos.api.v1.UserService/GetUser"
:
true
,
"/memos.api.v1.UserService/GetUserAvatarBinary"
:
true
,
"/memos.api.v1.UserService/SearchUsers"
:
true
,
"/memos.api.v1.MemoService/ListMemos"
:
true
,
"/memos.api.v1.MemoService/GetMemo"
:
true
,
"/memos.api.v1.MemoService/ListMemos"
:
true
,
"/memos.api.v1.MemoService/SearchMemos"
:
true
,
"/memos.api.v1.MemoService/ListMemoResources"
:
true
,
"/memos.api.v1.MemoService/ListMemoRelations"
:
true
,
"/memos.api.v1.MemoService/ListMemoComments"
:
true
,
"/memos.api.v1.MarkdownService/GetLinkMetadata"
:
true
,
"/memos.api.v1.ResourceService/GetResourceBinary"
:
true
,
}
...
...
@@ -30,7 +27,8 @@ func isUnauthorizeAllowedMethod(fullMethodName string) bool {
}
var
allowedMethodsOnlyForAdmin
=
map
[
string
]
bool
{
"/memos.api.v1.UserService/CreateUser"
:
true
,
"/memos.api.v1.UserService/CreateUser"
:
true
,
"/memos.api.v1.WorkspaceSettingService/SetWorkspaceSetting"
:
true
,
}
// isOnlyForAdminAllowedMethod returns true if the method is allowed to be called only by admin.
...
...
server/router/api/v1/workspace_setting_service.go
View file @
bb076ce4
...
...
@@ -13,7 +13,16 @@ import (
)
func
(
s
*
APIV1Service
)
ListWorkspaceSettings
(
ctx
context
.
Context
,
_
*
v1pb
.
ListWorkspaceSettingsRequest
)
(
*
v1pb
.
ListWorkspaceSettingsResponse
,
error
)
{
workspaceSettings
,
err
:=
s
.
Store
.
ListWorkspaceSettings
(
ctx
,
&
store
.
FindWorkspaceSetting
{})
user
,
err
:=
getCurrentUser
(
ctx
,
s
.
Store
)
if
err
!=
nil
{
return
nil
,
status
.
Errorf
(
codes
.
Internal
,
"failed to get current user: %v"
,
err
)
}
workspaceSettingFind
:=
&
store
.
FindWorkspaceSetting
{}
if
user
==
nil
||
user
.
Role
==
store
.
RoleUser
{
workspaceSettingFind
.
Name
=
storepb
.
WorkspaceSettingKey_WORKSPACE_SETTING_GENERAL
.
String
()
}
workspaceSettings
,
err
:=
s
.
Store
.
ListWorkspaceSettings
(
ctx
,
workspaceSettingFind
)
if
err
!=
nil
{
return
nil
,
status
.
Errorf
(
codes
.
Internal
,
"failed to get workspace setting: %v"
,
err
)
}
...
...
@@ -35,9 +44,8 @@ func (s *APIV1Service) GetWorkspaceSetting(ctx context.Context, request *v1pb.Ge
if
err
!=
nil
{
return
nil
,
status
.
Errorf
(
codes
.
InvalidArgument
,
"invalid workspace setting name: %v"
,
err
)
}
settingKey
:=
storepb
.
WorkspaceSettingKey
(
storepb
.
WorkspaceSettingKey_value
[
settingKeyString
])
workspaceSetting
,
err
:=
s
.
Store
.
GetWorkspaceSetting
(
ctx
,
&
store
.
FindWorkspaceSetting
{
Name
:
settingKey
.
String
()
,
Name
:
settingKey
String
,
})
if
err
!=
nil
{
return
nil
,
status
.
Errorf
(
codes
.
Internal
,
"failed to get workspace setting: %v"
,
err
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment