From ffd83837e5f95020d75be87fb591c20c0d245d14 Mon Sep 17 00:00:00 2001
From: Andrey Orlov <aaorlov1@gmail.com>
Date: Sat, 6 Feb 2021 20:26:04 +0400
Subject: [PATCH] Add support of 'JWT_SECRET' environment variable

---
 src/database/globals.rs | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/database/globals.rs b/src/database/globals.rs
index 86c09c8..09c4d55 100644
--- a/src/database/globals.rs
+++ b/src/database/globals.rs
@@ -54,8 +54,12 @@ impl Globals<'_> {
             }
         };
 
-        let jwt_decoding_key =
-            config.get_str("jwt_secret").map(|secret| jsonwebtoken::DecodingKey::from_secret(secret.as_bytes()).into_static()).ok();
+        let jwt_decoding_key = config
+            .get_str("jwt_secret")
+            .map(ToString::to_string)
+            .or(std::env::var("JWT_SECRET"))
+            .map(|secret| jsonwebtoken::DecodingKey::from_secret(secret.as_bytes()).into_static())
+            .ok();
 
         Ok(Self {
             globals,
@@ -63,7 +67,7 @@ impl Globals<'_> {
             reqwest_client: reqwest::Client::new(),
             server_name: config
                 .get_str("server_name")
-                .map(std::string::ToString::to_string)
+                .map(ToString::to_string)
                 .unwrap_or_else(|_| {
                     std::env::var("SERVER_NAME").unwrap_or_else(|_| "localhost".to_string())
                 })