Skip to content

Allow default uploader when using external uploaders in LiveView #3801

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
nallwhy wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Allow default uploader when using external uploaders in LiveView #3801

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 18 additions & 2 deletions lib/phoenix_live_view/upload.ex
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -361,7 +361,7 @@ defmodule Phoenix.LiveView.Upload do
channel_preflight(new_socket, new_conf, new_entries, cid, client_meta)

func when is_function(func) ->
external_preflight(new_socket, new_conf, new_entries, client_meta)
external_preflight(new_socket, new_conf, new_entries, cid, client_meta)
end
end

Expand Down Expand Up @@ -404,7 +404,13 @@ defmodule Phoenix.LiveView.Upload do
for {ref, err} <- conf.errors, ref == entry.ref, do: err
end

defp external_preflight(%Socket{} = socket, %UploadConfig{} = conf, entries, client_config_meta) do
defp external_preflight(
%Socket{} = socket,
%UploadConfig{} = conf,
entries,
cid,
client_config_meta
) do
reply_entries =
Enum.reduce_while(entries, {:ok, %{}, %{}, socket}, fn entry, {:ok, metas, errors, acc} ->
if conf.auto_upload? and not entry.valid? do
Expand All @@ -417,6 +423,16 @@ defmodule Phoenix.LiveView.Upload do
new_socket = update_upload_entry_meta(new_socket, conf.name, entry, meta)
{:cont, {:ok, Map.put(metas, entry.ref, meta), errors, new_socket}}

{:ok, :default, new_socket} ->
token =
Phoenix.LiveView.Static.sign_token(socket.endpoint, %{
pid: self(),
ref: {conf.ref, entry.ref},
cid: cid
})

{:cont, {:ok, Map.put(metas, entry.ref, token), errors, new_socket}}

{:error, %{} = meta, new_socket} ->
if conf.auto_upload? do
new_errors = Map.put(errors, entry.ref, [meta])
Expand Down
Loading