Browse Source

Support full automatic no-questions-asked login

- ?me=.. on homepage redirects to auth
- ?dontask=1 skips confirmation questions
- "reply" and other parameters are transferred across login
pull/53/head
Christian Weiske 8 years ago
parent
commit
19a1628b5a
  1. 26
      controllers/auth.php

26
controllers/auth.php

@ -1,7 +1,7 @@
<?php <?php
function buildRedirectURI() {
return Config::$base_url . 'auth/callback';
function buildRedirectURI($params = array()) {
return Config::$base_url . 'auth/callback?' . http_build_query($params);
} }
function build_url($parsed_url) { function build_url($parsed_url) {
@ -19,7 +19,10 @@ function build_url($parsed_url) {
$app->get('/', function($format='html') use($app) { $app->get('/', function($format='html') use($app) {
$res = $app->response(); $res = $app->response();
$params = $app->request()->params();
if (k($params, 'me')) {
$app->redirect('/auth/start?'.http_build_query($params), 302);
}
ob_start(); ob_start();
render('index', array( render('index', array(
@ -62,7 +65,10 @@ $app->get('/auth/start', function() use($app) {
$_SESSION['auth_state'] = $state; $_SESSION['auth_state'] = $state;
$scope = 'post'; $scope = 'post';
$authorizationURL = IndieAuth\Client::buildAuthorizationURL($authorizationEndpoint, $me, buildRedirectURI(), Config::$base_url, $state, $scope);
$cleanparams = $params;
unset($cleanparams['me']);
unset($cleanparams['redirect']);
$authorizationURL = IndieAuth\Client::buildAuthorizationURL($authorizationEndpoint, $me, buildRedirectURI($cleanparams), Config::$base_url, $state, $scope);
} else { } else {
$authorizationURL = false; $authorizationURL = false;
} }
@ -99,6 +105,10 @@ $app->get('/auth/start', function() use($app) {
$user->micropub_access_token = ''; // blank out the access token if they attempt to sign in again $user->micropub_access_token = ''; // blank out the access token if they attempt to sign in again
$user->save(); $user->save();
if (k($params, 'dontask') && $params['dontask']) {
$app->redirect($authorizationURL, 302);
}
$html = render('auth_start', array( $html = render('auth_start', array(
'title' => 'Sign In', 'title' => 'Sign In',
'me' => $me, 'me' => $me,
@ -219,13 +229,17 @@ $app->get('/auth/callback', function() use($app) {
unset($_SESSION['auth_state']); unset($_SESSION['auth_state']);
if($redirectToDashboardImmediately) {
if($redirectToDashboardImmediately || k($params, 'dontask')) {
if(k($_SESSION, 'redirect_after_login')) { if(k($_SESSION, 'redirect_after_login')) {
$dest = $_SESSION['redirect_after_login']; $dest = $_SESSION['redirect_after_login'];
unset($_SESSION['redirect_after_login']); unset($_SESSION['redirect_after_login']);
$app->redirect($dest, 301); $app->redirect($dest, 301);
} else { } else {
$app->redirect('/new', 301);
$cleanparams = $params;
unset($cleanparams['code']);
unset($cleanparams['me']);
unset($cleanparams['state']);
$app->redirect('/new?' . http_build_query($cleanparams), 301);
} }
} else { } else {
$html = render('auth_callback', array( $html = render('auth_callback', array(

Loading…
Cancel
Save