maestrano-connector-rails 0.3.5 → 0.3.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ecb5e0b3c1b1cba58c3e8d59cf9482e9f2d7e8ae
-  data.tar.gz: 370650bd45310a4aa5c38fb8adb275d8807c77e2
+  metadata.gz: d94d15e3a6fd70083f95437d043eaa3a75483798
+  data.tar.gz: 265289bdb90adbc369999c37e22b0614b4793c9a
 SHA512:
-  metadata.gz: 0e1c2fa672cdcacb98241508eac191fdf2c8285da9c839384bf8ca43cd4b348959e0a4b0eedfb1f2a565c3604f385c051e95c42beeaf0864ed290ff3afbe6401
-  data.tar.gz: 2226a0f6777653327da0d79d6a4023a7d01e2385ce94c74eee95b28b7f92bdc1ef948ba513e277358d5ae0b747af4d61c2aba8ea97842fd4fd22dc6c49ad12a3
+  metadata.gz: 5876b376594568daf87136ffe2db59812f25d023def013a2419f8e4e1a8bd47b51d0b971c7584d7ee7b869821d7db91a47ea5b92178ceece70c2a3f284b3c9b6
+  data.tar.gz: 10e5113d838dbd8a9bfbb282955a4b9ad715772289d2a4afd510d5e542612157fcdef2a2303bbf0bbb0c677f04c1c3fb01ffb0d062855655bfff670b80f5f1cf

data/VERSION

@@ -1 +1 @@
-0.3.5
+0.3.6

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

@@ -1,16 +1,14 @@
 class Maestrano::Auth::SamlController < Maestrano::Rails::SamlBaseController
+
+  def init
+    session[:settings] = !!params[:settings]
+    super
+  end
+
   #== POST '/maestrano/auth/saml/consume'
   # Final phase of the Single Sign-On handshake. Find or create
   # the required resources (user and group) and sign the user
   # in
-  #
-  # This action is left to you to customize based on your application
-  # requirements. Below is presented a potential way of writing 
-  # the action.
-  #
-  # Assuming you have enabled maestrano on a user model
-  # called 'User' and a group model called 'Organization'
-  # the action could be written the following way
   def consume
     params[:tenant] ||= 'default'
     user = Maestrano::Connector::Rails::User.find_or_create_for_maestrano(user_auth_hash, params[:tenant])
@@ -25,7 +23,16 @@ class Maestrano::Auth::SamlController < Maestrano::Rails::SamlBaseController
       session[:org_uid] = organization.uid
       session[:"role_#{organization.uid}"] = user_group_rel_hash[:role]
     end
-    
-    redirect_to main_app.root_path
+
+    if session[:settings]
+      session.delete(:setting)
+      redirect_to main_app.root_path
+    else
+      if current_organization && current_organization.oauth_uid && current_organization.sync_enabled
+        redirect_to main_app.home_redirect_to_external_path
+      else
+        redirect_to main_app.root_path
+      end
+    end
   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 0.3.5 ruby lib
+# stub: maestrano-connector-rails 0.3.6 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "maestrano-connector-rails"
-  s.version = "0.3.5"
+  s.version = "0.3.6"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib"]
   s.authors = ["Pierre Berard"]
-  s.date = "2016-03-21"
+  s.date = "2016-03-29"
   s.description = "Maestrano is the next generation marketplace for SME applications. See https://maestrano.com for details."
   s.email = "pierre.berard@maestrano.com"
   s.executables = ["rails"]

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: maestrano-connector-rails
 version: !ruby/object:Gem::Version
-  version: 0.3.5
+  version: 0.3.6
 platform: ruby
 authors:
 - Pierre Berard
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-21 00:00:00.000000000 Z
+date: 2016-03-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: maestrano-rails