diff --git a/apps/fg_http/lib/fg_http/devices.ex b/apps/fg_http/lib/fg_http/devices.ex index b1638d20e..eef55d84a 100644 --- a/apps/fg_http/lib/fg_http/devices.ex +++ b/apps/fg_http/lib/fg_http/devices.ex @@ -90,19 +90,6 @@ defmodule FgHttp.Devices do |> Repo.update() end - @doc """ - Verifies a Device. - - ## Examples - - iex> verify!(device.id) - {:ok, %Device{}} - """ - def verify(id) do - get_device!(id) - |> update_device(%{verified_at: DateTime.utc_now}) - end - @doc """ Deletes a device. diff --git a/apps/fg_http/lib/fg_http/devices/device.ex b/apps/fg_http/lib/fg_http/devices/device.ex index 57706dbc3..ecf4a34c5 100644 --- a/apps/fg_http/lib/fg_http/devices/device.ex +++ b/apps/fg_http/lib/fg_http/devices/device.ex @@ -9,7 +9,6 @@ defmodule FgHttp.Devices.Device do schema "devices" do field :name, :string field :public_key, :string - field :verified_at, :utc_datetime field :user_id, :id has_many :rules, FgHttp.Rules.Rule @@ -20,7 +19,7 @@ defmodule FgHttp.Devices.Device do @doc false def changeset(device, attrs) do device - |> cast(attrs, [:user_id, :verified_at, :name, :public_key]) + |> cast(attrs, [:user_id, :name, :public_key]) |> validate_required([:user_id]) end end diff --git a/apps/fg_http/lib/fg_http_web/controllers/device_controller.ex b/apps/fg_http/lib/fg_http_web/controllers/device_controller.ex index 3dd2106eb..f04053930 100644 --- a/apps/fg_http/lib/fg_http_web/controllers/device_controller.ex +++ b/apps/fg_http/lib/fg_http_web/controllers/device_controller.ex @@ -21,18 +21,13 @@ defmodule FgHttpWeb.DeviceController do def create(conn, %{"device" => device_params}) do create_params = %{ "user_id" => conn.assigns.current_user.id, - "verified_at" => DateTime.utc_now, "name" => "Auto" } all_params = Map.merge(device_params, create_params) - IO.puts "Create device with params: " - IO.inspect all_params case Devices.create_device(all_params) do {:ok, device} -> - IO.inspect(device) redirect(conn, to: Routes.device_path(conn, :show, device)) {:error, %Ecto.Changeset{} = changeset} -> - IO.inspect(changeset) render(conn, "new.html", changeset: changeset) end end diff --git a/apps/fg_http/lib/fg_http_web/live/new_device_live.ex b/apps/fg_http/lib/fg_http_web/live/new_device_live.ex index 5e41759a6..b4490f70f 100644 --- a/apps/fg_http/lib/fg_http_web/live/new_device_live.ex +++ b/apps/fg_http/lib/fg_http_web/live/new_device_live.ex @@ -7,7 +7,6 @@ defmodule FgHttpWeb.NewDeviceLive do def mount(_params, %{}, socket) do user_id = "1" - IO.inspect(socket) if connected?(socket), do: wait_for_device(socket) device = %Device{id: "1", user_id: user_id} diff --git a/apps/fg_http/lib/fg_http_web/templates/device/index.html.eex b/apps/fg_http/lib/fg_http_web/templates/device/index.html.eex index 85559e08b..3f60956b6 100644 --- a/apps/fg_http/lib/fg_http_web/templates/device/index.html.eex +++ b/apps/fg_http/lib/fg_http_web/templates/device/index.html.eex @@ -4,7 +4,6 @@ Name - Verified at Public key @@ -12,7 +11,6 @@ <%= for device <- @devices do %> <%= device.name %> - <%= device.verified_at %> <%= device.public_key %> diff --git a/apps/fg_http/lib/fg_http_web/templates/device/show.html.eex b/apps/fg_http/lib/fg_http_web/templates/device/show.html.eex index 9ca326d51..8db5dae66 100644 --- a/apps/fg_http/lib/fg_http_web/templates/device/show.html.eex +++ b/apps/fg_http/lib/fg_http_web/templates/device/show.html.eex @@ -6,11 +6,6 @@ <%= @device.name %> -
  • - Verified at: - <%= @device.verified_at %> -
  • -
  • Public key: <%= @device.public_key %> diff --git a/apps/fg_http/priv/repo/migrations/20200228145810_create_devices.exs b/apps/fg_http/priv/repo/migrations/20200228145810_create_devices.exs index 0a5dc8035..f2d57d058 100644 --- a/apps/fg_http/priv/repo/migrations/20200228145810_create_devices.exs +++ b/apps/fg_http/priv/repo/migrations/20200228145810_create_devices.exs @@ -4,7 +4,6 @@ defmodule FgHttp.Repo.Migrations.CreateDevices do def change do create table(:devices) do add :name, :string - add :verified_at, :utc_datetime add :public_key, :string add :user_id, references(:users, on_delete: :delete_all) diff --git a/apps/fg_http/test/fg_http_web/controllers/device_controller_test.exs b/apps/fg_http/test/fg_http_web/controllers/device_controller_test.exs index 58650e19e..9f594aab3 100644 --- a/apps/fg_http/test/fg_http_web/controllers/device_controller_test.exs +++ b/apps/fg_http/test/fg_http_web/controllers/device_controller_test.exs @@ -2,13 +2,19 @@ defmodule FgHttpWeb.DeviceControllerTest do use FgHttpWeb.ConnCase alias FgHttp.Devices + alias FgHttp.Users @create_attrs %{name: "some name"} @update_attrs %{name: "some updated name"} - @invalid_attrs %{name: nil} + @invalid_attrs %{user_id: nil} + + def fixture(:user) do + {:ok, user} = Users.create_user(%{email: "test"}) + user + end def fixture(:device) do - {:ok, device} = Devices.create_device(@create_attrs) + {:ok, device} = Devices.create_device(Map.merge(%{user_id: fixture(:user).id}, @create_attrs)) device end