Adds site validation for noosfero_oauth providers

Signed-off-by: Gabriel Silva <gabriel93.silva@gmail.com>

Adds site validation for noosfero_oauth providers
Signed-off-by: Gabriel Silva <gabriel93.silva@gmail.com>
Gabriel Silva
1 parent 0125b04e
Showing 6 changed files with 43 additions and 9 deletions Show diff stats
plugins/oauth_client/lib/oauth_client_plugin.rb
plugins/oauth_client/models/oauth_client_plugin/provider.rb
plugins/oauth_client/public/provider.js
plugins/oauth_client/test/unit/provider_test.rb
plugins/oauth_client/views/oauth_client_plugin_admin/_noosfero_oauth2.html.erb
plugins/oauth_client/views/oauth_client_plugin_admin/edit.html.erb
@@ -105,7 +105,7 @@ class OauthClientPlugin &lt; Noosfero::Plugin
   end
   def js_files
-  ["script.js"]
+  ["script.js", "provider.js"]
   end
 end
@@ -4,6 +4,8 @@ class OauthClientPlugin::Provider &lt; ApplicationRecord
   validates_presence_of :name, :strategy
+  validate :noosfero_provider_must_have_a_site
+
   acts_as_having_image
   acts_as_having_settings field: :options
@@ -18,4 +20,10 @@ class OauthClientPlugin::Provider &lt; ApplicationRecord
   acts_as_having_image
+  def noosfero_provider_must_have_a_site
+    if self.strategy == 'noosfero_oauth2' && (self.client_options.nil? || self.client_options[:site].blank?)
+      self.errors.add(:site, "A Noosfero provider must have a site")
+    end
+  end
+
 end
@@ -0,0 +1,12 @@
+function toggle_strategy(strategyName) {
+  if (strategyName == "noosfero_oauth2") {
+    $(".client-url").addClass("required-field");
+  } else {
+    $(".client-url").removeClass("required-field");
+  }
+}
+
+$(document).on("change", "select#oauth_client_plugin_provider_strategy", function() {
+  var selectedOption = $(this).find(":selected").text();
+  toggle_strategy(selectedOption);
+});
@@ -0,0 +1,17 @@
+require 'test_helper'
+
+class ProviderTest < ActiveSupport::TestCase
+
+  should "only create a noosfero provider without a site" do
+    provider = OauthClientPlugin::Provider.new(:name => 'noosfero', :strategy => 'noosfero_oauth2')
+    assert_not provider.valid?
+
+    provider.client_options = { :site => "http://noosfero.org" }
+    assert provider.valid?
+  end
+
+  should "create a regular provider without a site" do
+    provider = OauthClientPlugin::Provider.new(:name => 'github', :strategy => 'github')
+    assert provider.valid?
+  end
+end
@@ -1,5 +0,0 @@
-<%= f.fields_for :client_options, OpenStruct.new(provider.options[:client_options]) do |c| %>
-  <div class="client-url">
-    <%= labelled_form_field _('Client Url'), c.text_field(:site) %>
-  </div>
-<% end %>
@@ -8,7 +8,7 @@
   </div>
   <div class="name">
-    <%= labelled_form_field _('Name'), f.text_field(:name) %>
+    <%= required labelled_form_field _('Name'), f.text_field(:name) %>
   </div>
   <div class="strategy">
@@ -27,8 +27,10 @@
     <%= labelled_form_field _('Client Secret'), f.text_field(:client_secret) %>
   </div>
-  <% if File.exists?(File.join(File.dirname(__FILE__), "_#{@provider.strategy}.html.erb")) %>
-    <%= render :partial => "#{@provider.strategy}", :locals => {:f => f, :provider => @provider} %>
+  <%= f.fields_for :client_options, OpenStruct.new(@provider.options[:client_options]) do |c| %>
+    <div class="client-url <%= "required-field" if @provider.strategy == "noosfero_oauth2" %>">
+      <%= labelled_form_field _('Client Url'), c.text_field(:site) %>
+    </div>
   <% end %>
   <div class="image-icon">
	@@ -105,7 +105,7 @@ class OauthClientPlugin < Noosfero::Plugin		@@ -105,7 +105,7 @@ class OauthClientPlugin < Noosfero::Plugin
105	end	105	end
106		106
107	def js_files	107	def js_files
108	- ["script.js"]	108	+ ["script.js", "provider.js"]
109	end	109	end
110		110
111	end	111	end
@@ -0,0 +1,12 @@		@@ -0,0 +1,12 @@
	1	+function toggle_strategy(strategyName) {
	2	+ if (strategyName == "noosfero_oauth2") {
	3	+ $(".client-url").addClass("required-field");
	4	+ } else {
	5	+ $(".client-url").removeClass("required-field");
	6	+ }
	7	+}
	8	+
	9	+$(document).on("change", "select#oauth_client_plugin_provider_strategy", function() {
	10	+ var selectedOption = $(this).find(":selected").text();
	11	+ toggle_strategy(selectedOption);
	12	+});
@@ -0,0 +1,17 @@		@@ -0,0 +1,17 @@
	1	+require 'test_helper'
	2	+
	3	+class ProviderTest < ActiveSupport::TestCase
	4	+
	5	+ should "only create a noosfero provider without a site" do
	6	+ provider = OauthClientPlugin::Provider.new(:name => 'noosfero', :strategy => 'noosfero_oauth2')
	7	+ assert_not provider.valid?
	8	+
	9	+ provider.client_options = { :site => "http://noosfero.org" }
	10	+ assert provider.valid?
	11	+ end
	12	+
	13	+ should "create a regular provider without a site" do
	14	+ provider = OauthClientPlugin::Provider.new(:name => 'github', :strategy => 'github')
	15	+ assert provider.valid?
	16	+ end
	17	+end
	@@ -1,5 +0,0 @@	@@ -1,5 +0,0 @@
1	-<%= f.fields_for :client_options, OpenStruct.new(provider.options[:client_options]) do \|c\| %>
2	- <div class="client-url">
3	- <%= labelled_form_field _('Client Url'), c.text_field(:site) %>
4	- </div>
5	-<% end %>