]> cat aescling's git repositories - mastodon.git/commitdiff
Fix OAuth authorization redirect
authorEugen Rochko <eugen@zeonfederated.com>
Sun, 23 Oct 2016 10:05:55 +0000 (12:05 +0200)
committerEugen Rochko <eugen@zeonfederated.com>
Sun, 23 Oct 2016 10:05:55 +0000 (12:05 +0200)
app/assets/stylesheets/forms.scss
app/controllers/oauth/authorizations_controller.rb
app/views/oauth/authorizations/show.html.haml

index f7677ac9d2f708b6387658b908cb4c5d84930107..fc670a130615765dc73315d3674ea68fd708a814 100644 (file)
@@ -1,3 +1,8 @@
+code {
+  font-family: 'Roboto Mono', monospace;
+  font-weight: 400;
+}
+
 .form-container {
   max-width: 400px;
   padding: 20px;
     }
   }
 
-  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;
   }
index f5f05814ec96da5e48c05e3398436c2a25f8d5e8..e2d154597b8da3809487a5009cf9f65f93185f38 100644 (file)
@@ -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
 
index d1a3e1f81a08b6da3af039e0647c6e640c25526a..897a15cee5389afc6b2716774bb74c6e00b4eaaa 100644 (file)
@@ -1 +1,2 @@
-%code= params[:code]
+.flash-message
+  %code= params[:code]