Extranet domains

app/controllers/admin/communication/extranets_controller.rb

@@ -55,6 +55,6 @@ class Admin::Communication::ExtranetsController < Admin::Communication::Applicat
 
   def extranet_params
     params.require(:communication_extranet)
-          .permit(:name, :domain)
+          .permit(:name, :domain, :logo, :logo_delete)
   end
 end

app/controllers/application_controller.rb

 class ApplicationController < ActionController::Base
   include WithErrors
   include WithLocale
-  include WithUniversity
+  include WithDomain
 
   def breadcrumb
     add_breadcrumb t('home'), root_path

app/controllers/application_controller/with_domain.rb

+module ApplicationController::WithDomain
+  extend ActiveSupport::Concern
+
+  included do
+    def current_extranet
+      @current_extranet ||= Communication::Extranet.with_host(request.host)
+    end
+    helper_method :current_extranet
+
+    def current_university
+      @current_university ||= begin
+        current_extranet.present? ? current_extranet.university
+                                  : University.with_host(request.host)
+      end
+    end
+    helper_method :current_university
+
+    def current_context
+      @current_context ||= begin
+        # Take the extranet as a context
+        context = current_extranet
+        # If no extranet, university becomes the context
+        context ||= current_university
+        # Return context, might be nil if neither extranet nor university
+        context
+      end
+    end
+    helper_method :current_context
+  end
+end

app/controllers/application_controller/with_university.rb

-module ApplicationController::WithUniversity
-  extend ActiveSupport::Concern
-
-  included do
-    # Raises ActiveRecord::RecordNotFound to prevent access from non-listed hosts
-    def current_university
-      @current_university ||= University.with_host(request.host)
-    end
-    helper_method :current_university
-  end
-end

app/models/communication/extranet.rb

@@ -22,6 +22,12 @@ class Communication::Extranet < ApplicationRecord
 
   validates_presence_of :name, :domain
 
+  has_one_attached_deletable :logo
+
+  def self.with_host(host)
+    find_by domain: host
+  end
+
   def url
     "https://#{domain}"
   end

app/models/university/with_identifier.rb

@@ -14,7 +14,7 @@ module University::WithIdentifier
     end
 
     def self.with_host(host)
-      find_by!(identifier: extract_identifier_from(host))
+      find_by identifier: extract_identifier_from(host)
     end
 
     private

app/views/admin/communication/extranets/_form.html.erb

@@ -8,6 +8,22 @@
         <div class="card-body">
           <%= f.input :name %>
           <%= f.input :domain %>
+
+        </div>
+      </div>
+    </div>
+    <div class="col-md-4">
+      <div class="card flex-fill w-100">
+        <div class="card-header">
+          <h5 class="card-title mb-0"><%= t('logo') %></h5>
+        </div>
+        <div class="card-body">
+          <%= f.input :logo,
+                      as: :single_deletable_file,
+                      input_html: { accept: '.jpg,.jpeg,.png,.svg' },
+                      preview: 200,
+                      direct_upload: true %>
+
         </div>
       </div>
     </div>

app/views/layouts/devise.html.erb

@@ -16,10 +16,10 @@
         <div class="col-sm-10 mx-auto">
           <h1 class="my-5 py-5 text-center">
             <%= link_to root_path do %>
-              <% if current_university.logo.attached? %>
-                <%= image_tag current_university.logo, width: 200, alt: current_university.to_s %>
+              <% if current_context.logo.attached? %>
+                <%= image_tag current_context.logo, width: 200, alt: current_context.to_s %>
               <% else %>
-                <%= current_university %>
+                <%= current_context %>
               <% end %>
             <% end %>
           </h1>