Adapt external person attributes and current_user to allow for external login

Larissa Reis
1 parent 3b26008f
Showing 23 changed files with 151 additions and 76 deletions Show diff stats
app/concerns/authenticated_system.rb
app/controllers/my_profile/email_templates_controller.rb
app/controllers/public/profile_controller.rb
app/controllers/public/search_controller.rb
app/helpers/application_helper.rb
app/models/concerns/external_user.rb
app/models/concerns/profile_entity.rb
app/models/environment.rb
app/models/external_person.rb
app/models/profile.rb
app/models/user.rb
app/views/account/welcome.html.erb
app/views/enterprise_registration/basic_information.html.erb
app/views/environment_role_manager/affiliate.html.erb
app/views/layouts/_user.html.erb
app/views/profile_members/affiliate.html.erb
db/migrate/20160420140141_create_external_person.rb
plugins/organization_ratings/controllers/organization_ratings_plugin_profile_controller.rb
plugins/organization_ratings/views/organization_ratings_plugin_profile/_new_rating_fields.html.erb
plugins/organization_ratings/views/shared/_make_report_block.html.erb
@@ -27,7 +27,7 @@ module AuthenticatedSystem
       @current_user ||= begin
         user = nil
         if session[:external]
-          user = User.new
+          user = User.new #FIXME: User needs to have at least email
           user.external_person_id = session[:external]
         else
           id = session[:user]
@@ -64,7 +64,7 @@ class EmailTemplatesController &lt; ApplicationController
   private
   def template_params
-    {:profile_name => current_user.name, :environment_name => environment.name }
+    {:profile_name => current_person.name, :environment_name => environment.name }
   end
   def template_params_allowed params
@@ -176,7 +176,7 @@ class ProfileController &lt; PublicController
   end
   def unblock
-    if current_user.person.is_admin?(profile.environment)
+    if current_person.is_admin?(profile.environment)
       profile.unblock
       session[:notice] = _("You have unblocked %s successfully. ") % profile.name
       redirect_to :controller => 'profile', :action => 'index'
@@ -187,7 +187,7 @@ class ProfileController &lt; PublicController
   end
   def leave_scrap
-    sender = params[:sender_id].nil? ? current_user.person : Person.find(params[:sender_id])
+    sender = params[:sender_id].nil? ? current_person : Person.find(params[:sender_id])
     receiver = params[:receiver_id].nil? ? @profile : Person.find(params[:receiver_id])
     @scrap = Scrap.new(params[:scrap])
     @scrap.sender= sender
@@ -270,7 +270,7 @@ class ProfileController &lt; PublicController
   def remove_scrap
     begin
-      scrap = current_user.person.scraps(params[:scrap_id])
+      scrap = current_person.scraps(params[:scrap_id])
       scrap.destroy
       finish_successful_removal 'Scrap successfully removed.'
     rescue
@@ -247,7 +247,7 @@ class SearchController &lt; PublicController
   def visible_profiles(klass, *extra_relations)
     relations = [:image, :domains, :environment, :preferred_domain]
     relations += extra_relations
-    if current_user && current_user.person.is_admin?
+    if current_user && current_person.is_admin?
       @environment.send(klass.name.underscore.pluralize).includes(relations)
     else
       @environment.send(klass.name.underscore.pluralize).visible.includes(relations)
@@ -146,12 +146,12 @@ module ApplicationHelper
   end
   def link_to_cms(text, profile = nil, options = {})
-    profile ||= current_user.login
+    profile ||= current_person.identifier
     link_to text, myprofile_path(:controller => 'cms', :profile => profile), options
   end
   def link_to_profile(text, profile = nil, options = {})
-    profile ||= current_user.login
+    profile ||= current_person.identifier
     link_to text, profile_path(:profile => profile) , options
   end
@@ -160,7 +160,7 @@ module ApplicationHelper
   end
   def link_if_permitted(link, permission = nil, target = nil)
-    if permission.nil? || current_user.person.has_permission?(permission, target)
+    if permission.nil? || current_person.has_permission?(permission, target)
       link
     else
       nil
@@ -813,8 +813,8 @@ module ApplicationHelper
       {s_('contents|More viewed') => {href: url_for({host: host, controller: 'search', action: 'contents', filter: 'more_popular'})}},
       {s_('contents|Most commented') => {href: url_for({host: host, controller: 'search', action: 'contents', filter: 'more_comments'})}}
     ]
-    if logged_in? && !current_user.external_person_id
-      links.push(_('New content') => modal_options({:href => url_for({:controller => 'cms', :action => 'new', :profile => current_user.login, :cms => true})}))
+    if logged_in?
+      links.push(_('New content') => modal_options({:href => url_for({:controller => 'cms', :action => 'new', :profile => current_person.identifier, :cms => true})}))
     end
     link_to(content_tag(:span, _('Contents'), :class => 'icon-menu-articles'), {:controller => "search", :action => 'contents', :category_path => nil}, :id => 'submenu-contents') +
@@ -829,9 +829,9 @@ module ApplicationHelper
        {s_('people|More active') => {href: url_for({host: host, controller: 'search', action: 'people', filter: 'more_active'})}},
        {s_('people|More popular') => {href: url_for({host: host, controller: 'search', action: 'people', filter: 'more_popular'})}}
      ]
-     if logged_in? && !current_user.external_person_id
-       links.push(_('My friends') => {:href => url_for({:profile => current_user.login, :controller => 'friends'})})
-       links.push(_('Invite friends') => {:href => url_for({:profile => current_user.login, :controller => 'invite', :action => 'friends'})})
+     if logged_in?
+       links.push(_('My friends') => {:href => url_for({:profile => current_person.identifier, :controller => 'friends'})})
+       links.push(_('Invite friends') => {:href => url_for({:profile => current_person.identifier, :controller => 'invite', :action => 'friends'})})
      end
     link_to(content_tag(:span, _('People'), :class => 'icon-menu-people'), {:controller => "search", :action => 'people', :category_path => ''}, :id => 'submenu-people') +
@@ -846,9 +846,9 @@ module ApplicationHelper
        {s_('communities|More active') => {href: url_for({host: host, controller: 'search', action: 'communities', filter: 'more_active'})}},
        {s_('communities|More popular') => {href: url_for({host: host, controller: 'search', action: 'communities', filter: 'more_popular'})}}
      ]
-     if logged_in? && !current_user.external_person_id
-       links.push(_('My communities') => {:href => url_for({:profile => current_user.login, :controller => 'memberships'})})
-       links.push(_('New community') => {:href => url_for({:profile => current_user.login, :controller => 'memberships', :action => 'new_community'})})
+     if logged_in?
+       links.push(_('My communities') => {:href => url_for({:profile => current_person.identifier, :controller => 'memberships'})})
+       links.push(_('New community') => {:href => url_for({:profile => current_person.identifier, :controller => 'memberships', :action => 'new_community'})})
      end
     link_to(content_tag(:span, _('Communities'), :class => 'icon-menu-community'), {:controller => "search", :action => 'communities'}, :id => 'submenu-communities') +
@@ -49,8 +49,9 @@ module ExternalUser
           webfinger = OpenStruct.new(
                         identifier: user['user']['person']['identifier'],
                         name: user['user']['person']['name'],
+                        created_at: user['user']['person']['created_at'],
                         domain: domain,
-                        email_md5: Digest::MD5.hexdigest(user['user']['email'])
+                        email: user['user']['email']
                       )
           u.external_person_id = ExternalPerson.get_or_create(webfinger).id
           return u
@@ -35,4 +35,34 @@ module ProfileEntity
     true
   end
+  # returns +false+
+  def person?
+    self.kind_of?(Person)
+  end
+
+  def enterprise?
+    self.kind_of?(Enterprise)
+  end
+
+  def organization?
+    self.kind_of?(Organization)
+  end
+
+  def community?
+    self.kind_of?(Community)
+  end
+
+  include ActionView::Helpers::TextHelper
+  def short_name(chars = 40)
+    if self[:nickname].blank?
+      if chars
+        truncate self.name, length: chars, omission: '...'
+      else
+        self.name
+      end
+    else
+      self[:nickname]
+    end
+  end
+
 end
@@ -1010,8 +1010,7 @@ class Environment &lt; ApplicationRecord
   end
   def has_federated_network?(domain)
-    # FIXME: Should return whether "domain" is whitelisted in this environment as a federated network
-    true
+    self.federated_networks.map(&:url).any? {|url| /http[s]?:\/\/#{domain}\/?/ =~ url }
   end
   private
@@ -6,7 +6,7 @@ class ExternalPerson &lt; ActiveRecord::Base
   validates_uniqueness_of :identifier, scope: :source
-  attr_accessible :source, :email_md5_hash
+  attr_accessible :source, :email, :created_at
   def self.get_or_create(webfinger)
     user = ExternalPerson.find_by(identifier: webfinger.identifier, source: webfinger.domain)
@@ -14,7 +14,8 @@ class ExternalPerson &lt; ActiveRecord::Base
       user = ExternalPerson.create!(identifier: webfinger.identifier,
                                     name: webfinger.name,
                                     source: webfinger.domain,
-                                    email_md5_hash: webfinger.email_md5
+                                    email: webfinger.email,
+                                    created_at: webfinger.created_at
                                    )
     end
     user
@@ -24,12 +25,83 @@ class ExternalPerson &lt; ActiveRecord::Base
     "http://#{self.source}/#{self.identifier}"
   end
+  alias :public_profile_url :url
+
   def avatar
-    "http://#{self.source}/plugin/gravatar_provider/h/#{self.email_md5_hash}"
+    "http://#{self.source}/plugin/gravatar_provider/h/#{Digest::MD5.hexdigest(self.email)}"
+  end
+
+  def admin_url
+    "http://#{self.source}/myprofile/#{self.identifier}"
+  end
+
+  def profile_custom_icon(gravatar_default=nil)
+    self.avatar
   end
   def preferred_login_redirection
     environment.redirection_after_login
   end
+  def person?
+    true
+  end
+
+  def is_admin?(environment = nil)
+    false
+  end
+
+  def lat
+    nil
+  end
+  def lng
+    nil
+  end
+
+  def role_assignments
+    RoleAssignment.none
+  end
+
+  def favorite_enterprises
+    Enterprise.none
+  end
+
+  def memberships
+    Profile.none
+  end
+
+  def friendships
+    Profile.none
+  end
+
+  def follows?(profile)
+    false
+  end
+
+  def is_a_friend?(person)
+    false
+  end
+
+  def already_request_friendship?(person)
+    false
+  end
+
+  class ExternalPerson::Image
+    attr_accessor :path
+    def initialize(path)
+      self.path = path
+    end
+    def public_filename(size = nil)
+      self.path
+    end
+
+    def content_type
+      'image/png'
+    end
+  end
+
+  def image
+    ExternalPerson::Image.new(avatar)
+  end
+
 end
@@ -549,23 +549,6 @@ class Profile &lt; ApplicationRecord
     environment
   end
-  # returns +false+
-  def person?
-    self.kind_of?(Person)
-  end
-
-  def enterprise?
-    self.kind_of?(Enterprise)
-  end
-
-  def organization?
-    self.kind_of?(Organization)
-  end
-
-  def community?
-    self.kind_of?(Community)
-  end
-
   # returns false.
   def is_validation_entity?
     false
@@ -803,19 +786,6 @@ private :generate_url, :url_options
     !forbidden.include?(cat.class)
   end
-  include ActionView::Helpers::TextHelper
-  def short_name(chars = 40)
-    if self[:nickname].blank?
-      if chars
-        truncate self.name, length: chars, omission: '...'
-      else
-        self.name
-      end
-    else
-      self[:nickname]
-    end
-  end
-
   def custom_header
     self[:custom_header] || environment && environment.custom_header
   end
@@ -149,7 +149,7 @@ class User &lt; ApplicationRecord
       u.generate_private_token_if_not_exist
       return u
     end
-    
+
     return User.external_authenticate(login, password, environment)
   end
@@ -4,7 +4,7 @@
   <%= _('%s was successfuly activated. Now you may go to your control panel or to the control panel of your enterprise') % @enterprise.name %>
   <%= button_bar do %>
-    <%= button 'forward', _('Go to my control panel'), :action => 'index', :controller => 'profile_editor', :profile => current_user.person.identifier %>
+    <%= button 'forward', _('Go to my control panel'), :action => 'index', :controller => 'profile_editor', :profile => current_person.identifier %>
     <%= button 'forward', _('Go to my enterprise control panel') % @enterprise.name, :action => 'index', :controller => 'profile_editor', :profile => @enterprise.identifier %>
   <% end %>
 <% end %>
@@ -9,7 +9,7 @@
   </div>
   <%= button_bar do %>
-    <%= button :back, _('Go back'), { :profile => current_user.person.identifier, :action=>"enterprises", :controller=>"profile" }%>
+    <%= button :back, _('Go back'), { :profile => current_person.identifier, :action=>"enterprises", :controller=>"profile" }%>
   <% end %>
 <% else %>
   <div class='atention'>
@@ -37,7 +37,7 @@
     <%= template_options(:enterprises, 'create_enterprise')%>
     <%= button_bar do %>
-      <%= submit_button('next', _('Next'), :cancel => {:profile => current_user.person.identifier, :action=>"enterprises", :controller=>"profile"}) %>
+      <%= submit_button('next', _('Next'), :cancel => {:profile => current_person.identifier, :action=>"enterprises", :controller=>"profile"}) %>
     <% end %>
   <% end %>
 <% end %>
@@ -2,7 +2,7 @@
 <%= form_tag( {:action => 'give_role'}, {:method => :post}) do %>
   <%= select_tag 'role', options_for_select(@roles.map{|r|[r.name,r.id]})  %>
-  <%= hidden_field_tag 'person', current_user.person.id %>
+  <%= hidden_field_tag 'person', current_person.id %>
   <%= button_bar do %>
     <%= submit_button('affiliate', _('Affiliate', :cancel => {:action => 'index'}) %>
   <% end %>
 <div id="user">
   <% user = (session[:user] && User.find_by(id: session[:user])) || nil %>
+  <% user ||= (session[:external] && User.new(:external_person_id => session[:external])) || nil %>
   <% if user.present? %>
     <% user = user.person %>
     <span class='logged-in'>
@@ -2,7 +2,7 @@
 <%= form_tag( {:action => 'give_role'}, {:method => :post}) do %>
   <%= select_tag 'role', options_for_select(@roles.map{|r|[r.name,r.id]})  %>
-  <%= hidden_field_tag 'person', current_user.person.id %>
+  <%= hidden_field_tag 'person', current_person.id %>
   <%= button_bar do %>
     <%= submit_button('affiliate', _('Affiliate'), :cancel => {:action => 'index'}) %>
   <% end %>
@@ -4,9 +4,11 @@ class CreateExternalPerson &lt; ActiveRecord::Migration
       t.string :name
       t.string :identifier
       t.string :source
-      t.string :email_md5_hash
+      t.string :email
       t.integer :environment_id
       t.boolean :visible, default: true
+      t.datetime :created_at
+      t.datetime :updated_at
     end
   end
 end
@@ -38,7 +38,7 @@ class OrganizationRatingsPluginProfileController &lt; ProfileController
   def create_new_rate
     @rating = OrganizationRating.new(params[:organization_rating])
-    @rating.person = current_user.person
+    @rating.person = current_person
     @rating.organization = profile
     @rating.value = params[:organization_rating_value] if params[:organization_rating_value]
@@ -9,11 +9,11 @@
   <div class="star-profile-information">
     <div class="star-profile-image">
-      <%= link_to profile_image(current_user.person, :portrait), current_user.person.url %>
+      <%= link_to profile_image(current_person, :portrait), current_person.url %>
     </div>
     <div class="star-profile-name">
-      <%= link_to current_user.person.name,  current_user.person.url %>
+      <%= link_to current_person.name,  current_person.url %>
     </div>
   </div>
@@ -59,14 +59,14 @@
     </div>
   <% elsif env_organization_ratings_config.vote_once %>
     <div class="star-rate-form rating-vote-once">
-      <%= _("Hi, %s! The administrators set that you can vote") % current_user.name %>
+      <%= _("Hi, %s! The administrators set that you can vote") % current_person.name %>
       <strong><%= _("only once") %></strong>
       <%= _("for this %s.") % profile.class.name.downcase %>
       <%= render :partial => 'shared/rating_button', :locals => { :disabled => true } %>
     </div>
   <% else %>
     <div class="star-rate-form rating-cooldown">
-      <%= _("Hi, %s! The administrators set the minimum time of") % current_user.name %>
+      <%= _("Hi, %s! The administrators set the minimum time of") % current_person.name %>
       <strong><%= _("%d hour(s)") % env_organization_ratings_config.cooldown %></strong>
       <%= _("between each evaluation.") %>
-<% logged_in_image = link_to profile_image(current_user.person, :portrait), current_user.person.url if current_user %>
-<% logged_in_name = link_to current_user.person.name,  current_user.person.url if current_user %>
+<% logged_in_image = link_to profile_image(current_person, :portrait), current_person.url if current_user %>
+<% logged_in_name = link_to current_person.name,  current_person.url if current_user %>
 <% logged_out_image = image_tag('plugins/organization_ratings/public/images/user-not-logged.png') %>
 <div class="make-report-block">
@@ -26,4 +26,4 @@
       </div>
     <% end %>
   </div>
-</div>
 \ No newline at end of file
+</div>
@@ -140,7 +140,7 @@ module ApplicationHelper
         [s_('contents|Most commented'), {host: host, controller: :search, action: :contents, filter: 'more_comments'}],
       ]
       if logged_in?
-        links.push [_('New content'), '', modal_options({href: url_for({controller: 'cms', action: 'new', profile: current_user.login, cms: true})})]
+        links.push [_('New content'), '', modal_options({href: url_for({controller: 'cms', action: 'new', profile: current_person.identifier, cms: true})})]
       end
       content_tag :li, class: 'dropdown' do
@@ -170,8 +170,8 @@ module ApplicationHelper
         [s_('people|More popular'), {host: host, controller: :search, action: :people, filter: 'more_popular'}],
       ]
       if logged_in?
-        links.push [_('My friends'),     {profile: current_user.login, controller: 'friends'}]
-        links.push [_('Invite friends'), {profile: current_user.login, controller: 'invite', action: 'friends'}]
+        links.push [_('My friends'),     {profile: current_person.identifier, controller: 'friends'}]
+        links.push [_('Invite friends'), {profile: current_person.identifier, controller: 'invite', action: 'friends'}]
       end
       content_tag :li, class: 'dropdown' do
@@ -201,8 +201,8 @@ module ApplicationHelper
         [s_('communities|More popular'), {host: host, controller: :search, action: :communities, filter: 'more_popular'}],
       ]
       if logged_in?
-        links.push [_('My communities'), {profile: current_user.login, controller: 'memberships'}]
-        links.push [_('New community'),  {profile: current_user.login, controller: 'memberships', action: 'new_community'}]
+        links.push [_('My communities'), {profile: current_person.identifier, controller: 'memberships'}]
+        links.push [_('New community'),  {profile: current_person.identifier, controller: 'memberships', action: 'new_community'}]
       end
       content_tag :li, class: 'dropdown' do
@@ -8,7 +8,7 @@
   </ul>
   <div>
-    <% if logged_in? and (current_user.person.is_admin?(environment) or profile.admins.include?(current_user.person)) %>
+    <% if logged_in? and (current_person.is_admin?(environment) or profile.admins.include?(current_person)) %>
       <%= _('Edit %{inputs} and %{block.interests}') % {
         :inputs => link_to(_("products' inputs"), :controller => :manage_products, :action => :index),
         :interests => link_to(_('declared interests'), :controller => :sniffer_plugin_myprofile, :action => :edit),
@@ -12,9 +12,9 @@ module SolrPlugin::SearchHelper
     :products => ActiveSupport::OrderedHash[ :none, {:label => _('Relevance')},
       :more_recent, {:label => c_('More recent'), :solr_opts => {:sort => 'updated_at desc, score desc'}},
       :name, {:label => _('Name'), :solr_opts => {:sort => 'solr_plugin_name_sortable asc'}},
-      :closest, {:label => _('Closest to me'), :if => proc{ logged_in? && (profile=current_user.person).lat && profile.lng },
+      :closest, {:label => _('Closest to me'), :if => proc{ logged_in? && (profile=current_person).lat && profile.lng },
         :solr_opts => {:sort => "geodist() asc",
-          :latitude => proc{ current_user.person.lat }, :longitude => proc{ current_user.person.lng }}},
+          :latitude => proc{ current_person.lat }, :longitude => proc{ current_person.lng }}},
     ],
     :events => ActiveSupport::OrderedHash[ :none, {:label => _('Relevance')},
       :name, {:label => _('Name'), :solr_opts => {:sort => 'solr_plugin_name_sortable asc'}},
	@@ -27,7 +27,7 @@ module AuthenticatedSystem		@@ -27,7 +27,7 @@ module AuthenticatedSystem
27	@current_user \|\|= begin	27	@current_user \|\|= begin
28	user = nil	28	user = nil
29	if session[:external]	29	if session[:external]
30	- user = User.new	30	+ user = User.new #FIXME: User needs to have at least email
31	user.external_person_id = session[:external]	31	user.external_person_id = session[:external]
32	else	32	else
33	id = session[:user]	33	id = session[:user]
	@@ -64,7 +64,7 @@ class EmailTemplatesController < ApplicationController		@@ -64,7 +64,7 @@ class EmailTemplatesController < ApplicationController
64	private	64	private
65		65
66	def template_params	66	def template_params
67	- {:profile_name => current_user.name, :environment_name => environment.name }	67	+ {:profile_name => current_person.name, :environment_name => environment.name }
68	end	68	end
69		69
70	def template_params_allowed params	70	def template_params_allowed params
	@@ -176,7 +176,7 @@ class ProfileController < PublicController		@@ -176,7 +176,7 @@ class ProfileController < PublicController
176	end	176	end
177		177
178	def unblock	178	def unblock
179	- if current_user.person.is_admin?(profile.environment)	179	+ if current_person.is_admin?(profile.environment)
180	profile.unblock	180	profile.unblock
181	session[:notice] = _("You have unblocked %s successfully. ") % profile.name	181	session[:notice] = _("You have unblocked %s successfully. ") % profile.name
182	redirect_to :controller => 'profile', :action => 'index'	182	redirect_to :controller => 'profile', :action => 'index'
	@@ -187,7 +187,7 @@ class ProfileController < PublicController		@@ -187,7 +187,7 @@ class ProfileController < PublicController
187	end	187	end
188		188
189	def leave_scrap	189	def leave_scrap
190	- sender = params[:sender_id].nil? ? current_user.person : Person.find(params[:sender_id])	190	+ sender = params[:sender_id].nil? ? current_person : Person.find(params[:sender_id])
191	receiver = params[:receiver_id].nil? ? @profile : Person.find(params[:receiver_id])	191	receiver = params[:receiver_id].nil? ? @profile : Person.find(params[:receiver_id])
192	@scrap = Scrap.new(params[:scrap])	192	@scrap = Scrap.new(params[:scrap])
193	@scrap.sender= sender	193	@scrap.sender= sender
	@@ -270,7 +270,7 @@ class ProfileController < PublicController		@@ -270,7 +270,7 @@ class ProfileController < PublicController
270		270
271	def remove_scrap	271	def remove_scrap
272	begin	272	begin
273	- scrap = current_user.person.scraps(params[:scrap_id])	273	+ scrap = current_person.scraps(params[:scrap_id])
274	scrap.destroy	274	scrap.destroy
275	finish_successful_removal 'Scrap successfully removed.'	275	finish_successful_removal 'Scrap successfully removed.'
276	rescue	276	rescue
	@@ -247,7 +247,7 @@ class SearchController < PublicController		@@ -247,7 +247,7 @@ class SearchController < PublicController
247	def visible_profiles(klass, *extra_relations)	247	def visible_profiles(klass, *extra_relations)
248	relations = [:image, :domains, :environment, :preferred_domain]	248	relations = [:image, :domains, :environment, :preferred_domain]
249	relations += extra_relations	249	relations += extra_relations
250	- if current_user && current_user.person.is_admin?	250	+ if current_user && current_person.is_admin?
251	@environment.send(klass.name.underscore.pluralize).includes(relations)	251	@environment.send(klass.name.underscore.pluralize).includes(relations)
252	else	252	else
253	@environment.send(klass.name.underscore.pluralize).visible.includes(relations)	253	@environment.send(klass.name.underscore.pluralize).visible.includes(relations)
	@@ -35,4 +35,34 @@ module ProfileEntity		@@ -35,4 +35,34 @@ module ProfileEntity
35	true	35	true
36	end	36	end
37		37
		38	+ # returns +false+
		39	+ def person?
		40	+ self.kind_of?(Person)
		41	+ end
		42	+
		43	+ def enterprise?
		44	+ self.kind_of?(Enterprise)
		45	+ end
		46	+
		47	+ def organization?
		48	+ self.kind_of?(Organization)
		49	+ end
		50	+
		51	+ def community?
		52	+ self.kind_of?(Community)
		53	+ end
		54	+
		55	+ include ActionView::Helpers::TextHelper
		56	+ def short_name(chars = 40)
		57	+ if self[:nickname].blank?
		58	+ if chars
		59	+ truncate self.name, length: chars, omission: '...'
		60	+ else
		61	+ self.name
		62	+ end
		63	+ else
		64	+ self[:nickname]
		65	+ end
		66	+ end
		67	+
38	end	68	end
	@@ -1010,8 +1010,7 @@ class Environment < ApplicationRecord		@@ -1010,8 +1010,7 @@ class Environment < ApplicationRecord
1010	end	1010	end
1011		1011
1012	def has_federated_network?(domain)	1012	def has_federated_network?(domain)
1013	- # FIXME: Should return whether "domain" is whitelisted in this environment as a federated network
1014	- true	1013	+ self.federated_networks.map(&:url).any? {\|url\| /http[s]?:\/\/#{domain}\/?/ =~ url }
1015	end	1014	end
1016		1015
1017	private	1016	private
	@@ -6,7 +6,7 @@ class ExternalPerson < ActiveRecord::Base		@@ -6,7 +6,7 @@ class ExternalPerson < ActiveRecord::Base
6		6
7	validates_uniqueness_of :identifier, scope: :source	7	validates_uniqueness_of :identifier, scope: :source
8		8
9	- attr_accessible :source, :email_md5_hash	9	+ attr_accessible :source, :email, :created_at
10		10
11	def self.get_or_create(webfinger)	11	def self.get_or_create(webfinger)
12	user = ExternalPerson.find_by(identifier: webfinger.identifier, source: webfinger.domain)	12	user = ExternalPerson.find_by(identifier: webfinger.identifier, source: webfinger.domain)
	@@ -14,7 +14,8 @@ class ExternalPerson < ActiveRecord::Base		@@ -14,7 +14,8 @@ class ExternalPerson < ActiveRecord::Base
14	user = ExternalPerson.create!(identifier: webfinger.identifier,	14	user = ExternalPerson.create!(identifier: webfinger.identifier,
15	name: webfinger.name,	15	name: webfinger.name,
16	source: webfinger.domain,	16	source: webfinger.domain,
17	- email_md5_hash: webfinger.email_md5	17	+ email: webfinger.email,
		18	+ created_at: webfinger.created_at
18	)	19	)
19	end	20	end
20	user	21	user
	@@ -24,12 +25,83 @@ class ExternalPerson < ActiveRecord::Base		@@ -24,12 +25,83 @@ class ExternalPerson < ActiveRecord::Base
24	"http://#{self.source}/#{self.identifier}"	25	"http://#{self.source}/#{self.identifier}"
25	end	26	end
26		27
		28	+ alias :public_profile_url :url
		29	+
27	def avatar	30	def avatar
28	- "http://#{self.source}/plugin/gravatar_provider/h/#{self.email_md5_hash}"	31	+ "http://#{self.source}/plugin/gravatar_provider/h/#{Digest::MD5.hexdigest(self.email)}"
		32	+ end
		33	+
		34	+ def admin_url
		35	+ "http://#{self.source}/myprofile/#{self.identifier}"
		36	+ end
		37	+
		38	+ def profile_custom_icon(gravatar_default=nil)
		39	+ self.avatar
29	end	40	end
30		41
31	def preferred_login_redirection	42	def preferred_login_redirection
32	environment.redirection_after_login	43	environment.redirection_after_login
33	end	44	end
34		45
		46	+ def person?
		47	+ true
		48	+ end
		49	+
		50	+ def is_admin?(environment = nil)
		51	+ false
		52	+ end
		53	+
		54	+ def lat
		55	+ nil
		56	+ end
		57	+ def lng
		58	+ nil
		59	+ end
		60	+
		61	+ def role_assignments
		62	+ RoleAssignment.none
		63	+ end
		64	+
		65	+ def favorite_enterprises
		66	+ Enterprise.none
		67	+ end
		68	+
		69	+ def memberships
		70	+ Profile.none
		71	+ end
		72	+
		73	+ def friendships
		74	+ Profile.none
		75	+ end
		76	+
		77	+ def follows?(profile)
		78	+ false
		79	+ end
		80	+
		81	+ def is_a_friend?(person)
		82	+ false
		83	+ end
		84	+
		85	+ def already_request_friendship?(person)
		86	+ false
		87	+ end
		88	+
		89	+ class ExternalPerson::Image
		90	+ attr_accessor :path
		91	+ def initialize(path)
		92	+ self.path = path
		93	+ end
		94	+ def public_filename(size = nil)
		95	+ self.path
		96	+ end
		97	+
		98	+ def content_type
		99	+ 'image/png'
		100	+ end
		101	+ end
		102	+
		103	+ def image
		104	+ ExternalPerson::Image.new(avatar)
		105	+ end
		106	+
35	end	107	end
	@@ -549,23 +549,6 @@ class Profile < ApplicationRecord		@@ -549,23 +549,6 @@ class Profile < ApplicationRecord
549	environment	549	environment
550	end	550	end
551		551
552	- # returns +false+
553	- def person?
554	- self.kind_of?(Person)
555	- end
556	-
557	- def enterprise?
558	- self.kind_of?(Enterprise)
559	- end
560	-
561	- def organization?
562	- self.kind_of?(Organization)
563	- end
564	-
565	- def community?
566	- self.kind_of?(Community)
567	- end
568	-
569	# returns false.	552	# returns false.
570	def is_validation_entity?	553	def is_validation_entity?
571	false	554	false
	@@ -803,19 +786,6 @@ private :generate_url, :url_options		@@ -803,19 +786,6 @@ private :generate_url, :url_options
803	!forbidden.include?(cat.class)	786	!forbidden.include?(cat.class)
804	end	787	end
805		788
806	- include ActionView::Helpers::TextHelper
807	- def short_name(chars = 40)
808	- if self[:nickname].blank?
809	- if chars
810	- truncate self.name, length: chars, omission: '...'
811	- else
812	- self.name
813	- end
814	- else
815	- self[:nickname]
816	- end
817	- end
818	-
819	def custom_header	789	def custom_header
820	self[:custom_header] \|\| environment && environment.custom_header	790	self[:custom_header] \|\| environment && environment.custom_header
821	end	791	end
	@@ -149,7 +149,7 @@ class User < ApplicationRecord		@@ -149,7 +149,7 @@ class User < ApplicationRecord
149	u.generate_private_token_if_not_exist	149	u.generate_private_token_if_not_exist
150	return u	150	return u
151	end	151	end
152	-	152	+
153	return User.external_authenticate(login, password, environment)	153	return User.external_authenticate(login, password, environment)
154	end	154	end
155		155
	@@ -4,7 +4,7 @@		@@ -4,7 +4,7 @@
4	<%= _('%s was successfuly activated. Now you may go to your control panel or to the control panel of your enterprise') % @enterprise.name %>	4	<%= _('%s was successfuly activated. Now you may go to your control panel or to the control panel of your enterprise') % @enterprise.name %>
5		5
6	<%= button_bar do %>	6	<%= button_bar do %>
7	- <%= button 'forward', _('Go to my control panel'), :action => 'index', :controller => 'profile_editor', :profile => current_user.person.identifier %>	7	+ <%= button 'forward', _('Go to my control panel'), :action => 'index', :controller => 'profile_editor', :profile => current_person.identifier %>
8	<%= button 'forward', _('Go to my enterprise control panel') % @enterprise.name, :action => 'index', :controller => 'profile_editor', :profile => @enterprise.identifier %>	8	<%= button 'forward', _('Go to my enterprise control panel') % @enterprise.name, :action => 'index', :controller => 'profile_editor', :profile => @enterprise.identifier %>
9	<% end %>	9	<% end %>
10	<% end %>	10	<% end %>