Merge remote-tracking branch 'remotes/origin/develop' into auth-improvements

[akkoma] / lib / pleroma / helpers / auth_helper.ex

diff --git a/lib/pleroma/helpers/auth_helper.ex b/lib/pleroma/helpers/auth_helper.ex
index 6e29c006a6afc69453ec821cf073512bf753a2a1..878fec3466007b9983a4878fc60fdeb3793f3c09 100644 (file)
--- a/lib/pleroma/helpers/auth_helper.ex
+++ b/lib/pleroma/helpers/auth_helper.ex
@@ -5,13 +5,21 @@
 defmodule Pleroma.Helpers.AuthHelper do
   alias Pleroma.Web.Plugs.OAuthScopesPlug
 
+  import Plug.Conn
+
   @doc """
   Skips OAuth permissions (scopes) checks, assigns nil `:token`.
   Intended to be used with explicit authentication and only when OAuth token cannot be determined.
   """
   def skip_oauth(conn) do
     conn
-    |> Plug.Conn.assign(:token, nil)
+    |> assign(:token, nil)
     |> OAuthScopesPlug.skip_plug()
   end
+
+  def drop_auth_info(conn) do
+    conn
+    |> assign(:user, nil)
+    |> assign(:token, nil)
+  end
 end