solve issues #10 and #12 and update npm dependencies

Author: eltorio

.gitignore

@@ -4,6 +4,7 @@
 .s3config.toml
 .DS_Store
 db_v2.sqlite3-*
+_db_v2.sqlite3*
 test
 test.rs
 .vscode/tasks.json

Cargo.lock

@@ -1,6 +1,6 @@
 [package]
 name = "sctgdesk-api-server"
-version = "0.1.0"
+version = "1.1.99-42"
 edition = "2021"
 build = "build.rs"
 # [workspace]

Cargo.toml

@@ -460,15 +460,32 @@ impl Database {
         Some(user_id.0 as UserId)
     }
 
-    pub async fn delete_user(&self, user_id: UserId) -> Option<()> {
+    /// Delete a user and its address book
+    pub async fn delete_user(&self, uuid: &str) -> Option<()> {
         let mut tx = self.pool.begin().await.unwrap();
+        let user_id = Uuid::parse_str(uuid);
+        if user_id.is_err() {
+            log::error!("delete user error: {:?}", uuid);
+            return None;
+        }
+        let user_id = user_id.unwrap().as_bytes().to_vec();
         let res = sqlx::query!(
             r#"
             DELETE FROM
                 user
             WHERE
-                guid = ?
+                guid = ?;
+            DELETE FROM
+                ab_legacy
+            WHERE
+                user_guid = ?;
+            DELETE FROM
+                ab
+            WHERE
+                owner = ?;
         "#,
+            user_id,
+            user_id,
             user_id
         )
         .execute(&mut tx)
@@ -1004,6 +1021,8 @@ impl Database {
     ) -> Option<()> {
         let mut conn = self.pool.acquire().await.unwrap();
         let user_guid = Uuid::new_v4().as_bytes().to_vec();
+        // Create a personal address book name based on the user name
+        let ab_name = format!("{}'s Personal Address Book", name);
         // Check if the group exists
         let res = sqlx::query!(
             r#"
@@ -1036,7 +1055,7 @@ impl Database {
                     ?,
                     (SELECT guid FROM team  WHERE name = 'Default'), 1, ?, ?, ?, ?);
             INSERT OR IGNORE INTO ab(guid, name, owner, personal, info)
-                VALUES (?,"Personal Address Book",?,1,'{}');
+                VALUES (?,?,?,1,'{}');
             "#,
             user_guid,
             group_guid,
@@ -1045,6 +1064,7 @@ impl Database {
             password_hashed,
             email,
             ab_guid,
+            ab_name,
             user_guid
         )
         .execute(&mut conn)

libs/state/src/database.rs

@@ -386,7 +386,7 @@ impl ApiState {
         self.db.create_user(username, password, admin).await
     }
 
-    pub async fn ui_delete_user(&self, user_id: UserId) -> Option<()> {
+    pub async fn user_delete(&self, user_id: &str) -> Option<()> {
         self.db.delete_user(user_id).await
     }
 

libs/state/src/state.rs

@@ -784,4 +784,9 @@ pub struct AbSharedNameRequest {
     pub name: Option<String>,
     pub note: Option<String>,
     pub guid: String,
+}
+
+#[derive(Serialize, Deserialize, Clone, JsonSchema)]
+pub struct DeleteUserRequest {
+    pub rows: Vec<String>,
 }

libs/utils/src/types.rs

@@ -69,7 +69,7 @@ use rocket::{
 pub use state::{ApiState, UserPasswordInfo};
 use utils::{
     include_png_as_base64, unwrap_or_return, uuid_into_guid, AbTagRenameRequest, AddUserRequest,
-    AddressBook, EnableUserRequest, GroupsResponse, OidcSettingsResponse, PeersResponse,
+    AddressBook, EnableUserRequest, DeleteUserRequest, GroupsResponse, OidcSettingsResponse, PeersResponse,
     SoftwareResponse, SoftwareVersionResponse, UpdateUserRequest, UserList,
 };
 use utils::{
@@ -141,6 +141,7 @@ pub async fn build_rocket(figment: Figment) -> Rocket<Build> {
                 users,
                 users_client,
                 user_add,
+                user_delete,
                 user_enable,
                 user_update,
                 peers,
@@ -1728,6 +1729,45 @@ async fn user_add(
     Ok(Json(response))
 }
 
+/// # Delete user
+/// 
+/// This function is an API endpoint that deletes a user.
+/// 
+/// ## Parameters
+/// 
+/// - `request`: A JSON object containing the list of users to delete.
+/// 
+/// ## Returns
+/// 
+/// If successful, this function returns a `Json<UsersResponse>` object containing the number of users deleted.
+#[openapi(tag = "user")]
+#[delete("/api/user", format = "application/json", data = "<request>")]
+async fn user_delete(
+    state: &State<ApiState>,
+    _user: AuthenticatedAdmin,
+    request: Json<DeleteUserRequest>,
+) -> Result<Json<UsersResponse>, status::Unauthorized<()>> {
+    log::debug!("create_user");
+    state.check_maintenance().await;
+
+    let delete_users = request.0;
+
+    let mut count = 0;
+    for uuid in delete_users.rows {
+        let res = state.user_delete(uuid.as_str()).await;
+        if res.is_some() {
+            count += 1;
+        }
+    }
+    let response = UsersResponse {
+        msg: "success".to_string(),
+        total: count,
+        data: "[{}]".to_string(),
+    };
+
+    Ok(Json(response))
+}
+
 /// # Enable users
 ///
 /// This function is an API endpoint that enables or disables users.

src/lib.rs

@@ -1,49 +1,48 @@
 {
   "name": "sctgdesk-api-server-webconsole",
   "private": false,
-  "license": "AGPL-3.0-only",
-  "version": "1.1.99-39",
+  "version": "1.1.99-42",
   "type": "module",
   "scripts": {
-    "dev": "vite",
+    "create-cert": "openssl req -x509 -newkey rsa:4096 -keyout localhost.key -out localhost.pem -sha256 -nodes -days 365",
     "devserver": "npx nodemon -V -w ./src -e js,vue,ts,css,html --exec 'npm run build && node devserver.js'",
-    "preview": "vite preview",
+    "dev": "vite",
     "build": "vite build && gulp licenses",
-    "create-cert": "openssl req -x509 -newkey rsa:4096 -keyout localhost.key -out localhost.pem -sha256 -nodes -days 365"
+    "preview": "vite preview"
   },
   "dependencies": {
-    "jdenticon": "^3.3.0",
-    "@headlessui/vue": "^1.7.22",
-    "clipboard": "^2.0.11",
-    "@heroicons/vue": "^2.1.5",
     "@pqina/flip": "^1.8.3",
-    "vue": "^3.4.38",
-    "vue-router": "^4.3.3",
-    "pinia": "^2.2.2",
-    "axios": "^1.7.5",
     "chart.js": "^4.4.4",
-    "flowbite": "^2.5.1"
+    "@headlessui/vue": "^1.7.22",
+    "vue-router": "^4.4.3",
+    "flowbite": "^2.5.1",
+    "jdenticon": "^3.3.0",
+    "pinia": "^2.2.2",
+    "@heroicons/vue": "^2.1.5",
+    "axios": "^1.7.7",
+    "vue": "^3.5.3",
+    "clipboard": "^2.0.11"
   },
   "devDependencies": {
     "gulp": "^5.0.0",
+    "@tailwindcss/forms": "^0.5.9",
+    "sass": "^1.78.0",
+    "@tailwindcss/typography": "^0.5.15",
     "postcss-purgefonts": "^1.0.2",
-    "sass": "^1.77.8",
-    "ts-node": "^10.9.2",
-    "typescript": "^5.5.4",
-    "gulp-if": "^3.0.0",
-    "@tailwindcss/typography": "^0.5.14",
-    "gulp-append-prepend": "^1.0.9",
+    "postcss": "^8.4.45",
     "tailwindcss": "^3.4.10",
+    "nodemon": "^3.1.4",
     "vite-plugin-static-copy": "^1.0.6",
-    "vite": "^5.4.2",
-    "autoprefixer": "^10.4.20",
-    "glob": "11.0.0",
+    "@vitejs/plugin-vue": "^5.1.3",
+    "gulp-append-prepend": "^1.0.9",
     "@fullhuman/postcss-purgecss": "^6.0.0",
-    "nodemon": "^3.1.4",
+    "vite": "^5.4.3",
+    "gulp-if": "^3.0.0",
     "@types/glob": "^8.1.0",
-    "postcss": "^8.4.41",
-    "express": "^4.19.2",
-    "@vitejs/plugin-vue": "^5.1.2",
-    "@tailwindcss/forms": "^0.5.7"
+    "glob": "11.0.0",
+    "ts-node": "^10.9.2",
+    "autoprefixer": "^10.4.20",
+    "typescript": "^5.5.4",
+    "express": "^4.19.2"
   }
 }

webconsole/package.json

@@ -1 +1 @@
-3.0.57
+3.0.62

webconsole/src/api/.swagger-codegen/VERSION

@@ -20,6 +20,7 @@ import { BASE_PATH, COLLECTION_FORMATS, RequestArgs, BaseAPI, RequiredError } fr
 import { AddUserRequest } from '../models';
 import { CurrentUserRequest } from '../models';
 import { CurrentUserResponse } from '../models';
+import { DeleteUserRequest } from '../models';
 import { EnableUserRequest } from '../models';
 import { UpdateUserRequest } from '../models';
 import { UserList } from '../models';
@@ -134,6 +135,58 @@ export const UserApiAxiosParamCreator = function (configuration?: Configuration)
                 options: localVarRequestOptions,
             };
         },
+        /**
+         * This function is an API endpoint that deletes a user.  ## Parameters  - `request`: A JSON object containing the list of users to delete.  ## Returns  If successful, this function returns a `Json<UsersResponse>` object containing the number of users deleted.
+         * @summary Delete user
+         * @param {DeleteUserRequest} body 
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        userDelete: async (body: DeleteUserRequest, options: AxiosRequestConfig = {}): Promise<RequestArgs> => {
+            // verify required parameter 'body' is not null or undefined
+            if (body === null || body === undefined) {
+                throw new RequiredError('body','Required parameter body was null or undefined when calling userDelete.');
+            }
+            const localVarPath = `/api/user`;
+            // use dummy base URL string because the URL constructor only accepts absolute URLs.
+            const localVarUrlObj = new URL(localVarPath, 'https://example.com');
+            let baseOptions;
+            if (configuration) {
+                baseOptions = configuration.baseOptions;
+            }
+            const localVarRequestOptions :AxiosRequestConfig = { method: 'DELETE', ...baseOptions, ...options};
+            const localVarHeaderParameter = {} as any;
+            const localVarQueryParameter = {} as any;
+
+            // authentication authorization_admin required
+            // http bearer authentication required
+            if (configuration && configuration.accessToken) {
+                const accessToken = typeof configuration.accessToken === 'function'
+                    ? await configuration.accessToken()
+                    : await configuration.accessToken;
+                localVarHeaderParameter["Authorization"] = "Bearer " + accessToken;
+            }
+
+            localVarHeaderParameter['Content-Type'] = 'application/json';
+
+            const query = new URLSearchParams(localVarUrlObj.search);
+            for (const key in localVarQueryParameter) {
+                query.set(key, localVarQueryParameter[key]);
+            }
+            for (const key in options.params) {
+                query.set(key, options.params[key]);
+            }
+            localVarUrlObj.search = (new URLSearchParams(query)).toString();
+            let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {};
+            localVarRequestOptions.headers = {...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers};
+            const needsSerialization = (typeof body !== "string") || localVarRequestOptions.headers['Content-Type'] === 'application/json';
+            localVarRequestOptions.data =  needsSerialization ? JSON.stringify(body !== undefined ? body : {}) : (body || "");
+
+            return {
+                url: localVarUrlObj.pathname + localVarUrlObj.search + localVarUrlObj.hash,
+                options: localVarRequestOptions,
+            };
+        },
         /**
          * This function is an API endpoint that enables or disables users.  ## Parameters  - `request`: A JSON object containing the list of users to enable or disable.  ## Returns  If successful, this function returns a `Json<UsersResponse>` object containing the updated user information.
          * @summary Enable users
@@ -417,6 +470,20 @@ export const UserApiFp = function(configuration?: Configuration) {
                 return axios.request(axiosRequestArgs);
             };
         },
+        /**
+         * This function is an API endpoint that deletes a user.  ## Parameters  - `request`: A JSON object containing the list of users to delete.  ## Returns  If successful, this function returns a `Json<UsersResponse>` object containing the number of users deleted.
+         * @summary Delete user
+         * @param {DeleteUserRequest} body 
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        async userDelete(body: DeleteUserRequest, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => Promise<AxiosResponse<UsersResponse>>> {
+            const localVarAxiosArgs = await UserApiAxiosParamCreator(configuration).userDelete(body, options);
+            return (axios: AxiosInstance = globalAxios, basePath: string = BASE_PATH) => {
+                const axiosRequestArgs :AxiosRequestConfig = {...localVarAxiosArgs.options, url: basePath + localVarAxiosArgs.url};
+                return axios.request(axiosRequestArgs);
+            };
+        },
         /**
          * This function is an API endpoint that enables or disables users.  ## Parameters  - `request`: A JSON object containing the list of users to enable or disable.  ## Returns  If successful, this function returns a `Json<UsersResponse>` object containing the updated user information.
          * @summary Enable users
@@ -508,6 +575,16 @@ export const UserApiFactory = function (configuration?: Configuration, basePath?
         async userAdd(body: AddUserRequest, options?: AxiosRequestConfig): Promise<AxiosResponse<UsersResponse>> {
             return UserApiFp(configuration).userAdd(body, options).then((request) => request(axios, basePath));
         },
+        /**
+         * This function is an API endpoint that deletes a user.  ## Parameters  - `request`: A JSON object containing the list of users to delete.  ## Returns  If successful, this function returns a `Json<UsersResponse>` object containing the number of users deleted.
+         * @summary Delete user
+         * @param {DeleteUserRequest} body 
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        async userDelete(body: DeleteUserRequest, options?: AxiosRequestConfig): Promise<AxiosResponse<UsersResponse>> {
+            return UserApiFp(configuration).userDelete(body, options).then((request) => request(axios, basePath));
+        },
         /**
          * This function is an API endpoint that enables or disables users.  ## Parameters  - `request`: A JSON object containing the list of users to enable or disable.  ## Returns  If successful, this function returns a `Json<UsersResponse>` object containing the updated user information.
          * @summary Enable users
@@ -586,6 +663,17 @@ export class UserApi extends BaseAPI {
     public async userAdd(body: AddUserRequest, options?: AxiosRequestConfig) : Promise<AxiosResponse<UsersResponse>> {
         return UserApiFp(this.configuration).userAdd(body, options).then((request) => request(this.axios, this.basePath));
     }
+    /**
+     * This function is an API endpoint that deletes a user.  ## Parameters  - `request`: A JSON object containing the list of users to delete.  ## Returns  If successful, this function returns a `Json<UsersResponse>` object containing the number of users deleted.
+     * @summary Delete user
+     * @param {DeleteUserRequest} body 
+     * @param {*} [options] Override http request option.
+     * @throws {RequiredError}
+     * @memberof UserApi
+     */
+    public async userDelete(body: DeleteUserRequest, options?: AxiosRequestConfig) : Promise<AxiosResponse<UsersResponse>> {
+        return UserApiFp(this.configuration).userDelete(body, options).then((request) => request(this.axios, this.basePath));
+    }
     /**
      * This function is an API endpoint that enables or disables users.  ## Parameters  - `request`: A JSON object containing the list of users to enable or disable.  ## Returns  If successful, this function returns a `Json<UsersResponse>` object containing the updated user information.
      * @summary Enable users