From 4f7a63a2c2fbfdc7d023ebf9b681b02caba89d06 Mon Sep 17 00:00:00 2001 From: Fedorov Vladimir Date: Mon, 6 Jul 2026 23:38:21 +0700 Subject: [PATCH] update routes --- api/main.proto | 14 +- .../main.swagger.json | 176 +++++++++--------- proto/main.pb.go | 33 ++-- proto/main.pb.gw.go | 42 ++--- 4 files changed, 132 insertions(+), 133 deletions(-) diff --git a/api/main.proto b/api/main.proto index 93063f4..ef0a028 100644 --- a/api/main.proto +++ b/api/main.proto @@ -36,7 +36,7 @@ option (grpc.gateway.protoc_gen_openapiv2.options.openapiv2_swagger) = { service EveningDetectiveServer { rpc Ping(PingReq) returns (PingRsp) { option (google.api.http) = { - get: "/api/ping" + get: "/api/test/ping" }; option (grpc.gateway.protoc_gen_openapiv2.options.openapiv2_operation) = { security: { @@ -47,7 +47,7 @@ service EveningDetectiveServer { rpc Echo(EchoReq) returns (EchoRsp) { option (google.api.http) = { - post: "/api/echo" + post: "/api/test/echo" }; option (grpc.gateway.protoc_gen_openapiv2.options.openapiv2_operation) = { security: { @@ -58,7 +58,7 @@ service EveningDetectiveServer { rpc Signup(SignupReq) returns (SignupRsp) { option (google.api.http) = { - post: "/api/signup" + post: "/api/auth/signup" body: "*" }; option (grpc.gateway.protoc_gen_openapiv2.options.openapiv2_operation) = { @@ -70,7 +70,7 @@ service EveningDetectiveServer { rpc RefreshPassword(RefreshPasswordReq) returns (RefreshPasswordRsp) { option (google.api.http) = { - post: "/api/refresh-password" + post: "/api/auth/refresh-password" body: "*" }; option (grpc.gateway.protoc_gen_openapiv2.options.openapiv2_operation) = { @@ -82,7 +82,7 @@ service EveningDetectiveServer { rpc Login(LoginReq) returns (LoginRsp) { option (google.api.http) = { - post: "/api/login" + post: "/api/auth/login" body: "*" }; option (grpc.gateway.protoc_gen_openapiv2.options.openapiv2_operation) = { @@ -94,7 +94,7 @@ service EveningDetectiveServer { rpc Refresh(RefreshReq) returns (RefreshRsp) { option (google.api.http) = { - post: "/api/refresh" + post: "/api/auth/refresh" body: "*" }; option (grpc.gateway.protoc_gen_openapiv2.options.openapiv2_operation) = { @@ -118,7 +118,7 @@ service EveningDetectiveServer { rpc GetMe(GetMeReq) returns (GetMeRsp) { option (google.api.http) = { - get: "/api/me" + get: "/api/users/me" }; } diff --git a/cmd/evening_detective_server/main.swagger.json b/cmd/evening_detective_server/main.swagger.json index b2c83d8..beea22b 100644 --- a/cmd/evening_detective_server/main.swagger.json +++ b/cmd/evening_detective_server/main.swagger.json @@ -16,42 +16,7 @@ "application/json" ], "paths": { - "/api/echo": { - "post": { - "operationId": "EveningDetectiveServer_Echo", - "responses": { - "200": { - "description": "A successful response.", - "schema": { - "$ref": "#/definitions/evening_detective_serverEchoRsp" - } - }, - "default": { - "description": "An unexpected error response.", - "schema": { - "$ref": "#/definitions/rpcStatus" - } - } - }, - "parameters": [ - { - "name": "text", - "in": "query", - "required": false, - "type": "string" - } - ], - "tags": [ - "EveningDetectiveServer" - ], - "security": [ - { - "": [] - } - ] - } - }, - "/api/login": { + "/api/auth/login": { "post": { "operationId": "EveningDetectiveServer_Login", "responses": { @@ -88,56 +53,7 @@ ] } }, - "/api/me": { - "get": { - "operationId": "EveningDetectiveServer_GetMe", - "responses": { - "200": { - "description": "A successful response.", - "schema": { - "$ref": "#/definitions/evening_detective_serverGetMeRsp" - } - }, - "default": { - "description": "An unexpected error response.", - "schema": { - "$ref": "#/definitions/rpcStatus" - } - } - }, - "tags": [ - "EveningDetectiveServer" - ] - } - }, - "/api/ping": { - "get": { - "operationId": "EveningDetectiveServer_Ping", - "responses": { - "200": { - "description": "A successful response.", - "schema": { - "$ref": "#/definitions/evening_detective_serverPingRsp" - } - }, - "default": { - "description": "An unexpected error response.", - "schema": { - "$ref": "#/definitions/rpcStatus" - } - } - }, - "tags": [ - "EveningDetectiveServer" - ], - "security": [ - { - "": [] - } - ] - } - }, - "/api/refresh": { + "/api/auth/refresh": { "post": { "operationId": "EveningDetectiveServer_Refresh", "responses": { @@ -174,7 +90,7 @@ ] } }, - "/api/refresh-password": { + "/api/auth/refresh-password": { "post": { "operationId": "EveningDetectiveServer_RefreshPassword", "responses": { @@ -211,7 +127,7 @@ ] } }, - "/api/signup": { + "/api/auth/signup": { "post": { "operationId": "EveningDetectiveServer_Signup", "responses": { @@ -248,6 +164,68 @@ ] } }, + "/api/test/echo": { + "post": { + "operationId": "EveningDetectiveServer_Echo", + "responses": { + "200": { + "description": "A successful response.", + "schema": { + "$ref": "#/definitions/evening_detective_serverEchoRsp" + } + }, + "default": { + "description": "An unexpected error response.", + "schema": { + "$ref": "#/definitions/rpcStatus" + } + } + }, + "parameters": [ + { + "name": "text", + "in": "query", + "required": false, + "type": "string" + } + ], + "tags": [ + "EveningDetectiveServer" + ], + "security": [ + { + "": [] + } + ] + } + }, + "/api/test/ping": { + "get": { + "operationId": "EveningDetectiveServer_Ping", + "responses": { + "200": { + "description": "A successful response.", + "schema": { + "$ref": "#/definitions/evening_detective_serverPingRsp" + } + }, + "default": { + "description": "An unexpected error response.", + "schema": { + "$ref": "#/definitions/rpcStatus" + } + } + }, + "tags": [ + "EveningDetectiveServer" + ], + "security": [ + { + "": [] + } + ] + } + }, "/api/users": { "get": { "operationId": "EveningDetectiveServer_GetUsers", @@ -270,6 +248,28 @@ ] } }, + "/api/users/me": { + "get": { + "operationId": "EveningDetectiveServer_GetMe", + "responses": { + "200": { + "description": "A successful response.", + "schema": { + "$ref": "#/definitions/evening_detective_serverGetMeRsp" + } + }, + "default": { + "description": "An unexpected error response.", + "schema": { + "$ref": "#/definitions/rpcStatus" + } + } + }, + "tags": [ + "EveningDetectiveServer" + ] + } + }, "/api/users/{id}": { "get": { "operationId": "EveningDetectiveServer_GetUserById", diff --git a/proto/main.pb.go b/proto/main.pb.go index 1ea40f8..3968c5b 100644 --- a/proto/main.pb.go +++ b/proto/main.pb.go @@ -1199,31 +1199,30 @@ const file_main_proto_rawDesc = "" + "\x02id\x18\x01 \x01(\x05R\x02id\x12\x12\n" + "\x04role\x18\x02 \x01(\tR\x04role\")\n" + "\x11DeleteUserRoleRsp\x12\x14\n" + - "\x05error\x18\x01 \x01(\tR\x05error2\xe3\v\n" + - "\x16EveningDetectiveServer\x12v\n" + - "\x04Ping\x12'.crabs.evening_detective_server.PingReq\x1a'.crabs.evening_detective_server.PingRsp\"\x1c\x92A\bb\x06\n" + + "\x05error\x18\x01 \x01(\tR\x05error2\x88\f\n" + + "\x16EveningDetectiveServer\x12{\n" + + "\x04Ping\x12'.crabs.evening_detective_server.PingReq\x1a'.crabs.evening_detective_server.PingRsp\"!\x92A\bb\x06\n" + "\x04\n" + - "\x00\x12\x00\x82\xd3\xe4\x93\x02\v\x12\t/api/ping\x12v\n" + - "\x04Echo\x12'.crabs.evening_detective_server.EchoReq\x1a'.crabs.evening_detective_server.EchoRsp\"\x1c\x92A\bb\x06\n" + + "\x00\x12\x00\x82\xd3\xe4\x93\x02\x10\x12\x0e/api/test/ping\x12{\n" + + "\x04Echo\x12'.crabs.evening_detective_server.EchoReq\x1a'.crabs.evening_detective_server.EchoRsp\"!\x92A\bb\x06\n" + "\x04\n" + - "\x00\x12\x00\x82\xd3\xe4\x93\x02\v\"\t/api/echo\x12\x81\x01\n" + - "\x06Signup\x12).crabs.evening_detective_server.SignupReq\x1a).crabs.evening_detective_server.SignupRsp\"!\x92A\bb\x06\n" + + "\x00\x12\x00\x82\xd3\xe4\x93\x02\x10\"\x0e/api/test/echo\x12\x86\x01\n" + + "\x06Signup\x12).crabs.evening_detective_server.SignupReq\x1a).crabs.evening_detective_server.SignupRsp\"&\x92A\bb\x06\n" + "\x04\n" + - "\x00\x12\x00\x82\xd3\xe4\x93\x02\x10:\x01*\"\v/api/signup\x12\xa6\x01\n" + - "\x0fRefreshPassword\x122.crabs.evening_detective_server.RefreshPasswordReq\x1a2.crabs.evening_detective_server.RefreshPasswordRsp\"+\x92A\bb\x06\n" + + "\x00\x12\x00\x82\xd3\xe4\x93\x02\x15:\x01*\"\x10/api/auth/signup\x12\xab\x01\n" + + "\x0fRefreshPassword\x122.crabs.evening_detective_server.RefreshPasswordReq\x1a2.crabs.evening_detective_server.RefreshPasswordRsp\"0\x92A\bb\x06\n" + "\x04\n" + - "\x00\x12\x00\x82\xd3\xe4\x93\x02\x1a:\x01*\"\x15/api/refresh-password\x12}\n" + - "\x05Login\x12(.crabs.evening_detective_server.LoginReq\x1a(.crabs.evening_detective_server.LoginRsp\" \x92A\bb\x06\n" + + "\x00\x12\x00\x82\xd3\xe4\x93\x02\x1f:\x01*\"\x1a/api/auth/refresh-password\x12\x82\x01\n" + + "\x05Login\x12(.crabs.evening_detective_server.LoginReq\x1a(.crabs.evening_detective_server.LoginRsp\"%\x92A\bb\x06\n" + "\x04\n" + - "\x00\x12\x00\x82\xd3\xe4\x93\x02\x0f:\x01*\"\n" + - "/api/login\x12\x85\x01\n" + - "\aRefresh\x12*.crabs.evening_detective_server.RefreshReq\x1a*.crabs.evening_detective_server.RefreshRsp\"\"\x92A\bb\x06\n" + + "\x00\x12\x00\x82\xd3\xe4\x93\x02\x14:\x01*\"\x0f/api/auth/login\x12\x8a\x01\n" + + "\aRefresh\x12*.crabs.evening_detective_server.RefreshReq\x1a*.crabs.evening_detective_server.RefreshRsp\"'\x92A\bb\x06\n" + "\x04\n" + - "\x00\x12\x00\x82\xd3\xe4\x93\x02\x11:\x01*\"\f/api/refresh\x12x\n" + + "\x00\x12\x00\x82\xd3\xe4\x93\x02\x16:\x01*\"\x11/api/auth/refresh\x12x\n" + "\bGetUsers\x12+.crabs.evening_detective_server.GetUsersReq\x1a+.crabs.evening_detective_server.GetUsersRsp\"\x12\x82\xd3\xe4\x93\x02\f\x12\n" + "/api/users\x12\x86\x01\n" + - "\vGetUserById\x12..crabs.evening_detective_server.GetUserByIdReq\x1a..crabs.evening_detective_server.GetUserByIdRsp\"\x17\x82\xd3\xe4\x93\x02\x11\x12\x0f/api/users/{id}\x12l\n" + - "\x05GetMe\x12(.crabs.evening_detective_server.GetMeReq\x1a(.crabs.evening_detective_server.GetMeRsp\"\x0f\x82\xd3\xe4\x93\x02\t\x12\a/api/me\x12\x92\x01\n" + + "\vGetUserById\x12..crabs.evening_detective_server.GetUserByIdReq\x1a..crabs.evening_detective_server.GetUserByIdRsp\"\x17\x82\xd3\xe4\x93\x02\x11\x12\x0f/api/users/{id}\x12r\n" + + "\x05GetMe\x12(.crabs.evening_detective_server.GetMeReq\x1a(.crabs.evening_detective_server.GetMeRsp\"\x15\x82\xd3\xe4\x93\x02\x0f\x12\r/api/users/me\x12\x92\x01\n" + "\vAddUserRole\x12..crabs.evening_detective_server.AddUserRoleReq\x1a..crabs.evening_detective_server.AddUserRoleRsp\"#\x82\xd3\xe4\x93\x02\x1d:\x01*\"\x18/api/users/{id}/role/add\x12\x9e\x01\n" + "\x0eDeleteUserRole\x121.crabs.evening_detective_server.DeleteUserRoleReq\x1a1.crabs.evening_detective_server.DeleteUserRoleRsp\"&\x82\xd3\xe4\x93\x02 :\x01*\"\x1b/api/users/{id}/role/deleteB\xd7\x01\x92A\xc8\x01\x12U\n" + "KДокументация сервиса \"Вечерний детектив\"2\x06v0.1.0Z]\n" + diff --git a/proto/main.pb.gw.go b/proto/main.pb.gw.go index 996f090..7a9079b 100644 --- a/proto/main.pb.gw.go +++ b/proto/main.pb.gw.go @@ -382,7 +382,7 @@ func RegisterEveningDetectiveServerHandlerServer(ctx context.Context, mux *runti var stream runtime.ServerTransportStream ctx = grpc.NewContextWithServerTransportStream(ctx, &stream) inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) - annotatedContext, err := runtime.AnnotateIncomingContext(ctx, mux, req, "/crabs.evening_detective_server.EveningDetectiveServer/Ping", runtime.WithHTTPPathPattern("/api/ping")) + annotatedContext, err := runtime.AnnotateIncomingContext(ctx, mux, req, "/crabs.evening_detective_server.EveningDetectiveServer/Ping", runtime.WithHTTPPathPattern("/api/test/ping")) if err != nil { runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return @@ -402,7 +402,7 @@ func RegisterEveningDetectiveServerHandlerServer(ctx context.Context, mux *runti var stream runtime.ServerTransportStream ctx = grpc.NewContextWithServerTransportStream(ctx, &stream) inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) - annotatedContext, err := runtime.AnnotateIncomingContext(ctx, mux, req, "/crabs.evening_detective_server.EveningDetectiveServer/Echo", runtime.WithHTTPPathPattern("/api/echo")) + annotatedContext, err := runtime.AnnotateIncomingContext(ctx, mux, req, "/crabs.evening_detective_server.EveningDetectiveServer/Echo", runtime.WithHTTPPathPattern("/api/test/echo")) if err != nil { runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return @@ -422,7 +422,7 @@ func RegisterEveningDetectiveServerHandlerServer(ctx context.Context, mux *runti var stream runtime.ServerTransportStream ctx = grpc.NewContextWithServerTransportStream(ctx, &stream) inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) - annotatedContext, err := runtime.AnnotateIncomingContext(ctx, mux, req, "/crabs.evening_detective_server.EveningDetectiveServer/Signup", runtime.WithHTTPPathPattern("/api/signup")) + annotatedContext, err := runtime.AnnotateIncomingContext(ctx, mux, req, "/crabs.evening_detective_server.EveningDetectiveServer/Signup", runtime.WithHTTPPathPattern("/api/auth/signup")) if err != nil { runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return @@ -442,7 +442,7 @@ func RegisterEveningDetectiveServerHandlerServer(ctx context.Context, mux *runti var stream runtime.ServerTransportStream ctx = grpc.NewContextWithServerTransportStream(ctx, &stream) inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) - annotatedContext, err := runtime.AnnotateIncomingContext(ctx, mux, req, "/crabs.evening_detective_server.EveningDetectiveServer/RefreshPassword", runtime.WithHTTPPathPattern("/api/refresh-password")) + annotatedContext, err := runtime.AnnotateIncomingContext(ctx, mux, req, "/crabs.evening_detective_server.EveningDetectiveServer/RefreshPassword", runtime.WithHTTPPathPattern("/api/auth/refresh-password")) if err != nil { runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return @@ -462,7 +462,7 @@ func RegisterEveningDetectiveServerHandlerServer(ctx context.Context, mux *runti var stream runtime.ServerTransportStream ctx = grpc.NewContextWithServerTransportStream(ctx, &stream) inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) - annotatedContext, err := runtime.AnnotateIncomingContext(ctx, mux, req, "/crabs.evening_detective_server.EveningDetectiveServer/Login", runtime.WithHTTPPathPattern("/api/login")) + annotatedContext, err := runtime.AnnotateIncomingContext(ctx, mux, req, "/crabs.evening_detective_server.EveningDetectiveServer/Login", runtime.WithHTTPPathPattern("/api/auth/login")) if err != nil { runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return @@ -482,7 +482,7 @@ func RegisterEveningDetectiveServerHandlerServer(ctx context.Context, mux *runti var stream runtime.ServerTransportStream ctx = grpc.NewContextWithServerTransportStream(ctx, &stream) inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) - annotatedContext, err := runtime.AnnotateIncomingContext(ctx, mux, req, "/crabs.evening_detective_server.EveningDetectiveServer/Refresh", runtime.WithHTTPPathPattern("/api/refresh")) + annotatedContext, err := runtime.AnnotateIncomingContext(ctx, mux, req, "/crabs.evening_detective_server.EveningDetectiveServer/Refresh", runtime.WithHTTPPathPattern("/api/auth/refresh")) if err != nil { runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return @@ -542,7 +542,7 @@ func RegisterEveningDetectiveServerHandlerServer(ctx context.Context, mux *runti var stream runtime.ServerTransportStream ctx = grpc.NewContextWithServerTransportStream(ctx, &stream) inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) - annotatedContext, err := runtime.AnnotateIncomingContext(ctx, mux, req, "/crabs.evening_detective_server.EveningDetectiveServer/GetMe", runtime.WithHTTPPathPattern("/api/me")) + annotatedContext, err := runtime.AnnotateIncomingContext(ctx, mux, req, "/crabs.evening_detective_server.EveningDetectiveServer/GetMe", runtime.WithHTTPPathPattern("/api/users/me")) if err != nil { runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return @@ -640,7 +640,7 @@ func RegisterEveningDetectiveServerHandlerClient(ctx context.Context, mux *runti ctx, cancel := context.WithCancel(req.Context()) defer cancel() inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) - annotatedContext, err := runtime.AnnotateContext(ctx, mux, req, "/crabs.evening_detective_server.EveningDetectiveServer/Ping", runtime.WithHTTPPathPattern("/api/ping")) + annotatedContext, err := runtime.AnnotateContext(ctx, mux, req, "/crabs.evening_detective_server.EveningDetectiveServer/Ping", runtime.WithHTTPPathPattern("/api/test/ping")) if err != nil { runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return @@ -657,7 +657,7 @@ func RegisterEveningDetectiveServerHandlerClient(ctx context.Context, mux *runti ctx, cancel := context.WithCancel(req.Context()) defer cancel() inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) - annotatedContext, err := runtime.AnnotateContext(ctx, mux, req, "/crabs.evening_detective_server.EveningDetectiveServer/Echo", runtime.WithHTTPPathPattern("/api/echo")) + annotatedContext, err := runtime.AnnotateContext(ctx, mux, req, "/crabs.evening_detective_server.EveningDetectiveServer/Echo", runtime.WithHTTPPathPattern("/api/test/echo")) if err != nil { runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return @@ -674,7 +674,7 @@ func RegisterEveningDetectiveServerHandlerClient(ctx context.Context, mux *runti ctx, cancel := context.WithCancel(req.Context()) defer cancel() inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) - annotatedContext, err := runtime.AnnotateContext(ctx, mux, req, "/crabs.evening_detective_server.EveningDetectiveServer/Signup", runtime.WithHTTPPathPattern("/api/signup")) + annotatedContext, err := runtime.AnnotateContext(ctx, mux, req, "/crabs.evening_detective_server.EveningDetectiveServer/Signup", runtime.WithHTTPPathPattern("/api/auth/signup")) if err != nil { runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return @@ -691,7 +691,7 @@ func RegisterEveningDetectiveServerHandlerClient(ctx context.Context, mux *runti ctx, cancel := context.WithCancel(req.Context()) defer cancel() inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) - annotatedContext, err := runtime.AnnotateContext(ctx, mux, req, "/crabs.evening_detective_server.EveningDetectiveServer/RefreshPassword", runtime.WithHTTPPathPattern("/api/refresh-password")) + annotatedContext, err := runtime.AnnotateContext(ctx, mux, req, "/crabs.evening_detective_server.EveningDetectiveServer/RefreshPassword", runtime.WithHTTPPathPattern("/api/auth/refresh-password")) if err != nil { runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return @@ -708,7 +708,7 @@ func RegisterEveningDetectiveServerHandlerClient(ctx context.Context, mux *runti ctx, cancel := context.WithCancel(req.Context()) defer cancel() inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) - annotatedContext, err := runtime.AnnotateContext(ctx, mux, req, "/crabs.evening_detective_server.EveningDetectiveServer/Login", runtime.WithHTTPPathPattern("/api/login")) + annotatedContext, err := runtime.AnnotateContext(ctx, mux, req, "/crabs.evening_detective_server.EveningDetectiveServer/Login", runtime.WithHTTPPathPattern("/api/auth/login")) if err != nil { runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return @@ -725,7 +725,7 @@ func RegisterEveningDetectiveServerHandlerClient(ctx context.Context, mux *runti ctx, cancel := context.WithCancel(req.Context()) defer cancel() inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) - annotatedContext, err := runtime.AnnotateContext(ctx, mux, req, "/crabs.evening_detective_server.EveningDetectiveServer/Refresh", runtime.WithHTTPPathPattern("/api/refresh")) + annotatedContext, err := runtime.AnnotateContext(ctx, mux, req, "/crabs.evening_detective_server.EveningDetectiveServer/Refresh", runtime.WithHTTPPathPattern("/api/auth/refresh")) if err != nil { runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return @@ -776,7 +776,7 @@ func RegisterEveningDetectiveServerHandlerClient(ctx context.Context, mux *runti ctx, cancel := context.WithCancel(req.Context()) defer cancel() inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) - annotatedContext, err := runtime.AnnotateContext(ctx, mux, req, "/crabs.evening_detective_server.EveningDetectiveServer/GetMe", runtime.WithHTTPPathPattern("/api/me")) + annotatedContext, err := runtime.AnnotateContext(ctx, mux, req, "/crabs.evening_detective_server.EveningDetectiveServer/GetMe", runtime.WithHTTPPathPattern("/api/users/me")) if err != nil { runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return @@ -827,15 +827,15 @@ func RegisterEveningDetectiveServerHandlerClient(ctx context.Context, mux *runti } var ( - pattern_EveningDetectiveServer_Ping_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1}, []string{"api", "ping"}, "")) - pattern_EveningDetectiveServer_Echo_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1}, []string{"api", "echo"}, "")) - pattern_EveningDetectiveServer_Signup_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1}, []string{"api", "signup"}, "")) - pattern_EveningDetectiveServer_RefreshPassword_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1}, []string{"api", "refresh-password"}, "")) - pattern_EveningDetectiveServer_Login_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1}, []string{"api", "login"}, "")) - pattern_EveningDetectiveServer_Refresh_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1}, []string{"api", "refresh"}, "")) + pattern_EveningDetectiveServer_Ping_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2}, []string{"api", "test", "ping"}, "")) + pattern_EveningDetectiveServer_Echo_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2}, []string{"api", "test", "echo"}, "")) + pattern_EveningDetectiveServer_Signup_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2}, []string{"api", "auth", "signup"}, "")) + pattern_EveningDetectiveServer_RefreshPassword_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2}, []string{"api", "auth", "refresh-password"}, "")) + pattern_EveningDetectiveServer_Login_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2}, []string{"api", "auth", "login"}, "")) + pattern_EveningDetectiveServer_Refresh_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2}, []string{"api", "auth", "refresh"}, "")) pattern_EveningDetectiveServer_GetUsers_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1}, []string{"api", "users"}, "")) pattern_EveningDetectiveServer_GetUserById_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 1, 0, 4, 1, 5, 2}, []string{"api", "users", "id"}, "")) - pattern_EveningDetectiveServer_GetMe_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1}, []string{"api", "me"}, "")) + pattern_EveningDetectiveServer_GetMe_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2}, []string{"api", "users", "me"}, "")) pattern_EveningDetectiveServer_AddUserRole_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 1, 0, 4, 1, 5, 2, 2, 3, 2, 4}, []string{"api", "users", "id", "role", "add"}, "")) pattern_EveningDetectiveServer_DeleteUserRole_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 1, 0, 4, 1, 5, 2, 2, 3, 2, 4}, []string{"api", "users", "id", "role", "delete"}, "")) )