Skip to content

Add const for session key #23

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

Open
svilupp wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Add const for session key #23

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
19 changes: 10 additions & 9 deletions src/GenieAuthentication.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ export login, logout, with_authentication, without_authentication, @authenticate
const USER_ID_KEY = :__auth_user_id
const PARAMS_USERNAME_KEY = :username
const PARAMS_PASSWORD_KEY = :password
const PARAMS_SESSION_KEY = GenieSession.PARAMS_SESSION_KEY # :SESSION

"""
Stores the user id on the session.
Expand All @@ -27,7 +28,7 @@ function authenticate(user_id::SearchLight.DbId, session::GenieSession.Session)
authenticate(Int(user_id.value), session)
end
function authenticate(user_id::Union{String,Symbol,Int,SearchLight.DbId}, params::Dict{Symbol,Any} = Genie.Requests.payload()) :: GenieSession.Session
authenticate(user_id, params[:SESSION])
authenticate(user_id, params[PARAMS_SESSION_KEY])
end


Expand All @@ -38,10 +39,10 @@ end
Removes the user id from the session.
"""
function deauthenticate(session::GenieSession.Session) :: GenieSession.Session
Genie.Router.params!(:SESSION, GenieSession.unset!(session, USER_ID_KEY))
Genie.Router.params!(PARAMS_SESSION_KEY, GenieSession.unset!(session, USER_ID_KEY))
end
function deauthenticate(params::Dict = Genie.Requests.payload()) :: GenieSession.Session
deauthenticate(get(params, :SESSION, nothing))
deauthenticate(get(params, PARAMS_SESSION_KEY, nothing))
end


Expand All @@ -55,7 +56,7 @@ function is_authenticated(session::Union{GenieSession.Session,Nothing}) :: Bool
GenieSession.isset(session, USER_ID_KEY)
end
function is_authenticated(params::Dict = Genie.Requests.payload()) :: Bool
is_authenticated(get(params, :SESSION, nothing))
is_authenticated(get(params, PARAMS_SESSION_KEY, nothing))
end

const authenticated = is_authenticated
Expand Down Expand Up @@ -96,7 +97,7 @@ function get_authentication(session::GenieSession.Session) :: Union{Nothing,Any}
GenieSession.get(session, USER_ID_KEY)
end
function get_authentication(params::Dict = Genie.Requests.payload()) :: Union{Nothing,Any}
haskey(params, :SESSION) ? get_authentication(params[:SESSION]) : nothing
haskey(params, PARAMS_SESSION_KEY) ? get_authentication(params[PARAMS_SESSION_KEY]) : nothing
end

const authentication = get_authentication
Expand All @@ -112,7 +113,7 @@ function login(user::M, session::GenieSession.Session)::Union{Nothing,GenieSessi
authenticate(getfield(user, Symbol(pk(user))), session)
end
function login(user::M, params::Dict = Genie.Requests.payload())::Union{Nothing,GenieSession.Session} where {M<:SearchLight.AbstractModel}
login(user, params[:SESSION])
login(user, params[PARAMS_SESSION_KEY])
end


Expand All @@ -126,7 +127,7 @@ function logout(session::GenieSession.Session) :: GenieSession.Session
deauthenticate(session)
end
function logout(params::Dict = Genie.Requests.payload()) :: GenieSession.Session
logout(params[:SESSION])
logout(params[PARAMS_SESSION_KEY])
end


Expand All @@ -144,7 +145,7 @@ function with_authentication(f::Function, fallback::Function, session::Union{Gen
end
end
function with_authentication(f::Function, fallback::Function, params::Dict = Genie.Requests.payload())
with_authentication(f, fallback, params[:SESSION])
with_authentication(f, fallback, params[PARAMS_SESSION_KEY])
end


Expand All @@ -158,7 +159,7 @@ function without_authentication(f::Function, session::GenieSession.Session)
! is_authenticated(session) && f()
end
function without_authentication(f::Function, params::Dict = Genie.Requests.payload())
without_authentication(f, params[:SESSION])
without_authentication(f, params[PARAMS_SESSION_KEY])
end


Expand Down