#41 Ran project successfully

Author: Dominux

deploy/dev/.env

@@ -1,3 +1,4 @@
 DATABASE_URL=postgres://dgs:lmao@db/dgs
 PORT=8000
 ALLOWED_ORIGINS = "http://localhost:3000"
+MODE=DEV

deploy/prod/.env

@@ -1,3 +1,4 @@
 DATABASE_URL=postgres://dgs:lmao@db/dgs
 PORT=8100
 ALLOWED_ORIGINS = "https://dominux.github.io"
+MODE=PROD

deploy/test/.env

@@ -1,4 +1,5 @@
 DATABASE_URL=postgres://dgs:lmao@db
 PORT=8000
 ALLOWED_ORIGINS = "http://localhost:3000"
+MODE=TEST
 

server/src/app.rs

@@ -9,7 +9,7 @@ use tracing::Level;
 
 use crate::{
     apps::{games::routers::GamesRouter, rooms::routers::RoomsRouter, users::routers::UsersRouter},
-    common::routing::app_state::AppState,
+    common::{config::Mode, routing::app_state::AppState},
 };
 
 pub fn create_app(app_state: Arc<AppState>) -> Router {
@@ -25,14 +25,21 @@ pub fn create_app(app_state: Arc<AppState>) -> Router {
                 .collect::<Vec<_>>(),
         );
 
-    Router::new()
+    let mode = app_state.config.mode.clone();
+
+    let router = Router::new()
         .nest("/users", UsersRouter::get_router(app_state.clone()))
         .nest("/games", GamesRouter::get_router(app_state.clone()))
         .nest("/rooms", RoomsRouter::get_router(app_state))
         .layer(
             TraceLayer::new_for_http()
                 .make_span_with(trace::DefaultMakeSpan::new().level(Level::INFO))
                 .on_response(trace::DefaultOnResponse::new().level(Level::INFO)),
-        )
-    // .layer(dgs_cors)
+        );
+
+    if matches!(mode, Mode::Dev) {
+        router.layer(dgs_cors)
+    } else {
+        router
+    }
 }

server/src/common/config.rs

@@ -1,12 +1,12 @@
 use std::{env, str::FromStr};
 
 use super::errors::{DGSError, DGSResult};
-
 #[derive(Debug, Clone)]
 pub struct Config {
     pub db_uri: String,
     pub port: u16,
     pub allowed_origins: Vec<String>,
+    pub mode: Mode,
 }
 
 impl Config {
@@ -17,11 +17,13 @@ impl Config {
             .split(" ")
             .map(|origin| origin.to_string())
             .collect();
+        let mode = Self::get_env_var::<String>("MODE")?.as_str().parse()?;
 
         Ok(Self {
             db_uri,
             port,
             allowed_origins,
+            mode,
         })
     }
 
@@ -33,3 +35,23 @@ impl Config {
             .map_err(|_| DGSError::EnvVarParsingError(env_var.to_owned()))
     }
 }
+
+#[derive(Debug, Clone)]
+pub enum Mode {
+    Test,
+    Dev,
+    Prod,
+}
+
+impl FromStr for Mode {
+    type Err = DGSError;
+
+    fn from_str(s: &str) -> Result<Self, Self::Err> {
+        match s.to_lowercase().as_str() {
+            "test" => Ok(Self::Test),
+            "dev" => Ok(Self::Dev),
+            "prod" => Ok(Self::Prod),
+            _ => Err(DGSError::EnvVarParsingError(s.to_string())),
+        }
+    }
+}