diff --git a/lib/auth_web/controllers/apikey_controller.ex b/lib/auth_web/controllers/apikey_controller.ex index 41d95852..b0584d33 100644 --- a/lib/auth_web/controllers/apikey_controller.ex +++ b/lib/auth_web/controllers/apikey_controller.ex @@ -3,7 +3,7 @@ defmodule AuthWeb.ApikeyController do alias Auth.Apikey def index(conn, _params) do - person_id = conn.assigns.decoded.id + person_id = conn.assigns.person.id apikeys = Apikey.list_apikeys_for_person(person_id) render(conn, "index.html", apikeys: apikeys) end @@ -50,7 +50,7 @@ defmodule AuthWeb.ApikeyController do def create(conn, %{"apikey" => apikey_params}) do {:ok, apikey} = apikey_params - |> make_apikey(conn.assigns.decoded.id) + |> make_apikey(conn.assigns.person.id) |> Apikey.create_apikey() conn @@ -67,7 +67,7 @@ defmodule AuthWeb.ApikeyController do def edit(conn, %{"id" => id}) do apikey = Auth.Apikey.get_apikey!(id) # IO.inspect(apikey, label: "apikey") - if apikey.person_id == conn.assigns.decoded.id do + if apikey.person_id == conn.assigns.person.id do changeset = Auth.Apikey.change_apikey(apikey) render(conn, "edit.html", apikey: apikey, changeset: changeset) else @@ -82,7 +82,7 @@ defmodule AuthWeb.ApikeyController do def update(conn, %{"id" => id, "apikey" => apikey_params}) do apikey = Apikey.get_apikey!(id) # check that the person attempting to update the key owns it! - if apikey.person_id == conn.assigns.decoded.id do + if apikey.person_id == conn.assigns.person.id do case Apikey.update_apikey(apikey, apikey_params) do {:ok, apikey} -> conn @@ -100,7 +100,7 @@ defmodule AuthWeb.ApikeyController do def delete(conn, %{"id" => id}) do apikey = Apikey.get_apikey!(id) # check that the person attempting to delete the key owns it! - if apikey.person_id == conn.assigns.decoded.id do + if apikey.person_id == conn.assigns.person.id do {:ok, _apikey} = Apikey.delete_apikey(apikey) conn |> put_flash(:info, "Apikey deleted successfully.") diff --git a/lib/auth_web/templates/page/welcome.html.eex b/lib/auth_web/templates/page/welcome.html.eex index 3a19ea80..a94da05d 100644 --- a/lib/auth_web/templates/page/welcome.html.eex +++ b/lib/auth_web/templates/page/welcome.html.eex @@ -1,9 +1,9 @@
-

Welcome <%= @conn.assigns.decoded.givenName %>! - +

Welcome <%= @conn.assigns.person.givenName %>! +

You are signed in - with your <%= @conn.assigns.decoded.auth_provider %> account
+ with your <%= @conn.assigns.person.auth_provider %> account

diff --git a/mix.exs b/mix.exs index 484d5ba5..a75034ac 100644 --- a/mix.exs +++ b/mix.exs @@ -61,7 +61,7 @@ defmodule Auth.Mixfile do # https://github.com/dwyl/elixir-auth-google {:elixir_auth_google, "~> 1.2.0"}, # https://github.com/dwyl/auth_plug - {:auth_plug, "~> 1.0.0"}, + {:auth_plug, "~> 1.1.0"}, # Field Validation and Encryption: github.com/dwyl/fields {:fields, "~> 2.5.0"}, diff --git a/mix.lock b/mix.lock index 1c6c897e..f9cd1b16 100644 --- a/mix.lock +++ b/mix.lock @@ -1,6 +1,6 @@ %{ "argon2_elixir": {:hex, :argon2_elixir, "2.3.0", "e251bdafd69308e8c1263e111600e6d68bd44f23d2cccbe43fcb1a417a76bc8e", [:make, :mix], [{:comeonin, "~> 5.3", [hex: :comeonin, repo: "hexpm", optional: false]}, {:elixir_make, "~> 0.6", [hex: :elixir_make, repo: "hexpm", optional: false]}], "hexpm", "28ccb63bff213aecec1f7f3dde9648418b031f822499973281d8f494b9d5a3b3"}, - "auth_plug": {:hex, :auth_plug, "1.0.0", "7e93fbc4a983b6af4e018fd48f966a3aa273f336850c99bb505e02872c02faae", [:mix], [{:joken, "~> 2.2.0", [hex: :joken, repo: "hexpm", optional: false]}, {:plug, "~> 1.10", [hex: :plug, repo: "hexpm", optional: false]}], "hexpm", "9bdcdebaa30106c3a2f6cc363b6456dc3ab5cd51ca48dc93008778ac47975f0c"}, + "auth_plug": {:hex, :auth_plug, "1.1.0", "55d892acdae9083706038db7c4c87a85c0b13fca4def040700864786f2c6aaa2", [:mix], [{:joken, "~> 2.2.0", [hex: :joken, repo: "hexpm", optional: false]}, {:plug, "~> 1.10", [hex: :plug, repo: "hexpm", optional: false]}], "hexpm", "93fcce126fb0941f28b0ec0e6af407ace148d3d3becade918226eb4e10d0afc0"}, "certifi": {:hex, :certifi, "2.5.1", "867ce347f7c7d78563450a18a6a28a8090331e77fa02380b4a21962a65d36ee5", [:rebar3], [{:parse_trans, "~>3.3", [hex: :parse_trans, repo: "hexpm", optional: false]}], "hexpm", "805abd97539caf89ec6d4732c91e62ba9da0cda51ac462380bbd28ee697a8c42"}, "comeonin": {:hex, :comeonin, "5.3.1", "7fe612b739c78c9c1a75186ef2d322ce4d25032d119823269d0aa1e2f1e20025", [:mix], [], "hexpm", "d6222483060c17f0977fad1b7401ef0c5863c985a64352755f366aee3799c245"}, "connection": {:hex, :connection, "1.0.4", "a1cae72211f0eef17705aaededacac3eb30e6625b04a6117c1b2db6ace7d5976", [:mix], [], "hexpm", "4a0850c9be22a43af9920a71ab17c051f5f7d45c209e40269a1938832510e4d9"},