From f110074d69eb27ecf7e594b2447bd5b1405f4867 Mon Sep 17 00:00:00 2001
From: Thomas <tschneider.ac@gmail.com>
Date: Fri, 9 Aug 2019 15:17:44 +0200
Subject: [PATCH] fix upload

---
 src/Controller/FediPlanController.php |  6 +++---
 templates/fediplan/schedule.html.twig | 10 +++++++---
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/src/Controller/FediPlanController.php b/src/Controller/FediPlanController.php
index e0943e8..491ee9d 100644
--- a/src/Controller/FediPlanController.php
+++ b/src/Controller/FediPlanController.php
@@ -27,7 +27,6 @@ use Symfony\Component\Security\Core\Authentication\Token\UsernamePasswordToken;
 class FediPlanController extends AbstractController
 {
 
-    private $token;
 
     /**
      * @Route("/", name="index")
@@ -74,11 +73,10 @@ class FediPlanController extends AbstractController
 
                 }
             } else if ($flow->getCurrentStep() == 2) {
-
+                $host = $client->getHost();
                 $code = $client->getCode();
                 $mastodon_api->set_url("https://" . $client->getHost());
                 $mastodon_api->set_scopes([]);
-
                 $mastodon_api->set_client($client->getClientId(), $client->getClientSecret());
                 $reply = $mastodon_api->loginAuthorization($code);
                 if( isset($reply['error']) ){
@@ -93,6 +91,7 @@ class FediPlanController extends AbstractController
                         $form->get('code')->addError(new FormError($translator->trans('error.instance.mastodon_account',[],'fediplan','en')));
                     }else{
                         $Account =  $mastodon_api->getSingleAccount($accountReply['response']);
+                        $Account->setInstance($host);
                         $Account->setToken($token_type ." ".$access_token);
                         $token = new UsernamePasswordToken($Account, null, 'main', array('ROLE_USER'));
                         $this->get('security.token_storage')->setToken($token);
@@ -132,6 +131,7 @@ class FediPlanController extends AbstractController
 
         return $this->render("fediplan/schedule.html.twig",[
             'form' => $form->createView(),
+            'instance' => $user->getInstance(),
             'token' => $user->getToken(),
             ]);
 
diff --git a/templates/fediplan/schedule.html.twig b/templates/fediplan/schedule.html.twig
index 77d4451..a56666b 100644
--- a/templates/fediplan/schedule.html.twig
+++ b/templates/fediplan/schedule.html.twig
@@ -314,8 +314,10 @@
             $('#fileupload').fileupload({
                 // Uncomment the following to send cross-domain cookies:
                 //xhrFields: {withCredentials: true},
-                headers: [{ name: 'Authorization', value: '{{ token }}' }],
-                url: 'schedule/'
+                beforeSend: function ( xhr ) {
+                    setHeader(xhr);
+                },
+                url: 'https://{{ instance }}/api/v1/media'
             });
 
             // Enable iframe cross-domain access via redirect option:
@@ -370,6 +372,8 @@
                     });
             }
         });
-
+        var setHeader = function (xhr) {
+            xhr.setRequestHeader('Authorization', '{{ token }}');
+        };
     </script>
 {% endblock %}