chore: move server to a separate file

3 files changed, 45 insertions, 44 deletions

diff --git a/bin/test b/bin/test
index a5298f3..e644d2a 100755
--- a/bin/test
+++ b/bin/test
@@ -40,6 +40,7 @@ class ServerTest < Minitest::Test
   def test_metadata
     response = client.get(base_url + "/.well-known/oauth-authorization-server")
     assert_equal "200", response.code
+    assert_equal "application/json", response["Content-Type"]
   end
 
   # /token - Token endpoint https://datatracker.ietf.org/doc/html/rfc8693#section-2.3
@@ -54,4 +55,3 @@ class ServerTest < Minitest::Test
   def test_revoke
   end
 end
-
diff --git a/src/main.rs b/src/main.rs
index 15e17ae..a579181 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -1,48 +1,8 @@
-use std::fs;
-use std::io::BufReader;
-use std::io::prelude::*;
-use std::net::TcpListener;
-use std::net::TcpStream;
-
-pub struct Server {
-    bind: String,
-}
-
-impl Server {
-    pub fn new(bind: String) -> Server {
-        Server { bind }
-    }
-
-    pub fn start(&self) {
-        let listener = TcpListener::bind(self.bind.clone()).unwrap();
-        for next_stream in listener.incoming() {
-            self.handle(next_stream.unwrap());
-        }
-    }
-
-    pub fn handle(&self, mut stream: TcpStream) {
-        let io = BufReader::new(&stream);
-        let request_line = io.lines().next().unwrap().unwrap();
-
-        let (status_line, filename) = match &request_line[..] {
-            "GET / HTTP/1.1" => ("HTTP/1.1 200 OK", "./public/index.html"),
-            "GET /.well-known/oauth-authorization-server HTTP/1.1" => {
-                ("HTTP/1.1 200 OK", "./public/metadata.json")
-            }
-            _ => ("HTTP/1.1 404 NOT FOUND", "./public/404.html"),
-        };
-
-        let contents = fs::read_to_string(filename).unwrap();
-        let length = contents.len();
-        let response = format!("{status_line}\r\nContent-Length: {length}\r\n\r\n{contents}");
-
-        stream.write_all(response.as_bytes()).unwrap();
-    }
-}
+mod server;
 
 fn main() {
-    let server = Server::new("127.0.0.1:7878".to_string());
-    server.start()
+    let server = server::Server::new(String::from("127.0.0.1:7878"));
+    server.start();
 }
 
 #[cfg(test)]
diff --git a/src/server.rs b/src/server.rs
new file mode 100644
index 0000000..709aba1
--- /dev/null
+++ b/src/server.rs
@@ -0,0 +1,41 @@
+use std::fs;
+use std::io::BufReader;
+use std::io::prelude::*;
+use std::net::TcpListener;
+use std::net::TcpStream;
+
+pub struct Server {
+    bind: String,
+}
+
+impl Server {
+    pub fn new(bind: String) -> Server {
+        Server { bind }
+    }
+
+    pub fn start(&self) {
+        let listener = TcpListener::bind(self.bind.clone()).unwrap();
+        for next_stream in listener.incoming() {
+            self.handle(next_stream.unwrap());
+        }
+    }
+
+    pub fn handle(&self, mut stream: TcpStream) {
+        let io = BufReader::new(&stream);
+        let request_line = io.lines().next().unwrap().unwrap();
+
+        let (status_line, filename) = match &request_line[..] {
+            "GET / HTTP/1.1" => ("HTTP/1.1 200 OK", "./public/index.html"),
+            "GET /.well-known/oauth-authorization-server HTTP/1.1" => {
+                ("HTTP/1.1 200 OK", "./public/metadata.json")
+            }
+            _ => ("HTTP/1.1 404 NOT FOUND", "./public/404.html"),
+        };
+
+        let contents = fs::read_to_string(filename).unwrap();
+        let length = contents.len();
+        let response = format!("{status_line}\r\nContent-Length: {length}\r\n\r\n{contents}");
+
+        stream.write_all(response.as_bytes()).unwrap();
+    }
+}