FEATURE: allow API to upload files synchronously

app/controllers/uploads_controller.rb

@@ -7,8 +7,47 @@ class UploadsController < ApplicationController
     file = params[:file] || params[:files].first
     url = params[:url]
     client_id = params[:client_id]
+    synchronous = is_api? && params[:synchronous]
 
+    # HACK FOR IE9 to prevent the "download dialog"
+    response.headers["Content-Type"] = "text/plain" if request.user_agent =~ /MSIE 9/
+
+    if synchronous
+      data = create_upload(type, file, url)
+      render json: data.as_json
+    else
       Scheduler::Defer.later("Create Upload") do
+        data = create_upload(type, file, url)
+        MessageBus.publish("/uploads/#{type}", data.as_json, client_ids: [client_id])
+      end
+      render json: success_json
+    end
+  end
+
+  def show
+    return render_404 if !RailsMultisite::ConnectionManagement.has_db?(params[:site])
+
+    RailsMultisite::ConnectionManagement.with_connection(params[:site]) do |db|
+      return render_404 unless Discourse.store.internal?
+      return render_404 if SiteSetting.prevent_anons_from_downloading_files && current_user.nil?
+
+      if upload = Upload.find_by(sha1: params[:sha]) || Upload.find_by(id: params[:id], url: request.env["PATH_INFO"])
+        opts = { filename: upload.original_filename }
+        opts[:disposition] = 'inline' if params[:inline]
+        send_file(Discourse.store.path_for(upload), opts)
+      else
+        render_404
+      end
+    end
+  end
+
+  protected
+
+  def render_404
+    render nothing: true, status: 404
+  end
+
+  def create_upload(type, file, url)
     begin
       # API can provide a URL
       if file.nil? && url.present? && is_api?
@@ -37,41 +76,10 @@ class UploadsController < ApplicationController
         Jobs.enqueue(:create_thumbnails, upload_id: upload.id, type: type, user_id: params[:user_id])
       end
 
-        data = upload.errors.empty? ? upload : { errors: upload.errors.values.flatten }
+      upload.errors.empty? ? upload : { errors: upload.errors.values.flatten }
-
-        MessageBus.publish("/uploads/#{type}", data.as_json, client_ids: [client_id])
     ensure
       tempfile.try(:close!) rescue nil
     end
   end
 
-    # HACK FOR IE9 to prevent the "download dialog"
-    response.headers["Content-Type"] = "text/plain" if request.user_agent =~ /MSIE 9/
-
-    render json: success_json
-  end
-
-  def show
-    return render_404 if !RailsMultisite::ConnectionManagement.has_db?(params[:site])
-
-    RailsMultisite::ConnectionManagement.with_connection(params[:site]) do |db|
-      return render_404 unless Discourse.store.internal?
-      return render_404 if SiteSetting.prevent_anons_from_downloading_files && current_user.nil?
-
-      if upload = Upload.find_by(sha1: params[:sha]) || Upload.find_by(id: params[:id], url: request.env["PATH_INFO"])
-        opts = { filename: upload.original_filename }
-        opts[:disposition] = 'inline' if params[:inline]
-        send_file(Discourse.store.path_for(upload), opts)
-      else
-        render_404
-      end
-    end
-  end
-
-  protected
-
-  def render_404
-    render nothing: true, status: 404
-  end
-
 end