Fix show new session screen for newly generated project. closes #390

- Remove logged_out_url from default config
- Some template reformatting to aligh with the code formatter

Author: smpallen99

CHANGELOG.md

@@ -14,10 +14,12 @@ See these [0.5.x to 0.6.x upgrade instructions](https://gist.github.com/smpallen
   * Updated to Comeonin 4.0
   * Add support for configurable password hashing algorithms
   * Speed up tests by configuring the Bcrypt algorithm
+  * Format may generator templates to align with code formatter
 
 * Bug Fixes
   * Fixed detection of remember me checkbox on session new page
   * Fixed compiled gettext in view helpers
+  * Fix new session screen issue on newly generated project #390
 
 * Deprecations
   * Removed the coherence.make_templates task since its no longer needed with the new controller design

lib/mix/tasks/coh.gen.controllers.ex

@@ -93,14 +93,14 @@ defmodule Mix.Tasks.Coh.Gen.Controllers do
 
       # Change this block
       scope "/"#{web_base} do
-        pipe_through :browser
+        pipe_through(:browser)
         coherence_routes()
       end
 
       # Change this block
       scope "/"#{web_base} do
-        pipe_through :protected
-        coherence_routes :protected
+        pipe_through(:protected)
+        coherence_routes(:protected)
       end
 
       # ...

lib/mix/tasks/coh.install.ex

@@ -288,7 +288,6 @@ defmodule Mix.Tasks.Coh.Install do
       router: #{config[:router]},
       password_hashing_alg: #{config[:password_hashing_alg]},
       messages_backend: #{config[:web_base]}.Coherence.Messages,#{layout_field(config)}
-      logged_out_url: "/",#{user_active_field(config)}
       registration_permitted_attributes: ["email","name","password","current_password","password_confirmation"],
       invitation_permitted_attributes: ["name","email"],
       password_reset_permitted_attributes: ["reset_password_token","password","password_confirmation"],
@@ -308,11 +307,11 @@ defmodule Mix.Tasks.Coh.Install do
   defp layout_field(_),
     do: ""
 
-  defp user_active_field(%{user_active_field?: true}),
-    do: "\n  user_active_field: true,"
+  # defp user_active_field(%{user_active_field?: true}),
+  #   do: "\n  user_active_field: true,"
 
-  defp user_active_field(_),
-    do: ""
+  # defp user_active_field(_),
+  #   do: ""
 
   defp swoosh_config(string, %{web_base: web_base, use_email?: true}) do
     string <>
@@ -346,7 +345,8 @@ defmodule Mix.Tasks.Coh.Install do
           end
 
         if confirmed do
-          File.write!(@config_file, source <> "\n" <> string)
+          # File.write!(@config_file, source <> "\n" <> string)
+          File.write!(@config_file, Code.format_string!(source <> "\n" <> string))
           shell_info(config, "Your config/config.exs file was updated.")
           false
         else
@@ -1053,43 +1053,43 @@ defmodule Mix.Tasks.Coh.Install do
       use Coherence.Router         # Add this
 
       pipeline :browser do
-        plug :accepts, ["html"]
-        plug :fetch_session
-        plug :fetch_flash
-        plug :protect_from_forgery
-        plug :put_secure_browser_headers
-        plug Coherence.Authentication.Session  # Add this
+        plug(:accepts, ["html"])
+        plug(:fetch_session)
+        plug(:fetch_flash)
+        plug(:protect_from_forgery)
+        plug(:put_secure_browser_headers)
+        plug(Coherence.Authentication.Session)  # Add this
       end
 
       pipeline :protected do
-        plug :accepts, ["html"]
-        plug :fetch_session
-        plug :fetch_flash
-        plug :protect_from_forgery
-        plug :put_secure_browser_headers
-        plug Coherence.Authentication.Session, protected: true  # Add this
+        plug(:accepts, ["html"])
+        plug(:fetch_session)
+        plug(:fetch_flash)
+        plug(:protect_from_forgery)
+        plug(:put_secure_browser_headers)
+        plug(Coherence.Authentication.Session, protected: true)  # Add this
       end
 
       # Add this block
       scope "/" do
-        pipe_through :browser
+        pipe_through(:browser)
         coherence_routes()
       end
 
       # Add this block
       scope "/" do
-        pipe_through :protected
-        coherence_routes :protected
+        pipe_through(:protected)
+        coherence_routes(:protected)
       end
 
       scope "/", #{web_base} do
-        pipe_through :browser
-        get "/", PageController, :index
+        pipe_through(:browser)
+        get("/", PageController, :index)
         # Add public routes below
       end
 
       scope "/", #{web_base} do
-        pipe_through :protected
+        pipe_through(:protected)
         # Add protected routes below
       end
     end
@@ -1170,8 +1170,6 @@ defmodule Mix.Tasks.Coh.Install do
       |> Atom.to_string()
       |> Mix.Phoenix.inflect()
 
-    # IO.puts "binding: #{inspect binding}"
-
     base = opts[:module] || binding[:base]
     web_base = opts[:web_module] || base <> "Web"
     opts = Keyword.put(opts, :base, base)
@@ -1228,8 +1226,6 @@ defmodule Mix.Tasks.Coh.Install do
     ]
     |> Enum.into(opts_map)
     |> do_default_config(opts)
-
-    # |> IO.inspect(label: "config")
   end
 
   defp do_bin_opts(bin_opts) do

priv/templates/coh.gen.controllers/controllers/coherence/confirmation_controller.ex

@@ -8,7 +8,7 @@ defmodule <%= web_base %>.Coherence.ConfirmationController do
   use CoherenceWeb, :controller
   use Coherence.ConfirmationControllerBase, schemas: <%= base %>.Coherence.Schemas
 
-  plug Coherence.ValidateOption, :confirmable
-  plug :layout_view, view: Coherence.ConfirmationView, caller: __MODULE__
-  plug :redirect_logged_in when action in [:new]
+  plug(Coherence.ValidateOption, :confirmable)
+  plug(:layout_view, view: Coherence.ConfirmationView, caller: __MODULE__)
+  plug(:redirect_logged_in when action in [:new])
 end

priv/templates/coh.gen.controllers/controllers/coherence/invitation_controller.ex

@@ -13,7 +13,7 @@ defmodule <%= web_base %>.Coherence.InvitationController do
   use CoherenceWeb, :controller
   use Coherence.InvitationControllerBase, schemas: <%= base %>.Coherence.Schemas
 
-  plug Coherence.ValidateOption, :invitable
-  plug :scrub_params, "user" when action in [:create_user]
-  plug :layout_view, view: Coherence.InvitationView, caller: __MODULE__
+  plug(Coherence.ValidateOption, :invitable)
+  plug(:scrub_params, "user" when action in [:create_user])
+  plug(:layout_view, view: Coherence.InvitationView, caller: __MODULE__)
 end

priv/templates/coh.gen.controllers/controllers/coherence/password_controller.ex

@@ -14,6 +14,6 @@ defmodule <%= web_base %>.Coherence.PasswordController do
   use CoherenceWeb, :controller
   use Coherence.PasswordControllerBase, schemas: <%= base %>.Coherence.Schemas
 
-  plug :layout_view, view: Coherence.PasswordView, caller: __MODULE__
-  plug :redirect_logged_in when action in [:new, :create, :edit, :update]
+  plug(:layout_view, view: Coherence.PasswordView, caller: __MODULE__)
+  plug(:redirect_logged_in when action in [:new, :create, :edit, :update])
 end

priv/templates/coh.gen.controllers/controllers/coherence/registration_controller.ex

@@ -13,10 +13,10 @@ defmodule <%= web_base %>.Coherence.RegistrationController do
   use CoherenceWeb, :controller
   use Coherence.RegistrationControllerBase, schemas: <%= base %>.Coherence.Schemas
 
-  plug Coherence.RequireLogin when action in ~w(show edit update delete)a
-  plug Coherence.ValidateOption, :registerable
-  plug :scrub_params, "registration" when action in [:create, :update]
+  plug(Coherence.RequireLogin when action in ~w(show edit update delete)a)
+  plug(Coherence.ValidateOption, :registerable)
+  plug(:scrub_params, "registration" when action in [:create, :update])
 
-  plug :layout_view, view: Coherence.RegistrationView, caller: __MODULE__
-  plug :redirect_logged_in when action in [:new, :create]
+  plug(:layout_view, view: Coherence.RegistrationView, caller: __MODULE__)
+  plug(:redirect_logged_in when action in [:new, :create])
 end

priv/templates/coh.gen.controllers/controllers/coherence/session_controller.ex

@@ -9,6 +9,6 @@ defmodule <%= web_base %>.Coherence.SessionController do
   use CoherenceWeb, :controller
   use Coherence.SessionControllerBase, schemas: <%= base %>.Coherence.Schemas
 
-  plug :layout_view, view: Coherence.SessionView, caller: __MODULE__
-  plug :redirect_logged_in when action in [:new, :create]
+  plug(:layout_view, view: Coherence.SessionView, caller: __MODULE__)
+  plug(:redirect_logged_in when action in [:new, :create])
 end

priv/templates/coh.gen.controllers/controllers/coherence/unlock_controller.ex

@@ -10,7 +10,7 @@ defmodule <%= web_base %>.Coherence.UnlockController do
   use CoherenceWeb, :controller
   use Coherence.UnlockControllerBase, schemas: <%= base %>.Coherence.Schemas
 
-  plug Coherence.ValidateOption, :unlockable_with_token
-  plug :layout_view, view: Coherence.UnlockView, caller: __MODULE__
-  plug :redirect_logged_in when action in [:new, :create, :edit]
+  plug(Coherence.ValidateOption, :unlockable_with_token)
+  plug(:layout_view, view: Coherence.UnlockView, caller: __MODULE__)
+  plug(:redirect_logged_in when action in [:new, :create, :edit])
 end

priv/templates/coh.install/coherence_messages.ex

@@ -32,12 +32,21 @@ defmodule <%= web_base %>.Coherence.Messages do
   def cant_find_that_token, do: dgettext(@domain, "Can't find that token")
   def confirmation_email_sent, do: dgettext(@domain, "Confirmation email sent.")
   def confirmation_token_expired, do: dgettext(@domain, "Confirmation token expired.")
-  def could_not_find_that_email_address, do: dgettext(@domain, "Could not find that email address")
+
+  def could_not_find_that_email_address,
+    do: dgettext(@domain, "Could not find that email address")
+
   def forgot_your_password, do: dgettext(@domain, "Forgot your password?")
   def http_authentication_required, do: dgettext(@domain, "HTTP Authentication Required")
-  def incorrect_login_or_password(opts), do: dgettext(@domain, "Incorrect %{login_field} or password.", opts)
+
+  def incorrect_login_or_password(opts),
+    do: dgettext(@domain, "Incorrect %{login_field} or password.", opts)
+
   def invalid_current_password, do: dgettext(@domain, "invalid current password")
-  def invalid_invitation, do: dgettext(@domain, "Invalid Invitation. Please contact the site administrator.")
+
+  def invalid_invitation,
+    do: dgettext(@domain, "Invalid Invitation. Please contact the site administrator.")
+
   def invalid_request, do: dgettext(@domain, "Invalid Request.")
   def invalid_confirmation_token, do: dgettext(@domain, "Invalid confirmation token.")
   def invalid_email_or_password, do: dgettext(@domain, "Invalid email or password.")
@@ -47,33 +56,64 @@ defmodule <%= web_base %>.Coherence.Messages do
   def invitation_already_sent, do: dgettext(@domain, "Invitation already sent.")
   def invitation_sent, do: dgettext(@domain, "Invitation sent.")
   def invite_someone, do: dgettext(@domain, "Invite Someone")
-  def maximum_login_attempts_exceeded, do: dgettext(@domain, "Maximum Login attempts exceeded. Your account has been locked.")
+
+  def maximum_login_attempts_exceeded,
+    do: dgettext(@domain, "Maximum Login attempts exceeded. Your account has been locked.")
+
   def need_an_account, do: dgettext(@domain, "Need An Account?")
   def not_locked, do: dgettext(@domain, "not locked")
   def password_reset_token_expired, do: dgettext(@domain, "Password reset token expired.")
   def password_updated_successfully, do: dgettext(@domain, "Password updated successfully.")
-  def problem_confirming_user_account, do: dgettext(@domain, "Problem confirming user account. Please contact the system administrator.")
-  def registration_created_successfully, do: dgettext(@domain, "Registration created successfully.")
+
+  def problem_confirming_user_account,
+    do:
+      dgettext(
+        @domain,
+        "Problem confirming user account. Please contact the system administrator."
+      )
+
+  def registration_created_successfully,
+    do: dgettext(@domain, "Registration created successfully.")
+
   def required, do: dgettext(@domain, "required")
   def resend_confirmation_email, do: dgettext(@domain, "Resend confirmation email")
-  def reset_email_sent, do: dgettext(@domain, "Reset email sent. Check your email for a reset link.")
+
+  def reset_email_sent,
+    do: dgettext(@domain, "Reset email sent. Check your email for a reset link.")
+
   def restricted_area, do: dgettext(@domain, "Restricted Area")
   def send_an_unlock_email, do: dgettext(@domain, "Send an unlock email")
   def sign_in, do: dgettext(@domain, "Sign In")
   def sign_out, do: dgettext(@domain, "Sign Out")
   def signed_in_successfully, do: dgettext(@domain, "Signed in successfully.")
-  def too_many_failed_login_attempts, do: dgettext(@domain, "Too many failed login attempts. Account has been locked.")
+
+  def too_many_failed_login_attempts,
+    do: dgettext(@domain, "Too many failed login attempts. Account has been locked.")
+
   def unauthorized_ip_address, do: dgettext(@domain, "Unauthorized IP Address")
   def unlock_instructions_sent, do: dgettext(@domain, "Unlock Instructions sent.")
-  def user_account_confirmed_successfully, do: dgettext(@domain, "User account confirmed successfully.")
+
+  def user_account_confirmed_successfully,
+    do: dgettext(@domain, "User account confirmed successfully.")
+
   def user_already_has_an_account, do: dgettext(@domain, "User already has an account!")
-  def you_must_confirm_your_account, do: dgettext(@domain, "You must confirm your account before you can login.")
+
+  def you_must_confirm_your_account,
+    do: dgettext(@domain, "You must confirm your account before you can login.")
+
   def your_account_has_been_unlocked, do: dgettext(@domain, "Your account has been unlocked")
   def your_account_is_not_locked, do: dgettext(@domain, "Your account is not locked.")
+
   def verify_user_token(opts),
     do: dgettext(@domain, "Invalid %{user_token} error: %{error}", opts)
+
   def you_are_using_an_invalid_security_token,
-    do: dgettext(@domain, "You are using an invalid security token for this site! This security\nviolation has been logged.\n")
+    do:
+      dgettext(
+        @domain,
+        "You are using an invalid security token for this site! This security\nviolation has been logged.\n"
+      )
+
   def mailer_required, do: dgettext(@domain, "Mailer configuration required!")
   def account_is_inactive(), do: dgettext(@domain, "Account is inactive!")
 end