summaryrefslogtreecommitdiff
path: root/controllers/auth.php
diff options
context:
space:
mode:
Diffstat (limited to 'controllers/auth.php')
-rw-r--r--controllers/auth.php134
1 files changed, 12 insertions, 122 deletions
diff --git a/controllers/auth.php b/controllers/auth.php
index de6c8c5..9dcc81d 100644
--- a/controllers/auth.php
+++ b/controllers/auth.php
@@ -1,5 +1,4 @@
<?php
-use Abraham\TwitterOAuth\TwitterOAuth;
IndieAuth\Client::$clientID = Config::$base_url;
IndieAuth\Client::$redirectURL = Config::$base_url.'auth/callback';
@@ -9,13 +8,14 @@ $app->get('/auth/start', function() use($app) {
$params = $req->params();
- $defaultScope = 'create update media';
+ $defaultScope = 'create update media profile';
list($authorizationURL, $error) = IndieAuth\Client::begin($params['me'], $defaultScope);
+ $me = IndieAuth\Client::normalizeMeURL($params['me']);
+
// Double check for a micropub endpoint here for debugging purposes
if(!$error) {
- $me = $_SESSION['indieauth_url']; // set by IndieAuth\Client::begin(), will be the normalized and resolved URL
$micropubEndpoint = $_SESSION['indieauth']['micropub_endpoint'] = IndieAuth\Client::discoverMicropubEndpoint($me);
if(!$micropubEndpoint) {
$error['error'] = 'missing_micropub_endpoint';
@@ -25,7 +25,6 @@ $app->get('/auth/start', function() use($app) {
if($error && in_array($error['error'], ['missing_authorization_endpoint','missing_token_endpoint','missing_micropub_endpoint'])) {
// Display debug info for these particular errors
- $me = $_SESSION['indieauth_url']; // set by IndieAuth\Client::begin(), will be the normalized and resolved URL
$micropubEndpoint = $_SESSION['indieauth']['micropub_endpoint'] = IndieAuth\Client::discoverMicropubEndpoint($me);
$tokenEndpoint = $_SESSION['indieauth']['token_endpoint'] = IndieAuth\Client::discoverTokenEndpoint($me);
$authorizationEndpoint = $_SESSION['indieauth']['authorization_endpoint'] = IndieAuth\Client::discoverAuthorizationEndpoint($me);
@@ -55,7 +54,6 @@ $app->get('/auth/start', function() use($app) {
return;
}
- $me = $_SESSION['indieauth_url']; // set by IndieAuth\Client::begin(), will be the normalized and resolved URL
$micropubEndpoint = $_SESSION['indieauth']['micropub_endpoint'] = IndieAuth\Client::discoverMicropubEndpoint($me);
$tokenEndpoint = $_SESSION['indieauth']['token_endpoint'] = IndieAuth\Client::discoverTokenEndpoint($me);
$authorizationEndpoint = $_SESSION['indieauth']['authorization_endpoint'] = IndieAuth\Client::discoverAuthorizationEndpoint($me);
@@ -70,7 +68,7 @@ $app->get('/auth/start', function() use($app) {
// If the user has already signed in before and has a micropub access token,
// and the endpoints are all the same, skip the debugging screens and redirect
// immediately to the auth endpoint.
- // This will still generate a new access token when they finish logging in.
+ // This will still get a new access token when they finish logging in.
$user = ORM::for_table('users')->where('url', $me)->find_one();
if($user && $user->micropub_access_token
&& $user->micropub_endpoint == $micropubEndpoint
@@ -155,10 +153,10 @@ $app->get('/auth/callback', function() use($app) {
$redirectToDashboardImmediately = false;
// If a valid access token was returned, store the token info in the session and they are signed in
- if(k($token['auth'], array('me','access_token','scope'))) {
+ if(k($token['response'], array('me','access_token','scope'))) {
- $_SESSION['auth'] = $token['auth'];
- $_SESSION['me'] = $me = $token['auth']['me'];
+ $_SESSION['auth'] = $token['response'];
+ $_SESSION['me'] = $me = $token['me'];
$user = ORM::for_table('users')->where('url', $me)->find_one();
if($user) {
@@ -176,9 +174,9 @@ $app->get('/auth/callback', function() use($app) {
$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'];
- $user->micropub_response = $token['response'];
+ $user->micropub_access_token = $token['response']['access_token'];
+ $user->micropub_scope = $token['response']['scope'];
+ $user->micropub_response = $token['raw_response'];
$user->save();
$_SESSION['user_id'] = $user->id();
@@ -204,19 +202,14 @@ $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,
'authorizing' => $me,
'meParts' => parse_url($me),
'tokenEndpoint' => $tokenEndpoint,
- 'auth' => $token['auth'],
- 'response' => $tokenResponse,
+ 'auth' => $token['response'],
+ 'response' => $token['raw_response'],
'curl_error' => (array_key_exists('error', $token) ? $token['error'] : false),
'destination' => (k($_SESSION, 'redirect_after_login') ?: '/new')
));
@@ -255,107 +248,4 @@ $app->post('/auth/reset', function() use($app) {
$app->redirect('/', 302);
});
-$app->post('/auth/twitter', function() use($app) {
- if(!Config::$twitterClientID) {
- $app->response()['Content-type'] = 'application/json';
- $app->response()->body(json_encode(array(
- 'result' => 'error'
- )));
- return;
- }
-
- if($user=require_login($app, false)) {
- $params = $app->request()->params();
- // User just auth'd with twitter, store the access token
- $user->twitter_access_token = $params['twitter_token'];
- $user->twitter_token_secret = $params['twitter_secret'];
- $user->save();
-
- $app->response()['Content-type'] = 'application/json';
- $app->response()->body(json_encode(array(
- 'result' => 'ok'
- )));
- } else {
- $app->response()['Content-type'] = 'application/json';
- $app->response()->body(json_encode(array(
- 'result' => 'error'
- )));
- }
-});
-
-function getTwitterLoginURL(&$twitter) {
- $request_token = $twitter->oauth('oauth/request_token', [
- 'oauth_callback' => Config::$base_url . 'auth/twitter/callback'
- ]);
- $_SESSION['twitter_auth'] = $request_token;
- return $twitter->url('oauth/authorize', ['oauth_token' => $request_token['oauth_token']]);
-}
-
-$app->get('/auth/twitter', function() use($app) {
- if(!Config::$twitterClientID) {
- $app->response()['Content-type'] = 'application/json';
- $app->response()->body(json_encode(array(
- 'result' => 'error'
- )));
- return;
- }
-
- $params = $app->request()->params();
- if($user=require_login($app, false)) {
-
- // If there is an existing Twitter token, check if it is valid
- // Otherwise, generate a Twitter login link
- $twitter_login_url = false;
-
- if(array_key_exists('login', $params)) {
- $twitter = new TwitterOAuth(Config::$twitterClientID, Config::$twitterClientSecret);
- $twitter_login_url = getTwitterLoginURL($twitter);
- } else {
- $twitter = new TwitterOAuth(Config::$twitterClientID, Config::$twitterClientSecret,
- $user->twitter_access_token, $user->twitter_token_secret);
-
- if($user->twitter_access_token) {
- if($twitter->get('account/verify_credentials')) {
- $app->response()['Content-type'] = 'application/json';
- $app->response()->body(json_encode(array(
- 'result' => 'ok'
- )));
- return;
- } else {
- // If the existing twitter token is not valid, generate a login link
- $twitter_login_url = getTwitterLoginURL($twitter);
- }
- } else {
- $twitter_login_url = getTwitterLoginURL($twitter);
- }
- }
-
- $app->response()['Content-type'] = 'application/json';
- $app->response()->body(json_encode(array(
- 'url' => $twitter_login_url
- )));
-
- } else {
- $app->response()['Content-type'] = 'application/json';
- $app->response()->body(json_encode(array(
- 'result' => 'error'
- )));
- }
-});
-
-$app->get('/auth/twitter/callback', function() use($app) {
- if($user=require_login($app)) {
- $params = $app->request()->params();
-
- $twitter = new TwitterOAuth(Config::$twitterClientID, Config::$twitterClientSecret,
- $_SESSION['twitter_auth']['oauth_token'], $_SESSION['twitter_auth']['oauth_token_secret']);
- $credentials = $twitter->oauth('oauth/access_token', ['oauth_verifier' => $params['oauth_verifier']]);
- $user->twitter_access_token = $credentials['oauth_token'];
- $user->twitter_token_secret = $credentials['oauth_token_secret'];
- $user->twitter_username = $credentials['screen_name'];
- $user->save();
-
- $app->redirect('/settings');
- }
-});
generated by cgit v1.2.3 (git 2.39.1) at 2025-02-24 16:06:32 +0000