Skip to content

Commit ca5bd5f

Browse files
committed
Update docs setup. Update defaults
1 parent 4091a9a commit ca5bd5f

File tree

5 files changed

+17
-6
lines changed

5 files changed

+17
-6
lines changed

‎config/dev.exs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -108,8 +108,8 @@ if System.get_env("SMTP_PASSWORD") do
108108
username: System.get_env("SMTP_USERNAME"),
109109
password: System.get_env("SMTP_PASSWORD"),
110110
port: System.get_env("SMTP_PORT"),
111-
tls: String.to_existing_atom(System.get_env("SMTP_TLS") || "always"),
112-
ssl: String.to_existing_atom(System.get_env("SMTP_SSL") || "never"),
111+
tls: String.to_existing_atom(System.get_env("SMTP_TLS") || "never"),
112+
ssl: String.to_existing_atom(System.get_env("SMTP_SSL") || "true"),
113113
auth: :always,
114114
no_mx_lookups: false,
115115
retries: 2,

‎config/runtime.exs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -161,8 +161,8 @@ if config_env() == :prod do
161161
username: System.get_env("SMTP_USERNAME"),
162162
password: System.get_env("SMTP_PASSWORD"),
163163
port: System.get_env("SMTP_PORT"),
164-
tls: String.to_existing_atom(System.get_env("SMTP_TLS") || "always"),
165-
ssl: String.to_existing_atom(System.get_env("SMTP_SSL") || "never"),
164+
tls: String.to_existing_atom(System.get_env("SMTP_TLS") || "never"),
165+
ssl: String.to_existing_atom(System.get_env("SMTP_SSL") || "true"),
166166
retries: 2,
167167
auth: :always,
168168
no_mx_lookups: false,

‎lib/game_server/accounts.ex‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -263,6 +263,7 @@ defmodule GameServer.Accounts do
263263
case Base.url_decode64(token, padding: false) do
264264
{:ok, decoded} ->
265265
hashed = :crypto.hash(:sha256, decoded)
266+
266267
query =
267268
from t in UserToken,
268269
where: t.token == ^hashed and t.context == "confirm",
@@ -274,7 +275,11 @@ defmodule GameServer.Accounts do
274275
{user, _token} ->
275276
Repo.transaction(fn ->
276277
{:ok, user} = confirm_user(user)
277-
Repo.delete_all(from(ut in UserToken, where: ut.user_id == ^user.id and ut.context == "confirm"))
278+
279+
Repo.delete_all(
280+
from(ut in UserToken, where: ut.user_id == ^user.id and ut.context == "confirm")
281+
)
282+
278283
user
279284
end)
280285

‎lib/game_server_web/live/public_docs/email_setup.html.heex‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -99,6 +99,9 @@
9999
<div>SMTP_USERNAME="resend"</div>
100100
<div>SMTP_PASSWORD="your_resend_api_key"</div>
101101
<div>SMTP_RELAY="smtp.resend.com"</div>
102+
<div>SMTP_PORT=465</div>
103+
<div>SMTP_SSL=true</div>
104+
<div>SMTP_TLS=never</div>
102105
<div></div>
103106
<div># Sender configuration (recommended for delivery)</div>
104107
<div>SMTP_FROM_NAME="My App"</div>

‎test/game_server_web/controllers/user_session_controller_test.exs‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,10 @@ defmodule GameServerWeb.UserSessionControllerTest do
128128
assert redirected_to(conn) == ~p"/users/log-in"
129129
end
130130

131-
test "GET /users/confirm/:token confirms unconfirmed user", %{conn: conn, unconfirmed_user: user} do
131+
test "GET /users/confirm/:token confirms unconfirmed user", %{
132+
conn: conn,
133+
unconfirmed_user: user
134+
} do
132135
{encoded_token, user_token} = Accounts.UserToken.build_email_token(user, "confirm")
133136
GameServer.Repo.insert!(user_token)
134137

0 commit comments

Comments
 (0)