Fixed bug when returning from Questionnaire, anonymous user was logge…

…d out

core/systems/account/_plug.ex

@@ -4,7 +4,7 @@ defmodule Systems.Account.Plug do
   import Plug.Conn
   alias Systems.Account
 
-  @valid_participant_path ~r"^\/assignment\/\d.*$"
+  @valid_participant_path ~r"^\/assignment\/(callback\/)?\d.*$"
 
   @impl true
   def init(opts), do: opts

core/systems/assignment/_public.ex

@@ -83,6 +83,11 @@ defmodule Systems.Assignment.Public do
     |> Repo.preload(preload)
   end
 
+  def get_by_workflow_item_id(workflow_item_id, preload \\ []) do
+    %{workflow_id: workflow_id} = Workflow.Public.get_item!(String.to_integer(workflow_item_id))
+    Assignment.Public.get_by(:workflow_id, workflow_id, preload)
+  end
+
   def get_by_tool_ref(workflow, preload \\ [])
 
   def get_by_tool_ref(%Workflow.ToolRefModel{id: id}, preload), do: get_by_tool_ref(id, preload)

core/systems/assignment/_queries.ex

@@ -62,7 +62,7 @@ defmodule Systems.Assignment.Queries do
   end
 
   def participant_query() do
-    from(Crew.MemberModel, as: :member)
+    from(Crew.MemberModel, as: :member, order_by: [asc: :public_id])
   end
 
   def participant_query(%Assignment.Model{crew: %{id: id, auth_node_id: auth_node_id}}) do

core/systems/assignment/_routes.ex

@@ -9,7 +9,7 @@ defmodule Systems.Assignment.Routes do
         get("/assignment/:id/invite", Controller, :invite)
         get("/assignment/:id/apply", Controller, :apply)
         get("/assignment/:id/export", Controller, :export)
-        get("/assignment/callback/:item", Controller, :callback)
+        get("/assignment/callback/:workflow_item_id", Controller, :callback)
       end
 
       scope "/assignment", Systems.Assignment.Centerdata do

core/systems/assignment/controller.ex

@@ -18,7 +18,7 @@ defmodule Systems.Assignment.Controller do
   @progress_yes dgettext("eyra-assignment", "progress.yes")
   @progress_no dgettext("eyra-assignment", "progress.no")
 
-  def callback(%{assigns: %{current_user: user}} = conn, %{"item" => item_id}) do
+  def callback(%{assigns: %{current_user: user}} = conn, %{"workflow_item_id" => item_id}) do
     %{workflow_id: workflow_id} = item = Workflow.Public.get_item!(String.to_integer(item_id))
 
     %{id: id, crew: crew} =

core/systems/project/branch_plug.ex

@@ -15,6 +15,10 @@ defmodule Systems.Project.BranchPlug do
   end
 
   defp branch(["/", "storage", "endpoint", id | _]), do: branch(Storage.Public.get_endpoint!(id))
+
+  defp branch(["/", "assignment", "callback", workflow_item_id | _]),
+    do: branch(Assignment.Public.get_by_workflow_item_id(workflow_item_id))
+
   defp branch(["/", "assignment", id | _]), do: branch(Assignment.Public.get(id))
 
   defp branch(%{} = leaf) do