v0.5

Project.toml

@@ -1,7 +1,7 @@
 name = "GenieAuthentication"
 uuid = "e115e502-7e3a-11e9-29b2-aba8be6c6778"
 authors = ["Adrian Salceanu <e@essenciary.com>"]
-version = "0.4.2"
+version = "0.5"
 
 [deps]
 Genie = "c43c736e-a2d1-11e8-161f-af95117fbd1e"

files/app/resources/authentication/AuthenticationController.jl

@@ -3,6 +3,7 @@ module AuthenticationController
 using Genie, Genie.Renderer, Genie.Renderer.Html, Genie.Router
 using SearchLight
 using GenieAuthentication
+using ViewHelper
 using Users
 using Logging
 
@@ -37,7 +38,7 @@ end
 
 function register()
   try
-    user = SearchLight.save!!(User( username  = Genie.Router.@params(:username),
+    user = SearchLight.save!(User( username  = Genie.Router.@params(:username),
                                     password  = Genie.Router.@params(:password) |> Users.hash_password,
                                     name      = Genie.Router.@params(:name),
                                     email     = Genie.Router.@params(:email)))
@@ -46,7 +47,11 @@ function register()
 
     "Registration successful"
   catch ex
-    Genie.Flash.flash(ex.msg)
+    if hasfield(typeof(ex), :msg)
+      Genie.Flash.flash(ex.msg)
+    else
+      rethrow(ex)
+    end
 
     Genie.Renderer.redirect(:show_register)
   end

files/app/resources/users/Users.jl

@@ -5,77 +5,23 @@ using SHA
 
 export User
 
-mutable struct User <: AbstractModel
-  ### INTERNALS
-  _table_name::String
-  _id::String
-  _serializable::Vector{Symbol}
-
+Base.@kwdef mutable struct User <: AbstractModel
   ### FIELDS
-  id::DbId
-  username::String
-  password::String
-  name::String
-  email::String
+  id::DbId = DbId()
+  username::String = ""
+  password::String = ""
+  name::String = ""
+  email::String = ""
 
   ### VALIDATION
-  validator::ModelValidator
-
-  ### CALLBACKS
-  # before_save::Function
-  # after_save::Function
-  # on_save::Function
-  # on_find::Function
-  # after_find::Function
-
-  ### SCOPES
-  # scopes::Dict{Symbol,Vector{SearchLight.SQLWhereEntity}}
-
-  ### constructor
-  User(;
-    ### FIELDS
-    id = DbId(),
-    username = "",
-    password = "",
-    name = "",
-    email = "",
-
-    ### VALIDATION
-    validator = ModelValidator([
-      ValidationRule(:username, UsersValidator.not_empty),
-      ValidationRule(:username, UsersValidator.unique),
-      ValidationRule(:password, UsersValidator.not_empty),
-      ValidationRule(:email,    UsersValidator.not_empty),
-      ValidationRule(:email,    UsersValidator.unique),
-      ValidationRule(:name,     UsersValidator.not_empty)
-    ]),
-
-    ### CALLBACKS
-    # before_save = (m::User) -> begin
-    #   @info "Before save"
-    # end,
-    # after_save = (m::User) -> begin
-    #   @info "After save"
-    # end,
-    # on_save = (m::User, field::Symbol, value::Any) -> begin
-    #   @info "On save"
-    # end,
-    # on_find = (m::User, field::Symbol, value::Any) -> begin
-    #   @info "On find"
-    # end,
-    # after_find = (m::User) -> begin
-    #   @info "After find"
-    # end,
-
-    ### SCOPES
-    # scopes = Dict{Symbol,Vector{SearchLight.SQLWhereEntity}}()
-
-  ) = new("users", "id", Symbol[],                                                      ### INTERNALS
-          id, username, password, name, email,                                          ### FIELDS
-          validator,                                                                    ### VALIDATION
-          # before_save, after_save, on_save, on_find, after_find                       ### CALLBACKS
-          # scopes                                                                      ### SCOPES
-          )
+  # validator::ModelValidator  = ModelValidator([
+  #   ValidationRule(:username, UsersValidator.not_empty),
+  #   ValidationRule(:username, UsersValidator.unique),
+  #   ValidationRule(:password, UsersValidator.not_empty),
+  #   ValidationRule(:email,    UsersValidator.not_empty),
+  #   ValidationRule(:email,    UsersValidator.unique),
+  #   ValidationRule(:name,     UsersValidator.not_empty)
+  # ])
 end
 
 function hash_password(password::String)