From d030accddc70237fb38ec0a7a8d13e5cd53e8f82 Mon Sep 17 00:00:00 2001 From: shockrah Date: Wed, 7 Apr 2021 20:48:58 -0700 Subject: [PATCH] * Adding `id` to insertion call in db-lib::channel::add This is done at the driver level because the member id's are randomly generated u64's --- json-api/db/src/member.rs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/json-api/db/src/member.rs b/json-api/db/src/member.rs index 5ef3138..8605eee 100644 --- a/json-api/db/src/member.rs +++ b/json-api/db/src/member.rs @@ -55,7 +55,7 @@ impl Member { Ok(Response::Set(members)) } } - pub async fn add(p: &Pool, name: &str, secret: &str, perms: u64) -> Result, SqlError> { + pub async fn add(p: &Pool, name: &str, enc_secret: &str, perms: u64) -> Result, SqlError> { //! @param {pool} p //! @param {&str} name of new user //! @param {&str} encrypted secret : userland auth module should have a function for this @@ -68,11 +68,11 @@ impl Member { let id: u64 = rand::rngs::OsRng.next_u64(); conn.exec_drop( - "INSERT INTO members(secret, name, status, permissions) + "INSERT INTO members(id, secret, name, status, permissions) VALUES(:id, :secret, :name, :status, :permissions)", mysql_async::params!{ "id" => id, - "secret" => secret.clone(), + "secret" => enc_secret.clone(), "name" => name.clone(), "status" => STATUS_ONLINE, "permissions" => perms @@ -80,7 +80,7 @@ impl Member { return Ok(Response::Row(Self { id, - secret: secret.into(), + secret: enc_secret.into(), name: name.into(), status: STATUS_ONLINE, permissions: perms