From bd9782a8683d60c78bdb735ce20275c7e235911f Mon Sep 17 00:00:00 2001
From: Joshua Goins <josh@redstrate.com>
Date: Sat, 11 May 2024 13:50:05 -0400
Subject: [PATCH] Move generate SID to its own dedicated function

---
 src/bin/kawari-login.rs |  9 ++-------
 src/lib.rs              | 14 +++++++++++++-
 2 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/src/bin/kawari-login.rs b/src/bin/kawari-login.rs
index 73d689f..99ba5af 100644
--- a/src/bin/kawari-login.rs
+++ b/src/bin/kawari-login.rs
@@ -7,6 +7,7 @@ use axum::routing::post;
 use rand::distributions::Alphanumeric;
 use rand::Rng;
 use serde::Deserialize;
+use kawari::generate_sid;
 
 #[derive(Deserialize)]
 #[allow(dead_code)]
@@ -33,13 +34,7 @@ struct Input {
 }
 
 async fn login_send(Form(input): Form<Input>) -> Html<String>  {
-    let random_id: String = rand::thread_rng()
-        .sample_iter(&Alphanumeric)
-        .take(56)
-        .map(char::from)
-        .collect();
-    let sid = random_id.to_lowercase();
-
+    let sid = generate_sid();
     Html(format!("window.external.user(\"login=auth,ok,sid,{sid},terms,1,region,2,etmadd,0,playable,1,ps3pkg,0,maxex,4,product,1\");"))
 }
 
diff --git a/src/lib.rs b/src/lib.rs
index a105933..338f7eb 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -1 +1,13 @@
-pub mod config;
\ No newline at end of file
+use rand::distributions::Alphanumeric;
+use rand::Rng;
+
+pub mod config;
+
+pub fn generate_sid() -> String {
+    let random_id: String = rand::thread_rng()
+        .sample_iter(&Alphanumeric)
+        .take(56)
+        .map(char::from)
+        .collect();
+    random_id.to_lowercase()
+}
\ No newline at end of file