Merge pull request #81 from epochtalk/add-authorizations

Add authorizations
epochtalk · Nov 8, 2023 · 6efb0be · 6efb0be
2 parents 4dfd4fb + 82007a6
commit 6efb0be
Show file tree

Hide file tree

Showing 10 changed files with 327 additions and 75 deletions.
diff --git a/lib/epochtalk_server/models/mention.ex b/lib/epochtalk_server/models/mention.ex
@@ -46,8 +46,8 @@ defmodule EpochtalkServer.Models.Mention do
   def create_changeset(mention, attrs) do
     now = NaiveDateTime.truncate(NaiveDateTime.utc_now(), :second)
 
-    attrs =
-      attrs
+    mention =
+      mention
       |> Map.put(:created_at, now)
 
     mention

diff --git a/lib/epochtalk_server/models/notification.ex b/lib/epochtalk_server/models/notification.ex
@@ -77,7 +77,7 @@ defmodule EpochtalkServer.Models.Notification do
     |> Repo.all()
     |> case do
       [] ->
-        %{message: 0, mentions: 0}
+        %{message: 0, mention: 0}
 
       notifications ->
         {messages, mentions} = Enum.split_with(notifications, &(&1.type == @types.message))

diff --git a/lib/epochtalk_server_web/controllers/board.ex b/lib/epochtalk_server_web/controllers/board.ex
@@ -88,6 +88,7 @@ defmodule EpochtalkServerWeb.Controllers.Board do
   @doc """
   Used to convert `Board` slug to id
   """
+  # TODO(akinsey): allow validate cast to match a regex, for completeness validate slug format
   def slug_to_id(conn, attrs) do
     with slug <- Validate.cast(attrs, "slug", :string, required: true),
          {:ok, id} <- Board.slug_to_id(slug) do

diff --git a/lib/epochtalk_server_web/controllers/moderation_log.ex b/lib/epochtalk_server_web/controllers/moderation_log.ex
@@ -8,12 +8,14 @@ defmodule EpochtalkServerWeb.Controllers.ModerationLog do
   alias EpochtalkServer.Models.ModerationLog
   alias EpochtalkServerWeb.ErrorHelpers
   alias EpochtalkServerWeb.Helpers.Validate
+  alias EpochtalkServerWeb.Helpers.ACL
 
   @doc """
   Used to page `ModerationLog` models for moderation log view`
   """
   def page(conn, attrs) do
     with {:auth, true} <- {:auth, Guardian.Plug.authenticated?(conn)},
+         :ok <- ACL.allow!(conn, "moderationLogs.page"),
          page <- Validate.cast(attrs, "page", :integer, min: 1),
          limit <- Validate.cast(attrs, "limit", :integer, min: 1),
          {:ok, moderation_logs, data} <- ModerationLog.page(attrs, page, per_page: limit) do

diff --git a/lib/epochtalk_server_web/controllers/notification.ex b/lib/epochtalk_server_web/controllers/notification.ex
@@ -63,6 +63,7 @@ defmodule EpochtalkServerWeb.Controllers.Notification do
 
   def dismiss(conn, %{"type" => type}) do
     with {:auth, user} <- {:auth, Guardian.Plug.current_resource(conn)},
+         :ok <- ACL.allow!(conn, "notifications.dismiss"),
          {_count, nil} <- Notification.dismiss_type_by_user_id(user.id, type) do
       EpochtalkServerWeb.Endpoint.broadcast("user:#{user.id}", "refreshMentions", %{})
       render(conn, :dismiss, success: true)