Fixed flash message logic and behavior (#1117)

pulibrary · Dec 11, 2024 · 842896e · 842896e
1 parent 9ff4c6e
commit 842896e
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 2 deletions.
diff --git a/app/assets/stylesheets/_header.scss b/app/assets/stylesheets/_header.scss
@@ -5,6 +5,7 @@
 #header {
     padding: 0px;
     background-color: $black;
+    margin-bottom: 1em;
 
     .navbar-brand {
         color: $white;

diff --git a/app/controllers/users/omniauth_callbacks_controller.rb b/app/controllers/users/omniauth_callbacks_controller.rb
@@ -12,7 +12,6 @@ def cas
       flash.alert = "You are not a recognized CAS user."
     else
       sign_in_and_redirect @user, event: :authentication # this will throw if @user is not activated
-      flash.notice = "Welcome, #{@user.given_name}"
     end
   end
 end
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
@@ -43,8 +43,12 @@
       <% if flash[:notice] or flash[:alert] %>
         <div class="row">
           <div class="col">
+          <% if flash[:notice]%>
             <div class="alert alert-primary" role="alert" ><%= flash[:notice] %></div>
+          <% end %>
+          <% if flash[:alert]%> 
             <div class="alert alert-warning" role="alert"><%= flash[:alert] %></div>
+          <% end %> 
           </div>
         </div>
       <% end %>

diff --git a/spec/controllers/omniauth_callbacks_controller_spec.rb b/spec/controllers/omniauth_callbacks_controller_spec.rb
@@ -10,7 +10,6 @@
       allow(User).to receive(:from_cas) { project_sponsor }
       get :cas
       expect(response).to redirect_to(root_path)
-      expect(flash.notice).to eq("Welcome, #{project_sponsor.given_name}")
     end
   end