Merge branch 'master' of git.companytools.nl:/var/git/qwaiter

app/assets/javascripts/supplier/app/components/form/file-upload.js.coffee

@@ -4,9 +4,9 @@ App.FormFileUploadComponent = Ember.TextField.extend
   type: 'file'
   file: null,
   change: (e)->
-      reader = new FileReader()
-      that = this
-      reader.onload = (el)->
-          fileToUpload = el.target.result
-          Ember.run -> that.set('file', fileToUpload)
-      reader.readAsDataURL(e.target.files[0])
+    reader = new FileReader()
+    that = this
+    reader.onload = (el)->
+        fileToUpload = el.target.result
+        Ember.run -> that.set('file', fileToUpload)
+    reader.readAsDataURL(e.target.files[0])

app/controllers/user_controller.rb

@@ -13,7 +13,14 @@ class UserController < Users::ApplicationController
   end
 
   def obtain_token
-    redirect_to user_omniauth_authorize_path(params[:provider].presence || 'facebook') and return unless current_user.present?
+    if current_user.blank?
+      case params[:provider]
+      when 'instagram' then redirect_to user_instagram_omniauth_authorize_path
+      else redirect_to user_facebook_omniauth_authorize_path
+      end
+      return
+    end
+    #redirect_to user_omniauth_authorize_path(params[:provider].presence || 'facebook') and return unless current_user.present?
     respond_to do |format|
       format.html { render layout: 'user/obtain_token' }
       format.json do