From 76bbcb5de8d2fae6f13daa08d44e4ec729a9e11c Mon Sep 17 00:00:00 2001
From: David Darrell <david.darrell@gmail.com>
Date: Sun, 24 Jun 2018 19:29:19 +0800
Subject: [PATCH] Always set 'secret_key' in session example.

This commit also removes a previously unused 'Flash' message.
---
 examples/session/Rocket.toml | 7 +------
 examples/session/src/main.rs | 6 +++---
 2 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/examples/session/Rocket.toml b/examples/session/Rocket.toml
index 42a09793..1f0e0de2 100644
--- a/examples/session/Rocket.toml
+++ b/examples/session/Rocket.toml
@@ -1,7 +1,2 @@
-[staging]
-secret_key = "itlYmFR2vYKrOmFhupMIn/hyB6lYCCTXz4yaQX89XVg="
-address = "localhost"
-port = 8000
-
-[production]
+[global]
 secret_key = "itlYmFR2vYKrOmFhupMIn/hyB6lYCCTXz4yaQX89XVg="
diff --git a/examples/session/src/main.rs b/examples/session/src/main.rs
index b130fa4b..1cc392a7 100644
--- a/examples/session/src/main.rs
+++ b/examples/session/src/main.rs
@@ -36,12 +36,12 @@ impl<'a, 'r> FromRequest<'a, 'r> for User {
 }
 
 #[post("/login", data = "<login>")]
-fn login(mut cookies: Cookies, login: Form<Login>) -> Flash<Redirect> {
+fn login(mut cookies: Cookies, login: Form<Login>) -> Result<Redirect, Flash<Redirect>> {
     if login.get().username == "Sergio" && login.get().password == "password" {
         cookies.add_private(Cookie::new("user_id", 1.to_string()));
-        Flash::success(Redirect::to(uri!(index)), "Successfully logged in.")
+        Ok(Redirect::to(uri!(index)))
     } else {
-        Flash::error(Redirect::to(uri!(login_page)), "Invalid username/password.")
+        Err(Flash::error(Redirect::to(uri!(login_page)), "Invalid username/password."))
     }
 }