Login with password now requires email to be confirmed
This commit is contained in:
@@ -5,10 +5,11 @@
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1" />
|
||||
<meta name="csrf-token" content={get_csrf_token()} />
|
||||
<link rel="icon" href={~p"/favicon.ico"} sizes="any" />
|
||||
<%
|
||||
meta_title = (assigns[:page_title] || "Mixer")
|
||||
meta_description = assigns[:page_description] || "Mixer is a social feed for all. Come join the conversation — built with Elixir."
|
||||
%>
|
||||
<% meta_title = assigns[:page_title] || "Mixer"
|
||||
|
||||
meta_description =
|
||||
assigns[:page_description] ||
|
||||
"Mixer is a social feed for all. Come join the conversation — built with Elixir." %>
|
||||
<meta name="description" content={meta_description} />
|
||||
<meta name="robots" content={assigns[:robots] || "index, follow"} />
|
||||
<meta property="og:site_name" content="Mixer" />
|
||||
|
||||
@@ -9,17 +9,16 @@ SPDX-License-Identifier: MIT
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1" />
|
||||
<meta name="csrf-token" content={get_csrf_token()} />
|
||||
<link rel="icon" href={~p"/favicon.ico"} sizes="any" />
|
||||
<%
|
||||
{spa_title, spa_description} = case @page do
|
||||
"feed" -> {"Mixer · Feed", "See the latest posts from everyone on Mixer."}
|
||||
"tweet" -> {"Mixer · Post", "Read this post and join the conversation on Mixer."}
|
||||
"following" -> {"Mixer · Following", "Posts from the people you follow on Mixer."}
|
||||
"profile" -> {"Mixer · My Profile", "View and manage your Mixer profile."}
|
||||
"users" -> {"Mixer · People", "Discover and follow people on Mixer."}
|
||||
"user-detail" -> {"Mixer · Profile", "View this user's profile and posts on Mixer."}
|
||||
_ -> {"Mixer", "A social feed built in Elixir."}
|
||||
end
|
||||
%>
|
||||
<% {spa_title, spa_description} =
|
||||
case @page do
|
||||
"feed" -> {"Mixer · Feed", "See the latest posts from everyone on Mixer."}
|
||||
"tweet" -> {"Mixer · Post", "Read this post and join the conversation on Mixer."}
|
||||
"following" -> {"Mixer · Following", "Posts from the people you follow on Mixer."}
|
||||
"profile" -> {"Mixer · My Profile", "View and manage your Mixer profile."}
|
||||
"users" -> {"Mixer · People", "Discover and follow people on Mixer."}
|
||||
"user-detail" -> {"Mixer · Profile", "View this user's profile and posts on Mixer."}
|
||||
_ -> {"Mixer", "A social feed built in Elixir."}
|
||||
end %>
|
||||
<meta name="description" content={spa_description} />
|
||||
<meta name="robots" content="index, follow" />
|
||||
<meta property="og:site_name" content="Mixer" />
|
||||
|
||||
@@ -35,8 +35,11 @@ defmodule MixerWeb.AuthController do
|
||||
You can confirm your account using the link we sent to you, or by resetting your password.
|
||||
"""
|
||||
|
||||
{_, %AshAuthentication.Errors.UnconfirmedUser{}} ->
|
||||
"You must confirm your email address before signing in. Please check your inbox for a confirmation email."
|
||||
|
||||
_ ->
|
||||
"Incorrect email or password"
|
||||
"Incorrect email or password or unconfirmed email"
|
||||
end
|
||||
|
||||
conn
|
||||
|
||||
Reference in New Issue
Block a user