maestrano-rails 1.0.0 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 87260e05e84bc26411b8506f75bcc95b3880917e
-  data.tar.gz: 5d1d488f5681f851fea19dcd291c183ffd55c821
+  metadata.gz: f4b49bdb15b181380859f23803e3a71e8e6eb337
+  data.tar.gz: 0a18fb96c3100d317505114e8ff2c660b0fb788e
 SHA512:
-  metadata.gz: acc1b8ddb1e53a91e1f15249b9114a19aa5a29f929773f076f7c72b9f2183f7cb51257c840684c5fb4441e0704f73ef37acf8aae273e6275227c2c18cf776dc4
-  data.tar.gz: ef543baca016b0338aa079771750148623581dc3b5bf91b99d27304bf4494bf632f6960e51ad5473102d29132f6376a96ef3eba41901a019cace85086500a78b
+  metadata.gz: 30aa342a8e3372cb31d6ee74cd371de2a4ed4a744108f10bf6a25054e564ef1146e7d9db0fb95b98a7036fbb19df1cfad05a1e8e0223b5c052f86b78062788bc
+  data.tar.gz: 47781cfd2033777cd73e5730d88a0672e5d9ab340a7ef7810bfd7c5976bf0d76439087af3660956f735649275fac133afd11d26069aa02ab0dce385294b704e0

data/Gemfile

@@ -5,7 +5,7 @@ gem 'jquery-rails'
 gem 'haml-rails'
 gem 'mongoid', require: false
 
-gem 'maestrano', '1.0.0'
+gem 'maestrano', '~> 1.0.0'
 
 group :development, :test do
   gem 'sqlite3', platforms: :ruby

data/Gemfile.lock

@@ -1,6 +1,6 @@
 GIT
   remote: git://github.com/jruby/activerecord-jdbc-adapter.git
-  revision: 5468b6f404604e18d0286b9291d7287cdc394310
+  revision: ee68c1881a9b0ce59f5095cd1999c109bddf6167
   branch: rails-5
   specs:
 
@@ -42,26 +42,29 @@ GEM
       minitest (~> 5.1)
       thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
-    addressable (2.4.0)
-    arel (6.0.3)
-    bson (4.1.1)
+    addressable (2.5.0)
+      public_suffix (~> 2.0, >= 2.0.2)
+    arel (6.0.4)
+    bson (4.2.1)
     builder (3.2.2)
-    concurrent-ruby (1.0.2)
+    concurrent-ruby (1.0.4)
     database_cleaner (1.5.3)
     descendants_tracker (0.0.4)
       thread_safe (~> 0.3, >= 0.3.1)
-    domain_name (0.5.20161021)
+    domain_name (0.5.20161129)
       unf (>= 0.0.5, < 1.0.0)
     erubis (2.7.0)
     faraday (0.9.2)
       multipart-post (>= 1.2, < 3)
     git (1.3.0)
-    github_api (0.14.5)
-      addressable (~> 2.4.0)
-      descendants_tracker (~> 0.0.4)
+    github_api (0.11.3)
+      addressable (~> 2.3)
+      descendants_tracker (~> 0.0.1)
       faraday (~> 0.8, < 0.10)
-      hashie (>= 3.4)
-      oauth2 (~> 1.0)
+      hashie (>= 1.2)
+      multi_json (>= 1.7.5, < 2.0)
+      nokogiri (~> 1.6.0)
+      oauth2
     globalid (0.3.7)
       activesupport (>= 4.1.0)
     haml (4.0.7)
@@ -84,17 +87,18 @@ GEM
     httparty (0.14.0)
       multi_xml (>= 0.5.2)
     i18n (0.7.0)
-    jeweler (2.1.1)
+    jeweler (2.3.2)
       builder
       bundler (>= 1.0)
       git (>= 1.2.5)
-      github_api
+      github_api (~> 0.11.0)
       highline (>= 1.6.15)
       nokogiri (>= 1.5.10)
+      psych (~> 2.2)
       rake
       rdoc
-      semver
-    jquery-rails (4.2.1)
+      semver2
+    jquery-rails (4.2.2)
       rails-dom-testing (>= 1, < 3)
       railties (>= 4.2.0)
       thor (>= 0.14, < 2.0)
@@ -104,7 +108,7 @@ GEM
       nokogiri (>= 1.5.9)
     macaddr (1.7.1)
       systemu (~> 2.6.2)
-    maestrano (1.0.0)
+    maestrano (1.0.1)
       httparty (~> 0.14)
       json (~> 1.8)
       mime-types (~> 1.25)
@@ -116,32 +120,34 @@ GEM
     metaclass (0.0.4)
     mime-types (1.25.1)
     mini_portile2 (2.1.0)
-    minitest (5.9.1)
+    minitest (5.10.1)
     mocha (1.2.1)
       metaclass (~> 0.0.1)
-    mongo (2.3.0)
-      bson (~> 4.1)
-    mongoid (5.1.4)
+    mongo (2.4.1)
+      bson (>= 4.2.1, < 5.0.0)
+    mongoid (5.1.6)
       activemodel (~> 4.0)
       mongo (~> 2.1)
       origin (~> 2.2)
       tzinfo (>= 0.3.37)
     multi_json (1.12.1)
-    multi_xml (0.5.5)
+    multi_xml (0.6.0)
     multipart-post (2.0.0)
     netrc (0.11.0)
     nokogiri (1.6.8.1)
       mini_portile2 (~> 2.1.0)
-    oauth2 (1.2.0)
-      faraday (>= 0.8, < 0.10)
+    oauth2 (1.3.0)
+      faraday (>= 0.8, < 0.11)
       jwt (~> 1.0)
       multi_json (~> 1.3)
       multi_xml (~> 0.5)
       rack (>= 1.2, < 3)
-    origin (2.2.0)
+    origin (2.3.0)
     pg (0.19.0)
-    power_assert (0.3.1)
-    rack (1.6.4)
+    power_assert (0.4.1)
+    psych (2.2.2)
+    public_suffix (2.0.5)
+    rack (1.6.5)
     rack-test (0.6.3)
       rack (>= 1.0)
     rails (4.2.7.1)
@@ -157,9 +163,9 @@ GEM
       sprockets-rails
     rails-deprecated_sanitizer (1.0.3)
       activesupport (>= 4.2.0.alpha)
-    rails-dom-testing (1.0.7)
+    rails-dom-testing (1.0.8)
       activesupport (>= 4.2.0.beta, < 5.0)
-      nokogiri (~> 1.6.0)
+      nokogiri (~> 1.6)
       rails-deprecated_sanitizer (>= 1.0.1)
     rails-html-sanitizer (1.0.3)
       loofah (~> 2.0)
@@ -168,24 +174,23 @@ GEM
       activesupport (= 4.2.7.1)
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
-    rake (11.3.0)
-    rdoc (4.2.2)
-      json (~> 1.4)
+    rake (12.0.0)
+    rdoc (5.0.0)
     rest-client (1.8.0)
       http-cookie (>= 1.0.2, < 2.0)
       mime-types (>= 1.16, < 3.0)
       netrc (~> 0.7)
     ruby_parser (3.8.3)
       sexp_processor (~> 4.1)
-    semver (1.0.1)
+    semver2 (3.4.2)
     sexp_processor (4.7.0)
     shoulda (3.5.0)
       shoulda-context (~> 1.0, >= 1.0.1)
       shoulda-matchers (>= 1.4.1, < 3.0)
-    shoulda-context (1.2.1)
+    shoulda-context (1.2.2)
     shoulda-matchers (2.8.0)
       activesupport (>= 3.0.0)
-    sprockets (3.7.0)
+    sprockets (3.7.1)
       concurrent-ruby (~> 1.0)
       rack (> 1, < 3)
     sprockets-rails (3.2.0)
@@ -194,9 +199,9 @@ GEM
       sprockets (>= 3.0.0)
     sqlite3 (1.3.12)
     systemu (2.6.5)
-    test-unit (3.2.1)
+    test-unit (3.2.3)
       power_assert
-    thor (0.19.1)
+    thor (0.19.4)
     thread_safe (0.3.5)
     tilt (2.0.5)
     tzinfo (1.2.2)
@@ -218,7 +223,7 @@ DEPENDENCIES
   haml-rails
   jeweler
   jquery-rails
-  maestrano (= 1.0.0)
+  maestrano (~> 1.0.0)
   mocha (~> 1.1)
   mongoid
   pg
@@ -228,4 +233,4 @@ DEPENDENCIES
   test-unit (~> 3)
 
 BUNDLED WITH
-   1.12.5
+   1.13.7

data/README.md

@@ -25,11 +25,8 @@ Maestrano Cloud Integration is currently in closed beta. Want to know more? Send
 
 
 ## Getting Setup
-Before integrating with us you will need an App ID and API Key. Maestrano Cloud Integration being still in closed beta you will need to contact us beforehand to gain production access.
-
-For testing purpose we provide an API Sandbox where you can freely obtain an App ID and API Key. The sandbox is great to test single sign-on and API integration (e.g: billing API).
-
-To get started just go to: http://api-sandbox.maestrano.io
+To start the integration of your application with the Maestrano platform, you first need to register your application on our Developer Platform. You can find [more information here](https://maestrano.atlassian.net/wiki/x/NYA3Ag)
+Once your application is registered, you will be provided with API keys that are used to configure your application on the different marketplaces powered by Maestrano.
 
 A **rails demo application** is also available: https://github.com/maestrano/demoapp-rails
 
@@ -53,7 +50,7 @@ After you install Maestrano and add it to your Gemfile, you need to run the gene
 rails generate maestrano:install
 ```
 
-The generator will install an initializer which describes ALL Maestrano's configuration options. You will need to take a look at it as this is where you set your API key. This configuration will also be used to automatically generate a '/maestrano/metadata' endpoint in your application that Maestrano will fetch automatically at regular intervals (or by hitting 'refresh metadata' in your cloud partner dashboard on maestrano.com).
+The generator will install an initializer which describes Maestrano's configuration options.
 
 The generator also generates a SamlController for single sign-on that you will need to customize (see below) as well as the required routes.
 
@@ -279,6 +276,6 @@ So if you have any question or need help integrating with us just let us know at
 
 ## License
 
-MIT License. Copyright 2014 Maestrano Pty Ltd. https://maestrano.com
+MIT License. Copyright 2017 Maestrano Pty Ltd. https://maestrano.com
 
 You are not granted rights or licenses to the trademarks of Maestrano.

data/lib/generators/maestrano/templates/maestrano.rb

@@ -1,140 +1,7 @@
-Maestrano.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 = 'test' # or 'production'
-  
-  # ==> 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 = (config.environment == 'production' ? 'https://my-app.com' : 'http://localhost:3000')
-  
-  # ==> 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.id = (config.environment == 'production' ? 'prod_app_id' : 'sandbox_app_id')
-  config.api.key = (config.environment == 'production' ? 'prod_api_key' : 'sandbox_api_key')
-  
-  # ==> 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 = '/maestrano/auth/saml/init/default'
-  
-  # ==> 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 = '/maestrano/auth/saml/consume/default'
-  
-  # ==> 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 = '/maestrano/account/groups/:id/default'
-  config.webhook.account.group_users_path = '/maestrano/account/groups/:group_id/users/:id/default'
+if Rails.env.test?
+  Maestrano.configure do |config|
+    config.environment = 'local'
+  end
+else
+  Maestrano.auto_configure
 end
-
-# Example of multi-tenant configuration
-Maestrano['other-tenant'].configure do |config|
-  config.environment = 'test'
-  config.app.host = (config.environment == 'production' ? 'https://my-app.com' : 'http://localhost:3000')
-  
-  config.api.id = (config.environment == 'production' ? 'prod_app_id' : 'sandbox_app_id')
-  config.api.key = (config.environment == 'production' ? 'prod_api_key' : 'sandbox_api_key')
-
-  config.sso.init_path = '/maestrano/auth/saml/init/other-tenant'
-  config.sso.consume_path = '/maestrano/auth/saml/consume/other-tenant'
-  config.webhook.account.groups_path = '/maestrano/account/groups/:id/other-tenant'
-  config.webhook.account.group_users_path = '/maestrano/account/groups/:group_id/users/:id/other-tenant'
-end

data/lib/maestrano/rails/routing/routes.rb

@@ -2,14 +2,6 @@ module ActionDispatch::Routing
   class Mapper
     def maestrano_routes
       namespace :maestrano do
-        scope module: :rails do
-          # GET /maestrano/metadata
-          get '/metadata', to: 'metadata#index'
-
-          # GET /maestrano/metadata/mytenant
-          get '/metadata/:tenant', to: 'metadata#index'
-        end
-
         namespace :auth do
           resources :saml, only:[] do
             # GET /maestrano/auth/saml/init
@@ -42,4 +34,4 @@ module ActionDispatch::Routing
       end
     end
   end
-end
+end