Compare commits

..

43 Commits

Author SHA1 Message Date
nfel f23d1251b5 v2: redeem added to tfa code state
Signed-off-by: nfel <nfilsaraee@gmail.com>
2024-12-14 17:35:52 +03:30
nfel 5eb260df3a v2: changed tfa check
Signed-off-by: nfel <nfilsaraee@gmail.com>
2024-12-14 17:09:24 +03:30
nfel 72cb1d8117 v2: changed tfa check
Signed-off-by: nfel <nfilsaraee@gmail.com>
2024-12-14 16:55:50 +03:30
nfel 0cd6107abe v2: changed TFAReq Msg to accept trx id and state
Signed-off-by: nfel <nfilsaraee@gmail.com>
2024-12-14 16:45:12 +03:30
nfel 4b1ff1c31d v2: user_id added to recepient msg
Signed-off-by: nfel <nfilsaraee@gmail.com>
2024-12-10 15:09:54 +03:30
nfel 5df728fd9c Merge pull request 'improve recipient' (#6) from recipient into v2
Reviewed-on: https://git.kahrobatoken.com/Kahroba/proto/pulls/6
2024-12-10 08:22:22 +00:00
hoessein_225 3e699c2082 improve recipient 2024-12-10 11:48:22 +03:30
nfel cc0bd514d5 Merge pull request 'add internal rpc file and LookUpName rpc' (#5) from auth into v2 2024-12-10 07:23:47 +00:00
hoessein_225 8a0c7451fb edit state enum name 2024-12-10 10:50:40 +03:30
hoessein_225 9d8a2d160a add internal rpc file and LookUpName rpc 2024-12-10 10:34:16 +03:30
nfel 88aefe7d13 Merge pull request 'add some items to optState enum' (#4) from tfa into v2
Reviewed-on: https://git.kahrobatoken.com/Kahroba/proto/pulls/4
2024-12-09 11:02:37 +00:00
hoessein_225 1b6a64aa46 add some items to optState enum 2024-12-09 14:30:56 +03:30
nfel 114de30b57 Merge pull request 'add enum for TFA message' (#3) from tfa into v2
Reviewed-on: https://git.kahrobatoken.com/Kahroba/proto/pulls/3
2024-12-09 10:58:36 +00:00
hoessein_225 434f74756f add enum for TFA message 2024-12-09 14:25:50 +03:30
nfel 32d46850a5 v2: str -> double
Signed-off-by: nfel <nfilsaraee@gmail.com>
2024-12-09 13:41:08 +03:30
nfel 254f1697d8 Merge pull request 'improve InternalTransferAsset rpc' (#2) from transfer into v2
Reviewed-on: https://git.kahrobatoken.com/Kahroba/proto/pulls/2
2024-12-09 09:02:32 +00:00
hoessein_225 36af98b186 add some optional feat & change key name in TFA 2024-12-09 12:13:55 +03:30
hoessein_225 6ecb53aecd add Recipient message 2024-12-09 12:05:30 +03:30
hoessein_225 e21e98568b change Otp name 2024-12-09 12:00:13 +03:30
hoessein_225 8e64e1ca1f improve InternalTransferAsset rpc 2024-12-09 11:56:34 +03:30
nfel 3779679504 Merge pull request 'add CheckWalletKey rpc' (#1) from wallet into v2
Reviewed-on: https://git.kahrobatoken.com/Kahroba/proto/pulls/1
2024-12-07 10:45:03 +00:00
hoessein_225 f7729a595b change CheckWalletKey rpc name to GetPublicKeyByNationalID 2024-12-07 14:14:32 +03:30
hoessein_225 6a95269cef add CheckWalletKey rpc 2024-12-07 13:32:20 +03:30
nfel 8b560247e4 v2: buf format
Signed-off-by: nfel <nfilsaraee@gmail.com>
2024-11-29 00:04:49 +03:30
nfel b3ceb01bfb v2: removed test ci + alert filter fixed
Signed-off-by: nfel <nfilsaraee@gmail.com>
2024-11-26 14:15:10 +03:30
nfel 46ac6fcea5 v2:
Signed-off-by: nfel <nfilsaraee@gmail.com>
2024-11-26 12:41:07 +03:30
nfel 2fdaac14c6 v2:
Signed-off-by: nfel <nfilsaraee@gmail.com>
2024-11-26 12:39:54 +03:30
nfel 53b8db78dd v2:
Signed-off-by: nfel <nfilsaraee@gmail.com>
2024-11-26 12:38:52 +03:30
nfel 749a399197 v2:
Signed-off-by: nfel <nfilsaraee@gmail.com>
2024-11-26 12:37:42 +03:30
nfel 6396711ba7 v2:
Signed-off-by: nfel <nfilsaraee@gmail.com>
2024-11-26 12:24:40 +03:30
nfel b71c028f88 v2:
Signed-off-by: nfel <nfilsaraee@gmail.com>
2024-11-26 12:22:07 +03:30
nfel eeeedde123 v2:
Signed-off-by: nfel <nfilsaraee@gmail.com>
2024-11-26 12:19:30 +03:30
nfel 8660dea75b v2:
Signed-off-by: nfel <nfilsaraee@gmail.com>
2024-11-26 12:18:54 +03:30
nfel 014cc162b2 v2:
Signed-off-by: nfel <nfilsaraee@gmail.com>
2024-11-26 12:15:24 +03:30
nfel 208bc84c74 v2: test env
Signed-off-by: nfel <nfilsaraee@gmail.com>
2024-11-26 12:08:28 +03:30
nfel 5affc6bb04 v2: test env
Signed-off-by: nfel <nfilsaraee@gmail.com>
2024-11-26 12:05:32 +03:30
nfel d0354d77f1 v2: test env
Signed-off-by: nfel <nfilsaraee@gmail.com>
2024-11-26 11:56:49 +03:30
nfel b6cd325104 v2: test env
Signed-off-by: nfel <nfilsaraee@gmail.com>
2024-11-26 11:44:00 +03:30
nfel 79d2cedc3e v2: test env
Signed-off-by: nfel <nfilsaraee@gmail.com>
2024-11-26 11:42:02 +03:30
nfel 7b2eef8657 v2: test env
Signed-off-by: nfel <nfilsaraee@gmail.com>
2024-11-26 11:41:10 +03:30
nfel 22c5992046 v2: test env
Signed-off-by: nfel <nfilsaraee@gmail.com>
2024-11-26 11:38:00 +03:30
nfel c57abc00f6 v2: test env
Signed-off-by: nfel <nfilsaraee@gmail.com>
2024-11-26 11:36:57 +03:30
nfel db54a552ac v2: test env
Signed-off-by: nfel <nfilsaraee@gmail.com>
2024-11-26 11:31:33 +03:30
10 changed files with 110 additions and 26 deletions
+1
View File
@@ -45,6 +45,7 @@ jobs:
- run: "export PATH=$PATH:./node_modules/.bin\nbuf generate \n"
- name: tar files
run: |
ls -l ./stub
for out in go ts doc; do
tar czf .res/${out}.tar.gz ./stub/${out}/
done
+24 -5
View File
@@ -2,11 +2,20 @@ syntax = "proto3";
package alert.v1;
import "base/v1/msg.proto";
message AlertFilter {
base.v1.Filter base_filter = 1;
Importance importance = 2;
LogSource source = 3;
}
//Importance of given event
enum Importance {
LOW = 0;
MEDIUM = 1;
HIGH = 2;
CRITICAL = 3;
LOW = 0; // Low Severity ( unimportant and can be ignored )
MEDIUM = 1; // MEDIUM Severity
HIGH = 2; // High Severity
CRITICAL = 3; // CRITICAL Severity ( can cause panics and data lost )
}
enum LogSource {
@@ -26,7 +35,6 @@ message LogEvent {
optional uint64 id = 1; // Record Id of Log stored in db
string content = 2;
string effective_user = 3;
optional LogEvent prev_cause = 4;
optional LogSource source = 5;
Importance importance = 6;
Meta meta = 7;
@@ -38,9 +46,20 @@ message LogEventList {
/*
Internal Msg
*/
message SMSChangeLog {
uint32 when_ts = 1;
string what = 2;
}
message SMS {
string recipient = 1; //recipient
string text = 2;
optional string sender = 3;
Meta meta = 4;
repeated SMSChangeLog change_log = 5;
}
message SMSList {
repeated SMS sms = 1;
}
+3 -3
View File
@@ -6,7 +6,7 @@ import "alert/v1/msg.proto";
import "base/v1/msg.proto";
service AlertSrv {
rpc Log(LogEvent) returns (base.v1.StatusRes) {}
rpc LogHistory(base.v1.IdReq) returns(LogEventList) {}
rpc StatusChange(LogEvent) returns (base.v1.StatusRes) {}
rpc Emit(LogEvent) returns (base.v1.StatusRes) {}
rpc Update(LogEvent) returns (base.v1.StatusRes) {}
rpc Get(AlertFilter) returns (base.v1.StatusRes) {}
}
+9
View File
@@ -0,0 +1,9 @@
syntax = "proto3";
package auth.v1;
import "auth/v1/msg.proto";
service InternalAuthorizationService {
rpc LookUpName(LookUpNameReq) returns (LookUpNameRes) {}
}
+39 -3
View File
@@ -131,7 +131,7 @@ message Identity {
string updated_at = 18;
string created_at = 19;
string email = 20;
string mobile = 21;
string mobile = 21;
optional Company company = 22;
optional string employee_info = 23;
}
@@ -194,6 +194,8 @@ message TFAReq {
optional string mobile = 2;
optional string email = 3;
optional string reason = 4; // issued jwt reason -> can be login, redeem, withdrawal
optional string transaction_id = 5;
optional TfaStateEnum state = 6;
}
// Two Factor Authentication Exchange Response
@@ -205,6 +207,40 @@ message TFAExRes {
message CheckTFAReq {
InternalIAM iam = 1;
string code = 2;
optional string algorithm = 3;
optional string reason = 4; // Can be later used as a lookup
TFAReq req = 3;
// optional string algorithm = 3;
// optional string reason = 4; // Can be later used as a lookup
// optional string transaction_id = 5;
// optional TfaStateEnum state = 6;
}
message TFA {
TfaStateEnum state = 1;
int64 code = 2;
string transaction_id = 3;
}
enum TfaStateEnum {
TFA_STATE_ENUM_UNSPECIFIED = 0;
LOGIN = 1;
INTERNAL_TRANSFER = 2;
EXTERNAL_TRANSFER = 3;
REDEEM_TOKEN = 4;
}
message Recipient {
string key = 1;
optional string first_name = 2;
optional string last_name = 3;
optional int64 user_id = 4;
optional string public_key = 5;
}
message LookUpNameReq {
Recipient recipient = 1;
}
message LookUpNameRes {
Recipient recipient = 1;
}
+1 -2
View File
@@ -14,8 +14,7 @@ service AuthorizationService {
rpc UserLoginSendOTP(UserSendOtpReq) returns (UserSendOtpRes) {}
rpc UserLoginWithOTP(UserLoginReq) returns (UserAccessTokenRes) {}
rpc UserGetAccessTokenByRefreshToken(UserRefreshTokenReq)
returns (UserAccessTokenRes) {}
rpc UserGetAccessTokenByRefreshToken(UserRefreshTokenReq) returns (UserAccessTokenRes) {}
rpc UserGetUserPermission(InternalIAM) returns (PermissionList) {}
+3 -3
View File
@@ -13,12 +13,12 @@ message IdRes {
message IdReq {
int64 id = 1;
}
message Pagination{
uint32 page = 1; // in query param it will be p
message Pagination {
uint32 page = 1; // in query param it will be p
uint32 page_size = 2; // in query param it will be pz
}
message Filter {
string query = 1; // q
string sort = 2; // s
optional Pagination page = 3;
optional Pagination page = 3;
}
+5 -2
View File
@@ -28,8 +28,11 @@ plugins:
out: stub/doc/md
# # NOTE: Gateway
# # - remote: buf.build/grpc-ecosystem/gateway:v2.16.2
# - local: protoc-gen-grpc-gateway
# out: stub/go
- local: protoc-gen-grpc-gateway
out: stub/go
opt:
- standalone=true
- generate_unbound_methods=true
# # NOTE: SWAGGER json files
# # - remote: buf.build/grpc-ecosystem/openapiv2:v2.16.2
# - local: protoc-gen-openapiv2
+20 -7
View File
@@ -289,17 +289,22 @@ message UserBuyAssetReq {
Transfer
*/
message UserTransferAssetReq {
message InternalTransferAssetReq {
auth.v1.InternalIAM iam = 1;
int64 asset_id = 2;
auth.v1.Recipient recipient = 2;
double amount = 3;
string to_wallet_address = 4;
string to_wallet_memo = 5;
optional int64 network_id = 4;
int64 asset_id = 5;
optional bool approval = 6;
optional auth.v1.TFA tfa = 7;
}
message UserTransferRes {
int64 transaction_id = 1;
string tracking_code = 2;
message InternalTransferAssetRes {
auth.v1.Recipient recipient = 1;
double amount = 2;
// TODO: Change to Asset
string transaction_id = 3;
string transaction_hash = 4;
}
// represent the information regarding the sale of the token
@@ -377,3 +382,11 @@ message RedeemTokenRes {
message RedeemTokenResList {
repeated RedeemTokenRes list = 1;
}
message GetPublicKeyByNationalIDReq {
string national_id = 1;
}
message GetPublicKeyByNationalIDRes {
string pub_key = 1;
}
+5 -1
View File
@@ -19,7 +19,6 @@ service WalletService {
rpc UserInitWallet(UserInitWalletReq) returns (base.v1.StatusRes);
rpc UserGetWalletList(auth.v1.InternalIAM) returns (WalletList);
rpc UserTransferAsset(UserTransferAssetReq) returns (UserTransferRes);
rpc UserGetTransactionList(UserGetTransactionListReq) returns (TransactionList);
@@ -39,4 +38,9 @@ service WalletService {
rpc CalculateRedeemToken(RedeemTokenReq) returns (CalculateRedeemTokenRes);
rpc RedeemToken(RedeemTokenReq) returns (base.v1.StatusRes);
rpc RedeemTokenList(auth.v1.ReqWithIAMAndParams) returns (RedeemTokenResList);
rpc GetPublicKeyByNationalID(GetPublicKeyByNationalIDReq) returns (GetPublicKeyByNationalIDRes);
// Assets routing
rpc InternalTransferAsset(InternalTransferAssetReq) returns (InternalTransferAssetRes);
}