add Cors, dotenv and clippy

Author: ImGabe

.gitignore

@@ -1,2 +1,3 @@
 /target
-.direnv
+.direnv
+.env

Cargo.lock

@@ -8,6 +8,7 @@ nanoid = "0.4.0"
 url = "2.2.2"
 bb8 = "0.7.0"
 bb8-redis = "0.9.0"
+dotenv = "0.15.0"
 
 [dependencies.redis]
 version = "0.20.2"

Cargo.toml

@@ -0,0 +1,2 @@
+[debug]
+port = 8080

Rocket.toml

@@ -11,7 +11,7 @@
     in rec {
       # `nix build`
       packages.my-project = naersk-lib.buildPackage {
-        pname = "my-project";
+        pname = "ulink";
         root = ./.;
       };
       defaultPackage = packages.my-project;
@@ -24,7 +24,7 @@
 
       # `nix develop`
       devShell = pkgs.mkShell {
-        nativeBuildInputs = with pkgs; [ rustc cargo rust-analyzer ];
+        nativeBuildInputs = with pkgs; [ rustc cargo clippy rust-analyzer docker-compose ];
       };
     });
-}
+}

flake.nix

@@ -1,4 +1,4 @@
-use std::ops::{Deref, DerefMut};
+use std::{ops::{Deref, DerefMut}};
 
 use bb8_redis::RedisConnectionManager;
 use rocket::{

src/db.rs

@@ -1,3 +1,5 @@
+extern crate dotenv;
+
 mod consts;
 mod db;
 mod models;
@@ -6,10 +8,15 @@ use bb8_redis::redis::AsyncCommands;
 use db::RedisConnection;
 use models::{NewShorterURL, ShorterURL};
 use nanoid::nanoid;
-use rocket::response::status::Created;
+use rocket::{http::{ContentType, Method}, response::status::Created};
 use rocket::response::Redirect;
 use rocket::serde::json::Json;
-use rocket::{get, launch, post, routes, Responder};
+use rocket::{get, launch, post, options, routes, Request, Response, Responder};
+use rocket::http::Header;
+use rocket::fairing::{Fairing, Info, Kind};
+use dotenv::dotenv;
+use std::env;
+
 
 const REDIS_KEY_PREFIX: &str = "microshort::ids";
 
@@ -18,6 +25,9 @@ async fn index() -> &'static str {
     "Hello, world!"
 }
 
+#[options("/")]
+async fn cors() {}
+
 #[post("/", format = "json", data = "<data>")]
 async fn shorten(
     data: Json<NewShorterURL>,
@@ -27,6 +37,8 @@ async fn shorten(
         let id = nanoid!(4, &consts::ALPHANUMERIC);
         let key = format!("{}::{}", REDIS_KEY_PREFIX, id);
         let result = conn.set_nx(&key, &data.url).await.expect("RedisSetNXError");
+        
+        conn.expire::<&str, usize>(&key, data.duration).await.expect("RedisExpireError");
 
         if result {
             break id;
@@ -58,9 +70,42 @@ async fn access(id: &str, mut conn: RedisConnection<'_>) -> AccessResponse {
     }
 }
 
+struct Cors;
+
+#[rocket::async_trait]
+impl Fairing for Cors {
+    fn info(&self) -> Info {
+        Info {
+            name: "My Custom Fairing",
+            kind:  Kind::Response
+        }
+    }
+
+    async fn on_response<'r>(&self, req: &'r Request<'_>, res: &mut Response<'r>) {
+        let origin = match env::var("ORIGIN_ADDRESS") {
+            Ok(val) => val,
+            Err(e) => panic!("{}", e),
+        };
+
+        if req.method() == Method::Options || res.content_type() == Some(ContentType::JSON) {
+            res.set_header(Header::new("Access-Control-Allow-Origin", origin));
+            res.set_header(Header::new("Access-Control-Allow-Methods", "POST, GET, OPTIONS"));
+            res.set_header(Header::new("Access-Control-Allow-Headers", "Content-Type"));
+            res.set_header(Header::new("Access-Control-Allow-Credentials", "true"));
+        }
+
+        if req.method() == Method::Options {
+            res.set_header(ContentType::Plain);
+        }
+    }
+}
+
 #[launch]
 async fn rocket() -> _ {
+    dotenv().ok();
+
     rocket::build()
+        .attach(Cors)
         .manage(db::pool().await)
-        .mount("/", routes![index, access, shorten])
+        .mount("/", routes![index, access, shorten, cors])
 }