maestrano-connector-rails 2.0.0.pre.RC11 → 2.0.0.pre.RC12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 393f91e1248007d0b8d38c99280d466bd935f54f
-  data.tar.gz: d2e43d71732f2d7280d355e67484e18fc97c8b14
+  metadata.gz: 7d95bff19220474be447576fb4048e63d48e1266
+  data.tar.gz: 75565ee7992093efd5a77fe20052f9dc17d1b953
 SHA512:
-  metadata.gz: e29765cb69956279f371bd227b44065d114a24cce99f1cf88242d4e5afb1e8d17cde78487b15bb866028668050660a770ae6ebbe01bb9752a64b89c2e6c447d0
-  data.tar.gz: a0a8dc357400da0362385decfa9e5d0432affd445611c86021bea1500621e10df1ca8f72fd2afed11fec46012d9a1331e0f427ccb4d63cb21630930aa8b15099
+  metadata.gz: 7b673778a40d4dfc9b0e002fc54360c9e729e052aeffc244aebff563672e40f545f0232530ad6848333833229e6d2d839131e76b36abb84867a2d8dc53e23e16
+  data.tar.gz: d9644a034bfed0f31440df9aa33315a8a493dcf7aa58898304b33693bc9bf13fd95f0a4cc14b8cc7ef82f14e625d1f952a0b9414993903ab318ec5a35a4f558d

data/.rubocop.yml

@@ -12,6 +12,9 @@ AllCops:
     - 'db/migrate/*'
     - 'bin/*'
     - 'spec/**/*'
+    - 'template/*'
+    - 'lib/generators/connector/templates/*'
+    - 'lib/maestrano_connector_rails/factories.rb'
 
 # Enabled disabled Cops
 Style/CollectionMethods:

data/CHANGELOG.md

@@ -7,6 +7,8 @@
 * Follow migration steps up to framework version 1.5.0
 * Replace ocurrences of `@organizations` with `current_organization` in `home_index.haml`
 * In spec_helper.rb add the line `require 'maestrano_connector_rails/factories.rb'`
+* Add optional hash of parameters to be logged by ConnectorLogger
+* Add Maestrano Organization UID to the logs
 
 ### Developer Platform registration to be detailed
 

data/Gemfile

@@ -32,7 +32,7 @@ group :development do
   gem 'activerecord-jdbcsqlite3-adapter', platforms: :jruby
   gem 'sqlite3', platforms: :ruby
   gem 'shoulda-matchers'
-  gem 'rubocop'
+  gem 'rubocop', '~> 0.43'
   gem 'timecop'
   gem 'github_changelog_generator'
 end

data/VERSION

@@ -1 +1 @@
-2.0.0.pre.RC11
+2.0.0.pre.RC12

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

@@ -7,8 +7,8 @@ class Maestrano::Account::GroupUsersController < Maestrano::Rails::WebHookContro
     group_uid = params[:group_id]
 
     # Get the entities
-    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')
+    user = Maestrano::Connector::Rails::User.find_by(uid: user_uid, tenant: params[:tenant] || 'default')
+    organization = Maestrano::Connector::Rails::Organization.find_by(uid: group_uid, tenant: params[:tenant] || 'default')
 
     Maestrano::Connector::Rails::ConnectorLogger.log('info', organization, "remove user from group, user_uid=\"#{user_uid}\", group_uid=\"#{group_uid}\"")
 

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

@@ -6,7 +6,7 @@ class Maestrano::Account::GroupsController < Maestrano::Rails::WebHookController
     org_uid = params[:id]
 
     # Get entity
-    organization = Maestrano::Connector::Rails::Organization.find_by_uid_and_tenant(org_uid, params[:tenant] || 'default')
+    organization = Maestrano::Connector::Rails::Organization.find_by(uid: org_uid, tenant: params[:tenant] || 'default')
 
     Maestrano::Connector::Rails::ConnectorLogger.log('info', organization, 'delete organization')
 

data/app/controllers/maestrano/connec_controller.rb

@@ -6,21 +6,10 @@ class Maestrano::ConnecController < Maestrano::Rails::WebHookController
         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])
+          organization = Maestrano::Connector::Rails::Organization.find_by(uid: entity[:group_id], tenant: params[:tenant])
 
           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
-
+            next unless valid_organization?(organization, entity_class_hash)
             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)
@@ -31,18 +20,9 @@ class Maestrano::ConnecController < Maestrano::Rails::WebHookController
             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])
+            mapped_entity = map_entity(entity_class_hash, entity_instance, entity_name, entity)
 
+            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")}")
@@ -58,6 +38,25 @@ class Maestrano::ConnecController < Maestrano::Rails::WebHookController
 
   private
 
+    def valid_organization?(organization, entity_class_hash)
+      if organization.nil?
+        Maestrano::Connector::Rails::ConnectorLogger.log('info', organization, "Received notification from Connec! for an unknown organization, organization_uid=\"#{entity[:group_id]}\", tenant=\"#{params[:tenant]}\"")
+        return false
+      end
+
+      if organization.oauth_uid.blank?
+        Maestrano::Connector::Rails::ConnectorLogger.log('info', organization, "Received notification from Connec! for an organization not linked, organization_uid=\"#{entity[:group_id]}\", tenant=\"#{params[:tenant]}\"")
+        return false
+      end
+
+      unless organization.sync_enabled && organization.synchronized_entities[entity_class_hash[:name].to_sym]
+        Maestrano::Connector::Rails::ConnectorLogger.log('info', organization, "Skipping notification from Connec! webhook, entity_name=\"#{entity_name}\"")
+        return false
+      end
+
+      true
+    end
+
     def find_entity_class(entity_name)
       Maestrano::Connector::Rails::External.entities_list.each do |entity_name_from_list|
         clazz = "Entities::#{entity_name_from_list.singularize.titleize.split.join}".constantize
@@ -70,4 +69,20 @@ class Maestrano::ConnecController < Maestrano::Rails::WebHookController
       end
       nil
     end
+
+    def map_entity(entity_class_hash, entity_instance, entity_name, entity)
+      # 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
+
+      mapped_entity
+    end
 end

data/app/controllers/maestrano/synchronizations_controller.rb

@@ -2,7 +2,7 @@ class Maestrano::SynchronizationsController < Maestrano::Rails::WebHookControlle
   def show
     tenant = params[:tenant]
     uid = params[:id]
-    organization = Maestrano::Connector::Rails::Organization.find_by_uid_and_tenant(uid, tenant)
+    organization = Maestrano::Connector::Rails::Organization.find_by(uid: uid, tenant: tenant)
     return render json: {errors: [{message: 'Organization not found', code: 404}]}, status: :not_found unless organization
 
     status = organization_status organization
@@ -14,7 +14,7 @@ class Maestrano::SynchronizationsController < Maestrano::Rails::WebHookControlle
     tenant = params[:tenant]
     uid = params[:group_id]
     opts = params[:opts] || {}
-    organization = Maestrano::Connector::Rails::Organization.find_by_uid_and_tenant(uid, tenant)
+    organization = Maestrano::Connector::Rails::Organization.find_by(uid: uid, tenant: tenant)
     return render json: {errors: [{message: 'Organization not found', code: 404}]}, status: :not_found unless organization
 
     status = organization_status(organization)
@@ -30,7 +30,7 @@ class Maestrano::SynchronizationsController < Maestrano::Rails::WebHookControlle
   def toggle_sync
     tenant = params[:tenant]
     uid = params[:group_id]
-    organization = Maestrano::Connector::Rails::Organization.find_by_uid_and_tenant(uid, tenant)
+    organization = Maestrano::Connector::Rails::Organization.find_by(uid: uid, tenant: tenant)
     return render json: {errors: [{message: 'Organization not found', code: 404}]}, status: :not_found unless organization
 
     organization.toggle(:sync_enabled)

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

@@ -2,8 +2,10 @@ module Maestrano::Connector::Rails::Concerns::ConnectorLogger
   extend ActiveSupport::Concern
 
   module ClassMethods
-    def log(level, organization, msg)
-      Rails.logger.method(level).call("organization_uid=\"#{organization&.uid}\", tenant=\"#{organization&.tenant}\"), message=\"#{msg}\"")
+    def log(level, organization, msg, params = {})
+      line = "uid=\"#{organization&.uid}\", org_uid=\"#{organization&.org_uid}\", tenant=\"#{organization&.tenant}\""
+      line = "#{line}, #{params.map { |k, v| "#{k}=\"#{v}\"" }.join(', ')}" unless params.blank?
+      Rails.logger.method(level).call("#{line}, message=\"#{msg}\"")
     end
   end
 end

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

@@ -4,6 +4,8 @@ module Maestrano::Connector::Rails
     maestrano_group_via :provider, :uid, :tenant do |group, maestrano|
       group.name = (maestrano.name.blank? ? 'Default Group name' : maestrano.name)
       group.tenant = 'default' # To be set from SSO parameter
+      group.org_uid = maestrano.org_uid # Maestrano organization UID
+
       # group.country_alpha2 = maestrano.country
       # group.free_trial_end_at = maestrano.free_trial_end_at
       # group.some_required_field = 'some-appropriate-default-value'

data/db/migrate/20161018155513_add_org_uid_to_organization.rb

@@ -0,0 +1,5 @@
+class AddOrgUidToOrganization < ActiveRecord::Migration
+  def change
+    add_column :organizations, :org_uid, :string
+  end
+end

data/maestrano-connector-rails.gemspec

@@ -2,16 +2,16 @@
 # 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.RC11 ruby lib
+# stub: maestrano-connector-rails 2.0.0.pre.RC12 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "maestrano-connector-rails"
-  s.version = "2.0.0.pre.RC11"
+  s.version = "2.0.0.pre.RC12"
 
   s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib"]
   s.authors = ["Maestrano"]
-  s.date = "2016-10-13"
+  s.date = "2016-10-18"
   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"]
@@ -79,6 +79,7 @@ Gem::Specification.new do |s|
     "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",
+    "db/migrate/20161018155513_add_org_uid_to_organization.rb",
     "lib/generators/connector/USAGE",
     "lib/generators/connector/complex_entity_generator.rb",
     "lib/generators/connector/install_generator.rb",
@@ -200,7 +201,6 @@ Gem::Specification.new do |s|
     "template/Procfile",
     "template/application-sample.yml",
     "template/database.yml",
-    "template/factories.rb",
     "template/gitignore",
     "template/maestrano.rb",
     "template/maestrano_connector_template.rb",
@@ -248,7 +248,7 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<activerecord-jdbcsqlite3-adapter>, [">= 0"])
       s.add_development_dependency(%q<sqlite3>, [">= 0"])
       s.add_development_dependency(%q<shoulda-matchers>, [">= 0"])
-      s.add_development_dependency(%q<rubocop>, [">= 0"])
+      s.add_development_dependency(%q<rubocop>, ["~> 0.43"])
       s.add_development_dependency(%q<timecop>, [">= 0"])
       s.add_development_dependency(%q<github_changelog_generator>, [">= 0"])
     else
@@ -276,7 +276,7 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<activerecord-jdbcsqlite3-adapter>, [">= 0"])
       s.add_dependency(%q<sqlite3>, [">= 0"])
       s.add_dependency(%q<shoulda-matchers>, [">= 0"])
-      s.add_dependency(%q<rubocop>, [">= 0"])
+      s.add_dependency(%q<rubocop>, ["~> 0.43"])
       s.add_dependency(%q<timecop>, [">= 0"])
       s.add_dependency(%q<github_changelog_generator>, [">= 0"])
     end
@@ -305,7 +305,7 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<activerecord-jdbcsqlite3-adapter>, [">= 0"])
     s.add_dependency(%q<sqlite3>, [">= 0"])
     s.add_dependency(%q<shoulda-matchers>, [">= 0"])
-    s.add_dependency(%q<rubocop>, [">= 0"])
+    s.add_dependency(%q<rubocop>, ["~> 0.43"])
     s.add_dependency(%q<timecop>, [">= 0"])
     s.add_dependency(%q<github_changelog_generator>, [">= 0"])
   end

data/spec/dummy/db/schema.rb

@@ -11,7 +11,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20160614152139) do
+ActiveRecord::Schema.define(version: 20161018155513) do
 
   create_table "id_maps", force: :cascade do |t|
     t.string   "connec_id"
@@ -38,6 +38,7 @@ ActiveRecord::Schema.define(version: 20160614152139) do
     t.string   "provider"
     t.string   "uid"
     t.string   "name"
+    t.string   "org_uid"
     t.string   "tenant"
     t.string   "oauth_provider"
     t.string   "oauth_uid"

data/spec/models/connector_logger_spec.rb

@@ -12,10 +12,15 @@ describe Maestrano::Connector::Rails::ConnectorLogger do
     end
 
     it 'includes the organization uid and tenant' do
-      expect(organization).to receive(:uid)
-      expect(organization).to receive(:tenant)
+      expect(Rails.logger).to receive(:info).with("uid=\"#{organization.uid}\", org_uid=\"#{organization.org_uid}\", tenant=\"#{organization.tenant}\", message=\"msg\"")
+
       subject.log('info', organization, 'msg')
     end
-  end
 
-end
+    it 'includes extra params' do
+      expect(Rails.logger).to receive(:info).with("uid=\"#{organization.uid}\", org_uid=\"#{organization.org_uid}\", tenant=\"#{organization.tenant}\", foo=\"bar\", message=\"msg\"")
+
+      subject.log('info', organization, 'msg', foo: :bar)
+    end
+  end
+end

data/spec/models/organization_spec.rb

@@ -11,7 +11,7 @@ describe Maestrano::Connector::Rails::Organization do
   # Indexes
   it { should have_db_index([:uid, :tenant]) }
 
-  #Associations
+  # Associations
   it { should have_many(:user_organization_rels) }
   it { should have_many(:users) }
   it { should have_many(:id_maps).dependent(:destroy) }
@@ -113,7 +113,26 @@ describe Maestrano::Connector::Rails::Organization do
     end
 
     describe 'from_omniauth' do
-      #TODO
+      let(:saml_hash) { {provider: :maestrano, uid: 'cld-1234', info: {org_uid: 'org-abcd', name: 'My Company'}} }
+      let(:tenant) { 'mytenant' }
+
+      let(:subject) { Maestrano::Connector::Rails::Organization.find_or_create_for_maestrano(saml_hash, tenant) }
+
+      context 'with a new organization' do
+        it 'creates an organization from SAML parameters' do
+          expect(subject.name).to eql('My Company')
+          expect(subject.org_uid).to eql('org-abcd')
+          expect(subject.tenant).to eql(tenant)
+        end
+      end
+
+      context 'with an existing organization' do
+        let!(:organization) { create(:organization, provider: :maestrano, tenant: tenant, uid: 'cld-1234') }
+
+        it 'find the organization from SAML parameters' do
+          expect(subject).to eql(organization)
+        end
+      end
     end
 
     describe 'last_three_synchronizations_failed?' do

data/template/Procfile

@@ -1,2 +1,2 @@
-web: bundle exec rails server puma -p $PORT -e $RACK_ENV
-worker: bundle exec sidekiq
+web: bin/puma -t 5:5 -p $PORT -e $RACK_ENV
+worker: bin/sidekiq

data/template/application-sample.yml

@@ -1,2 +1,13 @@
-connec_api_id: ''
-connec_api_key: ''
+encryption_key1: ''
+encryption_key2: ''
+
+SIDEKIQ_USERNAME: admin
+SIDEKIQ_PASSWORD: password
+
+REDIS_URL: redis://localhost:6379/0/connector-myapp
+
+MNO_DEVPL_HOST: https://dev-platform.maestrano.com
+MNO_DEVPL_API_PATH: /api/config/v1/marketplaces
+MNO_DEVPL_ENV_NAME: connector-myapp
+MNO_DEVPL_ENV_KEY:
+MNO_DEVPL_ENV_SECRET:

data/template/database.yml

@@ -19,13 +19,13 @@ test:
   database: db/test.sqlite3
 
 production:
-  adapter: postgresql
+  adapter: mysql2
   url: <%=  ENV['DATABASE_URL'] %>
-  encoding: unicode
+  encoding: utf8
   pool: 5
 
 uat:
-  adapter: postgresql
+  adapter: mysql2
   url: <%=  ENV['DATABASE_URL'] %>
-  encoding: unicode
+  encoding: utf8
   pool: 5

data/template/gitignore

@@ -16,5 +16,8 @@
 !/log/.keep
 /tmp
 
+# Ignore application.yml
+config/application.yml
+
 # Ignore coverage files
-coverage/
+coverage/

data/template/maestrano.rb

@@ -1,174 +1,2 @@
-# frozen_string_literal: true
-%w(default maestrano-uat).each do |tenant|
-  Maestrano[tenant].configure do |config|
-    # ==> Environment configuration
-    # The environment to connect to.
-    # If set to 'production' then all Single Sign-On (SSO) and API requests
-    # will be made to maestrano.com
-    # If set to 'test' then requests will be made to api-sandbox.maestrano.io
-    # The api-sandbox allows you to easily test integration scenarios.
-    # More details on http://api-sandbox.maestrano.io
-    #
-    config.environment = Settings[tenant][:environment]
-
-    # ==> Application host
-    # This is your application host (e.g: my-app.com) which is ultimately
-    # used to redirect users to the right SAML url during SSO handshake.
-    #
-    config.app.host = Settings.app_host
-
-    # ==> App ID & API key
-    # Your application App ID and API key which you can retrieve on http://maestrano.com
-    # via your cloud partner dashboard.
-    # For testing you can retrieve/generate an api.id and api.key from the API Sandbox directly
-    # on http://api-sandbox.maestrano.io
-    #
-    config.api.host = Settings[tenant][:api_host]
-    config.connec.host = Settings[tenant][:connec_host]
-    config.api.id = ENV[Settings[tenant][:api_id]]
-    config.api.key = ENV[Settings[tenant][:api_key]]
-
-    config.sso.x509_certificate = Settings[tenant][:x509_certificate]
-    config.sso.x509_fingerprint = Settings[tenant][:x509_fingerprint]
-
-    # => Synchronizations endpoints
-    config.app.synchronization_status_path = "/maestrano/#{tenant}/synchronizations/:cld-uid"
-    config.app.synchronization_toggle_path = "/maestrano/#{tenant}/synchronizations/toggle_sync"
-    config.app.synchronization_start_path = "/maestrano/#{tenant}/synchronizations"
-
-    # ==> Single Sign-On activation
-    # Enable/Disable single sign-on. When troubleshooting authentication issues
-    # you might want to disable SSO temporarily
-    #
-    # config.sso.enabled = true
-
-    # ==> Single Sign-On Identity Manager
-    # By default we consider that the domain managing user identification
-    # is the same as your application host (see above config.app.host parameter)
-    # If you have a dedicated domain managing user identification and therefore
-    # responsible for the single sign-on handshake (e.g: https://idp.my-app.com)
-    # then you can specify it below
-    #
-    # config.sso.idm = (config.environment == 'production' ? 'https://idp.my-app.com' : 'http://localhost:3000')
-
-    # ==> SSO Initialization endpoint
-    # This is your application path to the SAML endpoint that allows users to
-    # initialize SSO authentication. Upon reaching this endpoint users your
-    # application will automatically create a SAML request and redirect the user
-    # to Maestrano. Maestrano will then authenticate and authorize the user. Upon
-    # authorization the user gets redirected to your application consumer endpoint
-    # (see below) for initial setup and/or login.
-    #
-    # The controller for this path is automatically
-    # generated when you run 'rake maestrano:install' and is available at
-    # <rails_root>/app/controllers/maestrano/auth/saml.rb
-    #
-    config.sso.init_path = Settings[tenant][:sso_init_path]
-
-    # ==> SSO Consumer endpoint
-    # This is your application path to the SAML endpoint that allows users to
-    # finalize SSO authentication. During the 'consume' action your application
-    # sets users (and associated group) up and/or log them in.
-    #
-    # The controller for this path is automatically
-    # generated when you run 'rake maestrano:install' and is available at
-    # <rails_root>/app/controllers/maestrano/auth/saml.rb
-    #
-    config.sso.consume_path = Settings[tenant][:sso_consume_path]
-
-    # ==> Single Logout activation
-    # Enable/Disable single logout. When troubleshooting authentication issues
-    # you might want to disable SLO temporarily.
-    # If set to false then Maestrano::SSO::Session#valid? - which should be
-    # used in a controller before filter to check user session - always return true
-    #
-    # config.sso.slo_enabled = true
-
-    # ==> SSO User creation mode
-    # !IMPORTANT
-    # On Maestrano users can take several "instances" of your service. You can consider
-    # each "instance" as 1) a billing entity and 2) a collaboration group (this is
-    # equivalent to a 'customer account' in a commercial world). When users login to
-    # your application via single sign-on they actually login via a specific group which
-    # is then supposed to determine which data they have access to inside your application.
-    #
-    # E.g: John and Jack are part of group 1. They should see the same data when they login to
-    # your application (employee info, analytics, sales etc..). John is also part of group 2
-    # but not Jack. Therefore only John should be able to see the data belonging to group 2.
-    #
-    # In most application this is done via collaboration/sharing/permission groups which is
-    # why a group is required to be created when a new user logs in via a new group (and
-    # also for billing purpose - you charge a group, not a user directly).
-    #
-    # == mode: 'real'
-    # In an ideal world a user should be able to belong to several groups in your application.
-    # In this case you would set the 'sso.creation_mode' to 'real' which means that the uid
-    # and email we pass to you are the actual user email and maestrano universal id.
-    #
-    # == mode: 'virtual'
-    # Now let's say that due to technical constraints your application cannot authorize a user
-    # to belong to several groups. Well next time John logs in via a different group there will
-    # be a problem: the user already exists (based on uid or email) and cannot be assigned
-    # to a second group. To fix this you can set the 'sso.creation_mode' to 'virtual'. In this
-    # mode users get assigned a truly unique uid and email across groups. So next time John logs
-    # in a whole new user account can be created for him without any validation problem. In this
-    # mode the email we assign to him looks like "usr-sdf54.cld-45aa2@mail.maestrano.com". But don't
-    # worry we take care of forwarding any email you would send to this address
-    #
-    # config.sso.creation_mode = 'real' # or 'virtual'
-
-    # ==> Account Webhooks
-    # Single sign on has been setup into your app and Maestrano users are now able
-    # to use your service. Great! Wait what happens when a business (group) decides to
-    # stop using your service? Also what happens when a user gets removed from a business?
-    # Well the endpoints below are for Maestrano to be able to notify you of such
-    # events.
-    #
-    # Even if the routes look restful we issue only issue DELETE requests for the moment
-    # to notify you of any service cancellation (group deletion) or any user being
-    # removed from a group.
-    #
-    # The controllers for these hooks path are automatically generated when
-    # you run 'rake maestrano:install' and is available under
-    # <rails_root>/app/controllers/maestrano/account/
-    #
-    config.webhook.account.groups_path = Settings[tenant][:webhook][:account][:groups_path]
-    config.webhook.account.group_users_path = Settings[tenant][:webhook][:account][:group_users_path]
-
-    config.webhook.connec.notifications_path = Settings[tenant][:webhook][:connec][:notifications_path]
-    config.webhook.connec.external_ids = true
-    #
-    # == Subscriptions
-    # This is the list of entities (organizations,people,invoices etc.) for which you want to be
-    # notified upon creation/update in Connec!
-    config.webhook.connec.subscriptions = {
-      accounts: false,
-      company: false,
-      employees: false,
-      events: false,
-      event_orders: false,
-      invoices: false,
-      items: false,
-      journals: false,
-      opportunities: false,
-      organizations: false,
-      payments: false,
-      pay_items: false,
-      pay_schedules: false,
-      pay_stubs: false,
-      pay_runs: false,
-      people: false,
-      projects: false,
-      purchase_orders: false,
-      quotes: false,
-      sales_orders: false,
-      tax_codes: false,
-      tax_rates: false,
-      time_activities: false,
-      time_sheets: false,
-      venues: false,
-      warehouses: false,
-      work_locations: false
-    }
-  end
-end
+Maestrano.auto_configure unless Rails.env.test?
+Maestrano.configure { |config| config.environment = 'test' } if Rails.env.test?

data/template/maestrano_connector_template.rb

@@ -33,22 +33,22 @@ if yes?('Use JRuby? [y/n]')
   run 'echo "ruby \'2.2.3\', :engine => \'jruby\', :engine_version => \'9.0.5.0\'" | cat - Gemfile > temp && mv temp Gemfile'
 end
 
-gem 'rails', '~> 4.2.6'
+gem 'rails', '~> 4.2'
 gem 'turbolinks', '~> 2.5'
 gem 'jquery-rails'
-gem 'puma'
+gem 'puma', require: false
 gem 'tzinfo-data', platforms: [:mingw, :mswin, :jruby]
 gem 'uglifier', '>= 1.3.0'
 
 gem 'maestrano-connector-rails'
 
-gem_group :production, :uat do
-  gem 'activerecord-jdbcpostgresql-adapter', platforms: :jruby
-  gem 'pg', platforms: :ruby
+group :production, :uat do
+  gem 'activerecord-jdbcmysql-adapter', platforms: :jruby
+  gem 'mysql2', platforms: :ruby
   gem 'rails_12factor'
 end
 
-gem_group :test, :develpment do
+group :test, :develpment do
   gem 'activerecord-jdbcsqlite3-adapter', platforms: :jruby
   gem 'sqlite3', platforms: :ruby
   gem 'rubocop'
@@ -101,6 +101,7 @@ after_bundle do
   copy_file 'settings/settings.yml', 'config/settings.yml'
 
   copy_file 'application-sample.yml', 'config/application-sample.yml'
+  copy_file 'application-sample.yml', 'config/application.yml'
 
   application do
     <<-RUBY
@@ -117,6 +118,10 @@ after_bundle do
   run 'bundle exec rake railties:install:migrations'
   run 'bundle exec rake db:migrate'
 
+  run 'bundler binstubs puma --force'
+  run 'bundler binstubs sidekiq --force'
+  run 'bundler binstubs rake --force'
+
   remove_file 'config/initializers/maestrano.rb'
   copy_file 'maestrano.rb', 'config/initializers/maestrano.rb'
 

data/template/routes.rb

@@ -1,14 +1,25 @@
 Rails.application.routes.draw do
   mount Maestrano::Connector::Rails::Engine, at: '/'
-  mount Sidekiq::Web => '/sidekiq'
 
+  # Default Connector pages
   root 'home#index'
   get 'home/index' => 'home#index'
   get 'home/redirect_to_external' => 'home#redirect_to_external'
   get 'home/index' => 'home#index'
   put 'home/update' => 'home#update'
   post 'home/synchronize' => 'home#synchronize'
-
   get 'synchronizations/index' => 'synchronizations#index'
   get 'shared_entities/index' => 'shared_entities#index'
+
+  # OAuth workflow pages
+  match 'auth/:provider/request', to: 'oauth#create_omniauth', via: [:get, :post]
+  match 'signout_omniauth', to: 'oauth#destroy_omniauth', as: 'signout_omniauth', via: [:get, :post]
+  post 'auth/auth', to: 'auth#auth'
+
+  # Sidekiq Admin
+  require 'sidekiq/web'
+  Sidekiq::Web.use Rack::Auth::Basic do |username, password|
+    username == ENV['SIDEKIQ_USERNAME'] && password == ENV['SIDEKIQ_PASSWORD']
+  end
+  mount Sidekiq::Web => '/sidekiq'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: maestrano-connector-rails
 version: !ruby/object:Gem::Version
-  version: 2.0.0.pre.RC11
+  version: 2.0.0.pre.RC12
 platform: ruby
 authors:
 - Maestrano
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-13 00:00:00.000000000 Z
+date: 2016-10-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -350,16 +350,16 @@ dependencies:
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.43'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.43'
 - !ruby/object:Gem::Dependency
   name: timecop
   requirement: !ruby/object:Gem::Requirement
@@ -457,6 +457,7 @@ files:
 - 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
+- db/migrate/20161018155513_add_org_uid_to_organization.rb
 - lib/generators/connector/USAGE
 - lib/generators/connector/complex_entity_generator.rb
 - lib/generators/connector/install_generator.rb
@@ -578,7 +579,6 @@ files:
 - template/Procfile
 - template/application-sample.yml
 - template/database.yml
-- template/factories.rb
 - template/gitignore
 - template/maestrano.rb
 - template/maestrano_connector_template.rb

data/template/factories.rb

@@ -1,24 +0,0 @@
-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'
-    oauth_provider 'this_app'
-  end
-
-  factory :idmap, class: Maestrano::Connector::Rails::IdMap do
-    connec_entity 'person'
-    external_id '4567ada66'
-    external_entity 'contact'
-    last_push_to_external 2.days.ago
-    last_push_to_connec 1.day.ago
-    association :organization
-  end
-
-  factory :synchronization, class: Maestrano::Connector::Rails::Synchronization do
-    association :organization
-    status 'SUCCESS'
-    partial false
-  end
-end