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

chore: tweak api name

Browse Source
This commit is contained in:
Steven 2024-04-15 22:52:21 +08:00
parent e0ad25b2c6
commit d2d63836d4
9 changed files with 51 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
server/route/api/v1/auth_service.go
View File

@ -19,7 +19,7 @@ import (
"github.com/yourselfhosted/slash/store" "github.com/yourselfhosted/slash/store"
) )
func (s *APIV2Service) GetAuthStatus(ctx context.Context, _ *apiv1pb.GetAuthStatusRequest) (*apiv1pb.GetAuthStatusResponse, error) { func (s *APIV1Service) GetAuthStatus(ctx context.Context, _ *apiv1pb.GetAuthStatusRequest) (*apiv1pb.GetAuthStatusResponse, error) {
user, err := getCurrentUser(ctx, s.Store) user, err := getCurrentUser(ctx, s.Store)
if err != nil { if err != nil {
return nil, status.Errorf(codes.Unauthenticated, "failed to get current user: %v", err) return nil, status.Errorf(codes.Unauthenticated, "failed to get current user: %v", err)
@ -32,7 +32,7 @@ func (s *APIV2Service) GetAuthStatus(ctx context.Context, _ *apiv1pb.GetAuthStat
}, nil }, nil
} }
func (s *APIV2Service) SignIn(ctx context.Context, request *apiv1pb.SignInRequest) (*apiv1pb.SignInResponse, error) { func (s *APIV1Service) SignIn(ctx context.Context, request *apiv1pb.SignInRequest) (*apiv1pb.SignInResponse, error) {
user, err := s.Store.GetUser(ctx, &store.FindUser{ user, err := s.Store.GetUser(ctx, &store.FindUser{
Email: &request.Email, Email: &request.Email,
}) })
@ -70,7 +70,7 @@ func (s *APIV2Service) SignIn(ctx context.Context, request *apiv1pb.SignInReques
}, nil }, nil
} }
func (s *APIV2Service) SignUp(ctx context.Context, request *apiv1pb.SignUpRequest) (*apiv1pb.SignUpResponse, error) { func (s *APIV1Service) SignUp(ctx context.Context, request *apiv1pb.SignUpRequest) (*apiv1pb.SignUpResponse, error) {
enableSignUpSetting, err := s.Store.GetWorkspaceSetting(ctx, &store.FindWorkspaceSetting{ enableSignUpSetting, err := s.Store.GetWorkspaceSetting(ctx, &store.FindWorkspaceSetting{
Key: storepb.WorkspaceSettingKey_WORKSAPCE_SETTING_ENABLE_SIGNUP, Key: storepb.WorkspaceSettingKey_WORKSAPCE_SETTING_ENABLE_SIGNUP,
}) })
@ -137,7 +137,7 @@ func (s *APIV2Service) SignUp(ctx context.Context, request *apiv1pb.SignUpReques
}, nil }, nil
} }
func (*APIV2Service) SignOut(ctx context.Context, _ *apiv1pb.SignOutRequest) (*apiv1pb.SignOutResponse, error) { func (*APIV1Service) SignOut(ctx context.Context, _ *apiv1pb.SignOutRequest) (*apiv1pb.SignOutResponse, error) {
// Set the cookie header to expire access token. // Set the cookie header to expire access token.
if err := grpc.SetHeader(ctx, metadata.New(map[string]string{ if err := grpc.SetHeader(ctx, metadata.New(map[string]string{
"Set-Cookie": fmt.Sprintf("%s=; Path=/; Expires=Thu, 01 Jan 1970 00:00:00 GMT; HttpOnly; SameSite=Strict", auth.AccessTokenCookieName), "Set-Cookie": fmt.Sprintf("%s=; Path=/; Expires=Thu, 01 Jan 1970 00:00:00 GMT; HttpOnly; SameSite=Strict", auth.AccessTokenCookieName),

12
server/route/api/v1/collection_service.go
View File

@ -15,7 +15,7 @@ import (
"github.com/yourselfhosted/slash/store" "github.com/yourselfhosted/slash/store"
) )
func (s *APIV2Service) ListCollections(ctx context.Context, _ *apiv1pb.ListCollectionsRequest) (*apiv1pb.ListCollectionsResponse, error) { func (s *APIV1Service) ListCollections(ctx context.Context, _ *apiv1pb.ListCollectionsRequest) (*apiv1pb.ListCollectionsResponse, error) {
user, err := getCurrentUser(ctx, s.Store) user, err := getCurrentUser(ctx, s.Store)
if err != nil { if err != nil {
return nil, status.Errorf(codes.Unauthenticated, "failed to get current user: %v", err) return nil, status.Errorf(codes.Unauthenticated, "failed to get current user: %v", err)
@ -52,7 +52,7 @@ func (s *APIV2Service) ListCollections(ctx context.Context, _ *apiv1pb.ListColle
return response, nil return response, nil
} }
func (s *APIV2Service) GetCollection(ctx context.Context, request *apiv1pb.GetCollectionRequest) (*apiv1pb.GetCollectionResponse, error) { func (s *APIV1Service) GetCollection(ctx context.Context, request *apiv1pb.GetCollectionRequest) (*apiv1pb.GetCollectionResponse, error) {
collection, err := s.Store.GetCollection(ctx, &store.FindCollection{ collection, err := s.Store.GetCollection(ctx, &store.FindCollection{
ID: &request.Id, ID: &request.Id,
}) })
@ -76,7 +76,7 @@ func (s *APIV2Service) GetCollection(ctx context.Context, request *apiv1pb.GetCo
return response, nil return response, nil
} }
func (s *APIV2Service) GetCollectionByName(ctx context.Context, request *apiv1pb.GetCollectionByNameRequest) (*apiv1pb.GetCollectionByNameResponse, error) { func (s *APIV1Service) GetCollectionByName(ctx context.Context, request *apiv1pb.GetCollectionByNameRequest) (*apiv1pb.GetCollectionByNameResponse, error) {
collection, err := s.Store.GetCollection(ctx, &store.FindCollection{ collection, err := s.Store.GetCollection(ctx, &store.FindCollection{
Name: &request.Name, Name: &request.Name,
}) })
@ -103,7 +103,7 @@ func (s *APIV2Service) GetCollectionByName(ctx context.Context, request *apiv1pb
return response, nil return response, nil
} }
func (s *APIV2Service) CreateCollection(ctx context.Context, request *apiv1pb.CreateCollectionRequest) (*apiv1pb.CreateCollectionResponse, error) { func (s *APIV1Service) CreateCollection(ctx context.Context, request *apiv1pb.CreateCollectionRequest) (*apiv1pb.CreateCollectionResponse, error) {
if request.Collection.Name == "" || request.Collection.Title == "" { if request.Collection.Name == "" || request.Collection.Title == "" {
return nil, status.Errorf(codes.InvalidArgument, "name and title are required") return nil, status.Errorf(codes.InvalidArgument, "name and title are required")
} }
@ -144,7 +144,7 @@ func (s *APIV2Service) CreateCollection(ctx context.Context, request *apiv1pb.Cr
return response, nil return response, nil
} }
func (s *APIV2Service) UpdateCollection(ctx context.Context, request *apiv1pb.UpdateCollectionRequest) (*apiv1pb.UpdateCollectionResponse, error) { func (s *APIV1Service) UpdateCollection(ctx context.Context, request *apiv1pb.UpdateCollectionRequest) (*apiv1pb.UpdateCollectionResponse, error) {
if request.UpdateMask == nil || len(request.UpdateMask.Paths) == 0 { if request.UpdateMask == nil || len(request.UpdateMask.Paths) == 0 {
return nil, status.Errorf(codes.InvalidArgument, "updateMask is required") return nil, status.Errorf(codes.InvalidArgument, "updateMask is required")
} }
@ -195,7 +195,7 @@ func (s *APIV2Service) UpdateCollection(ctx context.Context, request *apiv1pb.Up
return response, nil return response, nil
} }
func (s *APIV2Service) DeleteCollection(ctx context.Context, request *apiv1pb.DeleteCollectionRequest) (*apiv1pb.DeleteCollectionResponse, error) { func (s *APIV1Service) DeleteCollection(ctx context.Context, request *apiv1pb.DeleteCollectionRequest) (*apiv1pb.DeleteCollectionResponse, error) {
user, err := getCurrentUser(ctx, s.Store) user, err := getCurrentUser(ctx, s.Store)
if err != nil { if err != nil {
return nil, status.Errorf(codes.Unauthenticated, "failed to get current user: %v", err) return nil, status.Errorf(codes.Unauthenticated, "failed to get current user: %v", err)

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

@ -22,7 +22,7 @@ import (
"github.com/yourselfhosted/slash/store" "github.com/yourselfhosted/slash/store"
) )
func (s *APIV2Service) ListShortcuts(ctx context.Context, _ *apiv1pb.ListShortcutsRequest) (*apiv1pb.ListShortcutsResponse, error) { func (s *APIV1Service) ListShortcuts(ctx context.Context, _ *apiv1pb.ListShortcutsRequest) (*apiv1pb.ListShortcutsResponse, error) {
user, err := getCurrentUser(ctx, s.Store) user, err := getCurrentUser(ctx, s.Store)
if err != nil { if err != nil {
return nil, status.Errorf(codes.Unauthenticated, "failed to get current user: %v", err) return nil, status.Errorf(codes.Unauthenticated, "failed to get current user: %v", err)
@ -57,7 +57,7 @@ func (s *APIV2Service) ListShortcuts(ctx context.Context, _ *apiv1pb.ListShortcu
return response, nil return response, nil
} }
func (s *APIV2Service) GetShortcut(ctx context.Context, request *apiv1pb.GetShortcutRequest) (*apiv1pb.GetShortcutResponse, error) { func (s *APIV1Service) GetShortcut(ctx context.Context, request *apiv1pb.GetShortcutRequest) (*apiv1pb.GetShortcutResponse, error) {
shortcut, err := s.Store.GetShortcut(ctx, &store.FindShortcut{ shortcut, err := s.Store.GetShortcut(ctx, &store.FindShortcut{
ID: &request.Id, ID: &request.Id,
}) })
@ -89,7 +89,7 @@ func (s *APIV2Service) GetShortcut(ctx context.Context, request *apiv1pb.GetShor
return response, nil return response, nil
} }
func (s *APIV2Service) GetShortcutByName(ctx context.Context, request *apiv1pb.GetShortcutByNameRequest) (*apiv1pb.GetShortcutByNameResponse, error) { func (s *APIV1Service) GetShortcutByName(ctx context.Context, request *apiv1pb.GetShortcutByNameRequest) (*apiv1pb.GetShortcutByNameResponse, error) {
shortcut, err := s.Store.GetShortcut(ctx, &store.FindShortcut{ shortcut, err := s.Store.GetShortcut(ctx, &store.FindShortcut{
Name: &request.Name, Name: &request.Name,
}) })
@ -126,7 +126,7 @@ func (s *APIV2Service) GetShortcutByName(ctx context.Context, request *apiv1pb.G
return response, nil return response, nil
} }
func (s *APIV2Service) CreateShortcut(ctx context.Context, request *apiv1pb.CreateShortcutRequest) (*apiv1pb.CreateShortcutResponse, error) { func (s *APIV1Service) CreateShortcut(ctx context.Context, request *apiv1pb.CreateShortcutRequest) (*apiv1pb.CreateShortcutResponse, error) {
if request.Shortcut.Name == "" || request.Shortcut.Link == "" { if request.Shortcut.Name == "" || request.Shortcut.Link == "" {
return nil, status.Errorf(codes.InvalidArgument, "name and link are required") return nil, status.Errorf(codes.InvalidArgument, "name and link are required")
} }
@ -182,7 +182,7 @@ func (s *APIV2Service) CreateShortcut(ctx context.Context, request *apiv1pb.Crea
return response, nil return response, nil
} }
func (s *APIV2Service) UpdateShortcut(ctx context.Context, request *apiv1pb.UpdateShortcutRequest) (*apiv1pb.UpdateShortcutResponse, error) { func (s *APIV1Service) UpdateShortcut(ctx context.Context, request *apiv1pb.UpdateShortcutRequest) (*apiv1pb.UpdateShortcutResponse, error) {
if request.UpdateMask == nil || len(request.UpdateMask.Paths) == 0 { if request.UpdateMask == nil || len(request.UpdateMask.Paths) == 0 {
return nil, status.Errorf(codes.InvalidArgument, "updateMask is required") return nil, status.Errorf(codes.InvalidArgument, "updateMask is required")
} }
@ -248,7 +248,7 @@ func (s *APIV2Service) UpdateShortcut(ctx context.Context, request *apiv1pb.Upda
return response, nil return response, nil
} }
func (s *APIV2Service) DeleteShortcut(ctx context.Context, request *apiv1pb.DeleteShortcutRequest) (*apiv1pb.DeleteShortcutResponse, error) { func (s *APIV1Service) DeleteShortcut(ctx context.Context, request *apiv1pb.DeleteShortcutRequest) (*apiv1pb.DeleteShortcutResponse, error) {
user, err := getCurrentUser(ctx, s.Store) user, err := getCurrentUser(ctx, s.Store)
if err != nil { if err != nil {
return nil, status.Errorf(codes.Unauthenticated, "failed to get current user: %v", err) return nil, status.Errorf(codes.Unauthenticated, "failed to get current user: %v", err)
@ -276,7 +276,7 @@ func (s *APIV2Service) DeleteShortcut(ctx context.Context, request *apiv1pb.Dele
return response, nil return response, nil
} }
func (s *APIV2Service) GetShortcutAnalytics(ctx context.Context, request *apiv1pb.GetShortcutAnalyticsRequest) (*apiv1pb.GetShortcutAnalyticsResponse, error) { func (s *APIV1Service) GetShortcutAnalytics(ctx context.Context, request *apiv1pb.GetShortcutAnalyticsRequest) (*apiv1pb.GetShortcutAnalyticsResponse, error) {
shortcut, err := s.Store.GetShortcut(ctx, &store.FindShortcut{ shortcut, err := s.Store.GetShortcut(ctx, &store.FindShortcut{
ID: &request.Id, ID: &request.Id,
}) })
@ -347,7 +347,7 @@ func mapToAnalyticsSlice(m map[string]int32) []*apiv1pb.GetShortcutAnalyticsResp
return analyticsSlice return analyticsSlice
} }
func (s *APIV2Service) createShortcutViewActivity(ctx context.Context, shortcut *storepb.Shortcut) error { func (s *APIV1Service) createShortcutViewActivity(ctx context.Context, shortcut *storepb.Shortcut) error {
p, _ := peer.FromContext(ctx) p, _ := peer.FromContext(ctx)
headers, ok := metadata.FromIncomingContext(ctx) headers, ok := metadata.FromIncomingContext(ctx)
if !ok { if !ok {
@ -376,7 +376,7 @@ func (s *APIV2Service) createShortcutViewActivity(ctx context.Context, shortcut
return nil return nil
} }
func (s *APIV2Service) createShortcutCreateActivity(ctx context.Context, shortcut *storepb.Shortcut) error { func (s *APIV1Service) createShortcutCreateActivity(ctx context.Context, shortcut *storepb.Shortcut) error {
payload := &storepb.ActivityShorcutCreatePayload{ payload := &storepb.ActivityShorcutCreatePayload{
ShortcutId: shortcut.Id, ShortcutId: shortcut.Id,
} }
@ -397,7 +397,7 @@ func (s *APIV2Service) createShortcutCreateActivity(ctx context.Context, shortcu
return nil return nil
} }
func (s *APIV2Service) convertShortcutFromStorepb(ctx context.Context, shortcut *storepb.Shortcut) (*apiv1pb.Shortcut, error) { func (s *APIV1Service) convertShortcutFromStorepb(ctx context.Context, shortcut *storepb.Shortcut) (*apiv1pb.Shortcut, error) {
composedShortcut := &apiv1pb.Shortcut{ composedShortcut := &apiv1pb.Shortcut{
Id: shortcut.Id, Id: shortcut.Id,
CreatorId: shortcut.CreatorId, CreatorId: shortcut.CreatorId,

4
server/route/api/v1/subscription_service.go
View File

@ -9,7 +9,7 @@ import (
apiv1pb "github.com/yourselfhosted/slash/proto/gen/api/v1" apiv1pb "github.com/yourselfhosted/slash/proto/gen/api/v1"
) )
func (s *APIV2Service) GetSubscription(ctx context.Context, _ *apiv1pb.GetSubscriptionRequest) (*apiv1pb.GetSubscriptionResponse, error) { func (s *APIV1Service) GetSubscription(ctx context.Context, _ *apiv1pb.GetSubscriptionRequest) (*apiv1pb.GetSubscriptionResponse, error) {
subscription, err := s.LicenseService.LoadSubscription(ctx) subscription, err := s.LicenseService.LoadSubscription(ctx)
if err != nil { if err != nil {
return nil, status.Errorf(codes.Internal, "failed to load subscription: %v", err) return nil, status.Errorf(codes.Internal, "failed to load subscription: %v", err)
@ -19,7 +19,7 @@ func (s *APIV2Service) GetSubscription(ctx context.Context, _ *apiv1pb.GetSubscr
}, nil }, nil
} }
func (s *APIV2Service) UpdateSubscription(ctx context.Context, request *apiv1pb.UpdateSubscriptionRequest) (*apiv1pb.UpdateSubscriptionResponse, error) { func (s *APIV1Service) UpdateSubscription(ctx context.Context, request *apiv1pb.UpdateSubscriptionRequest) (*apiv1pb.UpdateSubscriptionResponse, error) {
subscription, err := s.LicenseService.UpdateSubscription(ctx, request.LicenseKey) subscription, err := s.LicenseService.UpdateSubscription(ctx, request.LicenseKey)
if err != nil { if err != nil {
return nil, status.Errorf(codes.Internal, "failed to load subscription: %v", err) return nil, status.Errorf(codes.Internal, "failed to load subscription: %v", err)

18
server/route/api/v1/user_service.go
View File

@ -24,7 +24,7 @@ const (
BotID = 0 BotID = 0
) )
func (s *APIV2Service) ListUsers(ctx context.Context, _ *apiv1pb.ListUsersRequest) (*apiv1pb.ListUsersResponse, error) { func (s *APIV1Service) ListUsers(ctx context.Context, _ *apiv1pb.ListUsersRequest) (*apiv1pb.ListUsersResponse, error) {
users, err := s.Store.ListUsers(ctx, &store.FindUser{}) users, err := s.Store.ListUsers(ctx, &store.FindUser{})
if err != nil { if err != nil {
return nil, status.Errorf(codes.Internal, "failed to list users: %v", err) return nil, status.Errorf(codes.Internal, "failed to list users: %v", err)
@ -40,7 +40,7 @@ func (s *APIV2Service) ListUsers(ctx context.Context, _ *apiv1pb.ListUsersReques
return response, nil return response, nil
} }
func (s *APIV2Service) GetUser(ctx context.Context, request *apiv1pb.GetUserRequest) (*apiv1pb.GetUserResponse, error) { func (s *APIV1Service) GetUser(ctx context.Context, request *apiv1pb.GetUserRequest) (*apiv1pb.GetUserResponse, error) {
user, err := s.Store.GetUser(ctx, &store.FindUser{ user, err := s.Store.GetUser(ctx, &store.FindUser{
ID: &request.Id, ID: &request.Id,
}) })
@ -58,7 +58,7 @@ func (s *APIV2Service) GetUser(ctx context.Context, request *apiv1pb.GetUserRequ
return response, nil return response, nil
} }
func (s *APIV2Service) CreateUser(ctx context.Context, request *apiv1pb.CreateUserRequest) (*apiv1pb.CreateUserResponse, error) { func (s *APIV1Service) CreateUser(ctx context.Context, request *apiv1pb.CreateUserRequest) (*apiv1pb.CreateUserResponse, error) {
passwordHash, err := bcrypt.GenerateFromPassword([]byte(request.User.Password), bcrypt.DefaultCost) passwordHash, err := bcrypt.GenerateFromPassword([]byte(request.User.Password), bcrypt.DefaultCost)
if err != nil { if err != nil {
return nil, status.Errorf(codes.Internal, "failed to hash password: %v", err) return nil, status.Errorf(codes.Internal, "failed to hash password: %v", err)
@ -89,7 +89,7 @@ func (s *APIV2Service) CreateUser(ctx context.Context, request *apiv1pb.CreateUs
return response, nil return response, nil
} }
func (s *APIV2Service) UpdateUser(ctx context.Context, request *apiv1pb.UpdateUserRequest) (*apiv1pb.UpdateUserResponse, error) { func (s *APIV1Service) UpdateUser(ctx context.Context, request *apiv1pb.UpdateUserRequest) (*apiv1pb.UpdateUserResponse, error) {
user, err := getCurrentUser(ctx, s.Store) user, err := getCurrentUser(ctx, s.Store)
if err != nil { if err != nil {
return nil, status.Errorf(codes.Unauthenticated, "failed to get current user: %v", err) return nil, status.Errorf(codes.Unauthenticated, "failed to get current user: %v", err)
@ -120,7 +120,7 @@ func (s *APIV2Service) UpdateUser(ctx context.Context, request *apiv1pb.UpdateUs
}, nil }, nil
} }
func (s *APIV2Service) DeleteUser(ctx context.Context, request *apiv1pb.DeleteUserRequest) (*apiv1pb.DeleteUserResponse, error) { func (s *APIV1Service) DeleteUser(ctx context.Context, request *apiv1pb.DeleteUserRequest) (*apiv1pb.DeleteUserResponse, error) {
user, err := getCurrentUser(ctx, s.Store) user, err := getCurrentUser(ctx, s.Store)
if err != nil { if err != nil {
return nil, status.Errorf(codes.Unauthenticated, "failed to get current user: %v", err) return nil, status.Errorf(codes.Unauthenticated, "failed to get current user: %v", err)
@ -136,7 +136,7 @@ func (s *APIV2Service) DeleteUser(ctx context.Context, request *apiv1pb.DeleteUs
return response, nil return response, nil
} }
func (s *APIV2Service) ListUserAccessTokens(ctx context.Context, request *apiv1pb.ListUserAccessTokensRequest) (*apiv1pb.ListUserAccessTokensResponse, error) { func (s *APIV1Service) ListUserAccessTokens(ctx context.Context, request *apiv1pb.ListUserAccessTokensRequest) (*apiv1pb.ListUserAccessTokensResponse, error) {
user, err := getCurrentUser(ctx, s.Store) user, err := getCurrentUser(ctx, s.Store)
if err != nil { if err != nil {
return nil, status.Errorf(codes.Unauthenticated, "failed to get current user: %v", err) return nil, status.Errorf(codes.Unauthenticated, "failed to get current user: %v", err)
@ -190,7 +190,7 @@ func (s *APIV2Service) ListUserAccessTokens(ctx context.Context, request *apiv1p
return response, nil return response, nil
} }
func (s *APIV2Service) CreateUserAccessToken(ctx context.Context, request *apiv1pb.CreateUserAccessTokenRequest) (*apiv1pb.CreateUserAccessTokenResponse, error) { func (s *APIV1Service) CreateUserAccessToken(ctx context.Context, request *apiv1pb.CreateUserAccessTokenRequest) (*apiv1pb.CreateUserAccessTokenResponse, error) {
user, err := getCurrentUser(ctx, s.Store) user, err := getCurrentUser(ctx, s.Store)
if err != nil { if err != nil {
return nil, status.Errorf(codes.Unauthenticated, "failed to get current user: %v", err) return nil, status.Errorf(codes.Unauthenticated, "failed to get current user: %v", err)
@ -243,7 +243,7 @@ func (s *APIV2Service) CreateUserAccessToken(ctx context.Context, request *apiv1
return response, nil return response, nil
} }
func (s *APIV2Service) DeleteUserAccessToken(ctx context.Context, request *apiv1pb.DeleteUserAccessTokenRequest) (*apiv1pb.DeleteUserAccessTokenResponse, error) { func (s *APIV1Service) DeleteUserAccessToken(ctx context.Context, request *apiv1pb.DeleteUserAccessTokenRequest) (*apiv1pb.DeleteUserAccessTokenResponse, error) {
user, err := getCurrentUser(ctx, s.Store) user, err := getCurrentUser(ctx, s.Store)
if err != nil { if err != nil {
return nil, status.Errorf(codes.Unauthenticated, "failed to get current user: %v", err) return nil, status.Errorf(codes.Unauthenticated, "failed to get current user: %v", err)
@ -274,7 +274,7 @@ func (s *APIV2Service) DeleteUserAccessToken(ctx context.Context, request *apiv1
return &apiv1pb.DeleteUserAccessTokenResponse{}, nil return &apiv1pb.DeleteUserAccessTokenResponse{}, nil
} }
func (s *APIV2Service) UpsertAccessTokenToStore(ctx context.Context, user *store.User, accessToken, description string) error { func (s *APIV1Service) UpsertAccessTokenToStore(ctx context.Context, user *store.User, accessToken, description string) error {
userAccessTokens, err := s.Store.GetUserAccessTokens(ctx, user.ID) userAccessTokens, err := s.Store.GetUserAccessTokens(ctx, user.ID)
if err != nil { if err != nil {
return errors.Wrap(err, "failed to get user access tokens") return errors.Wrap(err, "failed to get user access tokens")

4
server/route/api/v1/user_setting_service.go
View File

@ -12,7 +12,7 @@ import (
"github.com/yourselfhosted/slash/store" "github.com/yourselfhosted/slash/store"
) )
func (s *APIV2Service) GetUserSetting(ctx context.Context, request *apiv1pb.GetUserSettingRequest) (*apiv1pb.GetUserSettingResponse, error) { func (s *APIV1Service) GetUserSetting(ctx context.Context, request *apiv1pb.GetUserSettingRequest) (*apiv1pb.GetUserSettingResponse, error) {
userSetting, err := getUserSetting(ctx, s.Store, request.Id) userSetting, err := getUserSetting(ctx, s.Store, request.Id)
if err != nil { if err != nil {
return nil, status.Errorf(codes.Internal, "failed to get user setting: %v", err) return nil, status.Errorf(codes.Internal, "failed to get user setting: %v", err)
@ -22,7 +22,7 @@ func (s *APIV2Service) GetUserSetting(ctx context.Context, request *apiv1pb.GetU
}, nil }, nil
} }
func (s *APIV2Service) UpdateUserSetting(ctx context.Context, request *apiv1pb.UpdateUserSettingRequest) (*apiv1pb.UpdateUserSettingResponse, error) { func (s *APIV1Service) UpdateUserSetting(ctx context.Context, request *apiv1pb.UpdateUserSettingRequest) (*apiv1pb.UpdateUserSettingResponse, error) {
if request.UpdateMask == nil || len(request.UpdateMask.Paths) == 0 { if request.UpdateMask == nil || len(request.UpdateMask.Paths) == 0 {
return nil, status.Errorf(codes.InvalidArgument, "update mask is empty") return nil, status.Errorf(codes.InvalidArgument, "update mask is empty")
} }

26
server/route/api/v1/v1.go
View File

@ -17,7 +17,7 @@ import (
"github.com/yourselfhosted/slash/store" "github.com/yourselfhosted/slash/store"
) )
type APIV2Service struct { type APIV1Service struct {
apiv1pb.UnimplementedWorkspaceServiceServer apiv1pb.UnimplementedWorkspaceServiceServer
apiv1pb.UnimplementedSubscriptionServiceServer apiv1pb.UnimplementedSubscriptionServiceServer
apiv1pb.UnimplementedAuthServiceServer apiv1pb.UnimplementedAuthServiceServer
@ -35,7 +35,7 @@ type APIV2Service struct {
grpcServerPort int grpcServerPort int
} }
func NewAPIV2Service(secret string, profile *profile.Profile, store *store.Store, licenseService *license.LicenseService, grpcServerPort int) *APIV2Service { func NewAPIV1Service(secret string, profile *profile.Profile, store *store.Store, licenseService *license.LicenseService, grpcServerPort int) *APIV1Service {
authProvider := NewGRPCAuthInterceptor(store, secret) authProvider := NewGRPCAuthInterceptor(store, secret)
grpcServer := grpc.NewServer( grpcServer := grpc.NewServer(
grpc.ChainUnaryInterceptor( grpc.ChainUnaryInterceptor(
@ -43,7 +43,7 @@ func NewAPIV2Service(secret string, profile *profile.Profile, store *store.Store
authProvider.AuthenticationInterceptor, authProvider.AuthenticationInterceptor,
), ),
) )
apiV2Service := &APIV2Service{ apiV1Service := &APIV1Service{
Secret: secret, Secret: secret,
Profile: profile, Profile: profile,
Store: store, Store: store,
@ -52,24 +52,24 @@ func NewAPIV2Service(secret string, profile *profile.Profile, store *store.Store
grpcServerPort: grpcServerPort, grpcServerPort: grpcServerPort,
} }
apiv1pb.RegisterSubscriptionServiceServer(grpcServer, apiV2Service) apiv1pb.RegisterSubscriptionServiceServer(grpcServer, apiV1Service)
apiv1pb.RegisterWorkspaceServiceServer(grpcServer, apiV2Service) apiv1pb.RegisterWorkspaceServiceServer(grpcServer, apiV1Service)
apiv1pb.RegisterAuthServiceServer(grpcServer, apiV2Service) apiv1pb.RegisterAuthServiceServer(grpcServer, apiV1Service)
apiv1pb.RegisterUserServiceServer(grpcServer, apiV2Service) apiv1pb.RegisterUserServiceServer(grpcServer, apiV1Service)
apiv1pb.RegisterUserSettingServiceServer(grpcServer, apiV2Service) apiv1pb.RegisterUserSettingServiceServer(grpcServer, apiV1Service)
apiv1pb.RegisterShortcutServiceServer(grpcServer, apiV2Service) apiv1pb.RegisterShortcutServiceServer(grpcServer, apiV1Service)
apiv1pb.RegisterCollectionServiceServer(grpcServer, apiV2Service) apiv1pb.RegisterCollectionServiceServer(grpcServer, apiV1Service)
reflection.Register(grpcServer) reflection.Register(grpcServer)
return apiV2Service return apiV1Service
} }
func (s *APIV2Service) GetGRPCServer() *grpc.Server { func (s *APIV1Service) GetGRPCServer() *grpc.Server {
return s.grpcServer return s.grpcServer
} }
// RegisterGateway registers the gRPC-Gateway with the given Echo instance. // RegisterGateway registers the gRPC-Gateway with the given Echo instance.
func (s *APIV2Service) RegisterGateway(ctx context.Context, e *echo.Echo) error { func (s *APIV1Service) RegisterGateway(ctx context.Context, e *echo.Echo) error {
// Create a client connection to the gRPC Server we just started. // Create a client connection to the gRPC Server we just started.
// This is where the gRPC-Gateway proxies the requests. // This is where the gRPC-Gateway proxies the requests.
conn, err := grpc.DialContext( conn, err := grpc.DialContext(

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

@ -11,7 +11,7 @@ import (
"github.com/yourselfhosted/slash/store" "github.com/yourselfhosted/slash/store"
) )
func (s *APIV2Service) GetWorkspaceProfile(ctx context.Context, _ *apiv1pb.GetWorkspaceProfileRequest) (*apiv1pb.GetWorkspaceProfileResponse, error) { func (s *APIV1Service) GetWorkspaceProfile(ctx context.Context, _ *apiv1pb.GetWorkspaceProfileRequest) (*apiv1pb.GetWorkspaceProfileResponse, error) {
profile := &apiv1pb.WorkspaceProfile{ profile := &apiv1pb.WorkspaceProfile{
Mode: s.Profile.Mode, Mode: s.Profile.Mode,
Version: s.Profile.Version, Version: s.Profile.Version,
@ -41,7 +41,7 @@ func (s *APIV2Service) GetWorkspaceProfile(ctx context.Context, _ *apiv1pb.GetWo
}, nil }, nil
} }
func (s *APIV2Service) GetWorkspaceSetting(ctx context.Context, _ *apiv1pb.GetWorkspaceSettingRequest) (*apiv1pb.GetWorkspaceSettingResponse, error) { func (s *APIV1Service) GetWorkspaceSetting(ctx context.Context, _ *apiv1pb.GetWorkspaceSettingRequest) (*apiv1pb.GetWorkspaceSettingResponse, error) {
isAdmin := false isAdmin := false
userID, ok := ctx.Value(userIDContextKey).(int32) userID, ok := ctx.Value(userIDContextKey).(int32)
if ok { if ok {
@ -85,7 +85,7 @@ func (s *APIV2Service) GetWorkspaceSetting(ctx context.Context, _ *apiv1pb.GetWo
}, nil }, nil
} }
func (s *APIV2Service) UpdateWorkspaceSetting(ctx context.Context, request *apiv1pb.UpdateWorkspaceSettingRequest) (*apiv1pb.UpdateWorkspaceSettingResponse, error) { func (s *APIV1Service) UpdateWorkspaceSetting(ctx context.Context, request *apiv1pb.UpdateWorkspaceSettingRequest) (*apiv1pb.UpdateWorkspaceSettingResponse, error) {
if request.UpdateMask == nil || len(request.UpdateMask.Paths) == 0 { if request.UpdateMask == nil || len(request.UpdateMask.Paths) == 0 {
return nil, status.Errorf(codes.InvalidArgument, "update mask is empty") return nil, status.Errorf(codes.InvalidArgument, "update mask is empty")
} }

4
server/server.go
View File

@ -32,7 +32,7 @@ type Server struct {
licenseService *license.LicenseService licenseService *license.LicenseService
// API services. // API services.
apiV1Service *apiv1.APIV2Service apiV1Service *apiv1.APIV1Service
} }
func NewServer(ctx context.Context, profile *profile.Profile, store *store.Store) (*Server, error) { func NewServer(ctx context.Context, profile *profile.Profile, store *store.Store) (*Server, error) {
@ -71,7 +71,7 @@ func NewServer(ctx context.Context, profile *profile.Profile, store *store.Store
}) })
rootGroup := e.Group("") rootGroup := e.Group("")
s.apiV1Service = apiv1.NewAPIV2Service(secret, profile, store, licenseService, s.Profile.Port+1) s.apiV1Service = apiv1.NewAPIV1Service(secret, profile, store, licenseService, s.Profile.Port+1)
// Register gRPC gateway as api v1. // Register gRPC gateway as api v1.
if err := s.apiV1Service.RegisterGateway(ctx, e); err != nil { if err := s.apiV1Service.RegisterGateway(ctx, e); err != nil {
return nil, errors.Wrap(err, "failed to register gRPC gateway") return nil, errors.Wrap(err, "failed to register gRPC gateway")