From 56aa57ada338e2cfe5f5151b7e983e720a01d5b8 Mon Sep 17 00:00:00 2001
From: matheuslacerda <matheusmirandalacerda@gmail.com>
Date: Wed, 17 Aug 2016 12:03:14 -0300
Subject: [PATCH] Bug fixes on oauth_client plugin

---
 plugins/oauth_client/controllers/oauth_client_plugin_admin_controller.rb            |  4 ++--
 plugins/oauth_client/db/migrate/20160714113820_create_oauth_client_plugin_config.rb |  2 +-
 plugins/oauth_client/lib/ext/environment.rb                                         |  2 +-
 plugins/oauth_client/models/oauth_client_plugin/config.rb                           | 15 ---------------
 plugins/oauth_client/models/oauth_client_plugin/configuration.rb                    | 15 +++++++++++++++
 plugins/oauth_client/views/auth/_oauth_login.html.erb                               |  2 +-
 6 files changed, 20 insertions(+), 20 deletions(-)
 delete mode 100644 plugins/oauth_client/models/oauth_client_plugin/config.rb
 create mode 100644 plugins/oauth_client/models/oauth_client_plugin/configuration.rb

diff --git a/plugins/oauth_client/controllers/oauth_client_plugin_admin_controller.rb b/plugins/oauth_client/controllers/oauth_client_plugin_admin_controller.rb
index b1394fe..b17c101 100644
--- a/plugins/oauth_client/controllers/oauth_client_plugin_admin_controller.rb
+++ b/plugins/oauth_client/controllers/oauth_client_plugin_admin_controller.rb
@@ -1,7 +1,7 @@
 class OauthClientPluginAdminController < AdminController
 
   def index
-    @config = OauthClientPlugin::Config.instance
+    @config = OauthClientPlugin::Configuration.instance
   end
 
   def new
@@ -15,7 +15,7 @@ class OauthClientPluginAdminController < AdminController
   end
 
   def update_configs
-    OauthClientPlugin::Config.instance.update_attributes(params[:oauth_client_config])
+    OauthClientPlugin::Configuration.instance.update_attributes(params[:oauth_client_config])
     redirect_to :action => 'index'
   end
 
diff --git a/plugins/oauth_client/db/migrate/20160714113820_create_oauth_client_plugin_config.rb b/plugins/oauth_client/db/migrate/20160714113820_create_oauth_client_plugin_config.rb
index f321a05..dc5f9c2 100644
--- a/plugins/oauth_client/db/migrate/20160714113820_create_oauth_client_plugin_config.rb
+++ b/plugins/oauth_client/db/migrate/20160714113820_create_oauth_client_plugin_config.rb
@@ -1,7 +1,7 @@
 class CreateOauthClientPluginConfig < ActiveRecord::Migration
 
   def change
-    create_table :oauth_client_plugin_configs do |t|
+    create_table :oauth_client_plugin_configurations do |t|
      t.belongs_to :environment
      t.boolean :allow_external_login, :default => false
     end
diff --git a/plugins/oauth_client/lib/ext/environment.rb b/plugins/oauth_client/lib/ext/environment.rb
index 995809a..733546e 100644
--- a/plugins/oauth_client/lib/ext/environment.rb
+++ b/plugins/oauth_client/lib/ext/environment.rb
@@ -1,6 +1,6 @@
 require_dependency 'environment'
 
 class Environment
-  has_one :oauth_client_plugin_configs, :class_name => 'OauthClientPlugin::Config'
+  has_one :oauth_client_plugin_configuration, :class_name => 'OauthClientPlugin::Configuration'
   has_many :oauth_providers, :class_name => 'OauthClientPlugin::Provider'
 end
diff --git a/plugins/oauth_client/models/oauth_client_plugin/config.rb b/plugins/oauth_client/models/oauth_client_plugin/config.rb
deleted file mode 100644
index cb11742..0000000
--- a/plugins/oauth_client/models/oauth_client_plugin/config.rb
+++ /dev/null
@@ -1,15 +0,0 @@
-class OauthClientPlugin::Config < ApplicationRecord
-
-  belongs_to :environment
-  attr_accessible :allow_external_login, :environment_id
-
-  class << self
-    def instance
-      environment = Environment.default
-      environment.oauth_client_plugin_configs || create(environment_id: environment.id)
-    end
-
-    private :new
-  end
-
-end
diff --git a/plugins/oauth_client/models/oauth_client_plugin/configuration.rb b/plugins/oauth_client/models/oauth_client_plugin/configuration.rb
new file mode 100644
index 0000000..50a2293
--- /dev/null
+++ b/plugins/oauth_client/models/oauth_client_plugin/configuration.rb
@@ -0,0 +1,15 @@
+class OauthClientPlugin::Configuration < ApplicationRecord
+
+  belongs_to :environment
+  attr_accessible :allow_external_login, :environment_id
+
+  class << self
+    def instance
+      environment = Environment.default
+      environment.oauth_client_plugin_configuration || create(environment_id: environment.id)
+    end
+
+    private :new
+  end
+
+end
diff --git a/plugins/oauth_client/views/auth/_oauth_login.html.erb b/plugins/oauth_client/views/auth/_oauth_login.html.erb
index f57fa74..88a9360 100644
--- a/plugins/oauth_client/views/auth/_oauth_login.html.erb
+++ b/plugins/oauth_client/views/auth/_oauth_login.html.erb
@@ -5,7 +5,7 @@
       <div>
         <%= render :partial => 'auth/generate_providers_links', :locals => {:providers => providers, :action => ""} %>
       </div>
-      <% if OauthClientPlugin::Config.instance.allow_external_login %>
+      <% if OauthClientPlugin::Configuration.instance.allow_external_login %>
         <%= _('Login with:') %>
         <div>
           <%= render :partial => 'auth/generate_providers_links', :locals => {:providers => providers, :action => "external_login"} %>
--
libgit2 0.21.2