From 074d20a94f8d3709e307236c28013643a0ca7a6d Mon Sep 17 00:00:00 2001 From: Victor Costa Date: Thu, 16 Oct 2014 11:07:07 -0300 Subject: [PATCH] oauth_client: identifier attribute is no longer used --- plugins/oauth_client/db/migrate/20141010135314_create_oauth_client_plugin_provider.rb | 1 - plugins/oauth_client/lib/oauth_client_plugin.rb | 1 - plugins/oauth_client/lib/oauth_client_plugin/provider.rb | 5 ++--- plugins/oauth_client/test/functional/oauth_client_plugin_public_controller_test.rb | 2 +- plugins/oauth_client/test/unit/environment_test.rb | 2 +- plugins/oauth_client/test/unit/oauth_client_plugin_test.rb | 2 +- plugins/oauth_client/test/unit/user_test.rb | 2 +- plugins/oauth_client/views/oauth_client_plugin_admin/edit.html.erb | 9 --------- plugins/oauth_client/views/oauth_client_plugin_admin/index.html.erb | 2 -- 9 files changed, 6 insertions(+), 20 deletions(-) diff --git a/plugins/oauth_client/db/migrate/20141010135314_create_oauth_client_plugin_provider.rb b/plugins/oauth_client/db/migrate/20141010135314_create_oauth_client_plugin_provider.rb index 1b73865..ca156d6 100644 --- a/plugins/oauth_client/db/migrate/20141010135314_create_oauth_client_plugin_provider.rb +++ b/plugins/oauth_client/db/migrate/20141010135314_create_oauth_client_plugin_provider.rb @@ -4,7 +4,6 @@ class CreateOauthClientPluginProvider < ActiveRecord::Migration create_table :oauth_client_plugin_providers do |t| t.integer :environment_id t.string :strategy - t.string :identifier t.string :name t.text :options t.boolean :enabled diff --git a/plugins/oauth_client/lib/oauth_client_plugin.rb b/plugins/oauth_client/lib/oauth_client_plugin.rb index cdde2cb..7110ff6 100644 --- a/plugins/oauth_client/lib/oauth_client_plugin.rb +++ b/plugins/oauth_client/lib/oauth_client_plugin.rb @@ -52,7 +52,6 @@ class OauthClientPlugin < Noosfero::Plugin setup = lambda { |env| request = Rack::Request.new env strategy = env['omniauth.strategy'] - identifier = request.path.split('/').last domain = Domain.find_by_name(request.host) environment = domain.environment rescue Environment.default diff --git a/plugins/oauth_client/lib/oauth_client_plugin/provider.rb b/plugins/oauth_client/lib/oauth_client_plugin/provider.rb index fb8c909..70a9892 100644 --- a/plugins/oauth_client/lib/oauth_client_plugin/provider.rb +++ b/plugins/oauth_client/lib/oauth_client_plugin/provider.rb @@ -2,8 +2,7 @@ class OauthClientPlugin::Provider < Noosfero::Plugin::ActiveRecord belongs_to :environment - validates_presence_of :identifier, :name, :strategy - validates_uniqueness_of :identifier, :scope => :environment_id + validates_presence_of :name, :strategy acts_as_having_image acts_as_having_settings :field => :options @@ -12,7 +11,7 @@ class OauthClientPlugin::Provider < Noosfero::Plugin::ActiveRecord settings_items :client_secret, :type => :string settings_items :client_options, :type => Hash - attr_accessible :identifier, :name, :environment, :strategy, :client_id, :client_secret, :enabled, :client_options, :image_builder + attr_accessible :name, :environment, :strategy, :client_id, :client_secret, :enabled, :client_options, :image_builder scope :enabled, :conditions => {:enabled => true} diff --git a/plugins/oauth_client/test/functional/oauth_client_plugin_public_controller_test.rb b/plugins/oauth_client/test/functional/oauth_client_plugin_public_controller_test.rb index 0cd84fb..3f81251 100644 --- a/plugins/oauth_client/test/functional/oauth_client_plugin_public_controller_test.rb +++ b/plugins/oauth_client/test/functional/oauth_client_plugin_public_controller_test.rb @@ -7,7 +7,7 @@ class OauthClientPluginPublicControllerTest < ActionController::TestCase @auth.stubs(:info).returns(mock) request.env["omniauth.auth"] = @auth @environment = Environment.default - @provider = OauthClientPlugin::Provider.create!(:name => 'provider', :strategy => 'provider', :identifier =>'provider', :enabled => true) + @provider = OauthClientPlugin::Provider.create!(:name => 'provider', :strategy => 'provider', :enabled => true) end attr_reader :auth, :environment, :provider diff --git a/plugins/oauth_client/test/unit/environment_test.rb b/plugins/oauth_client/test/unit/environment_test.rb index a4b7d21..f47f5e3 100644 --- a/plugins/oauth_client/test/unit/environment_test.rb +++ b/plugins/oauth_client/test/unit/environment_test.rb @@ -4,7 +4,7 @@ class UserTest < ActiveSupport::TestCase should 'be able to add oauth providers in a environment' do env = fast_create(Environment) - env.oauth_providers << OauthClientPlugin::Provider.new(:name => 'test', :identifier => 'test', :strategy => 'test') + env.oauth_providers << OauthClientPlugin::Provider.new(:name => 'test', :strategy => 'test') end end diff --git a/plugins/oauth_client/test/unit/oauth_client_plugin_test.rb b/plugins/oauth_client/test/unit/oauth_client_plugin_test.rb index 82c21dd..58eaa55 100644 --- a/plugins/oauth_client/test/unit/oauth_client_plugin_test.rb +++ b/plugins/oauth_client/test/unit/oauth_client_plugin_test.rb @@ -9,7 +9,7 @@ class OauthClientPluginTest < ActiveSupport::TestCase @environment = Environment.default @session = {} @request = mock - @provider = OauthClientPlugin::Provider.create!(:name => 'name', :identifier => 'identifier', :strategy => 'strategy') + @provider = OauthClientPlugin::Provider.create!(:name => 'name', :strategy => 'strategy') end attr_reader :params, :plugin, :environment, :session, :request, :provider diff --git a/plugins/oauth_client/test/unit/user_test.rb b/plugins/oauth_client/test/unit/user_test.rb index dfab84c..f4bda17 100644 --- a/plugins/oauth_client/test/unit/user_test.rb +++ b/plugins/oauth_client/test/unit/user_test.rb @@ -3,7 +3,7 @@ require File.dirname(__FILE__) + '/../test_helper' class UserTest < ActiveSupport::TestCase def setup - @provider = OauthClientPlugin::Provider.create!(:name => 'name', :identifier => 'identifier', :strategy => 'strategy') + @provider = OauthClientPlugin::Provider.create!(:name => 'name', :strategy => 'strategy') end attr_reader :provider diff --git a/plugins/oauth_client/views/oauth_client_plugin_admin/edit.html.erb b/plugins/oauth_client/views/oauth_client_plugin_admin/edit.html.erb index a0d6932..5725454 100644 --- a/plugins/oauth_client/views/oauth_client_plugin_admin/edit.html.erb +++ b/plugins/oauth_client/views/oauth_client_plugin_admin/edit.html.erb @@ -17,15 +17,6 @@ -
- - <%= _('Identifier') %> - - - <%= f.text_field :identifier %> - -
-
<%= _('Strategy') %> diff --git a/plugins/oauth_client/views/oauth_client_plugin_admin/index.html.erb b/plugins/oauth_client/views/oauth_client_plugin_admin/index.html.erb index ffefdf6..a6df1a4 100644 --- a/plugins/oauth_client/views/oauth_client_plugin_admin/index.html.erb +++ b/plugins/oauth_client/views/oauth_client_plugin_admin/index.html.erb @@ -4,7 +4,6 @@ - @@ -12,7 +11,6 @@ <% environment.oauth_providers.each do |provider| %> -
<%= _('Name') %><%= _('Identifier') %> <%= _('Strategy') %> <%= _('Actions') %>
<%= provider.name %><%= provider.identifier %> <%= provider.strategy %> <%= link_to _('Edit'), {:action => 'edit', :id => provider.id} %> -- libgit2 0.21.2