Change models, new migrations, fix front and make tests work

Signed-off-by: Thomas Citharel <tcit@tcit.fr>
This commit is contained in:
Thomas Citharel
2018-01-13 23:33:03 +01:00
parent 92d2045735
commit 20cd1bb579
186 changed files with 2982 additions and 3214 deletions

View File

@@ -4,8 +4,10 @@ defmodule EventosWeb.Guardian do
user: [:base]
}
import Logger
alias Eventos.Accounts
alias Eventos.Accounts.User
alias Eventos.Accounts.{Account, User}
def subject_for_token(user = %User{}, _claims) do
{:ok, "User:" <> to_string(user.id)}
@@ -17,9 +19,11 @@ defmodule EventosWeb.Guardian do
def resource_from_claims(%{"sub" => "User:" <> uid_str}) do
try do
Logger.debug("Inspecting resource token")
Logger.debug(inspect uid_str)
case Integer.parse(uid_str) do
{uid, ""} ->
{:ok, Accounts.get_user!(uid)}
{:ok, Accounts.get_user_with_account!(uid)}
_ ->
{:error, :invalid_id}
end
@@ -28,13 +32,34 @@ defmodule EventosWeb.Guardian do
end
end
def resource_from_claims(_claims) do
def resource_from_claims(claims) do
Logger.debug("Check bad resource")
Logger.debug(inspect claims)
{:error, :reason_for_error}
end
# def build_claims(claims, _resource, opts) do
# claims = claims
# |> encode_permissions_into_claims!(Keyword.get(opts, :permissions))
# {:ok, claims}
# end
def after_encode_and_sign(resource, claims, token, _options) do
with {:ok, _} <- Guardian.DB.after_encode_and_sign(resource, claims["typ"], claims, token) do
{:ok, token}
end
end
def on_verify(claims, token, _options) do
Logger.debug(inspect claims)
with {:ok, _} <- Guardian.DB.on_verify(claims, token) do
{:ok, claims}
end
end
def on_revoke(claims, token, _options) do
with {:ok, _} <- Guardian.DB.on_revoke(claims, token) do
{:ok, claims}
end
end
# def build_claims(claims, _resource, opts) do
# claims = claims
# |> encode_permissions_into_claims!(Keyword.get(opts, :permissions))
# {:ok, claims}
# end
end