From 9439a16d98d61dbe58de6e2a75513d7e623cebc2 Mon Sep 17 00:00:00 2001
From: theworldbright <kent@kentshikama.com>
Date: Fri, 28 Aug 2015 15:51:10 -0700
Subject: [PATCH] Fix failing auth code test and styles
---
app/models/api/openid_connect/o_auth_application.rb | 3 +--
.../openid_connect/authorizations/_grants_list.haml | 4 ++--
.../user_applications/_add_remove_applications.haml | 2 +-
.../user_applications/_grants_list.haml | 4 ++--
app/views/shared/_settings_nav.mobile.haml | 12 ++++++------
features/step_definitions/auth_code_steps.rb | 6 +++---
6 files changed, 15 insertions(+), 16 deletions(-)
diff --git a/app/models/api/openid_connect/o_auth_application.rb b/app/models/api/openid_connect/o_auth_application.rb
index 8fc4c6dc37..6ade4b9a84 100644
--- a/app/models/api/openid_connect/o_auth_application.rb
+++ b/app/models/api/openid_connect/o_auth_application.rb
@@ -6,8 +6,7 @@ module Api
validates :client_id, presence: true, uniqueness: true
validates :client_secret, presence: true
- validates :client_name, presence: true
- validates_uniqueness_of :client_name, scope: :redirect_uris
+ validates :client_name, presence: true, uniqueness: {scope: :redirect_uris}
%i(redirect_uris response_types grant_types contacts).each do |serializable|
serialize serializable, JSON
diff --git a/app/views/api/openid_connect/authorizations/_grants_list.haml b/app/views/api/openid_connect/authorizations/_grants_list.haml
index 0223043037..72c1832211 100644
--- a/app/views/api/openid_connect/authorizations/_grants_list.haml
+++ b/app/views/api/openid_connect/authorizations/_grants_list.haml
@@ -5,7 +5,7 @@
%i.entypo-browser
.application-authorizations
- if app[:authorizations].count > 0
- %h4=t("api.openid_connect.authorizations.new.access", name: app[:name])
+ %h4= t("api.openid_connect.authorizations.new.access", name: app[:name])
%ul
- app[:authorizations].each do |authorization|
%li
@@ -13,4 +13,4 @@
%p= t("api.openid_connect.scopes.#{authorization}.description")
- else
.well
- =t("api.openid_connect.authorizations.new.no_requirement", name: app[:name])
+ = t("api.openid_connect.authorizations.new.no_requirement", name: app[:name])
diff --git a/app/views/api/openid_connect/user_applications/_add_remove_applications.haml b/app/views/api/openid_connect/user_applications/_add_remove_applications.haml
index 28afb90211..4837111f67 100644
--- a/app/views/api/openid_connect/user_applications/_add_remove_applications.haml
+++ b/app/views/api/openid_connect/user_applications/_add_remove_applications.haml
@@ -4,7 +4,7 @@
%li.list-group-item.authorized-application
= render "grants_list", app: app
= form_for "application", url: "#{api_openid_connect_authorizations_path}/#{app[:id]}",
- html: { method: :delete, class: "form-horizontal"} do |f|
+ html: {method: :delete, class: "form-horizontal"} do |f|
.clearfix= f.submit t("api.openid_connect.user_applications.revoke_autorization"),
class: "btn btn-danger pull-right app-revoke"
diff --git a/app/views/api/openid_connect/user_applications/_grants_list.haml b/app/views/api/openid_connect/user_applications/_grants_list.haml
index e2c67b8ffc..4b11c0030b 100644
--- a/app/views/api/openid_connect/user_applications/_grants_list.haml
+++ b/app/views/api/openid_connect/user_applications/_grants_list.haml
@@ -5,7 +5,7 @@
%i.entypo-browser
.application-authorizations
- if app[:authorizations].count > 0
- %h4=t("api.openid_connect.user_applications.index.access", name: app[:name])
+ %h4= t("api.openid_connect.user_applications.index.access", name: app[:name])
%ul
- app[:authorizations].each do |authorization|
%li
@@ -13,4 +13,4 @@
%p= t("api.openid_connect.scopes.#{authorization}.description")
- else
.well
- =t("api.openid_connect.user_applications.index.no_requirement",name: app[:name])
+ = t("api.openid_connect.user_applications.index.no_requirement", name: app[:name])
diff --git a/app/views/shared/_settings_nav.mobile.haml b/app/views/shared/_settings_nav.mobile.haml
index a85537dcb1..aaeb0b319c 100644
--- a/app/views/shared/_settings_nav.mobile.haml
+++ b/app/views/shared/_settings_nav.mobile.haml
@@ -1,9 +1,9 @@
#settings_nav
- %h2= t('settings')
+ %h2= t("settings")
%nav
%ul
- %li= link_to_unless_current t('profile'), edit_profile_path
- %li= link_to_unless_current t('account'), edit_user_path
- %li= link_to_unless_current t('privacy'), privacy_settings_path
- %li= link_to_unless_current t('_services'), services_path
- %li= link_to_unless_current t('_applications'), api_openid_connect_user_applications_path
+ %li= link_to_unless_current t("profile"), edit_profile_path
+ %li= link_to_unless_current t("account"), edit_user_path
+ %li= link_to_unless_current t("privacy"), privacy_settings_path
+ %li= link_to_unless_current t("_services"), services_path
+ %li= link_to_unless_current t("_applications"), api_openid_connect_user_applications_path
diff --git a/features/step_definitions/auth_code_steps.rb b/features/step_definitions/auth_code_steps.rb
index 3d0d11927b..bec5caa349 100644
--- a/features/step_definitions/auth_code_steps.rb
+++ b/features/step_definitions/auth_code_steps.rb
@@ -1,4 +1,4 @@
-O_AUTH_QUERY_PARAMS = {
+O_AUTH_QUERY_PARAMS_WITH_CODE = {
redirect_uri: "http://localhost:3000",
response_type: "code",
scope: "openid read",
@@ -10,12 +10,12 @@ Given /^I send a post request from that client to the code flow authorization en
client_json = JSON.parse(last_response.body)
@client_id = client_json["client_id"]
@client_secret = client_json["client_secret"]
- params = O_AUTH_QUERY_PARAMS.merge(client_id: @client_id)
+ params = O_AUTH_QUERY_PARAMS_WITH_CODE.merge(client_id: @client_id)
visit new_api_openid_connect_authorization_path(params)
end
Given /^I send a post request from that client to the code flow authorization endpoint using a invalid client id/ do
- params = O_AUTH_QUERY_PARAMS.merge(client_id: "randomid")
+ params = O_AUTH_QUERY_PARAMS_WITH_CODE.merge(client_id: "randomid")
visit new_api_openid_connect_authorization_path(params)
end
--
GitLab