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

chore: update license service

Browse Source
This commit is contained in:
Steven
2024-08-12 21:17:27 +08:00
parent 768af5b096
commit 00e2a6fd96
13 changed files with 297 additions and 107 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -58,6 +58,10 @@ func (s *APIV1Service) SignIn(ctx context.Context, request *v1pb.SignInRequest)
}
func (s *APIV1Service) SignInWithSSO(ctx context.Context, request *v1pb.SignInWithSSORequest) (*v1pb.User, error) {
if !s.LicenseService.IsFeatureEnabled(license.FeatureTypeSSO) {
return nil, status.Errorf(codes.PermissionDenied, "SSO is not available in the current plan")
}
identityProviderSetting, err := s.Store.GetWorkspaceSetting(ctx, &store.FindWorkspaceSetting{
Key: storepb.WorkspaceSettingKey_WORKSPACE_SETTING_IDENTITY_PROVIDER,
})
@ -105,6 +109,9 @@ func (s *APIV1Service) SignInWithSSO(ctx context.Context, request *v1pb.SignInWi
return nil, status.Errorf(codes.Internal, fmt.Sprintf("failed to find user by email %s", email))
}
if user == nil {
if err := s.checkSeatAvailability(ctx); err != nil {
return nil, err
}
userCreate := &store.User{
Email: email,
Nickname: userInfo.DisplayName,
@ -139,15 +146,8 @@ func (s *APIV1Service) SignUp(ctx context.Context, request *v1pb.SignUpRequest)
if !s.Profile.Public {
return nil, status.Errorf(codes.PermissionDenied, "sign up is not allowed")
}
if !s.LicenseService.IsFeatureEnabled(license.FeatureTypeUnlimitedAccounts) {
userList, err := s.Store.ListUsers(ctx, &store.FindUser{})
if err != nil {
return nil, status.Errorf(codes.Internal, fmt.Sprintf("failed to list users, err: %s", err))
}
if len(userList) >= 5 {
return nil, status.Errorf(codes.InvalidArgument, "maximum number of users reached")
}
if err := s.checkSeatAvailability(ctx); err != nil {
return nil, err
}
passwordHash, err := bcrypt.GenerateFromPassword([]byte(request.Password), bcrypt.DefaultCost)
@ -210,3 +210,17 @@ func (*APIV1Service) SignOut(ctx context.Context, _ *v1pb.SignOutRequest) (*empt
}
return &emptypb.Empty{}, nil
}
func (s *APIV1Service) checkSeatAvailability(ctx context.Context) error {
if !s.LicenseService.IsFeatureEnabled(license.FeatureTypeUnlimitedAccounts) {
userList, err := s.Store.ListUsers(ctx, &store.FindUser{})
if err != nil {
return status.Errorf(codes.Internal, fmt.Sprintf("failed to list users, err: %s", err))
}
seats := s.LicenseService.GetSubscription().Seats
if len(userList) > int(seats) {
return status.Errorf(codes.FailedPrecondition, "maximum number of users %d reached", seats)
}
}
return nil
}

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

@ -22,10 +22,7 @@ func (s *APIV1Service) GetWorkspaceProfile(ctx context.Context, _ *v1pb.GetWorks
}
// Load subscription plan from license service.
subscription, err := s.LicenseService.GetSubscription(ctx)
if err != nil {
return nil, status.Errorf(codes.Internal, "failed to get subscription: %v", err)
}
subscription := s.LicenseService.GetSubscription()
workspaceProfile.Plan = subscription.Plan
owner, err := s.GetInstanceOwner(ctx)
@ -53,6 +50,10 @@ func (s *APIV1Service) GetWorkspaceProfile(ctx context.Context, _ *v1pb.GetWorks
}
func (s *APIV1Service) GetWorkspaceSetting(ctx context.Context, _ *v1pb.GetWorkspaceSettingRequest) (*v1pb.GetWorkspaceSettingResponse, error) {
currentUser, err := getCurrentUser(ctx, s.Store)
if err != nil {
return nil, status.Errorf(codes.Unauthenticated, "failed to get current user: %v", err)
}
workspaceSettings, err := s.Store.ListWorkspaceSettings(ctx, &store.FindWorkspaceSetting{})
if err != nil {
return nil, status.Errorf(codes.Internal, "failed to list workspace settings: %v", err)
@ -70,7 +71,14 @@ func (s *APIV1Service) GetWorkspaceSetting(ctx context.Context, _ *v1pb.GetWorks
identityProviderSetting := v.GetIdentityProvider()
workspaceSetting.IdentityProviders = []*v1pb.IdentityProvider{}
for _, identityProvider := range identityProviderSetting.GetIdentityProviders() {
workspaceSetting.IdentityProviders = append(workspaceSetting.IdentityProviders, convertIdentityProviderFromStore(identityProvider))
identityProviderV1pb := convertIdentityProviderFromStore(identityProvider)
if currentUser == nil || currentUser.Role != store.RoleAdmin {
oauth2Config := identityProviderV1pb.Config.GetOauth2()
if oauth2Config != nil {
oauth2Config.ClientSecret = ""
}
}
workspaceSetting.IdentityProviders = append(workspaceSetting.IdentityProviders, identityProviderV1pb)
}
}
}