valitydev/fistful-server
14
0
Fork 0
mirror of https://github.com/valitydev/fistful-server.git synced 2024-11-06 02:35:18 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

upgrade: +images +build-utils (#386)

Browse Source
This commit is contained in:
dinama 2021-04-06 11:10:45 +03:00 committed by GitHub
parent eaeb81c95a
commit 41f6f1eddd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile
View File

@ -17,11 +17,11 @@ SERVICE_IMAGE_PUSH_TAG ?= $(SERVICE_IMAGE_TAG)
# Base image for the service # Base image for the service
BASE_IMAGE_NAME := service-erlang BASE_IMAGE_NAME := service-erlang
BASE_IMAGE_TAG := 51bd5f25d00cbf75616e2d672601dfe7351dcaa4 BASE_IMAGE_TAG := d2b5ac42305aadae44d6f8b1d859fd1065749997
# Build image tag to be used # Build image tag to be used
BUILD_IMAGE_NAME := build-erlang BUILD_IMAGE_NAME := build-erlang
BUILD_IMAGE_TAG := 61a001bbb48128895735a3ac35b0858484fdb2eb BUILD_IMAGE_TAG := cc2d319150ec0b9cd23ad9347692a8066616b0f4
REGISTRY := dr2.rbkmoney.com REGISTRY := dr2.rbkmoney.com

7
apps/wapi/src/wapi_wallet_handler.erl
View File

@ -5,7 +5,7 @@
%% swag_server_wallet_logic_handler callbacks %% swag_server_wallet_logic_handler callbacks
-export([map_error/2]). -export([map_error/2]).
-export([authorize_api_key/3]). -export([authorize_api_key/4]).
-export([handle_request/4]). -export([handle_request/4]).
%% wapi_handler callbacks %% wapi_handler callbacks
@ -52,8 +52,9 @@ map_error_type(schema_violated) -> <<"SchemaViolated">>;
map_error_type(wrong_type) -> <<"WrongType">>; map_error_type(wrong_type) -> <<"WrongType">>;
map_error_type(wrong_array) -> <<"WrongArray">>. map_error_type(wrong_array) -> <<"WrongArray">>.
-spec authorize_api_key(operation_id(), api_key(), handler_opts()) -> false | {true, wapi_auth:context()}. -spec authorize_api_key(operation_id(), api_key(), request_context(), handler_opts()) ->
authorize_api_key(OperationID, ApiKey, _Opts) -> false | {true, wapi_auth:context()}.
authorize_api_key(OperationID, ApiKey, _SwagContext, _Opts) ->
ok = scoper:add_scope('swag.server', #{api => wallet, operation_id => OperationID}), ok = scoper:add_scope('swag.server', #{api => wallet, operation_id => OperationID}),
case uac:authorize_api_key(ApiKey, wapi_auth:get_verification_options()) of case uac:authorize_api_key(ApiKey, wapi_auth:get_verification_options()) of
{ok, Context0} -> {ok, Context0} ->

7
apps/wapi/src/wapi_wallet_thrift_handler.erl
View File

@ -5,7 +5,7 @@
%% swag_server_wallet_logic_handler callbacks %% swag_server_wallet_logic_handler callbacks
-export([map_error/2]). -export([map_error/2]).
-export([authorize_api_key/3]). -export([authorize_api_key/4]).
-export([handle_request/4]). -export([handle_request/4]).
%% wapi_handler callbacks %% wapi_handler callbacks
@ -52,8 +52,9 @@ map_error_type(schema_violated) -> <<"SchemaViolated">>;
map_error_type(wrong_type) -> <<"WrongType">>; map_error_type(wrong_type) -> <<"WrongType">>;
map_error_type(wrong_array) -> <<"WrongArray">>. map_error_type(wrong_array) -> <<"WrongArray">>.
-spec authorize_api_key(operation_id(), api_key(), handler_opts()) -> false | {true, wapi_auth:context()}. -spec authorize_api_key(operation_id(), api_key(), request_context(), handler_opts()) ->
authorize_api_key(OperationID, ApiKey, _Opts) -> false | {true, wapi_auth:context()}.
authorize_api_key(OperationID, ApiKey, _SwagContext, _Opts) ->
ok = scoper:add_meta(#{api => wallet, operation_id => OperationID}), ok = scoper:add_meta(#{api => wallet, operation_id => OperationID}),
case uac:authorize_api_key(ApiKey, wapi_auth:get_verification_options()) of case uac:authorize_api_key(ApiKey, wapi_auth:get_verification_options()) of
{ok, Context0} -> {ok, Context0} ->

2
build-utils

@ -1 +1 @@
Subproject commit 56606f5cacec1c30ca11088c575e9c285f1f2f40 Subproject commit 24aa772730be966667adb285a09fcb494d4f218e