8 files changed
+29
-41
smbpndk-cli/src/account/forgot/mod.rs
+4
-23
@@ -3,21 +3,14 @@ use console::style;
3
use dialoguer::{theme::ColorfulTheme, Input, Password};
4
use reqwest::{Client, StatusCode};
5
use serde::{Deserialize, Serialize};
6
-use smbpndk_model::CommandResult;
6
+use smbpndk_model::{
7
+ forgot::{Args, Email, Param, UserUpdatePassword},
8
+ CommandResult,
9
+};
10
use smbpndk_networking::{constants::PATH_USERS_PASSWORD, smb_base_url_builder};
11
use smbpndk_utils::email_validation;
12
use spinners::Spinner;
13
11
-#[derive(Debug, Serialize)]
12
-struct Args {
13
- user: Email,
14
-}
15
-
16
-#[derive(Debug, Serialize)]
17
-struct Email {
18
- email: String,
19
-}
20
-
14
pub async fn process_forgot() -> Result<CommandResult> {
15
println!("Provide your login credentials.");
16
let email = Input::<String>::with_theme(&ColorfulTheme::default())
@@ -56,18 +49,6 @@ pub async fn process_forgot() -> Result<CommandResult> {
49
}
50
}
51
59
-#[derive(Debug, Serialize)]
60
-pub struct Param {
61
- pub(crate) user: UserUpdatePassword,
62
-}
63
-
64
-#[derive(Debug, Serialize)]
65
-pub struct UserUpdatePassword {
66
- pub(crate) reset_password_token: String,
67
- pub(crate) password: String,
68
- pub(crate) password_confirmation: String,
69
-}
70
-
52
async fn input_code() -> Result<CommandResult> {
53
let security_code = Input::<String>::with_theme(&ColorfulTheme::default())
54
.with_prompt("Code")
smbpndk-cli/src/account/lib.rs
-1
@@ -3,7 +3,6 @@ use console::style;
3
use log::debug;
4
use regex::Regex;
5
use reqwest::{Client, Response, StatusCode};
6
-
6
use smbpndk_model::account::SmbAuthorization;
7
use smbpndk_networking::{
8
constants::{
smbpndk-cli/src/account/login/process.rs
+1
-1
@@ -1,5 +1,4 @@
1
use crate::account::{
2
- forgot::{Param, UserUpdatePassword},
2
lib::{authorize_github, save_token},
3
signup::{do_signup, SignupMethod},
4
};
@@ -10,6 +9,7 @@ use log::debug;
9
use reqwest::{Client, StatusCode};
10
use smbpndk_model::{
11
account::{ErrorCode, GithubInfo, SmbAuthorization, User},
12
+ forgot::{Param, UserUpdatePassword},
13
login::{LoginArgs, LoginParams, UserParam},
14
signup::{GithubEmail, Provider, SignupGithubParams, SignupUserGithub},
15
CommandResult,
smbpndk-cli/src/account/mod.rs
-1
@@ -2,7 +2,6 @@ pub mod cli;
2
pub mod forgot;
3
pub mod lib;
4
pub mod login;
5
-pub mod model;
5
pub mod signup;
6
7
use self::{
smbpndk-cli/src/account/model/mod.rs
deleted
-1
@@ -1 +0,0 @@
1
-
smbpndk-cli/src/account/smbpndk.code-workspace
deleted
-14
@@ -1,14 +0,0 @@
1
-{
2
- "folders": [
3
- {
4
- "path": "../../.."
5
- },
6
- {
7
- "path": "../../../../smbpndk-api"
8
- },
9
- {
10
- "path": "../../../../smbpndk-web"
11
- }
12
- ],
13
- "settings": {}
14
-}
\ No newline at end of file
smbpndk-model/src/forgot.rs
new
+23
@@ -0,0 +1,23 @@
1
+use serde::Serialize;
2
+
3
+#[derive(Debug, Serialize)]
4
+pub struct Args {
5
+ pub user: Email,
6
+}
7
+
8
+#[derive(Debug, Serialize)]
9
+pub struct Email {
10
+ pub email: String,
11
+}
12
+
13
+#[derive(Debug, Serialize)]
14
+pub struct Param {
15
+ pub user: UserUpdatePassword,
16
+}
17
+
18
+#[derive(Debug, Serialize)]
19
+pub struct UserUpdatePassword {
20
+ pub reset_password_token: String,
21
+ pub password: String,
22
+ pub password_confirmation: String,
23
+}
smbpndk-model/src/lib.rs
+1
@@ -1,4 +1,5 @@
1
pub mod account;
2
+pub mod forgot;
3
pub mod login;
4
pub mod signup;
5