@smbcloud / cli / commits / e572684

Move paths to constant

Seto Elkahfi committed Sep 15, 2023 at 22:23 UTC e5726844596fe6f96208bef020368bb92259c737

5 files changed +31 -13

smbpndk-cli/src/account/forgot/mod.rs

+2 -2

@@ -4,7 +4,7 @@ use dialoguer::{theme::ColorfulTheme, Input, Password};

4 use reqwest::{Client, StatusCode};

5 use serde::{Deserialize, Serialize};

6 use smbpndk_model::CommandResult;

7 -use smbpndk_networking::smb_base_url_builder;

7 +use smbpndk_networking::{constants::PATH_USERS_PASSWORD, smb_base_url_builder};

8 use smbpndk_utils::email_validation;

9 use spinners::Spinner;

@@ -144,6 +144,6 @@ async fn input_code() -> Result<CommandResult> {

144

145 fn build_smb_forgot_url() -> String {

146 let mut url_builder = smb_base_url_builder();

147 - url_builder.add_route("v1/users/password");

147 + url_builder.add_route(PATH_USERS_PASSWORD);

148 url_builder.build()

149 }

smbpndk-cli/src/account/lib.rs

+4 -2

@@ -7,7 +7,9 @@ use reqwest::{Client, Response, StatusCode};

7 use serde::{Deserialize, Serialize};

8 use serde_repr::Deserialize_repr;

9 use smbpndk_networking::{

10 - constants::{GH_OAUTH_CLIENT_ID, GH_OAUTH_REDIRECT_HOST, GH_OAUTH_REDIRECT_PORT},

10 + constants::{

11 + GH_OAUTH_CLIENT_ID, GH_OAUTH_REDIRECT_HOST, GH_OAUTH_REDIRECT_PORT, PATH_AUTHORIZE,

12 + },

13 smb_base_url_builder,

14 };

15 use spinners::Spinner;

@@ -240,7 +242,7 @@ pub async fn process_connect_github(code: String) -> Result<SmbAuthorization> {

242

243 fn build_authorize_smb_url() -> String {

244 let mut url_builder = smb_base_url_builder();

243 - url_builder.add_route("v1/authorize");

245 + url_builder.add_route(PATH_AUTHORIZE);

246 url_builder.build()

247 }

248

smbpndk-cli/src/account/login/process.rs

+13 -7

@@ -13,7 +13,13 @@ use log::debug;

13 use reqwest::{Client, StatusCode};

14 use serde::{Deserialize, Serialize};

15 use smbpndk_model::CommandResult;

16 -use smbpndk_networking::{get_smb_token, smb_base_url_builder, smb_token_file_path};

16 +use smbpndk_networking::{

17 + constants::{

18 + PATH_LINK_GITHUB_ACCOUNT, PATH_RESEND_CONFIRMATION, PATH_RESET_PASSWORD_INSTRUCTIONS,

19 + PATH_USERS_PASSWORD, PATH_USERS_SIGN_IN, PATH_USERS_SIGN_OUT,

20 + },

21 + get_smb_token, smb_base_url_builder, smb_token_file_path,

22 +};

23 use smbpndk_utils::email_validation;

24 use spinners::Spinner;

25 use std::fs::{self};

@@ -512,36 +518,36 @@ async fn do_process_logout() -> Result<()> {

518

519 fn build_smb_login_url() -> String {

520 let mut url_builder = smb_base_url_builder();

515 - url_builder.add_route("v1/users/sign_in");

521 + url_builder.add_route(PATH_USERS_SIGN_IN);

522 url_builder.build()

523 }

524

525 fn build_smb_logout_url() -> String {

526 let mut url_builder = smb_base_url_builder();

521 - url_builder.add_route("v1/users/sign_out");

527 + url_builder.add_route(PATH_USERS_SIGN_OUT);

528 url_builder.build()

529 }

530

531 fn build_smb_resend_email_verification_url() -> String {

532 let mut url_builder = smb_base_url_builder();

527 - url_builder.add_route("v1/resend_confirmation");

533 + url_builder.add_route(PATH_RESEND_CONFIRMATION);

534 url_builder.build()

535 }

536

537 fn build_smb_resend_reset_password_instructions_url() -> String {

538 let mut url_builder = smb_base_url_builder();

533 - url_builder.add_route("v1/resend_reset_password_instructions");

539 + url_builder.add_route(PATH_RESET_PASSWORD_INSTRUCTIONS);

540 url_builder.build()

541 }

542

543 fn build_smb_reset_password_url() -> String {

544 let mut url_builder = smb_base_url_builder();

539 - url_builder.add_route("v1/users/password");

545 + url_builder.add_route(PATH_USERS_PASSWORD);

546 url_builder.build()

547 }

548

549 fn build_smb_connect_github_url() -> String {

550 let mut url_builder = smb_base_url_builder();

545 - url_builder.add_route("v1/link_github_account");

551 + url_builder.add_route(PATH_LINK_GITHUB_ACCOUNT);

552 url_builder.build()

553 }

smbpndk-cli/src/account/signup/process.rs

+2 -2

@@ -11,7 +11,7 @@ use reqwest::{Client, StatusCode};

11 use serde::{Deserialize, Serialize};

12 use smbpndk_model::CommandResult;

14 -use smbpndk_networking::{smb_base_url_builder, smb_token_file_path};

14 +use smbpndk_networking::{constants::PATH_USERS, smb_base_url_builder, smb_token_file_path};

15 use smbpndk_utils::email_validation;

16 use spinners::Spinner;

17 use std::fmt::{Display, Formatter};

@@ -206,6 +206,6 @@ pub async fn do_signup<T: Serialize + ?Sized>(args: &T) -> Result<CommandResult>

206

207 fn build_smb_signup_url() -> String {

208 let mut url_builder = smb_base_url_builder();

209 - url_builder.add_route("v1/users");

209 + url_builder.add_route(PATH_USERS);

210 url_builder.build()

211 }

smbpndk-networking/src/constants.rs

+10

@@ -20,3 +20,13 @@ pub const SMB_API_PROTOCOL: &str = "https";

20 pub const SMB_API_HOST: &str = "localhost:8088";

21 #[cfg(not(debug_assertions))]

22 pub const SMB_API_HOST: &str = "api.smbpndk.com";

23 +

24 +// Paths

25 +pub const PATH_USERS: &str = "v1/users";

26 +pub const PATH_USERS_PASSWORD: &str = "v1/users/password";

27 +pub const PATH_USERS_SIGN_OUT: &str = "v1/users/sign_out";

28 +pub const PATH_USERS_SIGN_IN: &str = "v1/users/sign_in";

29 +pub const PATH_LINK_GITHUB_ACCOUNT: &str = "v1/link_github_account";

30 +pub const PATH_RESET_PASSWORD_INSTRUCTIONS: &str = "v1/resend_reset_password_instructions";

31 +pub const PATH_RESEND_CONFIRMATION: &str = "v1/resend_confirmation";

32 +pub const PATH_AUTHORIZE: &str = "v1/authorize";