'.$token['auth']['me'].') did not match the domain of the user signing in ('.$me.').'
]);
$app->response()->body($html);
return;
@@ -223,6 +219,8 @@ $app->get('/auth/callback', function() use($app) {
$user->url = $me;
$user->date_created = date('Y-m-d H:i:s');
}
+ $user->authorization_endpoint = $_SESSION['indieauth']['authorization_endpoint'];
+ $user->token_endpoint = $tokenEndpoint;
$user->micropub_endpoint = $micropubEndpoint;
$user->micropub_access_token = $token['auth']['access_token'];
$user->micropub_scope = $token['auth']['scope'];
@@ -237,6 +235,7 @@ $app->get('/auth/callback', function() use($app) {
unset($_SESSION['auth_state']);
unset($_SESSION['attempted_me']);
+ unset($_SESSION['indieauth']);
if($redirectToDashboardImmediately || k($_SESSION, 'dontask')) {
unset($_SESSION['dontask']);
@@ -253,6 +252,11 @@ $app->get('/auth/callback', function() use($app) {
$app->redirect('/new?' . http_build_query($query), 302);
}
} else {
+ $tokenResponse = $token['response'];
+ $parsed = @json_decode($tokenResponse);
+ if($parsed)
+ $tokenResponse = json_encode($parsed, JSON_PRETTY_PRINT+JSON_UNESCAPED_SLASHES);
+
$html = render('auth_callback', array(
'title' => 'Sign In',
'me' => $me,
@@ -260,7 +264,7 @@ $app->get('/auth/callback', function() use($app) {
'meParts' => parse_url($me),
'tokenEndpoint' => $tokenEndpoint,
'auth' => $token['auth'],
- 'response' => $token['response'],
+ 'response' => $tokenResponse,
'curl_error' => (array_key_exists('error', $token) ? $token['error'] : false),
'destination' => (k($_SESSION, 'redirect_after_login') ?: '/new')
));
diff --git a/controllers/controllers.php b/controllers/controllers.php
index 237c4bb..cc74674 100644
--- a/controllers/controllers.php
+++ b/controllers/controllers.php
@@ -724,7 +724,7 @@ $app->get('/code', function() use($app) {
'nginx' => ['conf'],
'apache' => [],
'text' => ['txt'],
- ];
+ ];
ksort($languages);
$language_map = [];
foreach($languages as $lang=>$exts) {
@@ -989,18 +989,18 @@ $app->get('/edit', function() use($app) {
'error' => 'There was a problem!',
'error_description' => $error
]);
- return;
+ return;
}
// Until all interfaces are complete, show an error here for unsupported ones
- if(!in_array($url, ['/favorite','/repost'])) {
+ if(!in_array($url, ['/favorite','/repost','/code'])) {
render('edit/error', [
'title' => 'Not Yet Supported',
'summary' => '',
'error' => 'Not Yet Supported',
'error_description' => 'Editing is not yet supported for this type of post.'
]);
- return;
+ return;
}
$app->redirect($url . '?edit=' . $params['url'], 302);
diff --git a/controllers/static.php b/controllers/static.php
index 9822d6b..8c4425d 100644
--- a/controllers/static.php
+++ b/controllers/static.php
@@ -11,7 +11,7 @@ function doc_pages($page=null) {
'syndication' => 'Syndication',
'post-status' => 'Post Status',
];
- if($page == null)
+ if($page == null)
return $pages;
else
return $pages[$page];
@@ -28,7 +28,7 @@ $app->get('/', function($format='html') use($app) {
render('index', array(
'title' => 'Quill',
'meta' => '',
- 'authorizing' => false
+ 'authorizing' => false,
));
});
@@ -42,7 +42,7 @@ $app->get('/creating-a-micropub-endpoint', function() use($app) {
$app->get('/docs', function() use($app) {
render('docs/index', array(
- 'title' => 'Documentation',
+ 'title' => 'Documentation',
'authorizing' => false,
'pages' => doc_pages()
));
@@ -51,7 +51,7 @@ $app->get('/docs', function() use($app) {
$app->get('/docs/:page', function($page) use($app) {
if(file_exists('views/docs/'.$page.'.php'))
render('docs/'.$page, array(
- 'title' => doc_pages($page).' - Quill Documentation',
+ 'title' => doc_pages($page).' - Quill Documentation',
'authorizing' => false
));
else
diff --git a/public/css/style.css b/public/css/style.css
index 6dcf682..c68a55c 100644
--- a/public/css/style.css
+++ b/public/css/style.css
@@ -108,6 +108,8 @@ body {
font-family: Menlo,Monaco,Consolas,"Courier New",monospace;
word-break: break-all;
word-wrap: break-word;
+ overflow: scroll;
+ white-space: pre;
}
@@ -208,7 +210,7 @@ body {
}
-/**
+/**
* nicer file upload
*/
.btn-file {
@@ -229,7 +231,7 @@ body {
background: white;
cursor: inherit;
display: block;
-}
+}
.glyphicon-spin {
diff --git a/views/auth_callback.php b/views/auth_callback.php
index acdac8f..4d6ad5e 100644
--- a/views/auth_callback.php
+++ b/views/auth_callback.php
@@ -54,11 +54,15 @@
Below is the raw response from your token endpoint (tokenEndpoint ?>):
-Below is the raw response from your token endpoint (tokenEndpoint ?>):
The token endpoint is where this app will make a request to get an access token after obtaining authorization.
+The token endpoint is where this app will make a request to get an access token after obtaining authorization.
- tokenEndpoint): ?> -tokenEndpoint ?>You need to set your token endpoint in a <link> tag on your home page.
The Micropub endpoint is the URL this app will use to post new photos.
+The Micropub endpoint is the URL this app will use to post new photos.
- micropubEndpoint): ?> -micropubEndpoint ?>
- You need to set your Micropub endpoint in a <link> tag on your home page.
Clicking the button below will take you to your authorization server which is where you will allow this app to be able to post to your site.
+Click the button below to go to your website to allow this app to be able to post to your site.