aykhans/slash-e
1
0
Fork 0
mirror of https://github.com/aykhans/slash-e.git synced 2025-07-04 20:28:00 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

feat: add workspace security setting definition

Browse Source
This commit is contained in:
johnnyjoy
2024-08-17 13:11:53 +08:00
parent faa6fcf31c
commit a5bc443db9
21 changed files with 488 additions and 650 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
server/route/api/v1/shortcut_service.go
View File

@ -158,11 +158,10 @@ func (s *APIV1Service) CreateShortcut(ctx context.Context, request *v1pb.CreateS
OgMetadata: &storepb.OpenGraphMetadata{},
}
if shortcutCreate.Visibility == storepb.Visibility_VISIBILITY_UNSPECIFIED {
getWorkspaceSettingResponse, err := s.GetWorkspaceSetting(ctx, nil)
workspaceSetting, err := s.GetWorkspaceSetting(ctx, nil)
if err != nil {
return nil, status.Errorf(codes.Internal, "failed to get workspace setting, err: %v", err)
}
workspaceSetting := getWorkspaceSettingResponse.Setting
visibility := v1pb.Visibility_PRIVATE
if workspaceSetting.DefaultVisibility != v1pb.Visibility_VISIBILITY_UNSPECIFIED {
visibility = workspaceSetting.DefaultVisibility

24
server/route/api/v1/workspace_service.go
View File

@ -13,18 +13,16 @@ import (
"github.com/yourselfhosted/slash/store"
)
func (s *APIV1Service) GetWorkspaceProfile(ctx context.Context, _ *v1pb.GetWorkspaceProfileRequest) (*v1pb.GetWorkspaceProfileResponse, error) {
func (s *APIV1Service) GetWorkspaceProfile(ctx context.Context, _ *v1pb.GetWorkspaceProfileRequest) (*v1pb.WorkspaceProfile, error) {
workspaceProfile := &v1pb.WorkspaceProfile{
Mode: s.Profile.Mode,
Version: s.Profile.Version,
Plan: v1pb.PlanType_FREE,
EnableSignup: s.Profile.Public,
}
// Load subscription plan from license service.
subscription := s.LicenseService.GetSubscription()
workspaceProfile.Plan = subscription.Plan
workspaceProfile.Features = subscription.Features
workspaceProfile.Subscription = subscription
owner, err := s.GetInstanceOwner(ctx)
if err != nil {
@ -45,12 +43,10 @@ func (s *APIV1Service) GetWorkspaceProfile(ctx context.Context, _ *v1pb.GetWorks
workspaceProfile.Branding = generalSetting.GetBranding()
}
return &v1pb.GetWorkspaceProfileResponse{
Profile: workspaceProfile,
}, nil
return workspaceProfile, nil
}
func (s *APIV1Service) GetWorkspaceSetting(ctx context.Context, _ *v1pb.GetWorkspaceSettingRequest) (*v1pb.GetWorkspaceSettingResponse, error) {
func (s *APIV1Service) GetWorkspaceSetting(ctx context.Context, _ *v1pb.GetWorkspaceSettingRequest) (*v1pb.WorkspaceSetting, error) {
currentUser, err := getCurrentUser(ctx, s.Store)
if err != nil {
return nil, status.Errorf(codes.Unauthenticated, "failed to get current user: %v", err)
@ -83,12 +79,10 @@ func (s *APIV1Service) GetWorkspaceSetting(ctx context.Context, _ *v1pb.GetWorks
}
}
}
return &v1pb.GetWorkspaceSettingResponse{
Setting: workspaceSetting,
}, nil
return workspaceSetting, nil
}
func (s *APIV1Service) UpdateWorkspaceSetting(ctx context.Context, request *v1pb.UpdateWorkspaceSettingRequest) (*v1pb.UpdateWorkspaceSettingResponse, error) {
func (s *APIV1Service) UpdateWorkspaceSetting(ctx context.Context, request *v1pb.UpdateWorkspaceSettingRequest) (*v1pb.WorkspaceSetting, error) {
if request.UpdateMask == nil || len(request.UpdateMask.Paths) == 0 {
return nil, status.Errorf(codes.InvalidArgument, "update mask is empty")
}
@ -184,13 +178,11 @@ func (s *APIV1Service) UpdateWorkspaceSetting(ctx context.Context, request *v1pb
}
}
getWorkspaceSettingResponse, err := s.GetWorkspaceSetting(ctx, &v1pb.GetWorkspaceSettingRequest{})
workspaceSetting, err := s.GetWorkspaceSetting(ctx, &v1pb.GetWorkspaceSettingRequest{})
if err != nil {
return nil, status.Errorf(codes.Internal, "failed to get workspace setting: %v", err)
}
return &v1pb.UpdateWorkspaceSettingResponse{
Setting: getWorkspaceSettingResponse.Setting,
}, nil
return workspaceSetting, nil
}
var ownerCache *v1pb.User