Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix: Proper logout #33

Merged
merged 3 commits into from
Jun 30, 2023
Merged

Fix: Proper logout #33

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
fdc2ac0
Fix: Proper logout
fschoenfeldt Jun 29, 2023
23131df
use post instead of get for logout
fschoenfeldt Jun 30, 2023
ff46ff3
update gettext
fschoenfeldt Jun 30, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 11 additions & 4 deletions auth0/clients/Fotohaecker Uberspace.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,12 @@
},
"allowed_clients": [],
"allowed_logout_urls": [
"http://localhost:1337/fh/auth/logout",
"http://localhost:1338/fh/auth/logout",
"https://fschoenf.uber.space/fh/auth/logout"
"http://localhost:1337/fh/de_DE",
"http://localhost:1337/fh/en_US",
"http://localhost:1338/fh/de_DE",
"http://localhost:1338/fh/en_US",
"https://fschoenf.uber.space/fh/de_DE",
"https://fschoenf.uber.space/fh/en_US"
],
"callbacks": [
"http://localhost:1337/fh/auth/auth0/callback",
Expand Down Expand Up @@ -48,6 +51,10 @@
"refresh_token",
"client_credentials"
],
"web_origins": ["http://localhost:1337", "http://localhost:1338", "https://fschoenf.uber.space/"],
"web_origins": [
"http://localhost:1337",
"http://localhost:1338",
"https://fschoenf.uber.space/"
],
"custom_login_page_on": true
}
13 changes: 11 additions & 2 deletions lib/fotohaecker_web/controllers/auth_controller.ex
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,13 +19,22 @@ defmodule FotohaeckerWeb.AuthController do
|> redirect(external: Helpers.auth_path(conn, :request, provider))
end

def delete(conn, _params) do
def logout(conn, _params) do
locale = locale_from_session(conn)
domain = System.get_env("AUTH0_DOMAIN")
client_id = System.get_env("AUTH0_CLIENT_ID")

return_to =
conn
|> Helpers.index_home_url(:home, locale)
|> URI.encode_www_form()

logout_url = "https://#{domain}/v2/logout?returnTo=#{return_to}&client_id=#{client_id}"

conn
|> put_flash(:info, FotohaeckerWeb.Gettext.gettext("You have been logged out!"))
|> clear_session()
|> redirect(to: Helpers.index_home_path(conn, :home, locale))
|> redirect(external: logout_url)
end

def callback(%{assigns: %{ueberauth_failure: _fails}} = conn, _params) do
Expand Down
30 changes: 24 additions & 6 deletions lib/fotohaecker_web/live/user_live/index.ex
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,14 +30,32 @@ defmodule FotohaeckerWeb.UserLive.Index do
<%= gettext("Delete Account") %>
</button>
</.form>
<.link
class="btn btn--red flex items-center gap-2 max-w-max"
href={Routes.auth_path(FotohaeckerWeb.Endpoint, :delete)}

<.form
for={%{}}
method="post"
action={
FotohaeckerWeb.Router.Helpers.auth_path(
@socket,
:logout
)
}
>
<span class="text-white">
<button
type="submit"
class="btn btn--red flex items-center gap-2 max-w-max"
href={
Routes.auth_path(
FotohaeckerWeb.Endpoint,
:logout
)
}
>
<%!-- <span class="text-white"> --%>
<%= gettext("logout") %>
</span>
</.link>
<%!-- </span> --%>
</button>
</.form>
</div>
"""
end
Expand Down
2 changes: 1 addition & 1 deletion lib/fotohaecker_web/router.ex
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,8 @@ defmodule FotohaeckerWeb.Router do
live "/:locale/search", SearchLive.Search, :index

scope "/auth" do
post "/logout", AuthController, :logout
get "/login", AuthController, :login
get "/logout", AuthController, :delete
get "/:provider", AuthController, :request
get "/:provider/callback", AuthController, :callback
post "/:provider/callback", AuthController, :callback
Expand Down
10 changes: 5 additions & 5 deletions priv/gettext/de_DE/LC_MESSAGES/default.po
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,22 +133,22 @@ msgstr "Etwas ist beim Hochladen Deines Fotos schiefgelaufen. Bitte versuche es
msgid "login"
msgstr "Anmelden"

#: lib/fotohaecker_web/live/user_live/index.ex:38
#: lib/fotohaecker_web/live/user_live/index.ex:55
#, elixir-autogen, elixir-format
msgid "logout"
msgstr "Abmelden"

#: lib/fotohaecker_web/controllers/auth_controller.ex:35
#: lib/fotohaecker_web/controllers/auth_controller.ex:44
#, elixir-autogen, elixir-format
msgid "Failed to authenticate."
msgstr "Anmeldung fehlgeschlagen."

#: lib/fotohaecker_web/controllers/auth_controller.ex:45
#: lib/fotohaecker_web/controllers/auth_controller.ex:54
#, elixir-autogen, elixir-format
msgid "Successfully authenticated."
msgstr "Erfolgreich angemeldet."

#: lib/fotohaecker_web/controllers/auth_controller.ex:26
#: lib/fotohaecker_web/controllers/auth_controller.ex:35
#, elixir-autogen, elixir-format
msgid "You have been logged out!"
msgstr "Sie wurden abgemeldet!"
Expand Down Expand Up @@ -347,7 +347,7 @@ msgstr "Warte auf Absenden"
msgid "Delete Account"
msgstr "Account löschen"

#: lib/fotohaecker_web/controllers/auth_controller.ex:65
#: lib/fotohaecker_web/controllers/auth_controller.ex:74
#, elixir-autogen, elixir-format
msgid "Your account has been deleted!"
msgstr "Dein Account wurde gelöscht!"
10 changes: 5 additions & 5 deletions priv/gettext/default.pot
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,22 +132,22 @@ msgstr ""
msgid "login"
msgstr ""

#: lib/fotohaecker_web/live/user_live/index.ex:38
#: lib/fotohaecker_web/live/user_live/index.ex:55
#, elixir-autogen, elixir-format
msgid "logout"
msgstr ""

#: lib/fotohaecker_web/controllers/auth_controller.ex:35
#: lib/fotohaecker_web/controllers/auth_controller.ex:44
#, elixir-autogen, elixir-format
msgid "Failed to authenticate."
msgstr ""

#: lib/fotohaecker_web/controllers/auth_controller.ex:45
#: lib/fotohaecker_web/controllers/auth_controller.ex:54
#, elixir-autogen, elixir-format
msgid "Successfully authenticated."
msgstr ""

#: lib/fotohaecker_web/controllers/auth_controller.ex:26
#: lib/fotohaecker_web/controllers/auth_controller.ex:35
#, elixir-autogen, elixir-format
msgid "You have been logged out!"
msgstr ""
Expand Down Expand Up @@ -346,7 +346,7 @@ msgstr ""
msgid "Delete Account"
msgstr ""

#: lib/fotohaecker_web/controllers/auth_controller.ex:65
#: lib/fotohaecker_web/controllers/auth_controller.ex:74
#, elixir-autogen, elixir-format
msgid "Your account has been deleted!"
msgstr ""
10 changes: 5 additions & 5 deletions priv/gettext/en_US/LC_MESSAGES/default.po
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,22 +133,22 @@ msgstr ""
msgid "login"
msgstr ""

#: lib/fotohaecker_web/live/user_live/index.ex:38
#: lib/fotohaecker_web/live/user_live/index.ex:55
#, elixir-autogen, elixir-format
msgid "logout"
msgstr ""

#: lib/fotohaecker_web/controllers/auth_controller.ex:35
#: lib/fotohaecker_web/controllers/auth_controller.ex:44
#, elixir-autogen, elixir-format
msgid "Failed to authenticate."
msgstr ""

#: lib/fotohaecker_web/controllers/auth_controller.ex:45
#: lib/fotohaecker_web/controllers/auth_controller.ex:54
#, elixir-autogen, elixir-format
msgid "Successfully authenticated."
msgstr ""

#: lib/fotohaecker_web/controllers/auth_controller.ex:26
#: lib/fotohaecker_web/controllers/auth_controller.ex:35
#, elixir-autogen, elixir-format
msgid "You have been logged out!"
msgstr ""
Expand Down Expand Up @@ -347,7 +347,7 @@ msgstr ""
msgid "Delete Account"
msgstr ""

#: lib/fotohaecker_web/controllers/auth_controller.ex:65
#: lib/fotohaecker_web/controllers/auth_controller.ex:74
#, elixir-autogen, elixir-format
msgid "Your account has been deleted!"
msgstr ""
2 changes: 1 addition & 1 deletion test/e2e/tests/user.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ test.describe("User Settings page", () => {

test("can logout", async ({ page }) => {
await page.locator("a", { hasText: "your account" }).click();
await page.locator("a", { hasText: "logout" }).click();
await page.locator("button", { hasText: "logout" }).click();
await expect(page.locator(".alert--info")).toContainText("logged out");
await page.locator(".alert--info").click();
await expect(page.locator("a", { hasText: "login" })).toBeVisible();
Expand Down
Loading