StrafesNET/maps-service
7
Fork 0
Code Issues 7 Pull Requests Packages Projects Releases Wiki Activity

produce less garbage

Browse Source
This commit is contained in:
Quaternions 2024-12-09 20:10:23 -08:00
parent e495a8423f
commit 576c3a187a
2 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pkg/cmds/serve.go
View File

@ -10,6 +10,7 @@ import (
"net/http" "net/http"
"google.golang.org/grpc" "google.golang.org/grpc"
"google.golang.org/grpc/credentials/insecure" "google.golang.org/grpc/credentials/insecure"
"git.itzana.me/strafesnet/go-grpc/auth"
) )
func NewServeCommand() *cli.Command { func NewServeCommand() *cli.Command {
@ -84,7 +85,7 @@ func serve(ctx *cli.Context) error {
log.Fatal(err) log.Fatal(err)
} }
sec := service.SecurityHandler{ sec := service.SecurityHandler{
Client: conn, Client: auth.NewAuthServiceClient(conn),
} }
srv, err := api.NewServer(svc, sec, api.WithPathPrefix("/v1")) srv, err := api.NewServer(svc, sec, api.WithPathPrefix("/v1"))

11
pkg/service/security.go
View File

@ -5,7 +5,6 @@ import (
"context" "context"
"git.itzana.me/strafesnet/maps-service/pkg/api" "git.itzana.me/strafesnet/maps-service/pkg/api"
"git.itzana.me/strafesnet/go-grpc/auth" "git.itzana.me/strafesnet/go-grpc/auth"
"google.golang.org/grpc"
) )
var ( var (
@ -40,7 +39,7 @@ func (usr UserInfo) IsSubmitter(submitter int64) bool{
} }
type SecurityHandler struct { type SecurityHandler struct {
Client *grpc.ClientConn Client auth.AuthServiceClient
} }
func (svc SecurityHandler) HandleCookieAuth(ctx context.Context, operationName api.OperationName, t api.CookieAuth) (context.Context, error){ func (svc SecurityHandler) HandleCookieAuth(ctx context.Context, operationName api.OperationName, t api.CookieAuth) (context.Context, error){
@ -49,23 +48,21 @@ func (svc SecurityHandler) HandleCookieAuth(ctx context.Context, operationName a
return nil, ErrMissingSessionID return nil, ErrMissingSessionID
} }
client := auth.NewAuthServiceClient(svc.Client) session, err := svc.Client.GetSessionUser(ctx, &auth.IdMessage{
session, err := client.GetSessionUser(ctx, &auth.IdMessage{
SessionID: sessionId, SessionID: sessionId,
}) })
if err != nil{ if err != nil{
return nil, err return nil, err
} }
role, err := client.GetGroupRole(ctx, &auth.IdMessage{ role, err := svc.Client.GetGroupRole(ctx, &auth.IdMessage{
SessionID: sessionId, SessionID: sessionId,
}) })
if err != nil{ if err != nil{
return nil, err return nil, err
} }
validate, err := client.ValidateSession(ctx, &auth.IdMessage{ validate, err := svc.Client.ValidateSession(ctx, &auth.IdMessage{
SessionID: sessionId, SessionID: sessionId,
}) })
if err != nil{ if err != nil{