diff --git a/docs/docs.go b/docs/docs.go index 5275aab..7788abf 100644 --- a/docs/docs.go +++ b/docs/docs.go @@ -319,31 +319,23 @@ const docTemplate = `{ }, "/merch/labels/{uuid}": { "get": { - "security": [ - { - "BearerAuth": [] - } - ], - "description": "Получить метки товара по его uuid", + "description": "Получить персональные данные. Запрос данных по gRPC у сервиса авторизации.", "produces": [ "application/json" ], "tags": [ - "Merch labels" - ], - "summary": "Получить метки товара по его uuid", - "parameters": [ - { - "type": "string", - "description": "label uuid", - "name": "uuid", - "in": "path", - "required": true - } + "User" ], + "summary": "Получить персональные данные.", "responses": { "200": { - "description": "OK" + "description": "OK", + "schema": { + "$ref": "#/definitions/common.PersonalDTO" + } + }, + "204": { + "description": "No Content" }, "400": { "description": "Bad Request", @@ -889,9 +881,6 @@ const docTemplate = `{ }, "delete": { "description": "Marks merch and all its extra data as deleted by uuid.", - "consumes": [ - "application/json" - ], "tags": [ "Merch" ], @@ -1114,6 +1103,26 @@ const docTemplate = `{ } }, "definitions": { + "common.PersonalDTO": { + "type": "object", + "properties": { + "email": { + "type": "string" + }, + "name": { + "type": "string" + }, + "surname": { + "type": "string" + }, + "username": { + "type": "string" + }, + "uuid": { + "type": "string" + } + } + }, "merch.DeleteZeroPrices": { "type": "object", "properties": { diff --git a/docs/swagger.json b/docs/swagger.json index 61908d7..16d273f 100644 --- a/docs/swagger.json +++ b/docs/swagger.json @@ -312,31 +312,23 @@ }, "/merch/labels/{uuid}": { "get": { - "security": [ - { - "BearerAuth": [] - } - ], - "description": "Получить метки товара по его uuid", + "description": "Получить персональные данные. Запрос данных по gRPC у сервиса авторизации.", "produces": [ "application/json" ], "tags": [ - "Merch labels" - ], - "summary": "Получить метки товара по его uuid", - "parameters": [ - { - "type": "string", - "description": "label uuid", - "name": "uuid", - "in": "path", - "required": true - } + "User" ], + "summary": "Получить персональные данные.", "responses": { "200": { - "description": "OK" + "description": "OK", + "schema": { + "$ref": "#/definitions/common.PersonalDTO" + } + }, + "204": { + "description": "No Content" }, "400": { "description": "Bad Request", @@ -882,9 +874,6 @@ }, "delete": { "description": "Marks merch and all its extra data as deleted by uuid.", - "consumes": [ - "application/json" - ], "tags": [ "Merch" ], @@ -1107,6 +1096,26 @@ } }, "definitions": { + "common.PersonalDTO": { + "type": "object", + "properties": { + "email": { + "type": "string" + }, + "name": { + "type": "string" + }, + "surname": { + "type": "string" + }, + "username": { + "type": "string" + }, + "uuid": { + "type": "string" + } + } + }, "merch.DeleteZeroPrices": { "type": "object", "properties": { diff --git a/docs/swagger.yaml b/docs/swagger.yaml index 1584523..2cc4ef4 100644 --- a/docs/swagger.yaml +++ b/docs/swagger.yaml @@ -1,5 +1,18 @@ basePath: /api/v2 definitions: + common.PersonalDTO: + properties: + email: + type: string + name: + type: string + surname: + type: string + username: + type: string + uuid: + type: string + type: object merch.DeleteZeroPrices: properties: id: @@ -200,8 +213,6 @@ info: paths: /merch/{uuid}: delete: - consumes: - - application/json description: Marks merch and all its extra data as deleted by uuid. parameters: - description: merch uuid @@ -456,18 +467,16 @@ paths: tags: - Merch labels get: - description: Получить метки товара по его uuid - parameters: - - description: label uuid - in: path - name: uuid - required: true - type: string + description: Получить персональные данные. Запрос данных по gRPC у сервиса авторизации. produces: - application/json responses: "200": description: OK + schema: + $ref: '#/definitions/common.PersonalDTO' + "204": + description: No Content "400": description: Bad Request schema: @@ -480,11 +489,9 @@ paths: description: Internal Server Error schema: $ref: '#/definitions/responses.InternalServerError' - security: - - BearerAuth: [] - summary: Получить метки товара по его uuid + summary: Получить персональные данные. tags: - - Merch labels + - User put: consumes: - application/json diff --git a/internal/app/handler.go b/internal/app/handler.go index cbcb879..c5f4b13 100644 --- a/internal/app/handler.go +++ b/internal/app/handler.go @@ -56,14 +56,16 @@ func New(ctx context.Context, cfg config.Config) *App { newApp.dbPool = dbPool sessionCheckProvider := authCheck.New(authCheck.Deps{ - Addr: net.JoinHostPort(cfg.Auth.Host, cfg.Auth.Port), - Timeout: cfg.Auth.Timeout, + Addr: net.JoinHostPort(cfg.Auth.Host, cfg.Auth.Port), + Timeout: cfg.Auth.Timeout, + ServiceId: serviceId, }) //providers with deps userProv := user.New(user.Deps{ - DB: dbPool, - Utils: u, + DB: dbPool, + Utils: u, + AuthDP: sessionCheckProvider, }) newApp.modules = append(newApp.modules, userProv) @@ -74,7 +76,6 @@ func New(ctx context.Context, cfg config.Config) *App { GinMode: cfg.Http.GinMode, UserProvider: userProv, AuthProvider: sessionCheckProvider, - ServiceId: serviceId, }) m := merch.New(merch.Deps{ @@ -84,7 +85,8 @@ func New(ctx context.Context, cfg config.Config) *App { newApp.modules = append(newApp.modules, m) newApp.tasker = task.New(task.Deps{ - Addr: "", + Host: cfg.TasksSource.Host, + Port: cfg.TasksSource.Port, MerchProvider: m, }) diff --git a/internal/appLog/logging.go b/internal/appLog/logging.go index 36d97bc..590d018 100644 --- a/internal/appLog/logging.go +++ b/internal/appLog/logging.go @@ -52,11 +52,20 @@ func (f *CustomFormatter) Format(entry *logrus.Entry) ([]byte, error) { errVal = fmt.Sprintf("%v\n", errVal) } + fieldsLine := "\n" + fields := entry.Data + if len(fields) > 0 { + fieldsLine = "| params: " + for key, val := range fields { + fieldsLine += fmt.Sprintf("\t%v=%v ", key, val) + } + } + cyanCode := f.getLevelColor(logrus.TraceLevel) filename := fmt.Sprintf("%s[%s:%d]%s", cyanCode, file, line, resetCode) - logLine := fmt.Sprintf("%s[%s]%v %s\t%v", - coloredLevel, timestamp, filename, msg, errVal) + logLine := fmt.Sprintf("%s[%s]%v %s\t%v %v", + coloredLevel, timestamp, filename, msg, fieldsLine, errVal) return []byte(logLine), nil } diff --git a/internal/common/interfaces.go b/internal/common/interfaces.go index ab37322..425eac6 100644 --- a/internal/common/interfaces.go +++ b/internal/common/interfaces.go @@ -8,3 +8,7 @@ type MerchProvider interface { GetTasks(ctx context.Context) ([]Task, error) InsertPrices(ctx context.Context, rawPrices []Result) error } + +type AuthDataProvider interface { + GetPersonalData(ctx context.Context, userUuid string) (*PersonalDTO, error) +} diff --git a/internal/common/structs.go b/internal/common/structs.go index 8d13b0a..d3da480 100644 --- a/internal/common/structs.go +++ b/internal/common/structs.go @@ -10,3 +10,11 @@ type Result struct { OriginName string Price int32 } + +type PersonalDTO struct { + Uuid string `json:"uuid"` + Email string `json:"email"` + Username string `json:"username"` + Name string `json:"name"` + Surname string `json:"surname"` +} diff --git a/internal/merch/controller.go b/internal/merch/controller.go index 2221240..d3ce21d 100644 --- a/internal/merch/controller.go +++ b/internal/merch/controller.go @@ -252,7 +252,6 @@ func (co *controller) updateExtraData(c *gin.Context) { // @Summary Delete merch // @Description Marks merch and all its extra data as deleted by uuid. // @Tags Merch -// @Accept json // @Param uuid path string true "merch uuid" // @Success 204 // @Failure 400 {object} responses.BadRequest @@ -381,6 +380,7 @@ func (co *controller) getChartsPrices(c *gin.Context) { logErr(controllerLogHeader, err) return } + log.WithField("response", response).Debugf("%v %v get chart prices success", pkgLogHeader, controllerLogHeader) c.JSON(http.StatusOK, response) } @@ -419,6 +419,7 @@ func (co *controller) getDistinctPrices(c *gin.Context) { c.Status(http.StatusNoContent) return } + log.WithField("response", response).Debugf("%v %v get distinct prices success", pkgLogHeader, controllerLogHeader) c.JSON(http.StatusOK, response) } diff --git a/internal/merch/provider.go b/internal/merch/provider.go index 8d7c8b5..50a308a 100644 --- a/internal/merch/provider.go +++ b/internal/merch/provider.go @@ -2,6 +2,7 @@ package merch import ( "context" + log "github.com/sirupsen/logrus" "merch-api/internal/common" "merch-api/pkg/utils" ) @@ -30,6 +31,7 @@ func (p *provider) GetTasks(ctx context.Context) ([]common.Task, error) { } func (p *provider) InsertPrices(ctx context.Context, rawPrices []common.Result) error { + log.WithField("payload", rawPrices).Debugf("%v Inserting prices", providerLogHeader) if rawPrices == nil || len(rawPrices) == 0 { logDebug(providerLogHeader, "no prices given") return nil @@ -56,15 +58,13 @@ func (p *provider) InsertPrices(ctx context.Context, rawPrices []common.Result) var insertPrices []Price for _, rawPrice := range rawPrices { insertPrices = append(insertPrices, Price{ - CreatedAt: now, - UpdatedAt: p.utils.NullTimeFromNow(now), - MerchId: uuidMap[rawPrice.MerchUuid], - OriginId: originIds[rawPrice.OriginName], - Price: int(rawPrice.Price), + MerchId: uuidMap[rawPrice.MerchUuid], + OriginId: originIds[rawPrice.OriginName], + Price: int(rawPrice.Price), }) } - if err = p.service.repo.insertPrices(ctx, insertPrices); err != nil { + if err = p.service.repo.insertPrices(ctx, now, p.utils.NullTimeFromNow(now), insertPrices); err != nil { logErr(serviceLogHeader, err) return err } diff --git a/internal/merch/repository_merch.go b/internal/merch/repository_merch.go index 4051f7a..af1868b 100644 --- a/internal/merch/repository_merch.go +++ b/internal/merch/repository_merch.go @@ -170,7 +170,7 @@ func (r *repo) getMerchUuidMap(ctx context.Context, merchUuids []string) (map[st return nil, err } - var merchUuidMap map[string]int64 + merchUuidMap := make(map[string]int64) for rows.Next() { var ( uuid string diff --git a/internal/merch/repository_prices.go b/internal/merch/repository_prices.go index b981443..e5d1769 100644 --- a/internal/merch/repository_prices.go +++ b/internal/merch/repository_prices.go @@ -8,7 +8,7 @@ import ( ) type Prices interface { - insertPrices(ctx context.Context, prices []Price) error + insertPrices(ctx context.Context, now time.Time, updatedAt sql.NullTime, prices []Price) error getPricesWithDays(ctx context.Context, userId int64, days time.Time) ([]Price, error) getDistinctPrices(ctx context.Context, userId int64, merchUuid string, days time.Time) ([]Price, error) @@ -17,7 +17,7 @@ type Prices interface { deleteZeroPrices(ctx context.Context, userId int64, now sql.NullTime, list []int64) error } -func (r *repo) insertPrices(ctx context.Context, prices []Price) error { +func (r *repo) insertPrices(ctx context.Context, now time.Time, updatedAt sql.NullTime, prices []Price) error { q := ` INSERT INTO merch_prices (created_at, updated_at, merch_id, origin_id, price) SELECT $1, $2, src.merch_id, src.origin_id, src.price @@ -40,7 +40,7 @@ func (r *repo) insertPrices(ctx context.Context, prices []Price) error { priceValues = append(priceValues, price.Price) } - _, err := r.db.Exec(ctx, q, merchIds, originIds, priceValues) + _, err := r.db.Exec(ctx, q, now, updatedAt, merchIds, originIds, priceValues) if err != nil { return err } @@ -127,14 +127,14 @@ func (r *repo) getZeroPrices(ctx context.Context, userId int64) ([]ZeroPrice, er q := ` WITH price_with_neighbors AS ( SELECT - p.id, p.created_at, p.merch_id, p.price, p.origin_id, m.name, + p.id, p.created_at, p.merch_id, p.price, p.origin_id, m.name, m.merch_uuid, LAG(price) OVER (PARTITION BY p.merch_id, p.origin_id ORDER BY p.created_at, p.id) AS prev_price, LEAD(price) OVER (PARTITION BY p.merch_id, p.origin_id ORDER BY p.created_at, p.id) AS next_price FROM merch_prices AS p JOIN merch as m ON m.id = p.merch_id WHERE p.deleted_at IS NULL AND m.deleted_at IS NULL - AND m.user_id = 3) + AND m.user_id = $1) SELECT pwn.id, pwn.created_at, pwn.merch_uuid, pwn.name, mo.name diff --git a/internal/merch/service_prices.go b/internal/merch/service_prices.go index 067326f..8e1006a 100644 --- a/internal/merch/service_prices.go +++ b/internal/merch/service_prices.go @@ -3,12 +3,10 @@ package merch import ( "context" "errors" - "fmt" "time" ) func (s *service) getPrices(ctx context.Context, userId int64, days int) ([]PricesResponse, error) { - fmt.Println("Enter service") merchList, err := s.repo.getAllUserMerch(ctx, userId) if err != nil { logErr(serviceLogHeader, err) diff --git a/internal/merch/service_prices_test.go b/internal/merch/service_prices_test.go new file mode 100644 index 0000000..4f0b206 --- /dev/null +++ b/internal/merch/service_prices_test.go @@ -0,0 +1,98 @@ +package merch + +import ( + "context" + "fmt" + "github.com/stretchr/testify/assert" + "github.com/stretchr/testify/mock" + "merch-api/pkg/utils" + "testing" + "time" +) + +func Test_service_getPrices(t *testing.T) { + type fields struct { + repo Repository + utils utils.Utils + } + type args struct { + ctx context.Context + userId int64 + days int + } + tests := []struct { + name string + fields fields + args args + want []PricesResponse + wantErr assert.ErrorAssertionFunc + }{ + // TODO: Add test cases. + {name: "success", + fields: fields{ + repo: nil, + utils: utils.New(), + }, + args: args{ + ctx: context.Background(), + userId: 4, + days: 180, + }, + want: []PricesResponse{}, + }, + } + for _, tt := range tests { + t.Run(tt.name, func(t *testing.T) { + mockMerch := []Merch{ + {Id: 1532, MerchUuid: "019cd7f4-e491-7dd5-a327-ea0b4c3800d6", Name: "Momo (darkness ver.)"}, + {Id: 1534, MerchUuid: "019cd7f4-e491-7dd7-a81f-1160db34da2d", Name: "Sairenji Haruna 1/4"}, + } + + mockPrices := []Price{ + {CreatedAt: timeFromString("2026-02-01 15:43:25.375677+00"), MerchId: 1532, Price: 1231, OriginId: 2}, + {CreatedAt: timeFromString("2026-02-02 15:43:25.375677+00"), MerchId: 1532, Price: 1232, OriginId: 2}, + {CreatedAt: timeFromString("2026-02-03 15:43:25.375677+00"), MerchId: 1532, Price: 1233, OriginId: 2}, + {CreatedAt: timeFromString("2026-02-04 15:43:25.375677+00"), MerchId: 1532, Price: 1234, OriginId: 2}, + {CreatedAt: timeFromString("2026-02-05 15:43:25.375677+00"), MerchId: 1532, Price: 1235, OriginId: 2}, + {CreatedAt: timeFromString("2026-02-06 15:43:25.375677+00"), MerchId: 1532, Price: 1231, OriginId: 2}, + // + {CreatedAt: timeFromString("2026-02-01 15:43:25.375677+00"), MerchId: 1534, Price: 5231, OriginId: 1}, + {CreatedAt: timeFromString("2026-02-02 15:43:25.375677+00"), MerchId: 1534, Price: 5232, OriginId: 1}, + {CreatedAt: timeFromString("2026-02-03 15:43:25.375677+00"), MerchId: 1534, Price: 5233, OriginId: 1}, + {CreatedAt: timeFromString("2026-02-04 15:43:25.375677+00"), MerchId: 1534, Price: 5234, OriginId: 1}, + {CreatedAt: timeFromString("2026-02-05 15:43:25.375677+00"), MerchId: 1534, Price: 5235, OriginId: 1}, + {CreatedAt: timeFromString("2026-02-06 15:43:25.375677+00"), MerchId: 1534, Price: 5231, OriginId: 1}, + } + + mockOrigins := []Origin{ + {Id: 1, Name: "surugaya"}, + {Id: 2, Name: "mandarake"}, + } + + mockRepo := new(MockRepository) + mockRepo.On("getAllUserMerch", mock.Anything, tt.args.userId).Return(mockMerch, nil) + + mockRepo.On("getPricesWithDays", mock.Anything, tt.args.userId, mock.Anything).Return(mockPrices, nil) + mockRepo.On("getOrigins", mock.Anything).Return(mockOrigins, nil) + + s := &service{ + repo: mockRepo, + utils: tt.fields.utils, + } + got, _ := s.getPrices(tt.args.ctx, tt.args.userId, tt.args.days) + //if !tt.wantErr(t, err, fmt.Sprintf("getPrices(%v, %v, %v)", tt.args.ctx, tt.args.userId, tt.args.days)) { + // return + //} + + for _, item := range got { + fmt.Printf("name: %v, merch_uuid: %v, origins: %v\n", item.Name, item.MerchUuid, item.Origins) + } + //assert.Equalf(t, tt.want, got, "getPrices(%v, %v, %v)", tt.args.ctx, tt.args.userId, tt.args.days) + }) + } +} + +func timeFromString(s string) time.Time { + t, _ := time.Parse("2006-01-02 15:04:05", s) + return t +} diff --git a/internal/task/handler.go b/internal/task/handler.go index 1d01394..2e75d04 100644 --- a/internal/task/handler.go +++ b/internal/task/handler.go @@ -17,7 +17,8 @@ type Handler struct { } type Deps struct { - Addr string + Host string + Port string MerchProvider common.MerchProvider } @@ -25,7 +26,7 @@ func New(deps Deps) *Handler { srv := grpc.NewServer() handler := &Handler{ - addr: deps.Addr, + addr: net.JoinHostPort(deps.Host, deps.Port), service: newService(deps.MerchProvider), } @@ -36,6 +37,7 @@ func New(deps Deps) *Handler { } func (h *Handler) Serve() error { + log.WithField("addr", h.addr).Debugf("%v Serving tasks", pkgLogHeader) listener, err := net.Listen("tcp", h.addr) if err != nil { log.WithError(err).Errorf("%v Listner failure", pkgLogHeader) diff --git a/internal/task/service.go b/internal/task/service.go index 38da458..cf5c3a7 100644 --- a/internal/task/service.go +++ b/internal/task/service.go @@ -1,11 +1,13 @@ package task import ( + "context" log "github.com/sirupsen/logrus" "google.golang.org/protobuf/types/known/emptypb" "io" "merch-api/internal/common" tt "merch-api/pkg/taskTransport/v1" + "sync" "time" ) @@ -21,9 +23,12 @@ func newService(mp common.MerchProvider) *service { } func (s *service) RequestTasks(_ *emptypb.Empty, stream tt.TaskProcessor_RequestTasksServer) error { - tasks, err := s.merchProvider.GetTasks(stream.Context()) + ctx, cancel := context.WithCancel(context.Background()) + + tasks, err := s.merchProvider.GetTasks(ctx) if err != nil { log.WithError(err).Errorf("%v Failed to get tasks", pkgLogHeader) + cancel() return err } @@ -33,31 +38,46 @@ func (s *service) RequestTasks(_ *emptypb.Empty, stream tt.TaskProcessor_Request Origins: task.Origins, }); err != nil { log.WithError(err).Errorf("%v Failed to send tasks", pkgLogHeader) + cancel() return err } } - + cancel() return nil } func (s *service) SendResults(stream tt.TaskProcessor_SendResultsServer) error { + ctx, cancel := context.WithCancel(context.Background()) + ticker := time.NewTicker(5 * time.Second) defer ticker.Stop() + mu := &sync.Mutex{} batch := make([]common.Result, 0) - done := make(chan struct{}) + + stop := make(chan struct{}) + var wg sync.WaitGroup + wg.Add(1) go func() { for { select { - case <-done: + case <-ctx.Done(): return case <-ticker.C: - if len(batch) > 0 { - err := s.merchProvider.InsertPrices(stream.Context(), batch) - if err != nil { - log.WithError(err).Errorf("%v Failed to batch insert result", pkgLogHeader) - } + mu.Lock() + if len(batch) == 0 { + mu.Unlock() + continue + } + + toInsert := make([]common.Result, len(batch)) + copy(toInsert, batch) + batch = batch[:0] + mu.Unlock() + + if err := s.merchProvider.InsertPrices(ctx, toInsert); err != nil { + log.WithError(err).Errorf("%v Failed to batch insert result", pkgLogHeader) } } } @@ -72,28 +92,36 @@ func (s *service) SendResults(stream tt.TaskProcessor_SendResultsServer) error { if err != nil { log.WithError(err).Errorf("%v Failed to receive", pkgLogHeader) + cancel() return err } + mu.Lock() batch = append(batch, common.Result{ MerchUuid: response.MerchUuid, OriginName: response.OriginName, Price: response.Price, }) + mu.Unlock() } - close(done) - if len(batch) > 0 { - err := s.merchProvider.InsertPrices(stream.Context(), batch) + close(stop) + wg.Wait() + + mu.Lock() + finalBatch := make([]common.Result, len(batch)) + copy(finalBatch, batch) + mu.Unlock() + + if len(finalBatch) > 0 { + err := s.merchProvider.InsertPrices(ctx, finalBatch) if err != nil { log.WithError(err).Errorf("%v Failed to batch insert last data", pkgLogHeader) + cancel() return err } } - if err := stream.SendAndClose(&emptypb.Empty{}); err != nil { - return err - } - - return nil + cancel() + return stream.SendAndClose(&emptypb.Empty{}) } diff --git a/internal/user/controller.go b/internal/user/controller.go index 5bee91f..a107a8c 100644 --- a/internal/user/controller.go +++ b/internal/user/controller.go @@ -28,7 +28,8 @@ func (h *Handler) RegisterRoutes(r *gin.RouterGroup, mw *router.Middlewares) { userGroup.POST("", mw.RegMW, h.controller.create) userGroup.DELETE("", mw.AuthMW, h.controller.delete) - userGroup.GET("/me", h.controller.me) + userGroup.GET("/me", mw.AuthMW, h.controller.me) + userGroup.GET("/personal", mw.AuthMW, h.controller.getPersonalData) } // create godoc @@ -121,3 +122,38 @@ func (co *controller) me(c *gin.Context) { c.JSON(http.StatusOK, response) } + +// getPersonalData godoc +// +// @Summary Получить персональные данные. +// @Description Получить персональные данные. Запрос данных по gRPC у сервиса авторизации. +// @Tags User +// @Produce json +// @Success 200 {object} common.PersonalDTO +// @Success 204 +// @Failure 400 {object} responses.BadRequest +// @Failure 401 {object} responses.Unauthorized +// @Failure 500 {object} responses.InternalServerError +// @Router /merch/labels/{uuid} [get] +func (co *controller) getPersonalData(c *gin.Context) { + u, err := co.utils.GetUserUuidFromContext(c) + if err != nil { + c.JSON(http.StatusBadRequest, responses.BadRequest{Error: err.Error()}) + appLog.LogErr(pkgLogHeader, controllerLogHeader, err) + return + } + + response, err := co.service.getPersonalData(c, u) + if err != nil { + c.JSON(http.StatusInternalServerError, responses.InternalServerError{Error: err.Error()}) + appLog.LogErr(pkgLogHeader, controllerLogHeader, err) + return + } + + if response == nil { + c.Status(http.StatusNoContent) + return + } + + c.JSON(http.StatusOK, response) +} diff --git a/internal/user/handler.go b/internal/user/handler.go index 2820208..3f9d2b0 100644 --- a/internal/user/handler.go +++ b/internal/user/handler.go @@ -2,6 +2,7 @@ package user import ( "github.com/jackc/pgx/v5/pgxpool" + "merch-api/internal/common" "merch-api/pkg/utils" ) @@ -13,13 +14,14 @@ type Handler struct { } type Deps struct { - DB *pgxpool.Pool - Utils utils.Utils + DB *pgxpool.Pool + Utils utils.Utils + AuthDP common.AuthDataProvider } func New(deps Deps) *Handler { r := newRepository(deps.DB) - s := newService(r, deps.Utils) + s := newService(r, deps.Utils, deps.AuthDP) c := newController(s, deps.Utils) return &Handler{ diff --git a/internal/user/service.go b/internal/user/service.go index bff395e..d4fe0d4 100644 --- a/internal/user/service.go +++ b/internal/user/service.go @@ -3,18 +3,24 @@ package user import ( "context" "errors" + log "github.com/sirupsen/logrus" + "merch-api/internal/common" "merch-api/pkg/utils" ) +const serviceLogHeader string = "service |" + type service struct { - repo Repository - utils utils.Utils + repo Repository + utils utils.Utils + authDP common.AuthDataProvider } -func newService(repo Repository, utils utils.Utils) *service { +func newService(repo Repository, utils utils.Utils, adp common.AuthDataProvider) *service { return &service{ - repo: repo, - utils: utils, + repo: repo, + utils: utils, + authDP: adp, } } @@ -48,3 +54,12 @@ func (s *service) getUser(ctx context.Context, userUuid string) (*MeDTO, error) return s.repo.getUser(ctx, userUuid) } + +func (s *service) getPersonalData(ctx context.Context, userUuid string) (*common.PersonalDTO, error) { + if userUuid == "" { + return nil, errors.New("user uuid is empty") + } + log.WithField("user_uuid", userUuid).Debugf("%v %v get personal data", pkgLogHeader, serviceLogHeader) + + return s.authDP.GetPersonalData(ctx, userUuid) +} diff --git a/pkg/authCheck/handler.go b/pkg/authCheck/handler.go index 12f9e83..7ca4b71 100644 --- a/pkg/authCheck/handler.go +++ b/pkg/authCheck/handler.go @@ -16,8 +16,9 @@ type Handler struct { } type Deps struct { - Addr string - Timeout time.Duration + Addr string + Timeout time.Duration + ServiceId int32 } func New(deps Deps) *Handler { @@ -35,6 +36,6 @@ func New(deps Deps) *Handler { return &Handler{ client: client, - service: newService(client, deps.Timeout), + service: newService(client, deps.Timeout, deps.ServiceId), } } diff --git a/pkg/authCheck/service.go b/pkg/authCheck/service.go index 0fa33d3..c137c89 100644 --- a/pkg/authCheck/service.go +++ b/pkg/authCheck/service.go @@ -3,29 +3,35 @@ package authCheck import ( "context" "errors" + log "github.com/sirupsen/logrus" + "merch-api/internal/common" verifyV1 "merch-api/pkg/verify/v1" "time" ) +const serviceLogHeader = "service |" + type service struct { - client verifyV1.AuthServiceClient - timeout time.Duration + client verifyV1.AuthServiceClient + timeout time.Duration + serviceId int32 } -func newService(c verifyV1.AuthServiceClient, timeout time.Duration) *service { +func newService(c verifyV1.AuthServiceClient, timeout time.Duration, sid int32) *service { return &service{ - client: c, - timeout: timeout, + client: c, + timeout: timeout, + serviceId: sid, } } -func (s *service) VerifySession(ctx context.Context, sessionUuid string, serviceId int32) (string, error) { +func (s *service) VerifySession(ctx context.Context, sessionUuid string) (string, error) { runCtx, cancel := context.WithTimeout(ctx, s.timeout) defer cancel() response, err := s.client.VerifyToken(runCtx, &verifyV1.VerifyTokenRequest{ SessionToken: sessionUuid, - ServiceId: serviceId, + ServiceId: s.serviceId, }) if err != nil { return "", err @@ -41,3 +47,33 @@ func (s *service) VerifySession(ctx context.Context, sessionUuid string, service return response.UserUuid, nil } + +func (s *service) GetPersonalData(ctx context.Context, userUuid string) (*common.PersonalDTO, error) { + runCtx, cancel := context.WithTimeout(ctx, s.timeout) + defer cancel() + + log.WithFields(log.Fields{ + "userUuid": userUuid, + "serviceId": s.serviceId, + }).Debugf("%v %v get personal data") + + response, err := s.client.GetPersonalInfo(runCtx, &verifyV1.PersonalRequest{ + UserUuid: userUuid, + ServiceId: s.serviceId, + }) + if err != nil { + return nil, err + } + + if response == nil { + return nil, errors.New("no data") + } + + return &common.PersonalDTO{ + Uuid: userUuid, + Email: response.Email, + Username: response.Username, + Name: response.Name, + Surname: response.Surname, + }, nil +} diff --git a/pkg/externalRegistration/v1/serviceRegistration.pb.go b/pkg/externalRegistration/v1/serviceRegistration.pb.go index 9f1da73..27e6363 100644 --- a/pkg/externalRegistration/v1/serviceRegistration.pb.go +++ b/pkg/externalRegistration/v1/serviceRegistration.pb.go @@ -9,6 +9,7 @@ package externalRegV1 import ( protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + emptypb "google.golang.org/protobuf/types/known/emptypb" reflect "reflect" sync "sync" unsafe "unsafe" @@ -29,6 +30,7 @@ type RegistrationRequest struct { ServiceEndCode int32 `protobuf:"varint,4,opt,name=service_end_code,json=serviceEndCode,proto3" json:"service_end_code,omitempty"` Secret string `protobuf:"bytes,5,opt,name=secret,proto3" json:"secret,omitempty"` Status string `protobuf:"bytes,6,opt,name=status,proto3" json:"status,omitempty"` + ServiceUrl string `protobuf:"bytes,7,opt,name=service_url,json=serviceUrl,proto3" json:"service_url,omitempty"` unknownFields protoimpl.UnknownFields sizeCache protoimpl.SizeCache } @@ -105,10 +107,18 @@ func (x *RegistrationRequest) GetStatus() string { return "" } +func (x *RegistrationRequest) GetServiceUrl() string { + if x != nil { + return x.ServiceUrl + } + return "" +} + type RegistrationResponse struct { state protoimpl.MessageState `protogen:"open.v1"` ServiceId int32 `protobuf:"varint,1,opt,name=service_id,json=serviceId,proto3" json:"service_id,omitempty"` AlreadyRegistered bool `protobuf:"varint,2,opt,name=already_registered,json=alreadyRegistered,proto3" json:"already_registered,omitempty"` + ServiceUrl string `protobuf:"bytes,3,opt,name=service_url,json=serviceUrl,proto3" json:"service_url,omitempty"` unknownFields protoimpl.UnknownFields sizeCache protoimpl.SizeCache } @@ -157,24 +167,119 @@ func (x *RegistrationResponse) GetAlreadyRegistered() bool { return false } +func (x *RegistrationResponse) GetServiceUrl() string { + if x != nil { + return x.ServiceUrl + } + return "" +} + +type UpdateRequest struct { + state protoimpl.MessageState `protogen:"open.v1"` + Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"` + Description string `protobuf:"bytes,2,opt,name=description,proto3" json:"description,omitempty"` + Status string `protobuf:"bytes,3,opt,name=status,proto3" json:"status,omitempty"` + ServiceUrl string `protobuf:"bytes,4,opt,name=service_url,json=serviceUrl,proto3" json:"service_url,omitempty"` + ServiceCode int32 `protobuf:"varint,5,opt,name=service_code,json=serviceCode,proto3" json:"service_code,omitempty"` + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache +} + +func (x *UpdateRequest) Reset() { + *x = UpdateRequest{} + mi := &file_proto_serviceRegistration_proto_msgTypes[2] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) +} + +func (x *UpdateRequest) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*UpdateRequest) ProtoMessage() {} + +func (x *UpdateRequest) ProtoReflect() protoreflect.Message { + mi := &file_proto_serviceRegistration_proto_msgTypes[2] + if x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use UpdateRequest.ProtoReflect.Descriptor instead. +func (*UpdateRequest) Descriptor() ([]byte, []int) { + return file_proto_serviceRegistration_proto_rawDescGZIP(), []int{2} +} + +func (x *UpdateRequest) GetName() string { + if x != nil { + return x.Name + } + return "" +} + +func (x *UpdateRequest) GetDescription() string { + if x != nil { + return x.Description + } + return "" +} + +func (x *UpdateRequest) GetStatus() string { + if x != nil { + return x.Status + } + return "" +} + +func (x *UpdateRequest) GetServiceUrl() string { + if x != nil { + return x.ServiceUrl + } + return "" +} + +func (x *UpdateRequest) GetServiceCode() int32 { + if x != nil { + return x.ServiceCode + } + return 0 +} + var File_proto_serviceRegistration_proto protoreflect.FileDescriptor const file_proto_serviceRegistration_proto_rawDesc = "" + "\n" + - "\x1fproto/serviceRegistration.proto\x12\x11auth.registration\"\xc8\x01\n" + + "\x1fproto/serviceRegistration.proto\x12\x11auth.registration\x1a\x1bgoogle/protobuf/empty.proto\"\xe9\x01\n" + "\x13RegistrationRequest\x12\x12\n" + "\x04name\x18\x01 \x01(\tR\x04name\x12 \n" + "\vdescription\x18\x02 \x01(\tR\vdescription\x12!\n" + "\fservice_code\x18\x03 \x01(\x05R\vserviceCode\x12(\n" + "\x10service_end_code\x18\x04 \x01(\x05R\x0eserviceEndCode\x12\x16\n" + "\x06secret\x18\x05 \x01(\tR\x06secret\x12\x16\n" + - "\x06status\x18\x06 \x01(\tR\x06status\"d\n" + + "\x06status\x18\x06 \x01(\tR\x06status\x12\x1f\n" + + "\vservice_url\x18\a \x01(\tR\n" + + "serviceUrl\"\x85\x01\n" + "\x14RegistrationResponse\x12\x1d\n" + "\n" + "service_id\x18\x01 \x01(\x05R\tserviceId\x12-\n" + - "\x12already_registered\x18\x02 \x01(\bR\x11alreadyRegistered2\x81\x01\n" + + "\x12already_registered\x18\x02 \x01(\bR\x11alreadyRegistered\x12\x1f\n" + + "\vservice_url\x18\x03 \x01(\tR\n" + + "serviceUrl\"\xa1\x01\n" + + "\rUpdateRequest\x12\x12\n" + + "\x04name\x18\x01 \x01(\tR\x04name\x12 \n" + + "\vdescription\x18\x02 \x01(\tR\vdescription\x12\x16\n" + + "\x06status\x18\x03 \x01(\tR\x06status\x12\x1f\n" + + "\vservice_url\x18\x04 \x01(\tR\n" + + "serviceUrl\x12!\n" + + "\fservice_code\x18\x05 \x01(\x05R\vserviceCode2\xc5\x01\n" + "\x14ExternalRegistration\x12i\n" + - "\x16AuthenticateOrRegister\x12&.auth.registration.RegistrationRequest\x1a'.auth.registration.RegistrationResponseB,Z*/pkg/externalRegistration/v1;externalRegV1b\x06proto3" + "\x16AuthenticateOrRegister\x12&.auth.registration.RegistrationRequest\x1a'.auth.registration.RegistrationResponse\x12B\n" + + "\x06Update\x12 .auth.registration.UpdateRequest\x1a\x16.google.protobuf.EmptyB,Z*/pkg/externalRegistration/v1;externalRegV1b\x06proto3" var ( file_proto_serviceRegistration_proto_rawDescOnce sync.Once @@ -188,16 +293,20 @@ func file_proto_serviceRegistration_proto_rawDescGZIP() []byte { return file_proto_serviceRegistration_proto_rawDescData } -var file_proto_serviceRegistration_proto_msgTypes = make([]protoimpl.MessageInfo, 2) +var file_proto_serviceRegistration_proto_msgTypes = make([]protoimpl.MessageInfo, 3) var file_proto_serviceRegistration_proto_goTypes = []any{ (*RegistrationRequest)(nil), // 0: auth.registration.RegistrationRequest (*RegistrationResponse)(nil), // 1: auth.registration.RegistrationResponse + (*UpdateRequest)(nil), // 2: auth.registration.UpdateRequest + (*emptypb.Empty)(nil), // 3: google.protobuf.Empty } var file_proto_serviceRegistration_proto_depIdxs = []int32{ 0, // 0: auth.registration.ExternalRegistration.AuthenticateOrRegister:input_type -> auth.registration.RegistrationRequest - 1, // 1: auth.registration.ExternalRegistration.AuthenticateOrRegister:output_type -> auth.registration.RegistrationResponse - 1, // [1:2] is the sub-list for method output_type - 0, // [0:1] is the sub-list for method input_type + 2, // 1: auth.registration.ExternalRegistration.Update:input_type -> auth.registration.UpdateRequest + 1, // 2: auth.registration.ExternalRegistration.AuthenticateOrRegister:output_type -> auth.registration.RegistrationResponse + 3, // 3: auth.registration.ExternalRegistration.Update:output_type -> google.protobuf.Empty + 2, // [2:4] is the sub-list for method output_type + 0, // [0:2] is the sub-list for method input_type 0, // [0:0] is the sub-list for extension type_name 0, // [0:0] is the sub-list for extension extendee 0, // [0:0] is the sub-list for field type_name @@ -214,7 +323,7 @@ func file_proto_serviceRegistration_proto_init() { GoPackagePath: reflect.TypeOf(x{}).PkgPath(), RawDescriptor: unsafe.Slice(unsafe.StringData(file_proto_serviceRegistration_proto_rawDesc), len(file_proto_serviceRegistration_proto_rawDesc)), NumEnums: 0, - NumMessages: 2, + NumMessages: 3, NumExtensions: 0, NumServices: 1, }, diff --git a/pkg/externalRegistration/v1/serviceRegistration_grpc.pb.go b/pkg/externalRegistration/v1/serviceRegistration_grpc.pb.go index d516302..35612b4 100644 --- a/pkg/externalRegistration/v1/serviceRegistration_grpc.pb.go +++ b/pkg/externalRegistration/v1/serviceRegistration_grpc.pb.go @@ -11,6 +11,7 @@ import ( grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" status "google.golang.org/grpc/status" + emptypb "google.golang.org/protobuf/types/known/emptypb" ) // This is a compile-time assertion to ensure that this generated file @@ -20,6 +21,7 @@ const _ = grpc.SupportPackageIsVersion9 const ( ExternalRegistration_AuthenticateOrRegister_FullMethodName = "/auth.registration.ExternalRegistration/AuthenticateOrRegister" + ExternalRegistration_Update_FullMethodName = "/auth.registration.ExternalRegistration/Update" ) // ExternalRegistrationClient is the client API for ExternalRegistration service. @@ -27,6 +29,7 @@ const ( // For semantics around ctx use and closing/ending streaming RPCs, please refer to https://pkg.go.dev/google.golang.org/grpc/?tab=doc#ClientConn.NewStream. type ExternalRegistrationClient interface { AuthenticateOrRegister(ctx context.Context, in *RegistrationRequest, opts ...grpc.CallOption) (*RegistrationResponse, error) + Update(ctx context.Context, in *UpdateRequest, opts ...grpc.CallOption) (*emptypb.Empty, error) } type externalRegistrationClient struct { @@ -47,11 +50,22 @@ func (c *externalRegistrationClient) AuthenticateOrRegister(ctx context.Context, return out, nil } +func (c *externalRegistrationClient) Update(ctx context.Context, in *UpdateRequest, opts ...grpc.CallOption) (*emptypb.Empty, error) { + cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) + out := new(emptypb.Empty) + err := c.cc.Invoke(ctx, ExternalRegistration_Update_FullMethodName, in, out, cOpts...) + if err != nil { + return nil, err + } + return out, nil +} + // ExternalRegistrationServer is the server API for ExternalRegistration service. // All implementations must embed UnimplementedExternalRegistrationServer // for forward compatibility. type ExternalRegistrationServer interface { AuthenticateOrRegister(context.Context, *RegistrationRequest) (*RegistrationResponse, error) + Update(context.Context, *UpdateRequest) (*emptypb.Empty, error) mustEmbedUnimplementedExternalRegistrationServer() } @@ -65,6 +79,9 @@ type UnimplementedExternalRegistrationServer struct{} func (UnimplementedExternalRegistrationServer) AuthenticateOrRegister(context.Context, *RegistrationRequest) (*RegistrationResponse, error) { return nil, status.Errorf(codes.Unimplemented, "method AuthenticateOrRegister not implemented") } +func (UnimplementedExternalRegistrationServer) Update(context.Context, *UpdateRequest) (*emptypb.Empty, error) { + return nil, status.Errorf(codes.Unimplemented, "method Update not implemented") +} func (UnimplementedExternalRegistrationServer) mustEmbedUnimplementedExternalRegistrationServer() {} func (UnimplementedExternalRegistrationServer) testEmbeddedByValue() {} @@ -104,6 +121,24 @@ func _ExternalRegistration_AuthenticateOrRegister_Handler(srv interface{}, ctx c return interceptor(ctx, in, info, handler) } +func _ExternalRegistration_Update_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(UpdateRequest) + if err := dec(in); err != nil { + return nil, err + } + if interceptor == nil { + return srv.(ExternalRegistrationServer).Update(ctx, in) + } + info := &grpc.UnaryServerInfo{ + Server: srv, + FullMethod: ExternalRegistration_Update_FullMethodName, + } + handler := func(ctx context.Context, req interface{}) (interface{}, error) { + return srv.(ExternalRegistrationServer).Update(ctx, req.(*UpdateRequest)) + } + return interceptor(ctx, in, info, handler) +} + // ExternalRegistration_ServiceDesc is the grpc.ServiceDesc for ExternalRegistration service. // It's only intended for direct use with grpc.RegisterService, // and not to be introspected or modified (even as a copy) @@ -115,6 +150,10 @@ var ExternalRegistration_ServiceDesc = grpc.ServiceDesc{ MethodName: "AuthenticateOrRegister", Handler: _ExternalRegistration_AuthenticateOrRegister_Handler, }, + { + MethodName: "Update", + Handler: _ExternalRegistration_Update_Handler, + }, }, Streams: []grpc.StreamDesc{}, Metadata: "proto/serviceRegistration.proto", diff --git a/pkg/router/handler.go b/pkg/router/handler.go index 56d7a48..d3f71a3 100644 --- a/pkg/router/handler.go +++ b/pkg/router/handler.go @@ -24,7 +24,6 @@ type Deps struct { GinMode string UserProvider UserProvider AuthProvider AuthChecker - ServiceId int32 } type Router struct { @@ -37,7 +36,6 @@ type Router struct { type providers struct { userProvider UserProvider authChecker AuthChecker - serviceId int32 } func NewRouter(deps Deps) *Router { @@ -75,7 +73,6 @@ func NewRouter(deps Deps) *Router { providers: providers{ userProvider: deps.UserProvider, authChecker: deps.AuthProvider, - serviceId: deps.ServiceId, }, } } @@ -96,7 +93,7 @@ func (r *Router) BaseGroup() *gin.RouterGroup { func (r *Router) MWSet() *Middlewares { return &Middlewares{ - AuthMW: AuthMW(r.providers.userProvider, r.providers.authChecker, r.providers.serviceId), - RegMW: RegisterMW(r.providers.authChecker, r.providers.serviceId), + AuthMW: AuthMW(r.providers.userProvider, r.providers.authChecker), + RegMW: RegisterMW(r.providers.authChecker), } } diff --git a/pkg/router/interfaces.go b/pkg/router/interfaces.go index 023f80c..ee3e821 100644 --- a/pkg/router/interfaces.go +++ b/pkg/router/interfaces.go @@ -7,5 +7,5 @@ type UserProvider interface { } type AuthChecker interface { - VerifySession(ctx context.Context, sessionUuid string, serviceId int32) (string, error) + VerifySession(ctx context.Context, sessionUuid string) (string, error) } diff --git a/pkg/router/middleware.go b/pkg/router/middleware.go index f4c5314..7f501e6 100644 --- a/pkg/router/middleware.go +++ b/pkg/router/middleware.go @@ -8,9 +8,8 @@ import ( ) type DepsMW struct { - UserProv UserProvider - AuthProv AuthChecker - ServiceId int32 + UserProv UserProvider + AuthProv AuthChecker } type Middlewares struct { @@ -18,18 +17,21 @@ type Middlewares struct { RegMW gin.HandlerFunc } -func AuthMW(up UserProvider, ap AuthChecker, sid int32) gin.HandlerFunc { +func AuthMW(up UserProvider, ap AuthChecker) gin.HandlerFunc { const funcHeader string = "Auth Middleware |" log.Debugf("%v %v begin", pkgLogHeader, funcHeader) return func(c *gin.Context) { cookie, err := c.Cookie(tokenCookieName) - log.WithField("value", cookie).Debugf("%v %v get session token from cookie", pkgLogHeader, funcHeader) + log.WithFields(log.Fields{ + "value": cookie, + "len": len(cookie), + }).Debugf("%v %v get session token from cookie", pkgLogHeader, funcHeader) if err != nil { c.JSON(http.StatusUnauthorized, responses.Unauthorized{Error: err.Error()}) c.Abort() } - userUuid, err := ap.VerifySession(c, cookie, sid) + userUuid, err := ap.VerifySession(c, cookie) if err != nil { c.JSON(http.StatusUnauthorized, responses.Unauthorized{Error: err.Error()}) c.Abort() @@ -50,7 +52,7 @@ func AuthMW(up UserProvider, ap AuthChecker, sid int32) gin.HandlerFunc { } } -func RegisterMW(ap AuthChecker, sid int32) gin.HandlerFunc { +func RegisterMW(ap AuthChecker) gin.HandlerFunc { log.Debug("Auth Middlewares enabled") return func(c *gin.Context) { cookie, err := c.Cookie(tokenCookieName) @@ -60,7 +62,7 @@ func RegisterMW(ap AuthChecker, sid int32) gin.HandlerFunc { return } - userUuid, err := ap.VerifySession(c, cookie, sid) + userUuid, err := ap.VerifySession(c, cookie) if err != nil { c.JSON(http.StatusUnauthorized, responses.Unauthorized{Error: err.Error()}) c.Abort() diff --git a/pkg/verify/v1/verify.pb.go b/pkg/verify/v1/verify.pb.go index 4ed1acf..592f4ad 100644 --- a/pkg/verify/v1/verify.pb.go +++ b/pkg/verify/v1/verify.pb.go @@ -133,6 +133,126 @@ func (x *VerifyTokenResponse) GetAccessCode() int32 { return 0 } +type PersonalRequest struct { + state protoimpl.MessageState `protogen:"open.v1"` + UserUuid string `protobuf:"bytes,1,opt,name=userUuid,proto3" json:"userUuid,omitempty"` + ServiceId int32 `protobuf:"varint,2,opt,name=serviceId,proto3" json:"serviceId,omitempty"` + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache +} + +func (x *PersonalRequest) Reset() { + *x = PersonalRequest{} + mi := &file_proto_verify_proto_msgTypes[2] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) +} + +func (x *PersonalRequest) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*PersonalRequest) ProtoMessage() {} + +func (x *PersonalRequest) ProtoReflect() protoreflect.Message { + mi := &file_proto_verify_proto_msgTypes[2] + if x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use PersonalRequest.ProtoReflect.Descriptor instead. +func (*PersonalRequest) Descriptor() ([]byte, []int) { + return file_proto_verify_proto_rawDescGZIP(), []int{2} +} + +func (x *PersonalRequest) GetUserUuid() string { + if x != nil { + return x.UserUuid + } + return "" +} + +func (x *PersonalRequest) GetServiceId() int32 { + if x != nil { + return x.ServiceId + } + return 0 +} + +type PersonalResponse struct { + state protoimpl.MessageState `protogen:"open.v1"` + Email string `protobuf:"bytes,1,opt,name=email,proto3" json:"email,omitempty"` + Username string `protobuf:"bytes,2,opt,name=username,proto3" json:"username,omitempty"` + Name string `protobuf:"bytes,3,opt,name=name,proto3" json:"name,omitempty"` + Surname string `protobuf:"bytes,4,opt,name=surname,proto3" json:"surname,omitempty"` + unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache +} + +func (x *PersonalResponse) Reset() { + *x = PersonalResponse{} + mi := &file_proto_verify_proto_msgTypes[3] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) +} + +func (x *PersonalResponse) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*PersonalResponse) ProtoMessage() {} + +func (x *PersonalResponse) ProtoReflect() protoreflect.Message { + mi := &file_proto_verify_proto_msgTypes[3] + if x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use PersonalResponse.ProtoReflect.Descriptor instead. +func (*PersonalResponse) Descriptor() ([]byte, []int) { + return file_proto_verify_proto_rawDescGZIP(), []int{3} +} + +func (x *PersonalResponse) GetEmail() string { + if x != nil { + return x.Email + } + return "" +} + +func (x *PersonalResponse) GetUsername() string { + if x != nil { + return x.Username + } + return "" +} + +func (x *PersonalResponse) GetName() string { + if x != nil { + return x.Name + } + return "" +} + +func (x *PersonalResponse) GetSurname() string { + if x != nil { + return x.Surname + } + return "" +} + var File_proto_verify_proto protoreflect.FileDescriptor const file_proto_verify_proto_rawDesc = "" + @@ -146,9 +266,18 @@ const file_proto_verify_proto_rawDesc = "" + "\aisValid\x18\x02 \x01(\bR\aisValid\x12\x1e\n" + "\n" + "accessCode\x18\x03 \x01(\x05R\n" + - "accessCode2c\n" + + "accessCode\"K\n" + + "\x0fPersonalRequest\x12\x1a\n" + + "\buserUuid\x18\x01 \x01(\tR\buserUuid\x12\x1c\n" + + "\tserviceId\x18\x02 \x01(\x05R\tserviceId\"r\n" + + "\x10PersonalResponse\x12\x14\n" + + "\x05email\x18\x01 \x01(\tR\x05email\x12\x1a\n" + + "\busername\x18\x02 \x01(\tR\busername\x12\x12\n" + + "\x04name\x18\x03 \x01(\tR\x04name\x12\x18\n" + + "\asurname\x18\x04 \x01(\tR\asurname2\xb7\x01\n" + "\vAuthService\x12T\n" + - "\vVerifyToken\x12!.verifyAuth.v1.VerifyTokenRequest\x1a\".verifyAuth.v1.VerifyTokenResponseB\x19Z\x17/pkg/verify/v1;verifyV1b\x06proto3" + "\vVerifyToken\x12!.verifyAuth.v1.VerifyTokenRequest\x1a\".verifyAuth.v1.VerifyTokenResponse\x12R\n" + + "\x0fGetPersonalInfo\x12\x1e.verifyAuth.v1.PersonalRequest\x1a\x1f.verifyAuth.v1.PersonalResponseB\x19Z\x17/pkg/verify/v1;verifyV1b\x06proto3" var ( file_proto_verify_proto_rawDescOnce sync.Once @@ -162,16 +291,20 @@ func file_proto_verify_proto_rawDescGZIP() []byte { return file_proto_verify_proto_rawDescData } -var file_proto_verify_proto_msgTypes = make([]protoimpl.MessageInfo, 2) +var file_proto_verify_proto_msgTypes = make([]protoimpl.MessageInfo, 4) var file_proto_verify_proto_goTypes = []any{ (*VerifyTokenRequest)(nil), // 0: verifyAuth.v1.VerifyTokenRequest (*VerifyTokenResponse)(nil), // 1: verifyAuth.v1.VerifyTokenResponse + (*PersonalRequest)(nil), // 2: verifyAuth.v1.PersonalRequest + (*PersonalResponse)(nil), // 3: verifyAuth.v1.PersonalResponse } var file_proto_verify_proto_depIdxs = []int32{ 0, // 0: verifyAuth.v1.AuthService.VerifyToken:input_type -> verifyAuth.v1.VerifyTokenRequest - 1, // 1: verifyAuth.v1.AuthService.VerifyToken:output_type -> verifyAuth.v1.VerifyTokenResponse - 1, // [1:2] is the sub-list for method output_type - 0, // [0:1] is the sub-list for method input_type + 2, // 1: verifyAuth.v1.AuthService.GetPersonalInfo:input_type -> verifyAuth.v1.PersonalRequest + 1, // 2: verifyAuth.v1.AuthService.VerifyToken:output_type -> verifyAuth.v1.VerifyTokenResponse + 3, // 3: verifyAuth.v1.AuthService.GetPersonalInfo:output_type -> verifyAuth.v1.PersonalResponse + 2, // [2:4] is the sub-list for method output_type + 0, // [0:2] is the sub-list for method input_type 0, // [0:0] is the sub-list for extension type_name 0, // [0:0] is the sub-list for extension extendee 0, // [0:0] is the sub-list for field type_name @@ -188,7 +321,7 @@ func file_proto_verify_proto_init() { GoPackagePath: reflect.TypeOf(x{}).PkgPath(), RawDescriptor: unsafe.Slice(unsafe.StringData(file_proto_verify_proto_rawDesc), len(file_proto_verify_proto_rawDesc)), NumEnums: 0, - NumMessages: 2, + NumMessages: 4, NumExtensions: 0, NumServices: 1, }, diff --git a/pkg/verify/v1/verify_grpc.pb.go b/pkg/verify/v1/verify_grpc.pb.go index 925be98..7b92883 100644 --- a/pkg/verify/v1/verify_grpc.pb.go +++ b/pkg/verify/v1/verify_grpc.pb.go @@ -19,7 +19,8 @@ import ( const _ = grpc.SupportPackageIsVersion9 const ( - AuthService_VerifyToken_FullMethodName = "/verifyAuth.v1.AuthService/VerifyToken" + AuthService_VerifyToken_FullMethodName = "/verifyAuth.v1.AuthService/VerifyToken" + AuthService_GetPersonalInfo_FullMethodName = "/verifyAuth.v1.AuthService/GetPersonalInfo" ) // AuthServiceClient is the client API for AuthService service. @@ -27,6 +28,7 @@ const ( // For semantics around ctx use and closing/ending streaming RPCs, please refer to https://pkg.go.dev/google.golang.org/grpc/?tab=doc#ClientConn.NewStream. type AuthServiceClient interface { VerifyToken(ctx context.Context, in *VerifyTokenRequest, opts ...grpc.CallOption) (*VerifyTokenResponse, error) + GetPersonalInfo(ctx context.Context, in *PersonalRequest, opts ...grpc.CallOption) (*PersonalResponse, error) } type authServiceClient struct { @@ -47,11 +49,22 @@ func (c *authServiceClient) VerifyToken(ctx context.Context, in *VerifyTokenRequ return out, nil } +func (c *authServiceClient) GetPersonalInfo(ctx context.Context, in *PersonalRequest, opts ...grpc.CallOption) (*PersonalResponse, error) { + cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) + out := new(PersonalResponse) + err := c.cc.Invoke(ctx, AuthService_GetPersonalInfo_FullMethodName, in, out, cOpts...) + if err != nil { + return nil, err + } + return out, nil +} + // AuthServiceServer is the server API for AuthService service. // All implementations must embed UnimplementedAuthServiceServer // for forward compatibility. type AuthServiceServer interface { VerifyToken(context.Context, *VerifyTokenRequest) (*VerifyTokenResponse, error) + GetPersonalInfo(context.Context, *PersonalRequest) (*PersonalResponse, error) mustEmbedUnimplementedAuthServiceServer() } @@ -65,6 +78,9 @@ type UnimplementedAuthServiceServer struct{} func (UnimplementedAuthServiceServer) VerifyToken(context.Context, *VerifyTokenRequest) (*VerifyTokenResponse, error) { return nil, status.Errorf(codes.Unimplemented, "method VerifyToken not implemented") } +func (UnimplementedAuthServiceServer) GetPersonalInfo(context.Context, *PersonalRequest) (*PersonalResponse, error) { + return nil, status.Errorf(codes.Unimplemented, "method GetPersonalInfo not implemented") +} func (UnimplementedAuthServiceServer) mustEmbedUnimplementedAuthServiceServer() {} func (UnimplementedAuthServiceServer) testEmbeddedByValue() {} @@ -104,6 +120,24 @@ func _AuthService_VerifyToken_Handler(srv interface{}, ctx context.Context, dec return interceptor(ctx, in, info, handler) } +func _AuthService_GetPersonalInfo_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(PersonalRequest) + if err := dec(in); err != nil { + return nil, err + } + if interceptor == nil { + return srv.(AuthServiceServer).GetPersonalInfo(ctx, in) + } + info := &grpc.UnaryServerInfo{ + Server: srv, + FullMethod: AuthService_GetPersonalInfo_FullMethodName, + } + handler := func(ctx context.Context, req interface{}) (interface{}, error) { + return srv.(AuthServiceServer).GetPersonalInfo(ctx, req.(*PersonalRequest)) + } + return interceptor(ctx, in, info, handler) +} + // AuthService_ServiceDesc is the grpc.ServiceDesc for AuthService service. // It's only intended for direct use with grpc.RegisterService, // and not to be introspected or modified (even as a copy) @@ -115,6 +149,10 @@ var AuthService_ServiceDesc = grpc.ServiceDesc{ MethodName: "VerifyToken", Handler: _AuthService_VerifyToken_Handler, }, + { + MethodName: "GetPersonalInfo", + Handler: _AuthService_GetPersonalInfo_Handler, + }, }, Streams: []grpc.StreamDesc{}, Metadata: "proto/verify.proto", diff --git a/proto/serviceRegistration.proto b/proto/serviceRegistration.proto index 1228ea8..d396e2e 100644 --- a/proto/serviceRegistration.proto +++ b/proto/serviceRegistration.proto @@ -1,4 +1,5 @@ syntax = "proto3"; +import "google/protobuf/empty.proto"; package auth.registration; option go_package = "/pkg/externalRegistration/v1;externalRegV1"; @@ -10,13 +11,24 @@ message RegistrationRequest { int32 service_end_code = 4; string secret = 5; string status = 6; + string service_url = 7; } message RegistrationResponse { int32 service_id = 1; bool already_registered = 2; + string service_url = 3; +} + +message UpdateRequest { + string name = 1; + string description = 2; + string status = 3; + string service_url = 4; + int32 service_code = 5; } service ExternalRegistration { rpc AuthenticateOrRegister (RegistrationRequest) returns (RegistrationResponse); + rpc Update (UpdateRequest) returns (google.protobuf.Empty); } \ No newline at end of file diff --git a/proto/verify.proto b/proto/verify.proto index 13f1e35..83c020b 100644 --- a/proto/verify.proto +++ b/proto/verify.proto @@ -14,6 +14,19 @@ message VerifyTokenResponse { int32 accessCode = 3; } +message PersonalRequest { + string userUuid = 1; + int32 serviceId = 2; +} + +message PersonalResponse { + string email = 1; + string username = 2; + string name = 3; + string surname = 4; +} + service AuthService { rpc VerifyToken(VerifyTokenRequest) returns (VerifyTokenResponse); + rpc GetPersonalInfo(PersonalRequest) returns (PersonalResponse); }