From 86403afdc232d4ac61e9975d9b2850e9fc0986eb Mon Sep 17 00:00:00 2001
From: Alex Feyerke <espy@users.noreply.github.com>
Date: Mon, 19 Oct 2015 11:40:39 +0200
Subject: [PATCH 1/5] feat(error-handling,login): redirect to login on 403,
 token expiration

---
 app/controllers/login.js    |  2 ++
 app/routes/authenticated.js | 13 ++++++++-----
 app/templates/login.hbs     |  4 +++-
 3 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/app/controllers/login.js b/app/controllers/login.js
index 0c7c2e6..e93f17b 100644
--- a/app/controllers/login.js
+++ b/app/controllers/login.js
@@ -1,6 +1,8 @@
 import Ember from 'ember';
 
 export default Ember.Controller.extend({
+  queryParams: ['expired'],
+  expired: null,
 
   reset: function() {
     this.setProperties({
diff --git a/app/routes/authenticated.js b/app/routes/authenticated.js
index ca9973a..93d6b28 100644
--- a/app/routes/authenticated.js
+++ b/app/routes/authenticated.js
@@ -4,20 +4,23 @@ export default Ember.Route.extend({
   // Before the model is loaded, check if the admin is signed in, and redirect to login if not
   beforeModel: function(transition) {
     if (!window.hoodieAdmin.account.isSignedIn()) {
-      this.redirectToLogin(transition);
+      this.redirectToLogin(transition, false);
     }
   },
 
-  redirectToLogin: function(transition) {
+  redirectToLogin: function(transition, expired) {
+    // Only show the "please log in again" message if explicitly requested
+    expired = expired || false;
     var loginController = this.controllerFor('login');
     loginController.set('attemptedTransition', transition);
-    this.transitionTo('login');
+    this.transitionTo('login', {expired: expired});
   },
 
   actions: {
     error: function(reason, transition) {
-      if (reason.status === 401) {
-        this.redirectToLogin(transition);
+      // If the token has expired, send back to login
+      if (reason.status === 401 || reason.status === 403) {
+        this.redirectToLogin(transition, true);
       } else {
         console.log('Something went wrong: ', reason);
       }
diff --git a/app/templates/login.hbs b/app/templates/login.hbs
index 325f2c3..85abd00 100644
--- a/app/templates/login.hbs
+++ b/app/templates/login.hbs
@@ -4,7 +4,9 @@
 <div class="login-container">
   <form class="form-inline login" {{action login on="submit"}}>
     <img src="assets/images/hoodie_logo.svg" alt="" class="fitWidth">
-    <label for="password">Please enter your admin password:</label>
+    {{#if expired}}
+      <p>You've been gone for too long, please re-enter your password:</p>
+    {{/if}}
     <div class="inputs">
     {{input id="password" value=password type="password" placeholder="Admin password" autofocus="autofocus"}}
     {{input class="btn" type="submit" value="Log In"}}

From 47a7cdd1adbbe4eeb0a6c826c4b5b515d09695b0 Mon Sep 17 00:00:00 2001
From: Alex Feyerke <espy@users.noreply.github.com>
Date: Mon, 19 Oct 2015 12:52:44 +0200
Subject: [PATCH 2/5] feat(login): redirect to users page on fresh login

---
 app/controllers/login.js    | 7 ++++---
 app/routes/authenticated.js | 6 ++++--
 www/index.html              | 2 +-
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/app/controllers/login.js b/app/controllers/login.js
index e93f17b..0ecb4ff 100644
--- a/app/controllers/login.js
+++ b/app/controllers/login.js
@@ -1,8 +1,8 @@
 import Ember from 'ember';
 
 export default Ember.Controller.extend({
-  queryParams: ['expired'],
-  expired: null,
+  expired: false,
+  attemptedTransition: null,
 
   reset: function() {
     this.setProperties({
@@ -30,13 +30,14 @@ export default Ember.Controller.extend({
   // or go to a default route.
   gotoRoute: function (self) {
     self.setBearerToken();
+    self.set('expired', false);
     var attemptedTransition = self.get('attemptedTransition');
     if (attemptedTransition) {
       attemptedTransition.retry();
       self.set('attemptedTransition', null);
     } else {
       // Redirect to 'plugins' by default.
-      self.transitionToRoute('plugins');
+      self.transitionToRoute('plugins.users');
     }
   },
 
diff --git a/app/routes/authenticated.js b/app/routes/authenticated.js
index 93d6b28..ba78d55 100644
--- a/app/routes/authenticated.js
+++ b/app/routes/authenticated.js
@@ -1,7 +1,8 @@
 import Ember from 'ember';
 
 export default Ember.Route.extend({
-  // Before the model is loaded, check if the admin is signed in, and redirect to login if not
+  // Before the model is loaded, check if the admin is signed in,
+  // and redirect to login if not
   beforeModel: function(transition) {
     if (!window.hoodieAdmin.account.isSignedIn()) {
       this.redirectToLogin(transition, false);
@@ -13,7 +14,8 @@ export default Ember.Route.extend({
     expired = expired || false;
     var loginController = this.controllerFor('login');
     loginController.set('attemptedTransition', transition);
-    this.transitionTo('login', {expired: expired});
+    loginController.set('expired', expired);
+    this.transitionTo('login');
   },
 
   actions: {
diff --git a/www/index.html b/www/index.html
index 474b5e0..11e4b7c 100644
--- a/www/index.html
+++ b/www/index.html
@@ -8,7 +8,7 @@
     <meta name="viewport" content="width=device-width, initial-scale=1">
 
     
-<meta name="hoodie-admin-dashboard/config/environment" content="%7B%22modulePrefix%22%3A%22hoodie-admin-dashboard%22%2C%22environment%22%3A%22development%22%2C%22baseURL%22%3A%22/%22%2C%22locationType%22%3A%22hash%22%2C%22EmberENV%22%3A%7B%22FEATURES%22%3A%7B%7D%7D%2C%22APP%22%3A%7B%22name%22%3A%22hoodie-admin-dashboard%22%2C%22version%22%3A%22master+42a8a862%22%7D%2C%22exportApplicationGlobal%22%3Atrue%7D" />
+<meta name="hoodie-admin-dashboard/config/environment" content="%7B%22modulePrefix%22%3A%22hoodie-admin-dashboard%22%2C%22environment%22%3A%22development%22%2C%22baseURL%22%3A%22/%22%2C%22locationType%22%3A%22hash%22%2C%22EmberENV%22%3A%7B%22FEATURES%22%3A%7B%7D%7D%2C%22APP%22%3A%7B%22name%22%3A%22hoodie-admin-dashboard%22%2C%22version%22%3A%22handle-403s+86403afd%22%7D%2C%22exportApplicationGlobal%22%3Atrue%7D" />
 <script src="/ember-cli-live-reload.js" type="text/javascript"></script>
 
     <link rel="stylesheet" href="assets/uikit.css">

From ad539231ab3a10e01887d76b4e724d97f91b57c4 Mon Sep 17 00:00:00 2001
From: Alex Feyerke <espy@users.noreply.github.com>
Date: Mon, 19 Oct 2015 13:05:33 +0200
Subject: [PATCH 3/5] fix(uikit): input hover and focus state

---
 app/styles/uikit.scss | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/app/styles/uikit.scss b/app/styles/uikit.scss
index 9bcbf30..acbda23 100644
--- a/app/styles/uikit.scss
+++ b/app/styles/uikit.scss
@@ -283,10 +283,17 @@ form{
     font-size: 16px;
     height: 44px;
     width: 70%;
+    box-shadow: none;
     &.select2-container{
       padding: 0;
       border: none;
     }
+    &:focus {
+      border-color: $strongLightBlue;
+      outline: 0;
+      box-shadow: none;
+      box-shadow: 0 0 0 3px rgba(102, 175, 233, 0.6);
+    }
   }
 }
 

From 095ccba029499be09f6295b00a32af704dd375bc Mon Sep 17 00:00:00 2001
From: Alex Feyerke <espy@users.noreply.github.com>
Date: Mon, 19 Oct 2015 13:08:34 +0200
Subject: [PATCH 4/5] fix(guide): correct url for uikit.js

---
 guide/index.html | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/guide/index.html b/guide/index.html
index b7da8e5..cb3734b 100644
--- a/guide/index.html
+++ b/guide/index.html
@@ -23,7 +23,7 @@ <h2>Including the UIKit</h2>
   <p>In your html's head: </p>
   <pre><code class="language-markup">&lt;link rel="stylesheet" href="/hoodie/admin/assets/uikit.css"></code></pre>
   <p>And before the closing body tag:</p>
-  <pre><code class="language-markup">&lt;script src="/hoodie/admin/uikit.js">&lt;/script></code></pre>
+  <pre><code class="language-markup">&lt;script src="/hoodie/admin/assets/uikit.js">&lt;/script></code></pre>
   <h2>Quickstart Template</h2>
   <p>Here's a handy template so you can get started without any hassle:</p>
   <pre><code class="language-markup">&lt;!doctype html>
@@ -34,7 +34,7 @@ <h2>Quickstart Template</h2>
   &lt;title>My Hoodie Plugin&lt;/title>
 
   &lt;!-- Admin Dashboard UIKit CSS -->
-  &lt;link rel="stylesheet" href="/hoodie/admin/uikit.css">
+  &lt;link rel="stylesheet" href="/hoodie/admin/assets/uikit.css">
 &lt;/head>
 &lt;body>
   &lt;div class="container">
@@ -42,7 +42,7 @@ <h2>Quickstart Template</h2>
   &lt;/div>
 
   &lt;!-- Admin Dashboard UIKit JS (includes jQuery and Boostrap Components) -->
-  &lt;script src="/hoodie/admin/uikit.js">&lt;/script>
+  &lt;script src="/hoodie/admin/assets/uikit.js">&lt;/script>
 &lt;/body>
 &lt;/html></code></pre>
   <p class="note">Please put all of your plugin's markup in the div with the class <code>container</code>.</p>

From b01363d0bc7af91341caad4b5861aede9e6de800 Mon Sep 17 00:00:00 2001
From: Alex Feyerke <espy@users.noreply.github.com>
Date: Mon, 19 Oct 2015 13:16:51 +0200
Subject: [PATCH 5/5] fix(login): redirect to users plugin when hitting root,
 too

---
 app/controllers/login.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/controllers/login.js b/app/controllers/login.js
index 0ecb4ff..b667868 100644
--- a/app/controllers/login.js
+++ b/app/controllers/login.js
@@ -30,9 +30,9 @@ export default Ember.Controller.extend({
   // or go to a default route.
   gotoRoute: function (self) {
     self.setBearerToken();
-    self.set('expired', false);
+    self.set('expired', null);
     var attemptedTransition = self.get('attemptedTransition');
-    if (attemptedTransition) {
+    if (attemptedTransition && attemptedTransition.targetName !== 'index') {
       attemptedTransition.retry();
       self.set('attemptedTransition', null);
     } else {