From fd4022a55cd0c17b9780cdd256c99ad1524c2287 Mon Sep 17 00:00:00 2001
From: theworldbright <kent@kentshikama.com>
Date: Sun, 22 Nov 2015 14:15:13 -0800
Subject: [PATCH] Fix pronto remarks

---
 app/assets/stylesheets/_application.scss      | 10 +++----
 .../openid_connect_error_page.scss            |  4 +--
 .../authorizations_controller.rb              | 28 +++++++++++--------
 .../step_definitions/oidc_common_steps.rb     |  1 -
 4 files changed, 23 insertions(+), 20 deletions(-)

diff --git a/app/assets/stylesheets/_application.scss b/app/assets/stylesheets/_application.scss
index d2c61e8dc..f61519547 100644
--- a/app/assets/stylesheets/_application.scss
+++ b/app/assets/stylesheets/_application.scss
@@ -1,7 +1,7 @@
 @import 'perfect-scrollbar';
 
 @import 'color-variables';
-@import "bootstrap-complete.scss";
+@import 'bootstrap-complete';
 @import 'mixins';
 
 
@@ -99,11 +99,11 @@
 @import 'statistics';
 
 /* gallery */
-@import "blueimp-gallery";
-@import "gallery";
+@import 'blueimp-gallery';
+@import 'gallery';
 
 // settings
 @import 'user_applications';
 
-// API
-@import "openid_connect_error_page";
+// OpenID Connect (API)
+@import 'openid_connect_error_page';
diff --git a/app/assets/stylesheets/openid_connect_error_page.scss b/app/assets/stylesheets/openid_connect_error_page.scss
index ccb566a5b..15e659fc3 100644
--- a/app/assets/stylesheets/openid_connect_error_page.scss
+++ b/app/assets/stylesheets/openid_connect_error_page.scss
@@ -1,7 +1,7 @@
 .api-error {
-  margin-top: 20px;
-  box-shadow: $card-shadow;
   background-color: $light-grey;
+  box-shadow: $card-shadow;
+  margin-top: 20px;
 
   h4 { text-align: center; }
 }
diff --git a/app/controllers/api/openid_connect/authorizations_controller.rb b/app/controllers/api/openid_connect/authorizations_controller.rb
index 192606ee8..a430bdd01 100644
--- a/app/controllers/api/openid_connect/authorizations_controller.rb
+++ b/app/controllers/api/openid_connect/authorizations_controller.rb
@@ -3,7 +3,7 @@ module Api
     class AuthorizationsController < ApplicationController
       rescue_from Rack::OAuth2::Server::Authorize::BadRequest do |e|
         logger.info e.backtrace[0, 10].join("\n")
-        error, description = e.message.split(" :: ")
+        error, _description = e.message.split(" :: ")
         handle_params_error(error, "The request was malformed: please double check the client id and redirect uri.")
       end
 
@@ -210,17 +210,7 @@ module Api
       def handle_prompt_none
         if params[:prompt] == "none"
           if user_signed_in?
-            client_id = params[:client_id]
-            if client_id
-              auth = Api::OpenidConnect::Authorization.find_by_client_id_and_user(client_id, current_user)
-              if auth
-                process_authorization_consent("true")
-              else
-                handle_params_error("interaction_required", "User must already be authorized when `prompt` is `none`")
-              end
-            else
-              handle_params_error("bad_request", "Client ID is missing from request")
-            end
+            handle_prompt_with_signed_in_user
           else
             handle_params_error("login_required", "User must already be logged in when `prompt` is `none`")
           end
@@ -229,6 +219,20 @@ module Api
         end
       end
 
+      def handle_prompt_with_signed_in_user
+        client_id = params[:client_id]
+        if client_id
+          auth = Api::OpenidConnect::Authorization.find_by_client_id_and_user(client_id, current_user)
+          if auth
+            process_authorization_consent("true")
+          else
+            handle_params_error("interaction_required", "User must already be authorized when `prompt` is `none`")
+          end
+        else
+          handle_params_error("bad_request", "Client ID is missing from request")
+        end
+      end
+
       def render_error(error_description)
         @error_description = error_description
         render "api/openid_connect/error/error",
diff --git a/features/step_definitions/oidc_common_steps.rb b/features/step_definitions/oidc_common_steps.rb
index d5f605b2d..743dfd8a7 100644
--- a/features/step_definitions/oidc_common_steps.rb
+++ b/features/step_definitions/oidc_common_steps.rb
@@ -37,4 +37,3 @@ end
 Then(/^I should see a message containing "(.*?)"$/) do |message|
   expect(find("#openid_connect_error_description").text).to eq(message)
 end
-