Clean up code

Author: badubizzle

lib/user_encryption/account/user.ex

@@ -39,8 +39,8 @@ defmodule UserEncryption.Account.User do
 
   end
 
-  def put_password(c)do
-    c
+  def put_password(changeset)do
+    changeset
   end
 
   def put_key_hash(%Ecto.Changeset{valid?: true, changes: %{password: password}}=changeset)do
@@ -49,8 +49,8 @@ defmodule UserEncryption.Account.User do
     |>put_change(:key_hash, key_hash)
   end
 
-  def put_key_hash(c)do
-    c
+  def put_key_hash(changeset)do
+    changeset
   end
 
 end

lib/user_encryption/security/utils.ex

@@ -1,6 +1,5 @@
 defmodule UserEncryption.Security.Utils do
 
-    
     defp encode(d)do
         d        
         |> Base.encode64()

lib/user_encryption_web/controllers/page_controller.ex

@@ -22,15 +22,21 @@ defmodule UserEncryptionWeb.PageController do
 
   def do_register(conn, %{"name"=>name, "email"=> email, 
   "password"=>password, 
-  "confirm_password"=>confirm})do
-    case UserEncryption.Account.create_user(%{name: name, email: email, password: password}) do
-      {:ok, u}->
-        conn
-        |>put_session(:user, u)
-        |>redirect(to: "/encrypt")
-      _ -> 
+  "confirm_password"=>confirm_password})do
+    case confirm_password === password do
+      true->
+        case UserEncryption.Account.create_user(%{name: name, email: email, password: password}) do
+          {:ok, u}->
+            conn
+            |>clear_session()
+            |>redirect(to: "/login")
+          _ -> 
+            conn|>redirect(to: "/register")
+        end
+      _ ->
         conn|>redirect(to: "/register")
     end
+    
   end
 
   def logout(conn, _p)do
@@ -97,7 +103,7 @@ defmodule UserEncryptionWeb.PageController do
   end
 
 
-  def change_password(conn, %{"old_password"=>old_password, "new_password"=>new_password})do    
+  def do_change_password(conn, %{"old_password"=>old_password, "new_password"=>new_password})do    
     user = get_session(conn, :user)    
     case UserEncryption.Account.validate_user(user, old_password)do
       %{key: key}->

lib/user_encryption_web/router.ex

@@ -45,7 +45,7 @@ defmodule UserEncryptionWeb.Router do
     get "/decrypt", PageController, :do_decrypt
 
     get "/changepassword", PageController, :change_password
-    post "/changepassword", PageController, :change_password
+    post "/changepassword", PageController, :do_change_password
   end
 
   scope "/", UserEncryptionWeb do

lib/user_encryption_web/templates/layout/app.html.eex

@@ -20,7 +20,7 @@
           <ul class="nav nav-pills pull-right">
             <li>
             <%= if Plug.Conn.get_session(@conn, :user) do %>
-            <%= Plug.Conn.get_session(@conn, :user) |> Map.get(:name) %>                        
+            Welcome, <%= Plug.Conn.get_session(@conn, :user) |> Map.get(:name) %>                        
             <% end %>
             </li>
           </ul>

lib/user_encryption_web/templates/page/encrypt.html.eex

@@ -8,6 +8,7 @@
 <%= for d <- @data do %>
     <p><strong>Hash: </strong><%= d.hash %></p>
     <p>
+    <!-- -->
     <form method="post" action="/decrypt/<%= d.id %>"> 
       <input type="hidden" name="_csrf_token" value="<%= get_csrf_token() %>">
       <input type="Submit" value="Decrypt" class="field" />

lib/user_encryption_web/templates/page/login.html.eex

@@ -1,5 +1,5 @@
-<div class="jumbotron">
-<form name="login" method="post">    
+<div class="row marketing">
+  <form name="login" method="post">    
     <input type="hidden" name="_csrf_token" value="<%= get_csrf_token() %>">
 
     <input placeholder="Email" name="email" type="email"  class="field" />
@@ -8,7 +8,3 @@
     <input type="Submit" value="Login" class="field" />
 </form>
 </div>
-
-<div class="row marketing">
-  
-</div>

lib/user_encryption_web/templates/page/register.html.eex

@@ -1,14 +1,13 @@
-<div class="jumbotron">
-<form name="register" method="post">    
+
+<div class="row marketing">
+
+  <form name="register" method="post">
+  <h4>Register</h4>    
     <input type="hidden" name="_csrf_token" value="<%= get_csrf_token() %>">
     <input placeholder="Name" name="name" type="text" class="field" />
     <input placeholder="Email" name="email" type="email"  class="field" />
     <input placeholder="Password" name="password" type="password" class="field"  />
     <input placeholder="Confirm Password" name="confirm_password" type="password" class="field"  />
-    <input type="Submit" value="Register" />
+    <input type="Submit" value="Register"  class="field"/>
 </form>
 </div>
-
-<div class="row marketing">
-  
-</div>