feat: добавлены новые ручки как логин и список файлов (добавлены токены для отслеживания изменении)Э

Author: RahatMelsov

.env.dev

@@ -1,24 +1,31 @@
-SERVER_PKG ?= ./cmd/server
+# Makefile (минимальный)
+APP := tui
+PKG := ./cmd/tui
+DIST := dist
 
-GRPC_ADDR ?= 127.0.0.1:8080
-DB_DSN ?= mem://
+.PHONY: build run clean linux mac windows
 
-.PHONY: run build tidy help
+build:
+	mkdir -p $(DIST)
+	go mod tidy
+	CGO_ENABLED=0 go build -o $(DIST)/$(APP) $(PKG)
 
-help:
-	@echo "make run  - run server via 'go run'"
-	@echo "make build  -build server binary into ./bin/server"
-	@echo "env overrides: GRPC_ADDR (default: $(GRPC_ADDR)), DB_DSN (default: $(DB_DSN))"
-	@echo "example: make run GRPC_ADDR=:9090 DB_DSN='postgres://...@localhost:5432/vault?sslmode=disable"
+run: build
+	$(DIST)/$(APP)
 
-run:
-	@echo "===> go run $(SERVER_PKG) (DB_DSN=$(GRPC_ADDR), DB_DSN=$(DB_DSN))"
-	@GRPC_ADDR=$(GRPC_ADDR) DB_DSN=$(DB_DSN) go run $(SERVER_PKG)
+clean:
+	rm -rf $(DIST)
 
-build:
-	@mkdir -p bin
-	@echo "===> go build ./cmd/server -> ./bin/server"
-	@go build -o bin/server $(SERVER_PKG)
+# Кросс-сборки, если нужно
+linux:
+	mkdir -p $(DIST)
+	CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -o $(DIST)/$(APP)_linux_amd64 $(PKG)
+
+mac:
+	mkdir -p $(DIST)
+	CGO_ENABLED=0 GOOS=darwin GOARCH=arm64 go build -o $(DIST)/$(APP)_darwin_arm64 $(PKG)
+
+windows:
+	mkdir -p $(DIST)
+	CGO_ENABLED=0 GOOS=windows GOARCH=amd64 go build -o $(DIST)/$(APP)_windows_amd64.exe $(PKG)
 
-tidy:
-	@go mod tidy

Makefile

@@ -2,35 +2,40 @@ syntax = "proto3";
 package common.v1;
 option go_package = "github.com/rtmelsov/adv-keeper/gen/go/common/v1;commonv1";
 
-message DeviceInfo {
-  string device_id = 1; // клиентский идентификатор устройства
-}
+import "google/protobuf/timestamp.proto";
 
 service AuthService {
+  rpc Logout(TokenPair) returns (TokenPair);
   rpc Register(RegisterRequest) returns (RegisterResponse);
   rpc Login(LoginRequest) returns (LoginResponse);
 }
 
-message RegisterRequest {
+message TokenPair {
+  string access_token = 1;   // JWT (HS256)
+  //google.protobuf.Timestamp
+  google.protobuf.Timestamp expires_at = 3;     // RFC3339 серверное время истечения refresh
+}
+
+message LoginRequest {
   string email    = 1;
   string password = 2;
-  DeviceInfo device = 3;
 }
 
-message RegisterResponse {
+message LoginResponse {
   string user_id   = 1;
-  string device_id = 2; // вернём то, что прислал клиент
+  string device_id = 2;
   string email     = 3;
+  TokenPair tokens = 4; // ← добавили
 }
 
-message LoginRequest {
+message RegisterRequest {
   string email    = 1;
   string password = 2;
-  DeviceInfo device = 3;
 }
 
-message LoginResponse {
+message RegisterResponse {
   string user_id   = 1;
   string device_id = 2; // вернём то, что прислал клиент
-  string email     = 3;
+  string email    = 3;
+  TokenPair tokens = 4; // ← добавили
 }

api/proto/common/v1/common.proto

@@ -5,44 +5,51 @@ import (
 	"google.golang.org/grpc/reflection"
 	"log"
 	"net"
-	"os"
+	"time"
 
 	commonv1 "github.com/rtmelsov/adv-keeper/gen/go/proto/common/v1"
 	filev1 "github.com/rtmelsov/adv-keeper/gen/go/proto/file/v1"
-	"github.com/rtmelsov/adv-keeper/internal/auth"
 	db "github.com/rtmelsov/adv-keeper/internal/db"
 	"github.com/rtmelsov/adv-keeper/internal/file"
+	"github.com/rtmelsov/adv-keeper/internal/helpers"
+	"github.com/rtmelsov/adv-keeper/internal/middleware"
+	"github.com/rtmelsov/adv-keeper/internal/server"
+	"google.golang.org/grpc/keepalive"
 
 	_ "github.com/jackc/pgx/v5/stdlib"
 	"google.golang.org/grpc"
 )
 
 func main() {
-	dsn := os.Getenv("DB_DSN")
-	if dsn == "" {
-		log.Fatal("DB_DSN is required")
-	}
-	addr := os.Getenv("GRPC_ADDR")
-	if addr == "" {
-		addr = "127.0.0.1:8080"
+	envs, err := helpers.LoadConfig()
+	if err != nil {
+		log.Fatal(err)
 	}
-	// получаем урл бд
 
-	lis, err := net.Listen("tcp", addr)
+	lis, err := net.Listen("tcp", envs.Addr)
 	if err != nil {
 		log.Fatal(err)
 	}
 
 	// Подключение к Postgres
-	dbx, err := sql.Open("pgx", dsn)
+	dbx, err := sql.Open("pgx", envs.DBDSN)
 	if err != nil {
 		log.Fatal(err)
 	}
 	defer dbx.Close()
 
 	q := db.New(dbx)
-	s := grpc.NewServer()
-	commonv1.RegisterAuthServiceServer(s, auth.New(q))
+	s := grpc.NewServer(
+		grpc.UnaryInterceptor(middleware.ServerInterceptor),
+		grpc.KeepaliveParams(keepalive.ServerParameters{
+			MaxConnectionIdle:     0,
+			MaxConnectionAge:      0,
+			MaxConnectionAgeGrace: 0,
+			Time:                  2 * time.Minute,
+			Timeout:               20 * time.Second,
+		}),
+	)
+	commonv1.RegisterAuthServiceServer(s, server.New(q))
 	filev1.RegisterFileServiceServer(s, file.New(q))
 
 	reflection.Register(s)

cmd/server/main.go

@@ -17,7 +17,6 @@ var (
 )
 
 func main() {
-
 	showVersion := flag.Bool("version", false, "print version and exit")
 	flag.Parse()
 	if *showVersion {

cmd/tui/main.go

@@ -1,16 +1,24 @@
 -- name: RegisterWithDevice :one
-WITH u AS (
-  INSERT INTO users (email, pwd_phc, e2ee_pub)
-  VALUES ($1, $2, $3)
-  RETURNING id
-),
-d AS (
-  INSERT INTO devices (user_id, device_id)
-  SELECT u.id, $4
-  FROM u
-  RETURNING device_id
-)
-SELECT
-  (SELECT id FROM u)        AS user_id,
-  (SELECT device_id FROM d) AS device_id;
+INSERT INTO users (email, pwd_phc, e2ee_pub)
+VALUES ($1, $2, $3)
+RETURNING id;
 
+-- name: GetUserByEmail :one
+SELECT id, email, pwd_phc, e2ee_pub, created_at
+FROM users
+WHERE email = $1;
+
+-- name: AddFile :one
+INSERT INTO files (user_id, name, path)
+VALUES ($1, $2, $3)
+RETURNING id, user_id, name, path, created_at;
+
+-- name: ListFilesByUser :many
+SELECT id, name, path, created_at
+FROM files
+WHERE user_id = $1
+ORDER BY created_at DESC;
+
+-- name: DeleteFile :exec
+DELETE FROM files
+WHERE id = $1 AND user_id = $2;