diff --git a/changelog.md b/changelog.md index afc53e6..6d838ca 100644 --- a/changelog.md +++ b/changelog.md @@ -1,3 +1,6 @@ +# v0.1.19 +- Fix visibility issues with multiple users + # v0.1.18 - Update deps - Fix content not escaping HTML properly diff --git a/lib/memex/contexts.ex b/lib/memex/contexts.ex index c9ec67b..72255a9 100644 --- a/lib/memex/contexts.ex +++ b/lib/memex/contexts.ex @@ -22,16 +22,16 @@ defmodule Memex.Contexts do @spec list_contexts(search :: String.t() | nil, User.t()) :: [Context.t()] def list_contexts(search \\ nil, user) - def list_contexts(search, %{id: user_id}) when search in [nil, ""] do - Repo.all(from c in Context, where: c.user_id == ^user_id, order_by: c.slug) + def list_contexts(search, %{id: user_id}) when user_id |> is_binary() and search in [nil, ""] do + Repo.all(from c in Context, order_by: c.slug) end - def list_contexts(search, %{id: user_id}) when search |> is_binary() do + def list_contexts(search, %{id: user_id}) + when user_id |> is_binary() and search |> is_binary() do trimmed_search = String.trim(search) Repo.all( from c in Context, - where: c.user_id == ^user_id, where: fragment( "search @@ websearch_to_tsquery('english', ?)", @@ -103,12 +103,8 @@ defmodule Memex.Contexts do """ @spec get_context!(Context.id(), User.t()) :: Context.t() - def get_context!(id, %{id: user_id}) do - Repo.one!( - from c in Context, - where: c.id == ^id, - where: c.user_id == ^user_id or c.visibility in [:public, :unlisted] - ) + def get_context!(id, %{id: user_id}) when user_id |> is_binary() do + Repo.one!(from c in Context, where: c.id == ^id) end def get_context!(id, _invalid_user) do @@ -134,12 +130,8 @@ defmodule Memex.Contexts do """ @spec get_context_by_slug(Context.slug(), User.t()) :: Context.t() | nil - def get_context_by_slug(slug, %{id: user_id}) do - Repo.one( - from c in Context, - where: c.slug == ^slug, - where: c.user_id == ^user_id or c.visibility in [:public, :unlisted] - ) + def get_context_by_slug(slug, %{id: user_id}) when user_id |> is_binary() do + Repo.one(from c in Context, where: c.slug == ^slug) end def get_context_by_slug(slug, _invalid_user) do @@ -194,23 +186,16 @@ defmodule Memex.Contexts do ## Examples - iex> delete_context(%Context{user_id: 123}, %User{id: 123}) - {:ok, %Context{}} - - iex> delete_context(%Context{user_id: 123}, %User{role: :admin}) - {:ok, %Context{}} - iex> delete_context(%Context{}, %User{id: 123}) + {:ok, %Context{}} + + iex> delete_context(%Context{}, nil) {:error, %Ecto.Changeset{}} """ @spec delete_context(Context.t(), User.t()) :: {:ok, Context.t()} | {:error, Context.changeset()} - def delete_context(%Context{user_id: user_id} = context, %{id: user_id}) do - context |> Repo.delete() - end - - def delete_context(%Context{} = context, %{role: :admin}) do + def delete_context(%Context{} = context, %{id: user_id}) when user_id |> is_binary() do context |> Repo.delete() end @@ -228,13 +213,4 @@ defmodule Memex.Contexts do def change_context(%Context{} = context, attrs \\ %{}, user) do context |> Context.update_changeset(attrs, user) end - - @spec owner_or_admin?(Context.t(), User.t()) :: boolean() - def owner_or_admin?(%{user_id: user_id}, %{id: user_id}), do: true - def owner_or_admin?(_context, %{role: :admin}), do: true - def owner_or_admin?(_context, _other_user), do: false - - @spec owner?(Context.t(), User.t()) :: boolean() - def owner?(%{user_id: user_id}, %{id: user_id}), do: true - def owner?(_context, _other_user), do: false end diff --git a/lib/memex/contexts/context.ex b/lib/memex/contexts/context.ex index 9be4b1e..fe992d4 100644 --- a/lib/memex/contexts/context.ex +++ b/lib/memex/contexts/context.ex @@ -63,8 +63,9 @@ defmodule Memex.Contexts.Context do end @spec update_changeset(t(), attrs :: map(), User.t()) :: changeset() - def update_changeset(%{user_id: user_id} = note, attrs, %User{id: user_id}) do - note + def update_changeset(%__MODULE__{} = context, attrs, %User{id: user_id}) + when user_id |> is_binary() do + context |> cast(attrs, [:slug, :content, :tags, :visibility]) |> cast_tags_string(attrs) |> validate_format(:slug, ~r/^[\p{L}\p{N}\-]+$/, diff --git a/lib/memex/notes.ex b/lib/memex/notes.ex index 1edbdb0..c58ed68 100644 --- a/lib/memex/notes.ex +++ b/lib/memex/notes.ex @@ -31,7 +31,6 @@ defmodule Memex.Notes do Repo.all( from n in Note, - where: n.user_id == ^user_id, where: fragment( "search @@ websearch_to_tsquery('english', ?)", @@ -102,12 +101,8 @@ defmodule Memex.Notes do """ @spec get_note!(Note.id(), User.t()) :: Note.t() - def get_note!(id, %{id: user_id}) do - Repo.one!( - from n in Note, - where: n.id == ^id, - where: n.user_id == ^user_id or n.visibility in [:public, :unlisted] - ) + def get_note!(id, %{id: user_id}) when user_id |> is_binary() do + Repo.one!(from n in Note, where: n.id == ^id) end def get_note!(id, _invalid_user) do @@ -133,12 +128,8 @@ defmodule Memex.Notes do """ @spec get_note_by_slug(Note.slug(), User.t()) :: Note.t() | nil - def get_note_by_slug(slug, %{id: user_id}) do - Repo.one( - from n in Note, - where: n.slug == ^slug, - where: n.user_id == ^user_id or n.visibility in [:public, :unlisted] - ) + def get_note_by_slug(slug, %{id: user_id}) when user_id |> is_binary() do + Repo.one(from n in Note, where: n.slug == ^slug) end def get_note_by_slug(slug, _invalid_user) do @@ -192,22 +183,15 @@ defmodule Memex.Notes do ## Examples - iex> delete_note(%Note{user_id: 123}, %User{id: 123}) - {:ok, %Note{}} - - iex> delete_note(%Note{}, %User{role: :admin}) - {:ok, %Note{}} - iex> delete_note(%Note{}, %User{id: 123}) + {:ok, %Note{}} + + iex> delete_note(%Note{}, nil) {:error, %Ecto.Changeset{}} """ @spec delete_note(Note.t(), User.t()) :: {:ok, Note.t()} | {:error, Note.changeset()} - def delete_note(%Note{user_id: user_id} = note, %{id: user_id}) do - note |> Repo.delete() - end - - def delete_note(%Note{} = note, %{role: :admin}) do + def delete_note(%Note{} = note, %{id: user_id}) when user_id |> is_binary() do note |> Repo.delete() end @@ -228,13 +212,4 @@ defmodule Memex.Notes do def change_note(%Note{} = note, attrs \\ %{}, user) do note |> Note.update_changeset(attrs, user) end - - @spec owner_or_admin?(Note.t(), User.t()) :: boolean() - def owner_or_admin?(%{user_id: user_id}, %{id: user_id}), do: true - def owner_or_admin?(_context, %{role: :admin}), do: true - def owner_or_admin?(_context, _other_user), do: false - - @spec owner?(Note.t(), User.t()) :: boolean() - def owner?(%{user_id: user_id}, %{id: user_id}), do: true - def owner?(_context, _other_user), do: false end diff --git a/lib/memex/notes/note.ex b/lib/memex/notes/note.ex index 2872e25..5812ed6 100644 --- a/lib/memex/notes/note.ex +++ b/lib/memex/notes/note.ex @@ -62,7 +62,8 @@ defmodule Memex.Notes.Note do end @spec update_changeset(t(), attrs :: map(), User.t()) :: changeset() - def update_changeset(%{user_id: user_id} = note, attrs, %User{id: user_id}) do + def update_changeset(%__MODULE__{} = note, attrs, %User{id: user_id}) + when user_id |> is_binary() do note |> cast(attrs, [:slug, :content, :tags, :visibility]) |> cast_tags_string(attrs) diff --git a/lib/memex/pipelines.ex b/lib/memex/pipelines.ex index c576a8e..922c70d 100644 --- a/lib/memex/pipelines.ex +++ b/lib/memex/pipelines.ex @@ -22,16 +22,17 @@ defmodule Memex.Pipelines do @spec list_pipelines(search :: String.t() | nil, User.t()) :: [Pipeline.t()] def list_pipelines(search \\ nil, user) - def list_pipelines(search, %{id: user_id}) when search in [nil, ""] do - Repo.all(from p in Pipeline, where: p.user_id == ^user_id, order_by: p.slug) + def list_pipelines(search, %{id: user_id}) + when user_id |> is_binary() and search in [nil, ""] do + Repo.all(from p in Pipeline, order_by: p.slug) end - def list_pipelines(search, %{id: user_id}) when search |> is_binary() do + def list_pipelines(search, %{id: user_id}) + when user_id |> is_binary() and search |> is_binary() do trimmed_search = String.trim(search) Repo.all( from p in Pipeline, - where: p.user_id == ^user_id, where: fragment( "search @@ websearch_to_tsquery('english', ?)", @@ -102,12 +103,8 @@ defmodule Memex.Pipelines do """ @spec get_pipeline!(Pipeline.id(), User.t()) :: Pipeline.t() - def get_pipeline!(id, %{id: user_id}) do - Repo.one!( - from p in Pipeline, - where: p.id == ^id, - where: p.user_id == ^user_id or p.visibility in [:public, :unlisted] - ) + def get_pipeline!(id, %{id: user_id}) when user_id |> is_binary() do + Repo.one!(from p in Pipeline, where: p.id == ^id) end def get_pipeline!(id, _invalid_user) do @@ -133,12 +130,8 @@ defmodule Memex.Pipelines do """ @spec get_pipeline_by_slug(Pipeline.slug(), User.t()) :: Pipeline.t() | nil - def get_pipeline_by_slug(slug, %{id: user_id}) do - Repo.one( - from p in Pipeline, - where: p.slug == ^slug, - where: p.user_id == ^user_id or p.visibility in [:public, :unlisted] - ) + def get_pipeline_by_slug(slug, %{id: user_id}) when user_id |> is_binary() do + Repo.one(from p in Pipeline, where: p.slug == ^slug) end def get_pipeline_by_slug(slug, _invalid_user) do @@ -193,23 +186,16 @@ defmodule Memex.Pipelines do ## Examples - iex> delete_pipeline(%Pipeline{user_id: 123}, %User{id: 123}) - {:ok, %Pipeline{}} - - iex> delete_pipeline(%Pipeline{}, %User{role: :admin}) - {:ok, %Pipeline{}} - iex> delete_pipeline(%Pipeline{}, %User{id: 123}) + {:ok, %Pipeline{}} + + iex> delete_pipeline(%Pipeline{}, nil) {:error, %Ecto.Changeset{}} """ @spec delete_pipeline(Pipeline.t(), User.t()) :: {:ok, Pipeline.t()} | {:error, Pipeline.changeset()} - def delete_pipeline(%Pipeline{user_id: user_id} = pipeline, %{id: user_id}) do - pipeline |> Repo.delete() - end - - def delete_pipeline(%Pipeline{} = pipeline, %{role: :admin}) do + def delete_pipeline(%Pipeline{} = pipeline, %{id: user_id}) when user_id |> is_binary() do pipeline |> Repo.delete() end @@ -230,13 +216,4 @@ defmodule Memex.Pipelines do def change_pipeline(%Pipeline{} = pipeline, attrs \\ %{}, user) do pipeline |> Pipeline.update_changeset(attrs, user) end - - @spec owner_or_admin?(Pipeline.t(), User.t()) :: boolean() - def owner_or_admin?(%{user_id: user_id}, %{id: user_id}), do: true - def owner_or_admin?(_context, %{role: :admin}), do: true - def owner_or_admin?(_context, _other_user), do: false - - @spec owner?(Pipeline.t(), User.t()) :: boolean() - def owner?(%{user_id: user_id}, %{id: user_id}), do: true - def owner?(_context, _other_user), do: false end diff --git a/lib/memex/pipelines/pipeline.ex b/lib/memex/pipelines/pipeline.ex index 93de712..2d55554 100644 --- a/lib/memex/pipelines/pipeline.ex +++ b/lib/memex/pipelines/pipeline.ex @@ -65,7 +65,8 @@ defmodule Memex.Pipelines.Pipeline do end @spec update_changeset(t(), attrs :: map(), User.t()) :: changeset() - def update_changeset(%{user_id: user_id} = pipeline, attrs, %User{id: user_id}) do + def update_changeset(%__MODULE__{} = pipeline, attrs, %User{id: user_id}) + when user_id |> is_binary() do pipeline |> cast(attrs, [:slug, :description, :tags, :visibility]) |> cast_tags_string(attrs) diff --git a/lib/memex/pipelines/step.ex b/lib/memex/pipelines/step.ex index 3124add..b416953 100644 --- a/lib/memex/pipelines/step.ex +++ b/lib/memex/pipelines/step.ex @@ -44,9 +44,12 @@ defmodule Memex.Pipelines.Steps.Step do @doc false @spec create_changeset(attrs :: map(), position :: non_neg_integer(), Pipeline.t(), User.t()) :: changeset() - def create_changeset(attrs, position, %Pipeline{id: pipeline_id, user_id: user_id}, %User{ - id: user_id - }) do + def create_changeset( + attrs, + position, + %Pipeline{id: pipeline_id, user_id: user_id}, + %User{id: user_id} + ) do %__MODULE__{} |> cast(attrs, [:title, :content]) |> change(pipeline_id: pipeline_id, user_id: user_id, position: position) @@ -55,22 +58,16 @@ defmodule Memex.Pipelines.Steps.Step do @spec update_changeset(t(), attrs :: map(), User.t()) :: changeset() - def update_changeset( - %{user_id: user_id} = step, - attrs, - %User{id: user_id} - ) do + def update_changeset(%__MODULE__{} = step, attrs, %User{id: user_id}) + when user_id |> is_binary() do step |> cast(attrs, [:title, :content]) |> validate_required([:title, :user_id, :position]) end @spec position_changeset(t(), position :: non_neg_integer(), User.t()) :: changeset() - def position_changeset( - %{user_id: user_id} = step, - position, - %User{id: user_id} - ) do + def position_changeset(%__MODULE__{} = step, position, %User{id: user_id}) + when user_id |> is_binary() do step |> change(position: position) |> validate_required([:title, :user_id, :position]) diff --git a/lib/memex/pipelines/steps.ex b/lib/memex/pipelines/steps.ex index d33de67..80f47e5 100644 --- a/lib/memex/pipelines/steps.ex +++ b/lib/memex/pipelines/steps.ex @@ -21,11 +21,10 @@ defmodule Memex.Pipelines.Steps do """ @spec list_steps(Pipeline.t(), User.t()) :: [Step.t()] - def list_steps(%{id: pipeline_id}, %{id: user_id}) do + def list_steps(%{id: pipeline_id}, %{id: user_id}) when user_id |> is_binary() do Repo.all( from s in Step, where: s.pipeline_id == ^pipeline_id, - where: s.user_id == ^user_id, order_by: s.position ) end @@ -62,8 +61,8 @@ defmodule Memex.Pipelines.Steps do """ @spec get_step!(Step.id(), User.t()) :: Step.t() - def get_step!(id, %{id: user_id}) do - Repo.one!(from n in Step, where: n.id == ^id, where: n.user_id == ^user_id) + def get_step!(id, %{id: user_id}) when user_id |> is_binary() do + Repo.one!(from n in Step, where: n.id == ^id) end def get_step!(id, _invalid_user) do @@ -119,22 +118,15 @@ defmodule Memex.Pipelines.Steps do ## Examples - iex> delete_step(%Step{user_id: 123}, %User{id: 123}) - {:ok, %Step{}} - - iex> delete_step(%Step{}, %User{role: :admin}) - {:ok, %Step{}} - iex> delete_step(%Step{}, %User{id: 123}) + {:ok, %Step{}} + + iex> delete_step(%Step{}, nil) {:error, %Ecto.Changeset{}} """ @spec delete_step(Step.t(), User.t()) :: {:ok, Step.t()} | {:error, Step.changeset()} - def delete_step(%Step{user_id: user_id} = step, %{id: user_id}) do - delete_step(step) - end - - def delete_step(%Step{} = step, %{role: :admin}) do + def delete_step(%Step{} = step, %{id: user_id}) when user_id |> is_binary() do delete_step(step) end @@ -181,10 +173,11 @@ defmodule Memex.Pipelines.Steps do def reorder_step(%Step{position: 0} = step, :up, _user), do: {:error, step} def reorder_step( - %Step{position: position, pipeline_id: pipeline_id, user_id: user_id} = step, + %Step{position: position, pipeline_id: pipeline_id} = step, :up, %{id: user_id} = user - ) do + ) + when user_id |> is_binary() do Multi.new() |> Multi.update_all( :reorder_steps, @@ -207,10 +200,11 @@ defmodule Memex.Pipelines.Steps do end def reorder_step( - %Step{pipeline_id: pipeline_id, position: position, user_id: user_id} = step, + %Step{pipeline_id: pipeline_id, position: position} = step, :down, %{id: user_id} = user - ) do + ) + when user_id |> is_binary() do Multi.new() |> Multi.one( :step_count, diff --git a/lib/memex_web/live/context_live/index.html.heex b/lib/memex_web/live/context_live/index.html.heex index 02a0308..050fe1a 100644 --- a/lib/memex_web/live/context_live/index.html.heex +++ b/lib/memex_web/live/context_live/index.html.heex @@ -1,4 +1,4 @@ -