maestrano-connector-rails 2.0.0.pre.RC8 → 2.0.0.pre.RC9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9793ce7b94518bfd9fda69a602b792cedbf30a69
-  data.tar.gz: 94d5059ebbeccd918ef66108273dbe31f853aa27
+  metadata.gz: e4034931c4f557a653f429fe27c03144246429d3
+  data.tar.gz: 8ac0745b563b712d1858bc4a0ea952d033a08a09
 SHA512:
-  metadata.gz: 36716f4680c9fa4b6f1d81d578aa4122baa0fc27c342d9c38f02f1904af50853e2199be6727242531f0f07e28c1a15eec3f98225b79c9bded68353f77b60a71d
-  data.tar.gz: 6d78274a939867b4dd196d264101a97d22678d3983d4882ddcd73a59236907ad50da0a766472fe83a5c5e6ad7d91bd7a2ef3afd71de9e4669c96123eb30f8a38
+  metadata.gz: 9c2c00231f6c47fd978dce08bb9750118314497f386d5c9c99b5d34c4e927bd92bf66e6416fbcbb2e8a41d7425a2d599e7aafdb4e095c48280438552c7ed0e2a
+  data.tar.gz: f3cfec868108174a4de89d53803987d1e8058f8561c4eb0bff59cb46685e36dfa852ae0def32e58fbedbcc334e72ed4c20a2acedf34ca1464c769bbfa9433681

data/CHANGELOG.md

@@ -0,0 +1,209 @@
+## 1.5.0
+
+### Breaking changes
+* `Maestrano::Connector::Rails::SynchronizationJob.perform` now takes an `organization.id` as parameter.
+
+## 1.4.0
+
+### Breaking changes
+* `map_to`, `map_to_connec` and `map_to_external` method have changed and now take two arguments.
+Additionally you should be able to remove all overloading to those methods using the new argument in hash mapper. See [documentation](https://maestrano.atlassian.net/wiki/display/DEV/Mapping+and+synchronization#Mappingandsynchronization-FAQ) for more details
+
+### Features
+* Possibility to use an extended mapper for creation only
+* Possibility to pass additional arguments to hash mapper to use in the after/before hooks
+
+## 1.3.5
+
+### Features
+* Improve generated files
+* Adds a built-in way to handle error when updating a deleted record
+
+### Fixes
+* Adds safety against potential infinite loop
+
+## 1.3.4
+`maestrano.rb` file should be updated with new synchronization paths.
+
+### Features
+* `connec_version_lt?` method
+
+### Fixes
+* Fixes multi-tenancy of synchronization endpoints
+* Fixes display of singleton entity
+
+## 1.3.3
+
+### Fixes
+* Fixes `connec_version` method
+
+## 1.3.2
+
+### Features
+* Improve display of entity names on the home page. You'll need to change your home view and controller as well as add some things in the layout and javascript files
+
+## 1.3.1
+
+### Fixes
+* Fix method in organization class that caused issue with authentication
+
+## 1.3.0
+* Methods `create_external_entity` and `update_external_entity` should now returns the created/updated entity
+* Home page should now include a link populated from `external.rb` to create an account
+
+### Features
+* Add support for references to Connec! sub entities' ids
+* Add support for support for sub_entities having the same name
+* Re-introduct `can_update_connec?` method
+* Add method for a `create an account` link
+
+### Fixes
+* Fix error format on the synchronizations endpoint
+
+## 1.2.3
+
+### Fixes
+* Fix Connec! version that was not cached scoped by tenant
+
+## 1.2.2
+
+### Fixes
+* Fix PushToConnecWork to take an organization_id insteand of an organization object
+
+### Features
+* Add a version endpoint with the framework version
+
+### Improvments
+* Add rubocop in the framework for better code quality
+* Improve framework dependancies handling and update template accordingly
+
+## 1.2.1
+
+### Features
+* Add PushToConnecWorker that give the possibilty to do jobs sequentially for a given organization and entity
+
+## 1.2.0
+/!\ For this version to work, you'll need to add `< Maestrano::Connector::Rails::EntityBase` to your `entity.rb` class
+
+### Features
+* Custom synchronization process for first sync. (For this feature to work, you'll need to implement handling of additionnal options in your `get_external_entities` method. The connector will still work as before if you don't).
+* Administrations endpoints to get the synchronizations status, start a synchronization, toggle `sync_enabled` and get the connector dependancies (depenancies are declared in ConnecHelper. You'll need to overload the dependancies method if you have specific dependancies)
+
+### Improvments
+* Entity and ComplexEntity now inherits from EntityBase
+
+## 1.1.2
+/!\ This version need a migration (`bundle exec rake railties:install:migrations; bundle exec rake db:migrate`). It also requires the running of a manual script to encrypt existing oauth_keys
+You'll also need to change some methods as the framework is not sending the `last_synchronization` anymore but directly the `last_synchronization_date` (`get_external_entities`, `before_sync`, `after_sync`)
+
+### Features
+* Encryption of oauth keys (you'll need to add `gem 'attr_encrypted', '~> 1.4.0'` to your Gemfile)
+* No historical data option: only data created after the link to the connector will be sync. For this option to be available, you'll need to implement a `creation_date_from_external_entity_hash` method. It also requires a front end update (view, controller, js)
+
+### Fixes
+* Fix synchronization cleaning
+* Minor fixes
+
+## 1.0.4
+
+### Fixes
+* Fix uneeded creation of idmap for Connec! entities following a failure
+* Fix Connec! pagination
+
+## 1.0.3
+
+### Fixes
+* Fix an issue with options that were involuntarily shared across entities
+
+## 1.0.2
+
+### Fixes
+* Fix an issue with integer ids
+
+## 1.0.1
+
+### Fixes
+* Fix an issue with singleton entities
+
+## 1.0.0
+
+### Features
+* Reference in mapping greatly simplified. See the documentation for an explanation and example: [here](https://maestrano.atlassian.net/wiki/display/DEV/Mapping+and+synchronization#Mappingandsynchronization-References).
+* Smart merging available. You can specifiy field on which Connec! will attempt to merge the record with an existing one. See the framework [documentation](https://maestrano.atlassian.net/wiki/display/DEV/Examples#Examples-Smartmerging) for an example, as well as the Connec! [documentation](http://maestrano.github.io/connec/#api-|-save-data-resource-creation-post)
+
+### Breaking changes
+A major refactoring as lead to some breaking changes:
+* `Entity` and `ComplexEntity` `initialize` method now take 3-4 argument instead of 0: `organization`, `connec_client`, `external_client` and `opts`
+* All the **instance** methods of those classes that previously took one of these arguments have been change to not include them anymore. Full list:
+
+**ComplexEntity & Entity:**
+**`connec_model_to_external_model`**
+**`external_model_to_connec_model`**
+`get_connec_entities`
+**`get_external_entities`**
+`consolidate_and_map_data`
+`push_entities_to_connec`
+`push_entities_to_external`
+**`before_sync`**
+**`after_sync`**
+**`filter_connec_entities`**
+
+
+**Entity:**
+**`map_to_external`**
+**`map_to_connec`**
+`push_entities_to_connec_to`
+`batch_op`
+`push_entities_to_external_to`
+`push_entity_to_external`
+**`create_external_entity`**
+**`update_external_entity`**
+`consolidate_and_map_singleton`
+`map_external_entity_with_idmap`
+
+**SubEntityBase:**
+**`map_to`**
+
+* The class method `entities_list` has been moved from `Entity` to `External`
+* The `references` method has been changed with the new reference system. The framework now expect it to be an array os strings instead of an array of hashes. Furthermore, it now supports reference fields embedded in hashes and arrays.
+* The following method from `Entity` as been changed from class methods to instance methods (and their arguments have been changed):
+`not_modified_since_last_push_to_connec?`
+`is_external_more_recent?`
+`solve_conflict`
+* Organization.uid is now enforced as an uniq attributes
+
+* The following methods have been removed
+`map_to_external_with_idmap`
+`create_idmap_from_external_entity`
+`create_idmap_from_connec_entity`
+`can_update_connec?`
+`id_from_ref`
+
+
+- - - -
+- - - -
+
+## 0.4.4
+
+### Features
+* Add filter_connec_entities method to allow filtering in webhook workflow
+
+### Fixes
+* Truncate idmap message to avoid database errors
+
+## 0.4.3
+
+### Fixes
+* Add `forced` option in home_controller when requesting a manual synchronization.
+
+
+## 0.4.2
+/!\ This release contains a new migration that you'll need to fetch and run
+
+### Features
+* Add call to before and after_sync methods during synchronization workflows
+* Add logic for record flagged as inactive in the external application
+
+### Fixes
+* Fix recovery mode: recovery mode was previously on as soon as the organization had three failed synchronizations, even if a synchronization had succeed afterward. Moreover, recovery mode doesn't prevent manual synchronization anymore.
+* Fix a typo in saml controller that prevented deletion of a session param.

data/Rakefile

@@ -18,13 +18,17 @@ Jeweler::Tasks.new do |gem|
   gem.homepage = 'http://github.com/maestrano/maestrano-connector-rails'
   gem.license = 'MIT'
   gem.summary = 'Rails framework to build connector with Maestrano'
-  gem.description = 'Maestrano is the next generation marketplace for SME applications. See https://maestrano.com for details.'
+  gem.description = 'Maestrano is the next generation marketplace for SME applications. See https://sme.maestrano.com for details.'
   gem.email = 'developers@maestrano.com'
-  gem.authors = ['Maestrano', 'Pierre Berard', 'Marco Bagnasco']
+  gem.authors = ['Maestrano']
   # dependencies defined in Gemfile
 end
 Jeweler::RubygemsDotOrgTasks.new
 
+# Rubocop
+require 'rubocop/rake_task'
+RuboCop::RakeTask.new
+
 APP_RAKEFILE = File.expand_path('../spec/dummy/Rakefile', __FILE__)
 load 'rails/tasks/engine.rake'
 
@@ -34,4 +38,4 @@ require 'rspec/core/rake_task'
 desc 'Run all specs in spec directory (excluding plugin specs)'
 RSpec::Core::RakeTask.new(spec: 'app:db:test:prepare')
 
-task default: :spec
+task default: [:spec, :rubocop]

data/VERSION

@@ -1 +1 @@
-2.0.0.pre.RC8
+2.0.0.pre.RC9

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

@@ -10,6 +10,8 @@ class Maestrano::Account::GroupUsersController < Maestrano::Rails::WebHookContro
     user = Maestrano::Connector::Rails::User.find_by_uid_and_tenant(user_uid, params[:tenant] || 'default')
     organization = Maestrano::Connector::Rails::Organization.find_by_uid_and_tenant(group_uid, params[:tenant] || 'default')
 
+    Maestrano::Connector::Rails::ConnectorLogger.log('info', organization, "remove user from group, user_uid=\"#{user_uid}\", group_uid=\"#{group_uid}\"")
+
     # Remove the user from the organization
     organization.remove_member(user)
 

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

@@ -8,6 +8,8 @@ class Maestrano::Account::GroupsController < Maestrano::Rails::WebHookController
     # Get entity
     organization = Maestrano::Connector::Rails::Organization.find_by_uid_and_tenant(org_uid, params[:tenant] || 'default')
 
+    Maestrano::Connector::Rails::ConnectorLogger.log('info', organization, 'delete organization')
+
     # Delete all relations
     organization.user_organization_rels.delete_all
 

data/app/controllers/maestrano/auth/saml_controller.rb

@@ -12,6 +12,9 @@ class Maestrano::Auth::SamlController < Maestrano::Rails::SamlBaseController
     params[:tenant] ||= 'default'
     user = Maestrano::Connector::Rails::User.find_or_create_for_maestrano(user_auth_hash, params[:tenant])
     organization = Maestrano::Connector::Rails::Organization.find_or_create_for_maestrano(group_auth_hash, params[:tenant])
+
+    Maestrano::Connector::Rails::ConnectorLogger.log('info', organization, "user authentication, user_uid=\"#{user.uid}\"")
+
     if user && organization
       organization.add_member(user) unless organization.member?(user)
 

data/app/controllers/maestrano/connec_controller.rb

@@ -1,43 +1,56 @@
 class Maestrano::ConnecController < Maestrano::Rails::WebHookController
   def notifications
-    Rails.logger.debug "Received notification from Connec!: #{params}"
-
     begin
       params.except(:tenant, :controller, :action, :connec).each do |entity_name, entities|
         entity_class_hash = find_entity_class(entity_name)
-        next Rails.logger.info "Received notification from Connec! for unknow entity: #{entity_name}" unless entity_class_hash
+        next Maestrano::Connector::Rails::ConnectorLogger.log('info', nil, "Received notification from Connec! for unknow entity: #{entity_name}") unless entity_class_hash
 
         entities.each do |entity|
           organization = Maestrano::Connector::Rails::Organization.find_by_uid_and_tenant(entity[:group_id], params[:tenant])
-          next Rails.logger.warn "Received notification from Connec! for unknown group or group without oauth: #{entity['group_id']} (tenant: #{params[:tenant]})" unless organization&.oauth_uid
-          next unless organization.sync_enabled && organization.synchronized_entities[entity_class_hash[:name].to_sym]
-
-          Maestrano::Connector::Rails::ConnectorLogger.log('info', organization, "Received entity from Connec! webhook: Entity=#{entity_name}, Data=#{entity}")
-          connec_client = Maestrano::Connector::Rails::ConnecHelper.get_client(organization)
-          external_client = Maestrano::Connector::Rails::External.get_client(organization)
-          last_synchronization_date = organization.last_synchronization_date
-
-          entity_instance = entity_class_hash[:class].new(organization, connec_client, external_client, {})
-          entity_instance.before_sync(last_synchronization_date)
-
-          # Build expected input for consolidate_and_map_data
-          if entity_class_hash[:is_complex]
-            connec_hash_of_entities = Maestrano::Connector::Rails::ComplexEntity.build_hash_with_entities(entity_instance.class.connec_entities_names, entity_name, ->(name) { name.parameterize('_').pluralize }, [entity])
-            filtered_entities = entity_instance.filter_connec_entities(connec_hash_of_entities)
-
-            empty_external_hash = Maestrano::Connector::Rails::ComplexEntity.build_empty_hash(entity_instance.class.external_entities_names)
-            mapped_entity = entity_instance.consolidate_and_map_data(filtered_entities, empty_external_hash)
-          else
-            filtered_entities = entity_instance.filter_connec_entities([entity])
-            mapped_entity = entity_instance.consolidate_and_map_data(filtered_entities, [])
-          end
-          entity_instance.push_entities_to_external(mapped_entity[:connec_entities])
 
-          entity_instance.after_sync(last_synchronization_date)
+          begin
+            if organization.nil?
+              next Maestrano::Connector::Rails::ConnectorLogger.log('info', organization, "Received notification from Connec! for an unknown organization, organization_uid=\"#{entity[:group_id]}\", tenant=\"#{params[:tenant]}\"")
+            end
+
+            if organization.oauth_uid.blank?
+              next Maestrano::Connector::Rails::ConnectorLogger.log('info', organization, "Received notification from Connec! for an organization not linked, organization_uid=\"#{entity[:group_id]}\", tenant=\"#{params[:tenant]}\"")
+            end
+
+            unless organization.sync_enabled && organization.synchronized_entities[entity_class_hash[:name].to_sym]
+              next Maestrano::Connector::Rails::ConnectorLogger.log('info', organization, "Skipping notification from Connec! webhook, entity_name=\"#{entity_name}\"")
+            end
+
+            Maestrano::Connector::Rails::ConnectorLogger.log('info', organization, "Processing entity from Connec! webhook, entity_name=\"#{entity_name}\", data=\"#{entity}\"")
+
+            connec_client = Maestrano::Connector::Rails::ConnecHelper.get_client(organization)
+            external_client = Maestrano::Connector::Rails::External.get_client(organization)
+            last_synchronization_date = organization.last_synchronization_date
+
+            entity_instance = entity_class_hash[:class].new(organization, connec_client, external_client, {})
+            entity_instance.before_sync(last_synchronization_date)
+
+            # Build expected input for consolidate_and_map_data
+            if entity_class_hash[:is_complex]
+              connec_hash_of_entities = Maestrano::Connector::Rails::ComplexEntity.build_hash_with_entities(entity_instance.class.connec_entities_names, entity_name, ->(name) { name.parameterize('_').pluralize }, [entity])
+              filtered_entities = entity_instance.filter_connec_entities(connec_hash_of_entities)
+
+              empty_external_hash = Maestrano::Connector::Rails::ComplexEntity.build_empty_hash(entity_instance.class.external_entities_names)
+              mapped_entity = entity_instance.consolidate_and_map_data(filtered_entities, empty_external_hash)
+            else
+              filtered_entities = entity_instance.filter_connec_entities([entity])
+              mapped_entity = entity_instance.consolidate_and_map_data(filtered_entities, [])
+            end
+            entity_instance.push_entities_to_external(mapped_entity[:connec_entities])
+
+            entity_instance.after_sync(last_synchronization_date)
+          rescue => e
+            Maestrano::Connector::Rails::ConnectorLogger.log('warn', organization, "error processing notification entity_name=\"#{entity_name}\", message=\"#{e.message}\", #{e.backtrace.join("\n")}")
+          end
         end
       end
     rescue => e
-      Rails.logger.warn("error processing notification #{e.message} - #{e.backtrace.join("\n")}")
+      Maestrano::Connector::Rails::ConnectorLogger.log('warn', nil, "error processing notification #{e.message} - #{e.backtrace.join("\n")}")
     end
 
     head 200, content_type: 'application/json'

data/app/controllers/version_controller.rb

@@ -3,7 +3,7 @@ class VersionController < ApplicationController
     framework_version = Gem.loaded_specs['maestrano-connector-rails'].version.version
     respond_to do |format|
       format.html { render text: "framework_version=#{framework_version}\n" }
-      format.json { render json: {framework_version: framework_version} }
+      format.json { render json: {framework_version: framework_version, env: Rails.env} }
     end
   end
 end

data/app/jobs/maestrano/connector/rails/push_to_connec_job.rb

@@ -27,7 +27,7 @@ module Maestrano::Connector::Rails
 
           entity_instance.after_sync(last_synchronization_date)
         else
-          Rails.logger.warn "Called push to connec job with unknow entity: #{external_entity_name}"
+          Maestrano::Connector::Rails::ConnectorLogger.log('warn', organization, "Called push to connec job with unknow entity: #{external_entity_name}")
         end
       end
     end

data/app/models/maestrano/connector/rails/concerns/connector_logger.rb

@@ -3,7 +3,7 @@ module Maestrano::Connector::Rails::Concerns::ConnectorLogger
 
   module ClassMethods
     def log(level, organization, msg)
-      Rails.logger.method(level).call("org: #{organization.uid} (#{organization.tenant}). Msg: #{msg}")
+      Rails.logger.method(level).call("organization_uid=\"#{organization&.uid}\", tenant=\"#{organization&.tenant}\"), message=\"#{msg}\"")
     end
   end
 end

data/app/models/maestrano/connector/rails/concerns/entity.rb

@@ -237,7 +237,7 @@ module Maestrano::Connector::Rails::Concerns::Entity
         next_page = response_hash['pagination']['next'].gsub(/^(.*)\/#{self.class.normalized_connec_entity_name}/, self.class.normalized_connec_entity_name)
 
         response_hash = fetch_connec(next_page, page_number)
-        entities << response_hash[self.class.normalized_connec_entity_name]
+        entities.concat response_hash[self.class.normalized_connec_entity_name]
       end
     end
 
@@ -367,7 +367,7 @@ module Maestrano::Connector::Rails::Concerns::Entity
       # TODO: improve the flexibility by adding the option for the developer to pass a custom/gem-dependent error
       if e.class == Maestrano::Connector::Rails::Exceptions::EntityNotFoundError
         idmap.update!(message: "The #{external_entity_name} record has been deleted in #{Maestrano::Connector::Rails::External.external_name}. Last attempt to sync on #{Time.now}", external_inactive: true)
-        Rails.logger.info "The #{idmap.external_entity} - #{idmap.external_id} record has been deleted. It is now set to inactive."
+        Maestrano::Connector::Rails::ConnectorLogger.log('info', @organization, "The #{idmap.external_entity} - #{idmap.external_id} record has been deleted. It is now set to inactive.")
       else
         # Store External error
         Maestrano::Connector::Rails::ConnectorLogger.log('error', @organization, "Error while pushing to #{Maestrano::Connector::Rails::External.external_name}: #{e}")
@@ -541,7 +541,7 @@ module Maestrano::Connector::Rails::Concerns::Entity
           elsif result['status'] == 201
             batch_entities[index][:idmap].update(connec_id: result['body'][self.class.normalize_connec_entity_name(connec_entity_name)]['id'].find { |id| id['provider'] == 'connec' }['id'], last_push_to_connec: Time.now, message: nil)
           else
-            Maestrano::Connector::Rails::ConnectorLogger.log('error', @organization, "Error while pushing to Connec!: #{result['body']}")
+            Maestrano::Connector::Rails::ConnectorLogger.log('warn', @organization, "Error while pushing to Connec!: #{result['body']}")
             # TODO, better error message
             batch_entities[index][:idmap].update(message: result['body'].to_s.truncate(255))
           end
@@ -571,7 +571,7 @@ module Maestrano::Connector::Rails::Concerns::Entity
       connec_entity['updated_at'] > self.class.last_update_date_from_external_entity_hash(external_entity)
     end
 
-    # This methods try to find a external entity among all the external entities matching the connec one (same id)
+    # This methods try to find a external entity among all the external entities matching the connec (mapped) one (same id)
     # If it does not find any, there is no conflict, and it returns the mapped connec entity
     # If it finds one, the conflict is solved either with options or using the entities timestamps
     #   If the connec entity is kept, it is returned mapped and the matching external entity is discarded (deleted from the array)

data/app/models/maestrano/connector/rails/organization.rb

@@ -38,6 +38,7 @@ module Maestrano::Connector::Rails
     validates :name, presence: true
     validates :tenant, presence: true
     validates :uid, uniqueness: {scope: :tenant}
+    validates :oauth_uid, uniqueness: {message: 'This account has already been linked'}
 
     #===================================
     # Serialized field
@@ -75,7 +76,7 @@ module Maestrano::Connector::Rails
       self.oauth_token = auth.credentials.token
       self.refresh_token = auth.credentials.refresh_token
       self.instance_url = auth.credentials.instance_url
-      save!
+      self.save
     end
 
     def clear_omniauth
@@ -86,16 +87,17 @@ module Maestrano::Connector::Rails
       self.save
     end
 
-    def check_historical_data(checkbox_ticked)
+    # Enable historical data sharing (prior to account linking)
+    def enable_historical_data(enabled)
+      # Historical data sharing cannot be unset
       return if self.historical_data
-      # checkbox_ticked is a boolean
-      if checkbox_ticked
+
+      if enabled
         self.date_filtering_limit = nil
         self.historical_data = true
       else
         self.date_filtering_limit ||= Time.now.getlocal
       end
-      self.save
     end
 
     def last_three_synchronizations_failed?

data/db/migrate/20161011005751_add_unique_index_on_organization_oauth_uid.rb

@@ -0,0 +1,5 @@
+class AddUniqueIndexOnOrganizationOauthUid < ActiveRecord::Migration
+  def change
+    add_index :organizations, :oauth_uid, unique: true
+  end
+end

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

@@ -7,16 +7,19 @@ class HomeController < ApplicationController
 
   def update
     organization = Maestrano::Connector::Rails::Organization.find_by_id(params[:id])
-
     return redirect_to(:back) unless organization && is_admin?(current_user, organization)
-    old_sync_state = organization.sync_enabled
+
+    # Update list of entities to synchronize
     organization.synchronized_entities.keys.each do |entity|
       organization.synchronized_entities[entity] = params[entity.to_s].present?
     end
     organization.sync_enabled = organization.synchronized_entities.values.any?
-    organization.check_historical_data(params['historical-data'].present?)
+    organization.enable_historical_data(params['historical-data'].present?)
+    trigger_sync = organization.sync_enabled && organization.sync_enabled_changed?
+    organization.save
 
-    start_synchronization(old_sync_state, organization) unless !old_sync_state && organization.sync_enabled
+    # Trigger sync only if the sync has been enabled
+    start_synchronization(organization) if trigger_sync
 
     redirect_to(:back)
   end
@@ -28,13 +31,14 @@ class HomeController < ApplicationController
     redirect_to(:back)
   end
 
+  # Implement the redirection to the external application
   def redirect_to_external
     redirect_to 'https://path/to/external/app'
   end
 
   private
 
-    def start_synchronization(old_sync_state, organization)
+    def start_synchronization(organization)
       Maestrano::Connector::Rails::SynchronizationJob.perform_later(organization.id, {})
       flash[:info] = 'Congrats, you\'re all set up! Your data are now being synced'
     end

data/{spec → lib/maestrano_connector_rails}/factories.rb

@@ -7,8 +7,8 @@ FactoryGirl.define do
   factory :organization, class: Maestrano::Connector::Rails::Organization do
     name 'My company'
     tenant 'default'
-    sequence(:uid) { |n| "cld-11#{n}" }
-    oauth_uid 'sfuiy765'
+    sequence(:uid) { SecureRandom.uuid }
+    sequence(:oauth_uid) { |n| "realm_#{n}" }
     oauth_provider 'this_app'
   end
 
@@ -18,9 +18,9 @@ FactoryGirl.define do
   end
 
   factory :idmap, class: Maestrano::Connector::Rails::IdMap do
-    sequence(:connec_id) { |n| "#{n}6798-ada6-te43#{n}" }
+    sequence(:connec_id) { SecureRandom.uuid }
     connec_entity 'person'
-    sequence(:external_id) { |n| "#{n}4567ada66#{n}" }
+    sequence(:external_id) { |n| "external_#{n}" }
     external_entity 'contact'
     last_push_to_external 2.days.ago
     last_push_to_connec 1.day.ago

data/maestrano-connector-rails.gemspec

@@ -2,17 +2,17 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: maestrano-connector-rails 2.0.0.pre.RC8 ruby lib
+# stub: maestrano-connector-rails 2.0.0.pre.RC9 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "maestrano-connector-rails"
-  s.version = "2.0.0.pre.RC8"
+  s.version = "2.0.0.pre.RC9"
 
   s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib"]
-  s.authors = ["Maestrano", "Pierre Berard", "Marco Bagnasco"]
-  s.date = "2016-10-05"
-  s.description = "Maestrano is the next generation marketplace for SME applications. See https://maestrano.com for details."
+  s.authors = ["Maestrano"]
+  s.date = "2016-10-12"
+  s.description = "Maestrano is the next generation marketplace for SME applications. See https://sme.maestrano.com for details."
   s.email = "developers@maestrano.com"
   s.executables = ["rails"]
   s.extra_rdoc_files = [
@@ -24,6 +24,7 @@ Gem::Specification.new do |s|
     ".rubocop.yml",
     ".rubocop_todo.yml",
     ".ruby-version",
+    "CHANGELOG.md",
     "CODESHIP.md",
     "DEVELOPER.md",
     "Gemfile",
@@ -77,6 +78,7 @@ Gem::Specification.new do |s|
     "db/migrate/20160427112250_add_inactive_to_idmaps.rb",
     "db/migrate/20160614114401_add_date_filtering_limit_to_organization.rb",
     "db/migrate/20160614160654_add_encryption_on_oauth_keys.rb",
+    "db/migrate/20161011005751_add_unique_index_on_organization_oauth_uid.rb",
     "lib/generators/connector/USAGE",
     "lib/generators/connector/complex_entity_generator.rb",
     "lib/generators/connector/install_generator.rb",
@@ -109,6 +111,7 @@ Gem::Specification.new do |s|
     "lib/generators/connector/templates/synchronizations_index.haml",
     "lib/maestrano/connector/rails.rb",
     "lib/maestrano_connector_rails.rb",
+    "lib/maestrano_connector_rails/factories.rb",
     "maestrano-connector-rails.gemspec",
     "maestrano.png",
     "release_notes.md",
@@ -169,7 +172,6 @@ Gem::Specification.new do |s|
     "spec/dummy/public/500.html",
     "spec/dummy/public/favicon.ico",
     "spec/dummy/tmp/cache/.gitkeep",
-    "spec/factories.rb",
     "spec/integration/complex_id_references_spec.rb",
     "spec/integration/complex_naming_spec.rb",
     "spec/integration/complex_spec.rb",

data/spec/controllers/connec_controller_spec.rb

@@ -33,9 +33,9 @@ describe Maestrano::ConnecController, type: :controller do
 
       context 'with an unexpected error' do
         let(:notifications) { {'people' => [entity]} }
-        it 'logs a warning' do
-          allow(controller).to receive(:find_entity_class).and_raise('Bruno c\'est peter')
-          expect(Rails.logger).to receive(:warn)
+        it 'does nothing' do
+          allow(controller).to receive(:find_entity_class).and_raise('Unexpected error')
+          expect(Maestrano::Connector::Rails::External).to_not receive(:get_client)
           subject
         end
       end
@@ -46,8 +46,8 @@ describe Maestrano::ConnecController, type: :controller do
           allow(Maestrano::Connector::Rails::External).to receive(:entities_list).and_return(%w())
         }
 
-        it 'logs a warning' do
-          expect(Rails.logger).to receive(:info).with('Received notification from Connec! for unknow entity: people')
+        it 'does nothing' do
+          expect(Maestrano::Connector::Rails::External).to_not receive(:get_client)
           subject
         end
       end
@@ -112,8 +112,8 @@ describe Maestrano::ConnecController, type: :controller do
 
         context 'with an invalid organization' do
           context 'with no organization' do
-            it 'logs a warning' do
-              expect(Rails.logger).to receive(:warn).with("Received notification from Connec! for unknown group or group without oauth: #{group_id} (tenant: default)")
+            it 'does nothing' do
+              expect(Maestrano::Connector::Rails::External).to_not receive(:get_client)
               subject
             end
           end
@@ -121,8 +121,8 @@ describe Maestrano::ConnecController, type: :controller do
           context 'with an organization with no oauth' do
             let!(:organization) { create(:organization, uid: group_id, oauth_uid: nil) }
 
-            it 'logs a warning' do
-              expect(Rails.logger).to receive(:warn).with("Received notification from Connec! for unknown group or group without oauth: #{group_id} (tenant: default)")
+            it 'does nothing' do
+              expect(Maestrano::Connector::Rails::External).to_not receive(:get_client).with(organization)
               subject
             end
           end
@@ -160,7 +160,6 @@ describe Maestrano::ConnecController, type: :controller do
             end
           end
         end
-
       end
     end
   end

data/spec/controllers/version_controller_spec.rb

@@ -11,7 +11,7 @@ describe VersionController, type: :controller do
 
     it 'returns a version hash' do
       subject
-      expect(JSON.parse(response.body)).to eql({"framework_version"=>"1.2"})
+      expect(JSON.parse(response.body)).to eql({"framework_version"=>"1.2", "env" => "test"})
     end
   end
-end
+end

data/spec/models/organization_spec.rb

@@ -25,6 +25,12 @@ describe Maestrano::Connector::Rails::Organization do
       expect(subject.synchronized_entities).to include(entities_list.first.to_sym)
       expect(subject.synchronized_entities).to include(entities_list.last.to_sym)
     end
+
+    it 'does not allow organizations with the same oauth UID' do
+      organization1 = create(:organization, oauth_provider: 'myapp', oauth_uid: 'ABC')
+      organization2 = build(:organization, oauth_provider: 'myapp', oauth_uid: 'ABC')
+      expect(organization2).not_to be_valid
+    end
   end
 
   describe "instance methods" do
@@ -129,7 +135,7 @@ describe Maestrano::Connector::Rails::Organization do
         2.times do
           subject.synchronizations.create(status: 'ERROR')
         end
-        
+
         expect(subject.last_three_synchronizations_failed?).to be false
       end
     end
@@ -146,7 +152,7 @@ describe Maestrano::Connector::Rails::Organization do
 
     describe 'last_synchronization_date' do
       let(:date) { 2.days.ago }
-      
+
       context 'with date_filtering_limit' do
         before {
           subject.date_filtering_limit = date
@@ -179,4 +185,4 @@ describe Maestrano::Connector::Rails::Organization do
   end
 
 
-end
+end

data/spec/spec_helper.rb

@@ -6,6 +6,7 @@ require 'factory_girl_rails'
 require 'shoulda/matchers'
 require 'simplecov'
 require 'timecop'
+require 'maestrano_connector_rails/factories.rb'
 SimpleCov.start
 
 Rails.backtrace_cleaner.remove_silencers!

metadata

@@ -1,16 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: maestrano-connector-rails
 version: !ruby/object:Gem::Version
-  version: 2.0.0.pre.RC8
+  version: 2.0.0.pre.RC9
 platform: ruby
 authors:
 - Maestrano
-- Pierre Berard
-- Marco Bagnasco
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-05 00:00:00.000000000 Z
+date: 2016-10-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -391,7 +389,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 description: Maestrano is the next generation marketplace for SME applications. See
-  https://maestrano.com for details.
+  https://sme.maestrano.com for details.
 email: developers@maestrano.com
 executables:
 - rails
@@ -404,6 +402,7 @@ files:
 - ".rubocop.yml"
 - ".rubocop_todo.yml"
 - ".ruby-version"
+- CHANGELOG.md
 - CODESHIP.md
 - DEVELOPER.md
 - Gemfile
@@ -457,6 +456,7 @@ files:
 - db/migrate/20160427112250_add_inactive_to_idmaps.rb
 - db/migrate/20160614114401_add_date_filtering_limit_to_organization.rb
 - db/migrate/20160614160654_add_encryption_on_oauth_keys.rb
+- db/migrate/20161011005751_add_unique_index_on_organization_oauth_uid.rb
 - lib/generators/connector/USAGE
 - lib/generators/connector/complex_entity_generator.rb
 - lib/generators/connector/install_generator.rb
@@ -489,6 +489,7 @@ files:
 - lib/generators/connector/templates/synchronizations_index.haml
 - lib/maestrano/connector/rails.rb
 - lib/maestrano_connector_rails.rb
+- lib/maestrano_connector_rails/factories.rb
 - maestrano-connector-rails.gemspec
 - maestrano.png
 - release_notes.md
@@ -549,7 +550,6 @@ files:
 - spec/dummy/public/500.html
 - spec/dummy/public/favicon.ico
 - spec/dummy/tmp/cache/.gitkeep
-- spec/factories.rb
 - spec/integration/complex_id_references_spec.rb
 - spec/integration/complex_naming_spec.rb
 - spec/integration/complex_spec.rb