wnagrodzki/fediplan
1
0
Fork 0
mirror of https://framagit.org/tom79/fediplan.git synced 2025-04-05 21:51:50 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix upload

Browse source
This commit is contained in:
Thomas 2019-08-09 15:17:44 +02:00
parent e2e65ed0c6
commit f110074d69
2 changed files with 10 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/Controller/FediPlanController.php
View file

@ -27,7 +27,6 @@ use Symfony\Component\Security\Core\Authentication\Token\UsernamePasswordToken;
class FediPlanController extends AbstractController class FediPlanController extends AbstractController
{ {
private $token;
/** /**
* @Route("/", name="index") * @Route("/", name="index")
@ -74,11 +73,10 @@ class FediPlanController extends AbstractController
} }
} else if ($flow->getCurrentStep() == 2) { } else if ($flow->getCurrentStep() == 2) {
$host = $client->getHost();
$code = $client->getCode(); $code = $client->getCode();
$mastodon_api->set_url("https://" . $client->getHost()); $mastodon_api->set_url("https://" . $client->getHost());
$mastodon_api->set_scopes([]); $mastodon_api->set_scopes([]);
$mastodon_api->set_client($client->getClientId(), $client->getClientSecret()); $mastodon_api->set_client($client->getClientId(), $client->getClientSecret());
$reply = $mastodon_api->loginAuthorization($code); $reply = $mastodon_api->loginAuthorization($code);
if( isset($reply['error']) ){ 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'))); $form->get('code')->addError(new FormError($translator->trans('error.instance.mastodon_account',[],'fediplan','en')));
}else{ }else{
$Account = $mastodon_api->getSingleAccount($accountReply['response']); $Account = $mastodon_api->getSingleAccount($accountReply['response']);
$Account->setInstance($host);
$Account->setToken($token_type ." ".$access_token); $Account->setToken($token_type ." ".$access_token);
$token = new UsernamePasswordToken($Account, null, 'main', array('ROLE_USER')); $token = new UsernamePasswordToken($Account, null, 'main', array('ROLE_USER'));
$this->get('security.token_storage')->setToken($token); $this->get('security.token_storage')->setToken($token);
@ -132,6 +131,7 @@ class FediPlanController extends AbstractController
return $this->render("fediplan/schedule.html.twig",[ return $this->render("fediplan/schedule.html.twig",[
'form' => $form->createView(), 'form' => $form->createView(),
'instance' => $user->getInstance(),
'token' => $user->getToken(), 'token' => $user->getToken(),
]); ]);

10
templates/fediplan/schedule.html.twig
View file

@ -314,8 +314,10 @@
$('#fileupload').fileupload({ $('#fileupload').fileupload({
// Uncomment the following to send cross-domain cookies: // Uncomment the following to send cross-domain cookies:
//xhrFields: {withCredentials: true}, //xhrFields: {withCredentials: true},
headers: [{ name: 'Authorization', value: '{{ token }}' }], beforeSend: function ( xhr ) {
url: 'schedule/' setHeader(xhr);
},
url: 'https://{{ instance }}/api/v1/media'
}); });
// Enable iframe cross-domain access via redirect option: // Enable iframe cross-domain access via redirect option:
@ -370,6 +372,8 @@
}); });
} }
}); });
var setHeader = function (xhr) {
xhr.setRequestHeader('Authorization', '{{ token }}');
};
</script> </script>
{% endblock %} {% endblock %}