From b746a931a5465b0ebf62e2a72e8fbea9e0f7433c Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Sun, 23 Oct 2016 12:05:55 +0200
Subject: [PATCH] Fix OAuth authorization redirect

---
 app/assets/stylesheets/forms.scss               | 17 +++++------------
 .../oauth/authorizations_controller.rb          |  3 +++
 app/views/oauth/authorizations/show.html.haml   |  3 ++-
 3 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/app/assets/stylesheets/forms.scss b/app/assets/stylesheets/forms.scss
index f7677ac9d2f..fc670a13061 100644
--- a/app/assets/stylesheets/forms.scss
+++ b/app/assets/stylesheets/forms.scss
@@ -1,3 +1,8 @@
+code {
+  font-family: 'Roboto Mono', monospace;
+  font-weight: 400;
+}
+
 .form-container {
   max-width: 400px;
   padding: 20px;
@@ -85,18 +90,6 @@
     }
   }
 
-  code {
-    display: block;
-    font-family: 'Roboto Mono', monospace;
-    font-weight: 400;
-    font-size: 12px;
-    margin-top: 20px;
-    background: #282c37;
-    border-radius: 4px;
-    padding: 2px;
-    word-wrap: break-word;
-  }
-
   .actions {
     margin-top: 30px;
   }
diff --git a/app/controllers/oauth/authorizations_controller.rb b/app/controllers/oauth/authorizations_controller.rb
index f5f05814ec9..e2d154597b8 100644
--- a/app/controllers/oauth/authorizations_controller.rb
+++ b/app/controllers/oauth/authorizations_controller.rb
@@ -1,5 +1,8 @@
 class Oauth::AuthorizationsController < Doorkeeper::AuthorizationsController
+  skip_before_action :authenticate_resource_owner!
+
   before_action :store_current_location
+  before_action :authenticate_resource_owner!
 
   private
 
diff --git a/app/views/oauth/authorizations/show.html.haml b/app/views/oauth/authorizations/show.html.haml
index d1a3e1f81a0..897a15cee53 100644
--- a/app/views/oauth/authorizations/show.html.haml
+++ b/app/views/oauth/authorizations/show.html.haml
@@ -1 +1,2 @@
-%code= params[:code]
+.flash-message
+  %code= params[:code]