- <%= if keycloak_auth?() do %>
- <%= link "Create your MBTA account", to: account_path(@conn, :new), class: "btn btn-primary btn-block" %>
- <% else %>
- <%= link "Create an account", to: account_path(@conn, :new), class: "btn btn-primary btn-block" %>
- <% end %>
+ <%= link "Create your MBTA account", to: account_path(@conn, :new), class: "btn btn-primary btn-block" %>
<%= link "Sign in", to: session_path(@conn, :new), class: "btn btn-outline-primary btn-block" %>
diff --git a/apps/concierge_site/lib/templates/session/new.html.eex b/apps/concierge_site/lib/templates/session/new.html.eex
deleted file mode 100644
index f0302e2b7..000000000
--- a/apps/concierge_site/lib/templates/session/new.html.eex
+++ /dev/null
@@ -1,35 +0,0 @@
-
Sign in
-<%= flash_error(@conn) %>
-<%= flash_info(@conn) %>
-
-
Don't have an account?
- <%= link(to: account_path(@conn, :new)) do %>
- Sign up
-
- <% end %>
-
-
-
-
-
- <%= form_for @login_changeset, session_path(@conn, :create), fn f -> %>
-
- <%= label f, :email, "Email login", class: "form__label" %>
- <%= email_input f, :email, placeholder: "your@email.com", class: "form-control" %>
- <%= error_tag f, :email %>
-
-
-
- <%= submit "Go to my account", class: "btn btn-primary btn btn-block" %>
-
- <% end %>
-
-
-
diff --git a/apps/concierge_site/lib/views/account_view.ex b/apps/concierge_site/lib/views/account_view.ex
index 1cf6ad043..348a8e23b 100644
--- a/apps/concierge_site/lib/views/account_view.ex
+++ b/apps/concierge_site/lib/views/account_view.ex
@@ -2,11 +2,9 @@ defmodule ConciergeSite.AccountView do
use ConciergeSite.Web, :view
alias AlertProcessor.Model.User
- alias ConciergeSite.SessionHelper
alias Ecto.Changeset
alias Plug.Conn
- defdelegate keycloak_auth?, to: SessionHelper
defdelegate email(user), to: User
defdelegate phone_number(user), to: User
diff --git a/apps/concierge_site/lib/views/page_view.ex b/apps/concierge_site/lib/views/page_view.ex
index e3222e364..d3ce9cc0c 100644
--- a/apps/concierge_site/lib/views/page_view.ex
+++ b/apps/concierge_site/lib/views/page_view.ex
@@ -1,7 +1,3 @@
defmodule ConciergeSite.PageView do
use ConciergeSite.Web, :view
-
- alias ConciergeSite.SessionHelper
-
- defdelegate keycloak_auth?, to: SessionHelper
end
diff --git a/apps/concierge_site/test/web/controllers/account_controller_test.exs b/apps/concierge_site/test/web/controllers/account_controller_test.exs
index 4c9219a21..d5118839e 100644
--- a/apps/concierge_site/test/web/controllers/account_controller_test.exs
+++ b/apps/concierge_site/test/web/controllers/account_controller_test.exs
@@ -8,13 +8,7 @@ defmodule ConciergeSite.AccountControllerTest do
alias AlertProcessor.Repo
describe "new/4" do
- test "using local auth, displays the Sign up page", %{conn: conn} do
- reassign_env(:concierge_site, ConciergeSite.Endpoint, authentication_source: "local")
- conn = get(conn, account_path(conn, :new))
- assert html_response(conn, 200) =~ "Sign up"
- end
-
- test "using keycloak auth, redirects to the keycloak register route", %{conn: conn} do
+ test "redirects to the keycloak register route", %{conn: conn} do
reassign_env(:concierge_site, ConciergeSite.Endpoint, authentication_source: "keycloak")
conn = get(conn, account_path(conn, :new))
assert redirected_to(conn) == "/auth/keycloak/register"
@@ -333,19 +327,6 @@ defmodule ConciergeSite.AccountControllerTest do
end
describe "update password" do
- test "GET /password/edit - for local auth", %{conn: conn} do
- reassign_env(:concierge_site, ConciergeSite.Endpoint, authentication_source: "local")
-
- user = insert(:user)
-
- conn =
- user
- |> guardian_login(conn)
- |> get(account_path(conn, :edit_password))
-
- assert html_response(conn, 200) =~ "Update password"
- end
-
test "GET /password/edit - for Keycloak auth", %{conn: conn} do
reassign_env(:concierge_site, ConciergeSite.Endpoint, authentication_source: "keycloak")
@@ -359,45 +340,6 @@ defmodule ConciergeSite.AccountControllerTest do
assert redirected_to(conn, 302) =~
~r/\/auth\/realms\/MBTA\/protocol\/openid-connect\/auth?.*kc_action=UPDATE_PASSWORD/
end
-
- test "POST /password/edit", %{conn: conn} do
- user = insert(:user, encrypted_password: Bcrypt.hash_pwd_salt("Password1!"))
-
- user_params = %{current_password: "Password1!", password: "Password2!"}
-
- conn =
- user
- |> guardian_login(conn)
- |> post(account_path(conn, :update_password), %{user: user_params})
-
- assert html_response(conn, 302) =~ "/trips"
- end
-
- test "POST /password/edit no match error", %{conn: conn} do
- user = insert(:user, encrypted_password: Bcrypt.hash_pwd_salt("Password1!"))
-
- user_params = %{current_password: "Password3!", password: "Password2!"}
-
- conn =
- user
- |> guardian_login(conn)
- |> post(account_path(conn, :update_password), %{user: user_params})
-
- assert html_response(conn, 200) =~ "Current password is incorrect"
- end
-
- test "POST /password/edit validation error", %{conn: conn} do
- user = insert(:user, encrypted_password: Bcrypt.hash_pwd_salt("Password1!"))
-
- user_params = %{current_password: "Password1!", password: "Password"}
-
- conn =
- user
- |> guardian_login(conn)
- |> post(account_path(conn, :update_password), %{user: user_params})
-
- assert html_response(conn, 200) =~ "New password format is incorrect"
- end
end
describe "account delete" do
diff --git a/apps/concierge_site/test/web/controllers/session_controller_test.exs b/apps/concierge_site/test/web/controllers/session_controller_test.exs
index 7f66cdac6..116750d8f 100644
--- a/apps/concierge_site/test/web/controllers/session_controller_test.exs
+++ b/apps/concierge_site/test/web/controllers/session_controller_test.exs
@@ -3,22 +3,10 @@ defmodule ConciergeSite.SessionControllerTest do
use ConciergeSite.ConnCase
import AlertProcessor.Factory
import Test.Support.Helpers
- alias AlertProcessor.{Model.User, Model.Trip, Repo}
alias Hammer
- @password "password1"
- @encrypted_password Bcrypt.hash_pwd_salt(@password)
-
describe "GET /login/new" do
- test "for local auth", %{conn: conn} do
- reassign_env(:concierge_site, ConciergeSite.Endpoint, authentication_source: "local")
-
- conn = get(conn, session_path(conn, :new))
-
- assert html_response(conn, 200) =~ "Sign in"
- end
-
- test "for Keycloak auth", %{conn: conn} do
+ test "redirects to Keycloak login page", %{conn: conn} do
reassign_env(:concierge_site, ConciergeSite.Endpoint, authentication_source: "keycloak")
conn = get(conn, session_path(conn, :new))
@@ -27,67 +15,6 @@ defmodule ConciergeSite.SessionControllerTest do
end
end
- test "POST /login", %{conn: conn} do
- user =
- Repo.insert!(%User{
- email: "test@email.com",
- role: "user",
- encrypted_password: @encrypted_password
- })
-
- params = %{"user" => %{"email" => user.email, "password" => @password}}
- conn = post(conn, session_path(conn, :create), params)
- assert html_response(conn, 302) =~ "/account/options"
- end
-
- test "POST /login with trips", %{conn: conn} do
- user =
- Repo.insert!(%User{
- email: "test@email.com",
- role: "user",
- encrypted_password: @encrypted_password
- })
-
- Repo.insert!(%Trip{
- user_id: user.id,
- relevant_days: [:monday],
- start_time: ~T[12:00:00],
- end_time: ~T[18:00:00],
- facility_types: [:elevator]
- })
-
- params = %{"user" => %{"email" => user.email, "password" => @password}}
- conn = post(conn, session_path(conn, :create), params)
- assert html_response(conn, 302) =~ "
"
- end
-
- test "POST /login rejected", %{conn: conn} do
- user =
- Repo.insert!(%User{
- email: "test@email.com",
- role: "user",
- encrypted_password: @encrypted_password
- })
-
- params = %{"user" => %{"email" => user.email, "password" => "11111111111"}}
- conn = post(conn, session_path(conn, :create), params)
- assert html_response(conn, 200) =~ "information was incorrect"
- end
-
- test "POST /login rate-limited", %{conn: conn} do
- on_exit(fn -> true = :ets.delete_all_objects(:hammer_ets_buckets) end)
- params = %{"user" => %{"email" => "test2@email.com", "password" => "11111111111"}}
-
- [first_attempt, _, _, _, next_to_last_attempt, last_attempt] =
- for _ <- 1..6 do
- conn |> assign(:rate_limit?, true) |> post(session_path(conn, :create), params)
- end
-
- assert first_attempt.status == 200
- assert next_to_last_attempt.status == 200
- assert last_attempt.status == 429
- end
-
test "DELETE /login", %{conn: conn} do
reassign_env(:concierge_site, ConciergeSite.Endpoint, authentication_source: "local")