reset password

oab/src/api/mod.rs

@@ -25,6 +25,7 @@ pub fn routes(cfg: &mut web::ServiceConfig) {
     cfg.service(tsdb);
     cfg.service(upload::save_files);
     cfg.service(user::get)
+        .service(user::reset)
         .service(user::list)
         .service(user::register)
         .service(user::login)

oab/src/api/user.rs

@@ -9,7 +9,7 @@ use std::fmt::Debug;
 
 use crate::{
     libs,
-    models::{self, app_user, user, AUStatus, UserPlugin},
+    models::{self, app_user, user, AUStatus, Token, UserPlugin},
     AppState, Error, Result,
 };
 use actix_web::{delete, get, head, http, patch, post, web, HttpResponse, Responder};
@@ -35,6 +35,47 @@ pub async fn get(id: web::Path<String>, stat: web::Data<AppState>) -> Result<imp
     }
 }
 
+#[derive(Debug, Deserialize, Serialize)]
+pub struct ResetOptions {
+    p: Option<String>,
+}
+
+#[get("/user/{id}/reset")]
+#[access_read("user")]
+pub async fn reset(
+    id: web::Path<String>,
+    stat: web::Data<AppState>,
+    t: web::ReqData<Token>,
+    query: web::Query<ResetOptions>,
+) -> Result<impl Responder> {
+    let id = id.into_inner();
+    // default optx123
+    let p = match query.into_inner().p {
+        Some(p) => p,
+        None => "b3B0eDEyMw==".to_string(),
+    };
+    if t.can_delete("user", &id) || id == t.id {
+        let mut uobj = models::user::Entity::find_by_id(&id)
+            .one(stat.db())
+            .await?
+            .ok_or("not found id")?;
+        let p = match base64::decode(p.as_bytes()) {
+            Err(_) => return Err(Error::ArgInvalid("password".to_string())),
+            Ok(p) => p,
+        };
+        let p = match std::str::from_utf8(&p) {
+            Ok(p) => p,
+            Err(_) => return Err(Error::ArgInvalid("password".to_string())),
+        };
+        let mut u: models::user::ActiveModel = uobj.clone().into();
+        uobj.update_pass(&p)?;
+        u.real_code = sea_orm::Set(uobj.real_code);
+        u.check_code = sea_orm::Set(uobj.check_code);
+        u.update(stat.db()).await?;
+    }
+    Ok("")
+}
+
 #[derive(Debug, Deserialize, Serialize)]
 pub struct ListOptions {
     name: Option<String>,
@@ -221,7 +262,6 @@ pub struct UpdateOpt {
     pub nickname: Option<String>,
     pub email: Option<String>,
     pub phone: Option<String>,
-    pub test: serde_json::Value,
 }
 
 #[patch("/user/{id}")]
@@ -232,7 +272,6 @@ pub async fn update(
     stat: web::Data<AppState>,
     data: web::Json<UpdateOpt>,
 ) -> Result<impl Responder> {
-    info!("{:#?}", data.test);
     Ok("")
 }
 

oab/src/cli.rs

@@ -14,7 +14,7 @@ use tracing::info;
 #[clap(name = "oab")]
 #[clap(about = "oab", long_about = None)]
 pub struct AppCli {
-    #[clap(short = 'c', value_name = "cfg",default_value_t = String::from("~/.config/oa/oab.yml"), value_hint = clap::ValueHint::DirPath)]
+    #[clap(short = 'c', value_name = "cfg",default_value_t = String::from("/root/.config/oa/oab.yml"), value_hint = clap::ValueHint::DirPath)]
     pub cfg: String,
     #[clap(short = 'n', value_name = "name",default_value_t = String::from("v.oab"))]
     pub name: String,

oaweb/src/boot/api/user.ts

@@ -19,6 +19,12 @@ export default {
     }, prop)
     return ajax.post(this.local, data)
   },
+  reset(id: string, p?: string) {
+    if (p) {
+      p = Base64.encode(p)
+    }
+    return ajax.get(this.local + id + '/reset', { p: p })
+  },
   login(username: string, password: string) {
     return ajax.head(this.local + username, {
       typ: 'username',

oaweb/src/pages/app/user.vue

@@ -48,6 +48,7 @@ import api from 'src/boot/api';
 import msg from '@veypi/msg';
 import { util } from 'src/libs';
 import cfg from 'src/cfg';
+import { useQuasar } from 'quasar';
 
 const auOpts: { [index: number]: any } = {
   [AUStatus.OK]: ['正常', 'positive'],
@@ -55,6 +56,7 @@ const auOpts: { [index: number]: any } = {
   [AUStatus.Applying]: ['申请中', 'primary'],
   [AUStatus.Disabled]: ['禁用', 'warning'],
 }
+let $q = useQuasar()
 let app = inject('app') as Ref<modelsApp>
 const columns = [
   {
@@ -91,6 +93,18 @@ const update_status = (id: string, n: number, old: number) => {
 }
 
 const reset = (id: string) => {
+  $q.dialog({
+    title: '是否重置密码',
+    message: '请谨慎操作',
+    cancel: true,
+    persistent: true
+  }).onOk(() => {
+    api.user.reset(id).then(e => {
+      msg.Info('重置成功 ')
+    }).catch(e => {
+      msg.Warn('失败 ' + e)
+    })
+  })
 }
 
 const sync = () => {

oaweb/src/pages/user.vue

@@ -90,6 +90,11 @@ const reset = () => {
     msg.Warn('两次密码不一致')
     return
   }
+  api.user.reset(u.id, pass.value[0]).then((e) => {
+    msg.Info('密码重置成功')
+  }).catch(e => {
+    msg.Warn('密码重置失败 ' + e)
+  })
 }
 </script>