softplayer/softplayer-backend
5
0
Fork 0
Code Pull Requests 2 Packages Releases Activity

A lot of thigs are going on
All checks were successful
ci/woodpecker/push/build Pipeline was successful
Details

Browse Source 
Signed-off-by: Nikolai Rodionov <allanger@badhouseplants.net>
This commit is contained in:
Nikolai Rodionov
2026-05-10 23:14:29 +02:00
parent 16fab87949
commit 33f48f2bfb
31 changed files with 72 additions and 1514 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
api/v1/accounts_auth.go → api/v1/accounts.go
View File

@@ -3,7 +3,6 @@ package v1
import (
"context"
"gitea.badhouseplants.net/softplayer/softplayer-backend/internal/authorization"
"gitea.badhouseplants.net/softplayer/softplayer-backend/internal/controllers"
accounts "gitea.badhouseplants.net/softplayer/softplayer-go-proto/pkg/accounts/v1"
"github.com/golang/protobuf/ptypes/empty"
@@ -16,27 +15,27 @@ import (
func NewAccountAuthRPCImpl(
accountsCtrl *controllers.AccountController,
authorizationCtrl *authorization.AuthController,
) *AccountsAuthServer {
return &AccountsAuthServer{
authorizationCtrl *controllers.AuthController,
) *AccountsServer {
return &AccountsServer{
accountsCtrl: accountsCtrl,
authorizationCtrl: authorizationCtrl,
}
}
type AccountsAuthServer struct {
accounts.UnimplementedAccountsAuthServiceServer
type AccountsServer struct {
accounts.UnimplementedAccountsServiceServer
accountsCtrl *controllers.AccountController
authorizationCtrl *authorization.AuthController
authorizationCtrl *controllers.AuthController
}
func (a *AccountsAuthServer) RefreshToken(ctx context.Context, in *empty.Empty) (*empty.Empty, error) {
func (a *AccountsServer) RefreshToken(ctx context.Context, in *empty.Empty) (*empty.Empty, error) {
claims, err := a.authorizationCtrl.ClaimsFromContext(ctx)
if err != nil {
return nil, status.Error(codes.Aborted, "Context is invalid")
}
if claims.TokenType != authorization.TokenTypeRefresh {
if claims.TokenType != controllers.TokenTypeRefresh {
return nil, status.Error(codes.Unauthenticated, "Invalid token")
}
@@ -49,17 +48,17 @@ func (a *AccountsAuthServer) RefreshToken(ctx context.Context, in *empty.Empty)
return nil, status.Error(codes.Unauthenticated, "Invalid session")
}
accessToken, _, err := a.authorizationCtrl.GenerateToken(session.UserID, authorization.TokenTypeAccess)
accessToken, _, err := a.authorizationCtrl.GenerateToken(session.UserID, controllers.TokenTypeAccess)
if err != nil {
return nil, status.Error(codes.Aborted, "Couldn't generate an access token")
}
refreshToken, tokenID, err := a.authorizationCtrl.GenerateToken(session.UserID, authorization.TokenTypeRefresh)
refreshToken, tokenID, err := a.authorizationCtrl.GenerateToken(session.UserID, controllers.TokenTypeRefresh)
if err != nil {
return nil, status.Error(codes.Aborted, "Couldn't generate an access token")
}
newSession := &authorization.Session{UserID: session.UserID}
newSession := &controllers.Session{UserID: session.UserID}
if err := a.authorizationCtrl.SaveSession(ctx, tokenID, newSession); err != nil {
return nil, status.Error(codes.Aborted, "Couldn't store session")

29
api/v1/accounts_no_auth.go → api/v1/public_accounts.go
View File

@@ -3,7 +3,6 @@ package v1
import (
"context"
"gitea.badhouseplants.net/softplayer/softplayer-backend/internal/authorization"
"gitea.badhouseplants.net/softplayer/softplayer-backend/internal/controllers"
accounts "gitea.badhouseplants.net/softplayer/softplayer-go-proto/pkg/accounts/v1"
"github.com/golang/protobuf/ptypes/empty"
@@ -16,36 +15,36 @@ import (
func NewAccountNoAuthRPCImpl(
accountsCtrl *controllers.AccountController,
authorizationCtrl *authorization.AuthController,
) *AccountsNoAuthServer {
return &AccountsNoAuthServer{
authorizationCtrl *controllers.AuthController,
) *PublicAccountService {
return &PublicAccountService{
accountsCtrl: accountsCtrl,
authorizationCtrl: authorizationCtrl,
}
}
type AccountsNoAuthServer struct {
accounts.UnimplementedAccountsNoAuthServiceServer
type PublicAccountService struct {
accounts.UnimplementedPublicAccountsServiceServer
accountsCtrl *controllers.AccountController
authorizationCtrl *authorization.AuthController
authorizationCtrl *controllers.AuthController
}
func (a *AccountsNoAuthServer) SignIn(ctx context.Context, in *accounts.SignInRequest) (*empty.Empty, error) {
func (a *PublicAccountService) SignIn(ctx context.Context, in *accounts.SignInRequest) (*empty.Empty, error) {
id, err := a.accountsCtrl.Login(ctx, in.GetEmail(), in.GetPassword())
if err != nil {
return nil, status.Error(codes.Aborted, "Couldn't create a user")
}
accessToken, _, err := a.authorizationCtrl.GenerateToken(id, authorization.TokenTypeAccess)
accessToken, _, err := a.authorizationCtrl.GenerateToken(id, controllers.TokenTypeAccess)
if err != nil {
return nil, status.Error(codes.Aborted, "Couldn't generate an access token")
}
refreshToken, tokenID, err := a.authorizationCtrl.GenerateToken(id, authorization.TokenTypeRefresh)
refreshToken, tokenID, err := a.authorizationCtrl.GenerateToken(id, controllers.TokenTypeRefresh)
if err != nil {
return nil, status.Error(codes.Aborted, "Couldn't generate an access token")
}
session := &authorization.Session{UserID: id}
session := &controllers.Session{UserID: id}
if err := a.authorizationCtrl.SaveSession(ctx, tokenID, session); err != nil {
return nil, status.Error(codes.Aborted, "Couldn't store session")
@@ -61,7 +60,7 @@ func (a *AccountsNoAuthServer) SignIn(ctx context.Context, in *accounts.SignInRe
}
// Create a new account in Softplayer
func (a *AccountsNoAuthServer) SignUp(ctx context.Context, in *accounts.SignUpRequest) (*empty.Empty, error) {
func (a *PublicAccountService) SignUp(ctx context.Context, in *accounts.SignUpRequest) (*empty.Empty, error) {
data := &controllers.AccountData{
Password: in.GetPassword(),
Email: in.GetEmail(),
@@ -71,17 +70,17 @@ func (a *AccountsNoAuthServer) SignUp(ctx context.Context, in *accounts.SignUpRe
return nil, status.Error(codes.Aborted, "Couldn't create a user")
}
accessToken, _, err := a.authorizationCtrl.GenerateToken(id, authorization.TokenTypeAccess)
accessToken, _, err := a.authorizationCtrl.GenerateToken(id, controllers.TokenTypeAccess)
if err != nil {
return nil, status.Error(codes.Aborted, "Couldn't generate an access token")
}
refreshToken, tokenID, err := a.authorizationCtrl.GenerateToken(id, authorization.TokenTypeRefresh)
refreshToken, tokenID, err := a.authorizationCtrl.GenerateToken(id, controllers.TokenTypeRefresh)
if err != nil {
return nil, status.Error(codes.Aborted, "Couldn't generate an access token")
}
session := &authorization.Session{UserID: id}
session := &controllers.Session{UserID: id}
if err := a.authorizationCtrl.SaveSession(ctx, tokenID, session); err != nil {
return nil, status.Error(codes.Aborted, "Couldn't store session")

2
api/v1/test_auth.go
View File

@@ -3,7 +3,7 @@ package v1
import (
"context"
"gitea.badhouseplants.net/softplayer/softplayer-backend/internal/tools/logger"
"gitea.badhouseplants.net/softplayer/softplayer-backend/internal/helpers/logger"
test "gitea.badhouseplants.net/softplayer/softplayer-go-proto/pkg/test/v1"
)

2
api/v1/test_no_auth.go
View File

@@ -3,7 +3,7 @@ package v1
import (
"context"
"gitea.badhouseplants.net/softplayer/softplayer-backend/internal/tools/logger"
"gitea.badhouseplants.net/softplayer/softplayer-backend/internal/helpers/logger"
test "gitea.badhouseplants.net/softplayer/softplayer-go-proto/pkg/test/v1"
)