From 9d8be9875ee10ec07e8e45e102a2e8158497587a Mon Sep 17 00:00:00 2001
From: EETagent <vojta.jungmann@gmail.com>
Date: Fri, 16 Dec 2022 13:31:22 +0100
Subject: [PATCH 1/6] feat: 12 letter code input

---
 .../login/[code=application]/+page.svelte     | 20 ++++++++++++++++---
 1 file changed, 17 insertions(+), 3 deletions(-)

diff --git a/frontend/src/routes/(candidate)/auth/login/[code=application]/+page.svelte b/frontend/src/routes/(candidate)/auth/login/[code=application]/+page.svelte
index ac92360..2d7343a 100644
--- a/frontend/src/routes/(candidate)/auth/login/[code=application]/+page.svelte
+++ b/frontend/src/routes/(candidate)/auth/login/[code=application]/+page.svelte
@@ -89,7 +89,7 @@
 					type="text"
 				/>
 			{/each}
-			<span class="bg-sspsBlue mr-2 hidden h-2 w-8 sm:block" />
+			<span class="separater" />
 			{#each [5, 6, 7, 8] as value}
 				<input
 					class="codeInputDesktop"
@@ -100,6 +100,17 @@
 					type="text"
 				/>
 			{/each}
+			<span class="separater" />
+			{#each [9, 10, 11, 12] as value}
+			<input
+				class="codeInputDesktop"
+				bind:this={codeElementArray[value - 1]}
+				bind:value={codeValueArray[value - 1]}
+				on:keydown={(e) => inputDesktopOnKeyDown(value - 1, e)}
+				on:paste|preventDefault={(e) => onPaste(e)}
+				type="text"
+			/>
+		{/each}
 		</div>
 		<h3 class="text-sspsBlue mx-8 mt-8 text-center text-xl font-semibold">
 			Zadejte 8místný kód pro aktivaci účtu
@@ -120,13 +131,16 @@
 		@apply text-sspsBlue text-center font-semibold;
 		@apply focus:border-sspsBlue hover:border-sspsBlue rounded-xl border border-2 bg-[#f8fafb] p-3 caret-transparent shadow-lg outline-none  transition-colors  duration-300;
 	}
+	.separater {
+		@apply bg-sspsBlue mr-2 hidden h-2 w-8 md:block
+	}
 	.codeInputMobile {
-		@apply sm:hidden;
+		@apply md:hidden;
 		@apply mx-5 w-full;
 	}
 	.codeInputDesktop {
 		@apply hidden;
 		@apply mr-1 md:mr-2;
-		@apply sm:h-15 xl:w-18 xl:h-22 sm:block sm:w-12 sm:text-xl md:h-20 md:w-16 md:text-4xl xl:p-0 xl:text-4xl;
+		@apply sm:h-15 xl:w-18 xl:h-22 md:block sm:w-12 sm:text-xl md:h-20 md:w-16 md:text-4xl xl:p-0 xl:text-4xl;
 	}
 </style>

From 570dcfb9e51b77aee3a9ab39dbea7bd8f33e2661 Mon Sep 17 00:00:00 2001
From: EETagent <vojta.jungmann@gmail.com>
Date: Fri, 16 Dec 2022 13:36:16 +0100
Subject: [PATCH 2/6] feat: improve dimensions

---
 .../login/[code=application]/+page.svelte     | 25 ++++++++++---------
 1 file changed, 13 insertions(+), 12 deletions(-)

diff --git a/frontend/src/routes/(candidate)/auth/login/[code=application]/+page.svelte b/frontend/src/routes/(candidate)/auth/login/[code=application]/+page.svelte
index 2d7343a..77b10ef 100644
--- a/frontend/src/routes/(candidate)/auth/login/[code=application]/+page.svelte
+++ b/frontend/src/routes/(candidate)/auth/login/[code=application]/+page.svelte
@@ -102,15 +102,15 @@
 			{/each}
 			<span class="separater" />
 			{#each [9, 10, 11, 12] as value}
-			<input
-				class="codeInputDesktop"
-				bind:this={codeElementArray[value - 1]}
-				bind:value={codeValueArray[value - 1]}
-				on:keydown={(e) => inputDesktopOnKeyDown(value - 1, e)}
-				on:paste|preventDefault={(e) => onPaste(e)}
-				type="text"
-			/>
-		{/each}
+				<input
+					class="codeInputDesktop"
+					bind:this={codeElementArray[value - 1]}
+					bind:value={codeValueArray[value - 1]}
+					on:keydown={(e) => inputDesktopOnKeyDown(value - 1, e)}
+					on:paste|preventDefault={(e) => onPaste(e)}
+					type="text"
+				/>
+			{/each}
 		</div>
 		<h3 class="text-sspsBlue mx-8 mt-8 text-center text-xl font-semibold">
 			Zadejte 8místný kód pro aktivaci účtu
@@ -129,10 +129,11 @@
 	}
 	input {
 		@apply text-sspsBlue text-center font-semibold;
-		@apply focus:border-sspsBlue hover:border-sspsBlue rounded-xl border border-2 bg-[#f8fafb] p-3 caret-transparent shadow-lg outline-none  transition-colors  duration-300;
+		@apply transition-colors duration-300;
+		@apply focus:border-sspsBlue hover:border-sspsBlue rounded-xl border border-2 bg-[#f8fafb] p-3 caret-transparent shadow-lg outline-none;
 	}
 	.separater {
-		@apply bg-sspsBlue mr-2 hidden h-2 w-8 md:block
+		@apply bg-sspsBlue mr-2 hidden h-2 w-8 md:block;
 	}
 	.codeInputMobile {
 		@apply md:hidden;
@@ -141,6 +142,6 @@
 	.codeInputDesktop {
 		@apply hidden;
 		@apply mr-1 md:mr-2;
-		@apply sm:h-15 xl:w-18 xl:h-22 md:block sm:w-12 sm:text-xl md:h-20 md:w-16 md:text-4xl xl:p-0 xl:text-4xl;
+		@apply sm:h-15 2xl:w-18 2xl:h-22 sm:w-12 sm:text-xl md:block md:h-20 md:w-16 md:text-4xl xl:h-20 xl:w-16 xl:p-0;
 	}
 </style>

From db0d72a4f23d74fe28a291546ab401ad82db53e1 Mon Sep 17 00:00:00 2001
From: Sebastian Pravda <sebastian.pravda@gmail.com>
Date: Fri, 16 Dec 2022 17:42:50 +0100
Subject: [PATCH 3/6] feat: 12 character code

---
 api/src/routes/admin.rs                |  4 +--
 core/src/crypto.rs                     | 37 +++++++++++++++-----------
 core/src/services/candidate_service.rs |  2 +-
 3 files changed, 24 insertions(+), 19 deletions(-)

diff --git a/api/src/routes/admin.rs b/api/src/routes/admin.rs
index c8e807e..cdc7333 100644
--- a/api/src/routes/admin.rs
+++ b/api/src/routes/admin.rs
@@ -1,7 +1,7 @@
 use std::net::{SocketAddr, IpAddr, Ipv4Addr};
 
 use portfolio_core::{
-    crypto::random_8_char_string,
+    crypto::random_12_char_string,
     services::{admin_service::AdminService, candidate_service::CandidateService, application_service::ApplicationService, portfolio_service::PortfolioService}, models::candidate::{BaseCandidateResponse, CreateCandidateResponse, ApplicationDetails}, sea_orm::prelude::Uuid, Query, error::ServiceError, utils::csv,
 };
 use requests::{AdminLoginRequest, RegisterRequest};
@@ -90,7 +90,7 @@ pub async fn create_candidate(
     let db = conn.into_inner();
     let form = request.into_inner();
 
-    let plain_text_password = random_8_char_string();
+    let plain_text_password = random_12_char_string();
 
     ApplicationService::create_candidate_with_parent(
         db,
diff --git a/core/src/crypto.rs b/core/src/crypto.rs
index cc6f0a4..61d8924 100644
--- a/core/src/crypto.rs
+++ b/core/src/crypto.rs
@@ -15,22 +15,27 @@ use crate::error::ServiceError;
 
 /// Foolproof random 8 char string
 /// only uppercase letters (except for 0 and O) and numbers
-pub fn random_8_char_string() -> String {
-    let iterator = rand::thread_rng()
+pub fn random_12_char_string() -> String {
+    let random_chars_12: Vec<char> = rand::thread_rng()
         .sample_iter(&rand::distributions::Alphanumeric)
-        .map(char::from);
+        .map(char::from)
+        .filter(is_usable_char)
+        .take(12)
+        .collect();
+    
+    random_chars_12
+        .iter()
+        .map(|c| c.to_string())
+        .collect::<Vec<String>>()
+        .join("")
+}
 
-    let mut s = String::new();
-    for c in iterator {
-        // add all characters except for: lowercase chars, 0 and O
-        if ('1'..='9').contains(&c) || ('A'..='N').contains(&c) || ('P'..'Z').contains(&c) {
-            s.push(c);
-            if s.len() == 8 {
-                break;
-            }
-        }
-    }
-    s
+/// Exclude O and 0, lowercase letters
+fn is_usable_char(c: &char) -> bool {
+    ('1'..='9').contains(&c) ||
+    ('A'..='N').contains(&c) ||
+    ('P'..'Z').contains(&c) ||
+    ['@', '#', '$', '%'].contains(&c)
 }
 
 pub async fn hash_password(password_plain_text: String) -> Result<String, ServiceError> {
@@ -336,7 +341,7 @@ mod tests {
     #[test]
     fn test_random_8_char_string() {
         for _ in 0..1000 {
-            let s = super::random_8_char_string();
+            let s = super::random_12_char_string();
             // Is 8 chars long
             assert_eq!(s.len(), 8);
             // Does not contain possibly confusing characters
@@ -388,7 +393,7 @@ mod tests {
         );
         assert!(key_2.len() >= 32);
 
-        let key_3 = super::convert_key_aes256(&super::random_8_char_string());
+        let key_3 = super::convert_key_aes256(&super::random_12_char_string());
         assert!(key_3.len() >= 32);
     }
 
diff --git a/core/src/services/candidate_service.rs b/core/src/services/candidate_service.rs
index d38d365..dc0639a 100644
--- a/core/src/services/candidate_service.rs
+++ b/core/src/services/candidate_service.rs
@@ -105,7 +105,7 @@ impl CandidateService {
         let parents = Query::find_candidate_parents(db, &candidate).await?;
 
             
-            let new_password_plain = crypto::random_8_char_string();
+        let new_password_plain = crypto::random_12_char_string();
         let new_password_hash = crypto::hash_password(new_password_plain.clone()).await?;
 
         let (pubkey, priv_key_plain_text) = crypto::create_identity();

From 0ef7844bcba4f811a6156934267afa0562012e47 Mon Sep 17 00:00:00 2001
From: Sebastian Pravda <sebastian.pravda@gmail.com>
Date: Fri, 16 Dec 2022 17:46:21 +0100
Subject: [PATCH 4/6] fix: random 12 character string tests

---
 api/src/routes/admin.rs | 2 +-
 core/src/crypto.rs      | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/api/src/routes/admin.rs b/api/src/routes/admin.rs
index cdc7333..02c0112 100644
--- a/api/src/routes/admin.rs
+++ b/api/src/routes/admin.rs
@@ -287,6 +287,6 @@ pub mod tests {
         let cookies = admin_login(&client);
         let response = create_candidate(&client, cookies, 1031511, "0".to_string());
     
-        assert_eq!(response.password.len(), 8);
+        assert_eq!(response.password.len(), 12);
     }
 }
\ No newline at end of file
diff --git a/core/src/crypto.rs b/core/src/crypto.rs
index 61d8924..427fb48 100644
--- a/core/src/crypto.rs
+++ b/core/src/crypto.rs
@@ -13,7 +13,7 @@ use std::str::FromStr;
 
 use crate::error::ServiceError;
 
-/// Foolproof random 8 char string
+/// Foolproof random 12 char string
 /// only uppercase letters (except for 0 and O) and numbers
 pub fn random_12_char_string() -> String {
     let random_chars_12: Vec<char> = rand::thread_rng()
@@ -339,11 +339,11 @@ pub async fn decrypt_file_with_private_key_as_buffer<P: AsRef<Path>>(
 #[cfg(test)]
 mod tests {
     #[test]
-    fn test_random_8_char_string() {
+    fn test_random_12_char_string() {
         for _ in 0..1000 {
             let s = super::random_12_char_string();
             // Is 8 chars long
-            assert_eq!(s.len(), 8);
+            assert_eq!(s.len(), 12);
             // Does not contain possibly confusing characters
             assert!(!s.contains('0'));
             assert!(!s.contains('O'));

From ad31b4be94efcca4c9f4217cd0af6dee21afeb9d Mon Sep 17 00:00:00 2001
From: Sebastian Pravda <sebastian.pravda@gmail.com>
Date: Fri, 16 Dec 2022 17:47:18 +0100
Subject: [PATCH 5/6] style: random 12 character string comment

---
 core/src/crypto.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/src/crypto.rs b/core/src/crypto.rs
index 427fb48..ae36c4a 100644
--- a/core/src/crypto.rs
+++ b/core/src/crypto.rs
@@ -14,7 +14,7 @@ use std::str::FromStr;
 use crate::error::ServiceError;
 
 /// Foolproof random 12 char string
-/// only uppercase letters (except for 0 and O) and numbers
+/// Only uppercase letters (except for O) and numbers (except for 0)
 pub fn random_12_char_string() -> String {
     let random_chars_12: Vec<char> = rand::thread_rng()
         .sample_iter(&rand::distributions::Alphanumeric)

From d7fbd267b88b7564fb16e002f6fbc653a5c381cc Mon Sep 17 00:00:00 2001
From: Sebastian Pravda <sebastian.pravda@gmail.com>
Date: Fri, 16 Dec 2022 21:14:49 +0100
Subject: [PATCH 6/6] fix: password submit

---
 .../(candidate)/auth/login/[code=application]/+page.svelte    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/frontend/src/routes/(candidate)/auth/login/[code=application]/+page.svelte b/frontend/src/routes/(candidate)/auth/login/[code=application]/+page.svelte
index 77b10ef..8719726 100644
--- a/frontend/src/routes/(candidate)/auth/login/[code=application]/+page.svelte
+++ b/frontend/src/routes/(candidate)/auth/login/[code=application]/+page.svelte
@@ -36,7 +36,7 @@
 		codeValueMobile = codeValueArray.join('');
 	};
 
-	$: if (codeValueArray.length === 8) {
+	$: if (codeValueArray.length === 12) {
 		submit();
 	}
 
@@ -113,7 +113,7 @@
 			{/each}
 		</div>
 		<h3 class="text-sspsBlue mx-8 mt-8 text-center text-xl font-semibold">
-			Zadejte 8místný kód pro aktivaci účtu
+			Zadejte 12místný kód pro aktivaci účtu
 		</h3>
 		<p class="text-sspsGray mx-8 mt-8 text-center">Nevíte si rady? Klikněte <u>zde</u></p>
 	</div>