From 336158c5adc73a065448c4db491b8d08eddef50a Mon Sep 17 00:00:00 2001
From: Sylvain <bond.never.die@gmail.com>
Date: Mon, 12 Sep 2016 12:10:46 +0200
Subject: [PATCH] [SSO] fix re-mapping of avatar, address and organization

---
 app/models/user.rb | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/app/models/user.rb b/app/models/user.rb
index cea52dbad..2985cad0c 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -234,7 +234,18 @@ class User < ActiveRecord::Base
     if parsed[1] == 'user'
       self[parsed[2].to_sym]
     elsif parsed[1] == 'profile'
-      self.profile[parsed[2].to_sym]
+      case sso_mapping
+        when 'profile.avatar'
+          self.profile.user_avatar.remote_attachment_url
+        when 'profile.address'
+          self.profile.address.address
+        when 'profile.organization_name'
+          self.profile.organization.name
+        when 'profile.organization_address'
+          self.profile.organization.address.address
+        else
+          self.profile[parsed[2].to_sym]
+      end
     end
   end