bet/beteran-backend-server-edge
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

bug fixed

Browse Source
This commit is contained in:
병준 박 2022-08-06 04:19:56 +00:00
parent 1b046fe6e8
commit 77c45ad354
2 changed files with 52 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Cargo.toml
View File

@ -19,7 +19,7 @@ prost = { version = "0" }
nats = { version = "0" } nats = { version = "0" }
base64 = { version = "0" } base64 = { version = "0" }
beteran-protobuf-rust = { git = "https://gitlab.loafle.net/bet/beteran-protobuf-rust.git", tag = "v0.1.20-snapshot" } beteran-protobuf-rust = { git = "https://gitlab.loafle.net/bet/beteran-protobuf-rust.git", tag = "v0.1.23-snapshot" }
beteran-common-rust = { git = "https://gitlab.loafle.net/bet/beteran-common-rust.git", tag = "v0.1.0-snapshot" } beteran-common-rust = { git = "https://gitlab.loafle.net/bet/beteran-common-rust.git", tag = "v0.1.3-snapshot" }
[build-dependencies] [build-dependencies]

68
src/identity/service.rs
View File

@ -105,7 +105,9 @@ impl Service {
.await .await
.map_err(|e| { .map_err(|e| {
bcr::error::rpc::Error::Server(bcr::error::rpc::Server { bcr::error::rpc::Error::Server(bcr::error::rpc::Server {
message: format!("server: {}", e), code: bpr::protobuf::rpc::Error::SERVER_00,
message: format!("server {}", e),
data: None,
}) })
})?; })?;
@ -115,13 +117,17 @@ impl Service {
) )
.map_err(|e| { .map_err(|e| {
bcr::error::rpc::Error::Server(bcr::error::rpc::Server { bcr::error::rpc::Error::Server(bcr::error::rpc::Server {
message: format!("server: {}", e), code: bpr::protobuf::rpc::Error::SERVER_00,
message: format!("server {}", e),
data: None,
}) })
})?; })?;
if let Some(e) = ss_check_username_for_duplication_res.error { if let Some(e) = ss_check_username_for_duplication_res.error {
return Err(bcr::error::rpc::Error::Server(bcr::error::rpc::Server { return Err(bcr::error::rpc::Error::Server(bcr::error::rpc::Server {
message: format!("server: {}", e), code: bpr::protobuf::rpc::Error::SERVER_00,
message: format!("server {}", e),
data: None,
})); }));
} }
@ -141,7 +147,9 @@ impl Service {
.await .await
.map_err(|e| { .map_err(|e| {
bcr::error::rpc::Error::Server(bcr::error::rpc::Server { bcr::error::rpc::Error::Server(bcr::error::rpc::Server {
message: format!("server: {}", e), code: bpr::protobuf::rpc::Error::SERVER_00,
message: format!("server {}", e),
data: None,
}) })
})?; })?;
} }
@ -202,7 +210,9 @@ impl Service {
.await .await
.map_err(|e| { .map_err(|e| {
bcr::error::rpc::Error::Server(bcr::error::rpc::Server { bcr::error::rpc::Error::Server(bcr::error::rpc::Server {
message: format!("server: {}", e), code: bpr::protobuf::rpc::Error::SERVER_00,
message: format!("server {}", e),
data: None,
}) })
})?; })?;
@ -212,13 +222,17 @@ impl Service {
) )
.map_err(|e| { .map_err(|e| {
bcr::error::rpc::Error::Server(bcr::error::rpc::Server { bcr::error::rpc::Error::Server(bcr::error::rpc::Server {
message: format!("server: {}", e), code: bpr::protobuf::rpc::Error::SERVER_00,
message: format!("server {}", e),
data: None,
}) })
})?; })?;
if let Some(e) = ss_check_nickname_for_duplication_res.error { if let Some(e) = ss_check_nickname_for_duplication_res.error {
return Err(bcr::error::rpc::Error::Server(bcr::error::rpc::Server { return Err(bcr::error::rpc::Error::Server(bcr::error::rpc::Server {
message: format!("server: {}", e), code: bpr::protobuf::rpc::Error::SERVER_00,
message: format!("server {}", e),
data: None,
})); }));
} }
@ -238,7 +252,9 @@ impl Service {
.await .await
.map_err(|e| { .map_err(|e| {
bcr::error::rpc::Error::Server(bcr::error::rpc::Server { bcr::error::rpc::Error::Server(bcr::error::rpc::Server {
message: format!("server: {}", e), code: bpr::protobuf::rpc::Error::SERVER_00,
message: format!("server {}", e),
data: None,
}) })
})?; })?;
} }
@ -295,7 +311,9 @@ impl Service {
.await .await
.map_err(|e| { .map_err(|e| {
bcr::error::rpc::Error::Server(bcr::error::rpc::Server { bcr::error::rpc::Error::Server(bcr::error::rpc::Server {
message: format!("server: {}", e), code: bpr::protobuf::rpc::Error::SERVER_00,
message: format!("server {}", e),
data: None,
}) })
})?; })?;
@ -303,13 +321,17 @@ impl Service {
bpr::ss::member::identity::CaptchaResponse::decode(ss_captcha_res_msg.data.as_slice()) bpr::ss::member::identity::CaptchaResponse::decode(ss_captcha_res_msg.data.as_slice())
.map_err(|e| { .map_err(|e| {
bcr::error::rpc::Error::Server(bcr::error::rpc::Server { bcr::error::rpc::Error::Server(bcr::error::rpc::Server {
message: format!("server: {}", e), code: bpr::protobuf::rpc::Error::SERVER_00,
message: format!("server {}", e),
data: None,
}) })
})?; })?;
if let Some(e) = ss_captcha_res.error { if let Some(e) = ss_captcha_res.error {
return Err(bcr::error::rpc::Error::Server(bcr::error::rpc::Server { return Err(bcr::error::rpc::Error::Server(bcr::error::rpc::Server {
message: format!("server: {}", e), code: bpr::protobuf::rpc::Error::SERVER_00,
message: format!("server {}", e),
data: None,
})); }));
} }
@ -319,7 +341,7 @@ impl Service {
bpr::c2se::common::identity::CaptchaResponse { bpr::c2se::common::identity::CaptchaResponse {
error: None, error: None,
result: Some(bpr::c2se::common::identity::captcha_response::Result { result: Some(bpr::c2se::common::identity::captcha_response::Result {
token: r.token, security_code_hash: r.security_code_hash,
image: r.image, image: r.image,
}), }),
} }
@ -328,7 +350,9 @@ impl Service {
.await .await
.map_err(|e| { .map_err(|e| {
bcr::error::rpc::Error::Server(bcr::error::rpc::Server { bcr::error::rpc::Error::Server(bcr::error::rpc::Server {
message: format!("server: {}", e), code: bpr::protobuf::rpc::Error::SERVER_00,
message: format!("server {}", e),
data: None,
}) })
})?; })?;
} }
@ -374,7 +398,7 @@ impl Service {
let ss_signin_req = bpr::ss::member::identity::SigninRequest { let ss_signin_req = bpr::ss::member::identity::SigninRequest {
client: Some(client), client: Some(client),
token: req.token, security_code_hash: req.security_code_hash,
security_code: req.security_code, security_code: req.security_code,
username: req.username, username: req.username,
password: req.password, password: req.password,
@ -389,7 +413,9 @@ impl Service {
.await .await
.map_err(|e| { .map_err(|e| {
bcr::error::rpc::Error::Server(bcr::error::rpc::Server { bcr::error::rpc::Error::Server(bcr::error::rpc::Server {
message: format!("server: {}", e), code: bpr::protobuf::rpc::Error::SERVER_00,
message: format!("server {}", e),
data: None,
}) })
})?; })?;
@ -397,13 +423,17 @@ impl Service {
bpr::ss::member::identity::SigninResponse::decode(ss_signin_res_msg.data.as_slice()) bpr::ss::member::identity::SigninResponse::decode(ss_signin_res_msg.data.as_slice())
.map_err(|e| { .map_err(|e| {
bcr::error::rpc::Error::Server(bcr::error::rpc::Server { bcr::error::rpc::Error::Server(bcr::error::rpc::Server {
message: format!("server: {}", e), code: bpr::protobuf::rpc::Error::SERVER_00,
message: format!("server {}", e),
data: None,
}) })
})?; })?;
if let Some(e) = ss_signin_res.error { if let Some(e) = ss_signin_res.error {
return Err(bcr::error::rpc::Error::Server(bcr::error::rpc::Server { return Err(bcr::error::rpc::Error::Server(bcr::error::rpc::Server {
message: format!("server: {}", e), code: bpr::protobuf::rpc::Error::SERVER_00,
message: format!("server {}", e),
data: None,
})); }));
} }
@ -421,7 +451,9 @@ impl Service {
.await .await
.map_err(|e| { .map_err(|e| {
bcr::error::rpc::Error::Server(bcr::error::rpc::Server { bcr::error::rpc::Error::Server(bcr::error::rpc::Server {
message: format!("server: {}", e), code: bpr::protobuf::rpc::Error::SERVER_00,
message: format!("server {}", e),
data: None,
}) })
})?; })?;
} }