maestrano-connector-rails 2.3.1 → 2.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bfd22362e09c5e15198f2930ccf7d5e0b3341170b769a4efa2c625bb367d9dc4
-  data.tar.gz: f05895b4dbc9777176257d2e421f948da00c6267ab637d89d8e83472c00547da
+  metadata.gz: fe03ff785065c1f8cadca66eb2e2b82ed5fc84f5323c4869b48336d12972c85b
+  data.tar.gz: b498996b210d55d76a64ddee0e3172b98ec59a2414865c6cc78b29cecd926057
 SHA512:
-  metadata.gz: cec844572c51c895cce3e9a1621f79fc14105bc9ae1f55df2ad28e981b26425767bb74015aa657da4104425108a116ed48a24155fabcd00dbfcd65893d6ad107
-  data.tar.gz: dd8814f5f5d28112e4d44be1d0eb3d99a1969c8f9b05f13abcd3433c3fcf8f9b8c9b26bfc310e883dac97ff648590608f0162a99b2b3cebdde7539b1ed577566
+  metadata.gz: e4bcd12d815b164b47bcea4882499ddecfacb4ed5eb86aa140ef89aa086f98df44dd250b5cc9f32f87ac05974038c026aef2917c1294178ff75141ede6c76d1b
+  data.tar.gz: 7118fddc3d02a5681232eeec359c16f2c500aac7456a621577d8443420d1785cd19a87c954bff5d011aa3a78ea864cd66af2b55d50a6851f830192ddf4c51ea7

data/app/controllers/maestrano/account/groups_controller.rb

@@ -10,7 +10,7 @@ class Maestrano::Account::GroupsController < Maestrano::Rails::WebHookController
 
     unless organization
       Maestrano::Connector::Rails::ConnectorLogger.log('info', nil, 'Organization not found')
-      return render json: {success: true}, status: 204
+      return render json: {success: true}, status: :no_content
     end
 
     Maestrano::Connector::Rails::ConnectorLogger.log('info', organization, 'delete organization')

data/db/migrate/20170315032224_add_metadata_to_id_map.rb

@@ -1,5 +1,5 @@
 class AddMetadataToIdMap < ActiveRecord::Migration
   def change
-  	add_column :id_maps, :metadata, :text
+    add_column :id_maps, :metadata, :text
   end
 end

data/lib/generators/connector/install_generator.rb

@@ -6,7 +6,7 @@ module Connector
     desc 'Creating a Maestrano Connector application'
 
     def maestrano_generator
-      generate 'maestrano:initializer'
+      generate 'maestrano:install'
     end
 
     def include_helpers

data/lib/generators/connector/templates/home.js

@@ -19,6 +19,10 @@ function closeModal(sender)
   $('#myModal').modal('hide');
 }
 
+$(function () {
+  $('[data-toggle="tooltip"]').tooltip()
+})
+
 $(document).ready(function(){
     $("#myModal").on('hidden.bs.modal', function (e) {
       if (!checkHistorical) {
@@ -28,8 +32,3 @@ $(document).ready(function(){
       checkHistorical = false
     });
 });
-
-
-$(function () {
-  $('[data-toggle="tooltip"]').tooltip()
-})

data/lib/generators/connector/templates/home_controller.rb

@@ -5,10 +5,10 @@ class HomeController < ApplicationController
 
     # Update list of entities to synchronize
     current_organization.synchronized_entities.keys.each do |entity|
-      next unless params[entity.to_s]
       current_organization.synchronized_entities[entity][:can_push_to_connec] = params[entity.to_s]["to_connec"] == "1"
       current_organization.synchronized_entities[entity][:can_push_to_external] = params[entity.to_s]["to_external"] == "1"
     end
+
     full_sync = params['historical-data'].present? && !current_organization.historical_data
     opts = {full_sync: full_sync}
     current_organization.sync_enabled = current_organization.synchronized_entities.values.any? { |settings| settings.values.any? { |v| v } }
@@ -31,13 +31,13 @@ class HomeController < ApplicationController
 
   # Implement the redirection to the external application
   def redirect_to_external
-    redirect_to 'https://path/to/external/app'
+    redirect_to 'https://your_application.com'
   end
 
   private
 
-    def start_synchronization(opts)
-      Maestrano::Connector::Rails::SynchronizationJob.perform_later(current_organization.id, opts)
-      flash[:info] = 'Congrats, you\'re all set up! Your data are now being synced' if current_organization.sync_enabled_changed?
-    end
+  def start_synchronization(opts)
+    Maestrano::Connector::Rails::SynchronizationJob.perform_later(current_organization.id, opts)
+    flash[:info] = 'Congrats, you\'re all set up! Your data are now being synced' if current_organization.sync_enabled_changed?
+  end
 end

data/lib/generators/connector/templates/home_controller_spec.rb

@@ -114,6 +114,6 @@ describe HomeController, type: :controller do
       allow_any_instance_of(Maestrano::Connector::Rails::SessionHelper).to receive(:current_organization).and_return(organization)
     end
 
-    it {expect(subject).to redirect_to('https://somewhere.com')}
+    it {expect(subject).to redirect_to('https://your_application.com')}
   end
 end

data/lib/generators/connector/templates/home_index.haml

@@ -64,9 +64,9 @@
                 - current_organization.displayable_synchronized_entities.each do |k, v|
                   .row.sync-entity
                     .col-md-1.link-step-action
-                      #{check_box("#{k}", "to_connec", {checked: (v[:can_push_to_connec] || v[:can_push_to_external])})}
+                      #{check_box("#{k}", "to_connec", {checked: (v[:can_push_to_connec] || v[:can_push_to_external]) && !current_organization.pull_disabled, onclick: "return !#{k}_to_external.checked;", disabled: current_organization.pull_disabled})}
                     .col-md-1.link-step-action
-                      #{check_box("#{k}", "to_external", {checked: v[:can_push_to_external], disabled: !v[:can_push_to_external]})}
+                      #{check_box("#{k}", "to_external", {checked: v[:can_push_to_external] && !current_organization.push_disabled, onchange: "#{k}_to_connec.checked = #{!current_organization.pull_disabled};", disabled: current_organization.push_disabled})}
                     %label.col-md-7{:for => "#{k}", style: 'padding-top: 5px;'}
                       .col-md-6
                         #{v[:external_name]}
@@ -79,7 +79,7 @@
 
             .spacer2
             .row
-              %h Chose whether to synchronize your historical data:
+              %h Choose whether to synchronize your historical data:
             .spacer1
             .row
               .col-md-4.col-md-offset-1
@@ -127,3 +127,7 @@
         .row
           .col-md-4.col-md-offset-4.text-center
             = link_to 'Go to ApplicationName', home_redirect_to_external_path, class: 'btn btn-lg btn-primary'
+      -else
+        .row
+          .col-md-4.col-md-offset-4.center
+            = link_to 'Link your Maestrano account', Maestrano::Connector::Rails::Engine.routes.url_helpers.default_maestrano_auth_saml_index_path(tenant: :default), class: 'btn btn-warning'

data/lib/maestrano/connector/rails/version.rb

@@ -1,7 +1,7 @@
 module Maestrano
   module Connector
     module Rails
-      VERSION = '2.3.1'.freeze
+      VERSION = '2.3.2'.freeze
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: maestrano-connector-rails
 version: !ruby/object:Gem::Version
-  version: 2.3.1
+  version: 2.3.2
 platform: ruby
 authors:
 - Maestrano
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-13 00:00:00.000000000 Z
+date: 2018-04-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails