From f7e02dc79403e74eef13e7c7bc7c8abdb9e86eb7 Mon Sep 17 00:00:00 2001 From: antifallobst Date: Sun, 10 Sep 2023 02:04:14 +0200 Subject: [PATCH] refactor(accounts): switched from deprecated function `base64::encode()` to `base64::Engine::encode()` --- ...943e04b4b796f18f6d1abb0608d5dae3bc0cd.json | 46 +++++++++++++++++++ src/accounts.rs | 6 +-- 2 files changed, 49 insertions(+), 3 deletions(-) create mode 100644 .sqlx/query-bdcf043d394bc561cd8c7dcdb27943e04b4b796f18f6d1abb0608d5dae3bc0cd.json diff --git a/.sqlx/query-bdcf043d394bc561cd8c7dcdb27943e04b4b796f18f6d1abb0608d5dae3bc0cd.json b/.sqlx/query-bdcf043d394bc561cd8c7dcdb27943e04b4b796f18f6d1abb0608d5dae3bc0cd.json new file mode 100644 index 0000000..fb247d2 --- /dev/null +++ b/.sqlx/query-bdcf043d394bc561cd8c7dcdb27943e04b4b796f18f6d1abb0608d5dae3bc0cd.json @@ -0,0 +1,46 @@ +{ + "db_name": "PostgreSQL", + "query": "SELECT * FROM Projects WHERE id = $1;", + "describe": { + "columns": [ + { + "ordinal": 0, + "name": "id", + "type_info": "Int8" + }, + { + "ordinal": 1, + "name": "name", + "type_info": "Varchar" + }, + { + "ordinal": 2, + "name": "description", + "type_info": "Text" + }, + { + "ordinal": 3, + "name": "created", + "type_info": "Timestamp" + }, + { + "ordinal": 4, + "name": "members", + "type_info": "Int8Array" + } + ], + "parameters": { + "Left": [ + "Int8" + ] + }, + "nullable": [ + false, + false, + false, + false, + false + ] + }, + "hash": "bdcf043d394bc561cd8c7dcdb27943e04b4b796f18f6d1abb0608d5dae3bc0cd" +} diff --git a/src/accounts.rs b/src/accounts.rs index c21862d..d6c475a 100644 --- a/src/accounts.rs +++ b/src/accounts.rs @@ -3,7 +3,7 @@ use argon2::{ password_hash::{rand_core::OsRng, PasswordHash, PasswordHasher, PasswordVerifier, SaltString}, Argon2, }; -use base64; +use base64::{Engine, engine::general_purpose::STANDARD as Base64Engine}; use sha2::{Digest, Sha256}; use sqlx::{postgres::PgPool, types::chrono as sqlx_chrono}; @@ -74,7 +74,7 @@ impl Account { let email_hash = { let mut hasher = Sha256::new(); hasher.update(email.as_bytes()); - base64::encode(hasher.finalize()) + Base64Engine.encode(hasher.finalize()) }; let joined = sqlx_chrono::Utc::now().naive_utc(); @@ -154,7 +154,7 @@ impl Account { let email_hash = { let mut hasher = Sha256::new(); hasher.update(email.as_bytes()); - base64::encode(hasher.finalize()) + Base64Engine.encode(hasher.finalize()) }; match sqlx::query_as!(