From 29b3e0b1fe5d3c7ab32da56d55b559d1ce5fbcc5 Mon Sep 17 00:00:00 2001 From: tnicolas1 Date: Wed, 5 Feb 2025 13:36:31 +0100 Subject: [PATCH] Renommer 'insider' par 'academic' --- .../application_controller.rb | 14 ++++++------ app/controllers/application_controller.rb | 10 ++++----- app/controllers/concerns/developer_oidc.rb | 2 +- .../users/omniauth_callbacks_controller.rb | 22 +++++++++---------- app/models/{insider => academic}/user.rb | 2 +- .../application/home.html.haml | 0 .../application/login.html.haml | 2 +- config/initializers/omniauth.rb | 2 +- config/locales/fr.yml | 2 +- config/routes.rb | 12 +++++----- 10 files changed, 34 insertions(+), 34 deletions(-) rename app/controllers/{insider => academic}/application_controller.rb (66%) rename app/models/{insider => academic}/user.rb (98%) rename app/views/{insider => academic}/application/home.html.haml (100%) rename app/views/{insider => academic}/application/login.html.haml (92%) diff --git a/app/controllers/insider/application_controller.rb b/app/controllers/academic/application_controller.rb similarity index 66% rename from app/controllers/insider/application_controller.rb rename to app/controllers/academic/application_controller.rb index 2e17dda3d..b4afd45d1 100644 --- a/app/controllers/insider/application_controller.rb +++ b/app/controllers/academic/application_controller.rb @@ -1,13 +1,13 @@ # frozen_string_literal: true -module Insider +module Academic class ApplicationController < ActionController::Base include UserLogger include PageTitle layout "application" - before_action :authenticate_insider_user!, except: :login + before_action :authenticate_academic_user!, except: :login before_action :log_user, :set_overrides, :infer_page_title @@ -19,19 +19,19 @@ def home; end def login; end def logout - sign_out(current_insider_user) + sign_out(current_academic_user) - redirect_to after_sign_out_path_for(:insider_user) + redirect_to after_sign_out_path_for(:academic_user) end protected def after_sign_out_path_for(_resource) - new_insider_user_session_path + new_academic_user_session_path end def current_user - current_insider_user + current_academic_user end def current_establishment @@ -40,7 +40,7 @@ def current_establishment def set_overrides @inhibit_nav = true - @logout_path = :destroy_insider_user_session + @logout_path = :destroy_academic_user_session end end end diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index e43174f12..efc22738b 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -7,7 +7,7 @@ class ApplicationController < ActionController::Base before_action :authenticate_user!, :log_user, :redirect_asp_users!, - :redirect_insider_users!, + :redirect_academic_users!, :check_maintenance, :check_current_establishment @@ -25,8 +25,8 @@ def after_sign_out_path_for(resource_or_scope) new_user_session_path when :asp_user new_asp_user_session_path - when :insider_user - new_insider_user_session_path + when :academic_user + new_academic_user_session_path end end @@ -55,8 +55,8 @@ def redirect_asp_users! redirect_to asp_schoolings_path and return if asp_user_signed_in? end - def redirect_insider_users! - redirect_to insider_home_path and return if insider_user_signed_in? + def redirect_academic_users! + redirect_to academic_home_path and return if academic_user_signed_in? end private diff --git a/app/controllers/concerns/developer_oidc.rb b/app/controllers/concerns/developer_oidc.rb index 38f35f34e..9edd75abb 100644 --- a/app/controllers/concerns/developer_oidc.rb +++ b/app/controllers/concerns/developer_oidc.rb @@ -43,7 +43,7 @@ def static_info(attrs) name: "Developer Account", email: attrs["info"]["email"] }, - callback: attrs["info"]["insider"] + callback: attrs["info"]["academic"] } end diff --git a/app/controllers/users/omniauth_callbacks_controller.rb b/app/controllers/users/omniauth_callbacks_controller.rb index 452f88fda..b095536fb 100644 --- a/app/controllers/users/omniauth_callbacks_controller.rb +++ b/app/controllers/users/omniauth_callbacks_controller.rb @@ -33,8 +33,8 @@ def fim end def oidc - if auth_hash.info.callback&.to_sym.eql?(:insider) - oidc_insider + if auth_hash.info.callback&.to_sym.eql?(:academic) + oidc_academic else oidc_aplypro end @@ -58,15 +58,15 @@ def oidc_aplypro choose_redirect_page! end - def oidc_insider - @insider_login = true - @insider_user = Insider::User.from_oidc(auth_hash).tap(&:save!) + def oidc_academic + @academic_login = true + @academic_user = Academic::User.from_oidc(auth_hash).tap(&:save!) # TODO: Check limited access to this part ? - sign_in(:insider_user, @insider_user) + sign_in(:academic_user, @academic_user) - redirect_to insider_home_path + redirect_to academic_home_path end def failure @@ -82,8 +82,8 @@ def authentication_failure(error) if defined? @asp_login fail_asp_user - elsif defined? @insider_login - fail_insider_user + elsif defined? @academic_login + fail_academic_user else fail_user end @@ -99,8 +99,8 @@ def fail_asp_user redirect_to new_asp_user_session_path end - def fail_insider_user - redirect_to new_insider_user_session_path + def fail_academic_user + redirect_to new_academic_user_session_path end private diff --git a/app/models/insider/user.rb b/app/models/academic/user.rb similarity index 98% rename from app/models/insider/user.rb rename to app/models/academic/user.rb index bfc850167..21280ff15 100644 --- a/app/models/insider/user.rb +++ b/app/models/academic/user.rb @@ -1,6 +1,6 @@ # frozen_string_literal: true -module Insider +module Academic class User < ApplicationRecord devise :authenticatable diff --git a/app/views/insider/application/home.html.haml b/app/views/academic/application/home.html.haml similarity index 100% rename from app/views/insider/application/home.html.haml rename to app/views/academic/application/home.html.haml diff --git a/app/views/insider/application/login.html.haml b/app/views/academic/application/login.html.haml similarity index 92% rename from app/views/insider/application/login.html.haml rename to app/views/academic/application/login.html.haml index 1ee6798c0..965eced76 100644 --- a/app/views/insider/application/login.html.haml +++ b/app/views/academic/application/login.html.haml @@ -6,4 +6,4 @@ description: t("omniauth.#{provider}.description"), button: t("omniauth.#{provider}.button"), path: "/users/auth/#{provider}", - callback: :insider + callback: :academic diff --git a/config/initializers/omniauth.rb b/config/initializers/omniauth.rb index 3cce7332e..58fdd0902 100644 --- a/config/initializers/omniauth.rb +++ b/config/initializers/omniauth.rb @@ -16,7 +16,7 @@ :email, { "Portail de connexion" => portals }, { "Role assumé" => ["Personnel de direction", "Personnel autorisé"] }, - { callback: %w[aplypro insider] } + { callback: %w[aplypro academic] } ] end diff --git a/config/locales/fr.yml b/config/locales/fr.yml index f8ff15689..c3bfeb9a1 100644 --- a/config/locales/fr.yml +++ b/config/locales/fr.yml @@ -164,7 +164,7 @@ fr: schoolings: index: Recherche d'un dossier show: "Dossier %{attributive_decision_number}" - insider: + academic: application: login: Connexion à APLyPro home : Accueil diff --git a/config/routes.rb b/config/routes.rb index ecf234458..a24a29f6b 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -20,15 +20,15 @@ delete "asp/logout", to: "asp/application#logout", as: :destroy_asp_user_session - namespace :insider do + namespace :academic do get "home", to: "application#home" - devise_for :users, skip: :all, class_name: "Insider::User" + devise_for :users, skip: :all, class_name: "Academic::User" end - get "insider/login", to: "insider/application#login", as: :new_insider_user_session + get "academic/login", to: "academic/application#login", as: :new_academic_user_session - delete "insider/logout", to: "insider/application#logout", as: :destroy_insider_user_session + delete "academic/logout", to: "academic/application#logout", as: :destroy_academic_user_session resources :users, only: :update do get "select_establishment" @@ -113,8 +113,8 @@ get "/auth/asp/callback" => "users/omniauth_callbacks#asp", as: :asp_login end - devise_scope :insider_user do - get "/auth/insider/callback" => "users/omniauth_callbacks#insider", as: :insider_login + devise_scope :academic_user do + get "/auth/academic/callback" => "users/omniauth_callbacks#academic", as: :academic_login end devise_for :users