Merge branch 'sso'

2 files changed, 13 insertions, 11 deletions

diff --git a/app/models/organisation.rb b/app/models/organisation.rb
index 9d6e92825..c219bcbc9 100644
--- a/app/models/organisation.rb
+++ b/app/models/organisation.rb
@@ -21,4 +21,12 @@ class Organisation < ActiveRecord::Base
   def add_rule_parameter_set
     RuleParameterSet.default_for_all_modes( self).save
   end
+
+  def self.sync_or_create code:, name:
+    find_or_create_by(code: code) do |org|
+      org.name      = name
+      org.code      = code
+      org.synced_at = Time.now
+    end
+  end
 end
diff --git a/app/models/user.rb b/app/models/user.rb
index e00b6a35a..a8b8a01a0 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -6,8 +6,7 @@ class User < ActiveRecord::Base
   cattr_reader :authentication_type
 
   devise :invitable, :registerable, :validatable,
-         :recoverable, :rememberable, :trackable,
-         :confirmable, :async, authentication_type
+         :recoverable, :rememberable, :trackable, :async, authentication_type
 
   # FIXME https://github.com/nbudin/devise_cas_authenticatable/issues/53
   # Work around :validatable, when database_authenticatable is diabled.
@@ -30,15 +29,10 @@ class User < ActiveRecord::Base
   after_destroy :check_destroy_organisation
 
   def cas_extra_attributes=(extra_attributes)
-    extra_attributes.each do |name, value|
-      # case name.to_sym
-      # Extra attributes
-      # when :fullname
-      #   self.fullname = value
-      # when :email
-      #   self.email = value
-      # end
-    end
+    extra      = extra_attributes.inject({}){|memo,(k,v)| memo[k.to_sym] = v; memo}
+    self.name  = extra[:full_name]
+    self.email = extra[:email]
+    self.organisation = Organisation.sync_or_create code: extra[:organisation_code], name: extra[:organisation_name]
   end
 
   private