Skip to content

Commit 0a9e2d6

Browse files
Gazizonokistanislav-shchetinin
authored andcommitted
Removed library/login and library/security libs (#267)
1 parent 36fd883 commit 0a9e2d6

File tree

15 files changed

+38
-1235
lines changed

15 files changed

+38
-1235
lines changed

src/client/table/impl/CMakeLists.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@ target_link_libraries(client-ydb_table-impl
1111
impl-ydb_internal-session_pool
1212
client-ydb_table-query_stats
1313
yql-public-issue-protos
14+
PRIVATE
15+
OpenSSL::SSL
1416
)
1517

1618
target_sources(client-ydb_table-impl PRIVATE

src/client/types/credentials/CMakeLists.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ add_library(client-ydb_types-credentials)
55

66
target_link_libraries(client-ydb_types-credentials PUBLIC
77
yutil
8-
library-login
98
api-grpc
109
client-ydb_types-status
1110
yql-public-issue

src/client/types/credentials/login/CMakeLists.txt

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
11
add_library(client-ydb_types-credentials-login)
22

3-
target_link_libraries(client-ydb_types-credentials-login PUBLIC
4-
yutil
5-
library-login
6-
library-security
7-
api-grpc
8-
client-ydb_types-status
9-
impl-ydb_internal-grpc_connections
10-
yql-public-issue
3+
target_link_libraries(client-ydb_types-credentials-login
4+
PUBLIC
5+
yutil
6+
PRIVATE
7+
api-grpc
8+
client-ydb_types-status
9+
impl-ydb_internal-grpc_connections
10+
yql-public-issue
11+
jwt-cpp::jwt-cpp
1112
)
1213

1314
target_sources(client-ydb_types-credentials-login PRIVATE

src/client/types/credentials/login/login.cpp

Lines changed: 27 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,37 @@
44
#include <src/client/impl/ydb_internal/grpc_connections/grpc_connections.h>
55
#include <src/client/types/core_facility/core_facility.h>
66
#include <src/api/grpc/ydb_auth_v1.grpc.pb.h>
7-
#include <src/library/login/login.h>
8-
#include <src/library/security/util.h>
97

108
#include <ydb-cpp-sdk/util/string/cast.h>
119

10+
#include <jwt-cpp/jwt.h>
11+
1212
namespace NYdb {
1313

14+
namespace {
15+
16+
// copy-pasted from <robot/library/utils/time_convert.h>
17+
template<typename Rep, typename Period>
18+
constexpr ui64 ToMicroseconds(std::chrono::duration<Rep, Period> value) {
19+
return std::chrono::duration_cast<std::chrono::microseconds>(value).count();
20+
}
21+
22+
template<typename Clock, typename Duration>
23+
constexpr TInstant ToInstant(std::chrono::time_point<Clock, Duration> value) {
24+
return TInstant::MicroSeconds(ToMicroseconds(value.time_since_epoch()));
25+
}
26+
27+
std::chrono::system_clock::time_point GetTokenExpiresAt(const std::string& token) {
28+
try {
29+
jwt::decoded_jwt decoded_token = jwt::decode(token);
30+
return decoded_token.get_expires_at();
31+
}
32+
catch (...) {
33+
}
34+
return {};
35+
}
36+
}
37+
1438
class TLoginCredentialsProvider : public ICredentialsProvider {
1539
public:
1640
TLoginCredentialsProvider(std::weak_ptr<ICoreFacility> facility, TLoginCredentialsParams params);
@@ -151,7 +175,7 @@ void TLoginCredentialsProvider::ParseToken() { // works under mutex
151175
Token_ = GetToken();
152176
Error_.reset();
153177
TInstant now = TInstant::Now();
154-
TokenExpireAt_ = NKikimr::ToInstant(NLogin::TLoginProvider::GetTokenExpiresAt(Token_.value()));
178+
TokenExpireAt_ = ToInstant(GetTokenExpiresAt(Token_.value()));
155179
TokenRequestAt_ = now + TDuration::Minutes((TokenExpireAt_ - now).Minutes() / 2);
156180
} else {
157181
Token_.reset();

src/library/CMakeLists.txt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,15 +20,13 @@ add_subdirectory(json)
2020
add_subdirectory(jwt)
2121
add_subdirectory(lcs)
2222
add_subdirectory(logger)
23-
add_subdirectory(login)
2423
add_subdirectory(mime)
2524
add_subdirectory(monlib)
2625
add_subdirectory(openssl)
2726
add_subdirectory(operation_id)
2827
add_subdirectory(persqueue)
2928
add_subdirectory(resource)
3029
add_subdirectory(retry)
31-
add_subdirectory(security)
3230
add_subdirectory(streams)
3331
add_subdirectory(string_utils)
3432
add_subdirectory(svnversion)

src/library/login/CMakeLists.txt

Lines changed: 0 additions & 19 deletions
This file was deleted.

0 commit comments

Comments
 (0)