style: fix linting errors
Some checks failed
continuous-integration/drone/push Build is failing

This commit is contained in:
Simon 2025-09-29 16:41:46 +02:00
parent d40bc0bb82
commit d10fcc3da1
Signed by: simon
GPG key ID: 40E7A58C4AA1EDB2
7 changed files with 68 additions and 46 deletions

View file

@ -31,6 +31,7 @@ defmodule MvWeb.Layouts do
attr :flash, :map, required: true, doc: "the map of flash messages"
attr :current_user, :map, default: nil, doc: "the current user, if authenticated"
attr :current_scope, :map,
default: nil,
doc: "the current [scope](https://hexdocs.pm/phoenix/scopes.html)"
@ -52,7 +53,6 @@ defmodule MvWeb.Layouts do
"""
end
@doc """
Shows the flash group with standard titles and content.

View file

@ -6,7 +6,9 @@ defmodule MvWeb.Layouts.Navbar do
use Gettext, backend: MvWeb.Gettext
use MvWeb, :verified_routes
attr :current_user, :map, required: true, doc: "The current user - navbar is only shown when user is present"
attr :current_user, :map,
required: true,
doc: "The current user - navbar is only shown when user is present"
def navbar(assigns) do
~H"""

View file

@ -34,8 +34,10 @@ defmodule MvWeb.LiveUserAuth do
case socket.assigns do
%{current_user: %{} = user} ->
{:cont, assign(socket, :current_user, user)}
_ ->
{:halt, Phoenix.LiveView.redirect(socket, to: ~p"/sign-in")}
socket = Phoenix.LiveView.redirect(socket, to: ~p"/sign-in")
{:halt, socket}
end
end

View file

@ -7,7 +7,8 @@ defmodule MvWeb.Layouts.NavbarTest do
# Setup: Create a user
user = create_test_user(%{email: "test@example.com"})
html = render_component(&MvWeb.Layouts.Navbar.navbar/1, %{
html =
render_component(&MvWeb.Layouts.Navbar.navbar/1, %{
current_user: user
})
@ -27,11 +28,13 @@ defmodule MvWeb.Layouts.NavbarTest do
# Setup: Create a user with specific email for testing initials
user = create_test_user(%{email: "test.user@example.com"})
html = render_component(&MvWeb.Layouts.Navbar.navbar/1, %{
html =
render_component(&MvWeb.Layouts.Navbar.navbar/1, %{
current_user: user
})
assert html =~ "<span>TU</span>" # Initials from test.user@example.com
# Initials from test.user@example.com
assert html =~ "<span>TU</span>"
end
@tag :skip
@ -42,29 +45,34 @@ defmodule MvWeb.Layouts.NavbarTest do
"sub" => "oidc_123",
"preferred_username" => "oidc.user@example.com"
}
oauth_tokens = %{
"access_token" => "test_token",
"id_token" => "test_id_token"
}
user = Mv.Accounts.User
user =
Mv.Accounts.User
|> Ash.Changeset.for_create(:register_with_rauthy, %{
user_info: user_info,
oauth_tokens: oauth_tokens
})
|> Ash.create!(domain: Mv.Accounts)
html = render_component(&MvWeb.Layouts.Navbar.navbar/1, %{
html =
render_component(&MvWeb.Layouts.Navbar.navbar/1, %{
current_user: user
})
assert html =~ "<span>OU</span>" # Initials from oidc.user@example.com
# Initials from oidc.user@example.com
assert html =~ "<span>OU</span>"
end
test "includes all required navigation items", %{conn: _conn} do
user = create_test_user(%{email: "test@example.com"})
html = render_component(&MvWeb.Layouts.Navbar.navbar/1, %{
html =
render_component(&MvWeb.Layouts.Navbar.navbar/1, %{
current_user: user
})

View file

@ -66,7 +66,8 @@ defmodule MvWeb.ProfileNavigationTest do
conn = conn_with_password_user(conn, user)
{:ok, _view, html} = live(conn, "/")
assert html =~ "<span>TU</span>" # Initials from test.user@example.com
# Initials from test.user@example.com
assert html =~ "<span>TU</span>"
end
end
@ -77,12 +78,14 @@ defmodule MvWeb.ProfileNavigationTest do
"sub" => "oidc_123",
"preferred_username" => "oidc.user@example.com"
}
oauth_tokens = %{
"access_token" => "test_token",
"id_token" => "test_id_token"
}
user = Mv.Accounts.User
user =
Mv.Accounts.User
|> Ash.Changeset.for_create(:register_with_rauthy, %{
user_info: user_info,
oauth_tokens: oauth_tokens
@ -99,13 +102,16 @@ defmodule MvWeb.ProfileNavigationTest do
# Verify we're on the correct profile page with OIDC specific information
{:ok, _profile_view, html} = live(conn, "/users/#{user.id}")
assert html =~ to_string(user.email)
assert html =~ "oidc_123" # OIDC ID should be visible
assert html =~ "Not enabled" # Password auth should be disabled for OIDC users
# OIDC ID should be visible
assert html =~ "oidc_123"
# Password auth should be disabled for OIDC users
assert html =~ "Not enabled"
end
test "profile navigation works across different authentication methods", %{conn: conn} do
# Create password user
password_user = create_test_user(%{
password_user =
create_test_user(%{
email: "password2@example.com",
password: "test_password123"
})
@ -115,11 +121,14 @@ defmodule MvWeb.ProfileNavigationTest do
"sub" => "oidc_789",
"preferred_username" => "oidc@example.com"
}
oauth_tokens = %{
"access_token" => "test_token",
"id_token" => "test_id_token"
}
oidc_user = Mv.Accounts.User
oidc_user =
Mv.Accounts.User
|> Ash.Changeset.for_create(:register_with_rauthy, %{
user_info: user_info,
oauth_tokens: oauth_tokens
@ -139,5 +148,4 @@ defmodule MvWeb.ProfileNavigationTest do
assert_redirected(view_oidc, "/users/#{oidc_user.id}")
end
end
end

View file

@ -388,7 +388,8 @@ defmodule MvWeb.UserLive.IndexTest do
assert html =~ "Email"
assert html =~ "OIDC ID"
# Should show the authenticated user at minimum
assert html =~ "oidc.user" # Matches the generated email pattern oidc.user{unique_id}@example.com
# Matches the generated email pattern oidc.user{unique_id}@example.com
assert html =~ "oidc.user"
end
test "handles users with missing OIDC ID", %{conn: conn} do

View file

@ -103,6 +103,7 @@ defmodule MvWeb.ConnCase do
def conn_with_oidc_user(conn, user_attrs \\ %{}) do
# Ensure unique email for OIDC users
unique_id = System.unique_integer([:positive])
default_attrs = %{
email: "oidc.user#{unique_id}@example.com",
oidc_id: "oidc_#{unique_id}"