comparing 8d9db809c07cc5a3293cf9730b343ce3160bce90 and main on veryroundbird.house/smallbird-social

+72 -73

index.php

···

       67
       67
        
       Flight::set('publicApi', PUBLIC_API);

     

       68
       68
        
       Flight::set('frontpageFeed', FRONTPAGE_FEED);

     

       69
       69
        
       Flight::set('defaultRelay', DEFAULT_RELAY);

     

       70
       70
       -
       Flight::set('userAuth', $_SESSION['sbs_'.SITE_DOMAIN]);

     

       70
       70
       +
       Flight::set('userAuth', array_key_exists('sbs_'.SITE_DOMAIN, $_SESSION) ? $_SESSION['sbs_'.SITE_DOMAIN] : null);

     

       71
       71
       +
       Flight::set('userPds', array_key_exists('sbs_'.SITE_DOMAIN.'_pds', $_SESSION) ? $_SESSION['sbs_'.SITE_DOMAIN.'_pds'] : null);

     

       72
       72
       +
       Flight::set('userInfo', array_key_exists('sbs_'.SITE_DOMAIN.'_userinfo', $_SESSION) ? $_SESSION['sbs_'.SITE_DOMAIN.'_userinfo'] : null);

     

       71
       73
        
       Flight::set('flight.log_errors', false);

     

       72
       74
        
       Flight::set('flight.handle_errors', false);

     

       73
       75
        
       Flight::set('flight.content_length', false);

     
···

       79
       81
        
         'setTheme' => array_key_exists('sbs_theme', $_COOKIE) ? $_COOKIE['sbs_theme'] : DEFAULT_THEME,

     

       80
       82
        
         'setFont' => array_key_exists('sbs_font', $_COOKIE) ? $_COOKIE['sbs_font'] : DEFAULT_FONT,

     

       81
       83
        
         'userAuth' => Flight::get('userAuth'),

     

       84
       84
       +
         'userPds' => Flight::get('userPds'),

     

       85
       85
       +
         'userInfo' => Flight::Get('userInfo'),

     

       82
       86
        
         'favFeeds' => $favoriteFeeds,

     

       83
       87
        
         'pages' => PAGES,

     

       84
       88
        
         'links' => LINKS,

     
···

       178
       182
        
       });

     

       179
       183
        
       

     

       180
       184
        
       Flight::route('/login', function(): void {

     

       181
       181
       -
         if (!array_key_exists('username', $_GET)) {

     

       185
       185
       +
         if (isset($_GET['username'])) {

     

       186
       186
       +
         $username = $_GET['username'];

     

       187
       187
       +
           $bskyToucher = new BskyToucher();

     

       188
       188
       +
           $userInfo = $bskyToucher->getUserInfo($username);

     

       189
       189
       +
           if (!$userInfo) die(1);

     

       190
       190
       +
           $pds = $userInfo->pds;

     

       191
       191
       +
           $options = new OAuthOptions([

     

       192
       192
       +
             'key'          => 'https://'.SITE_DOMAIN.CLIENT_ID,

     

       193
       193
       +
             'secret'       => CLIENT_SECRET,

     

       194
       194
       +
             'callbackURL'  => 'https://'.SITE_DOMAIN.'/login',

     

       195
       195
       +
             'sessionStart' => true,

     

       196
       196
       +
             'sessionStorageVar' => 'sbs_'.SITE_DOMAIN

     

       197
       197
       +
           ]);

     

       198
       198
       +
           $storage = new SessionStorage($options);

     

       199
       199
       +
           $connector = new React\Socket\Connector([

     

       200
       200
       +
             'dns' => '1.1.1.1'

     

       201
       201
       +
           ]);

     

       202
       202
       +
           $http = new React\Http\Browser($connector);

     

       203
       203
       +
           $httpFactory = new HttpFactory();

     

       204
       204
       +
           $token_builder = Builder::new(new JoseEncoder(), ChainedFormatter::default());

     

       205
       205
       +
           $algorithm    = new Sha256();

     

       206
       206
       +
           $signing_key   = InMemory::file(CERT_PATH);

     

       207
       207
       +
           $now   = new DateTimeImmutable();

     

       208
       208
       +
           $token = $token_builder

     

       209
       209
       +
             ->withHeader('alg', 'ES256')

     

       210
       210
       +
             ->withHeader('typ', 'JWT')

     

       211
       211
       +
             ->withHeader('kid', 'ocwgKj_O7H9at1sL6yWf9ZZ82NOM7D0xlN8HGIyWH6M')

     

       212
       212
       +
             ->issuedBy('https://'.SITE_DOMAIN.CLIENT_ID)

     

       213
       213
       +
             ->identifiedBy(uniqid())

     

       214
       214
       +
             ->relatedTo('https://'.SITE_DOMAIN.CLIENT_ID)

     

       215
       215
       +
             ->permittedFor($pds)

     

       216
       216
       +
             ->issuedAt($now->modify('-5 seconds'))

     

       217
       217
       +
             ->getToken($algorithm, $signing_key);

     

       218
       218
       +
           $client = new GuzzleHttp\Client([

     

       219
       219
       +
             'verify' => true,

     

       220
       220
       +
             'headers' => [

     

       221
       221
       +
               'User-Agent' => USER_AGENT_STR,

     

       222
       222
       +
               'Authorization' => 'Bearer: '.$token->toString()

     

       223
       223
       +
             ]

     

       224
       224
       +
           ]);

     

       225
       225
       +
           $provider = new BskyProvider($options, $client, $httpFactory, $httpFactory, $httpFactory);

     

       226
       226
       +
           $provider->setPds($pds);

     

       227
       227
       +
           $name = $provider->getName();

     

       228
       228
       +
           if (isset($_GET['login']) && $_GET['login'] === $name) {

     

       229
       229
       +
             $auth_url = $provider->getAuthorizationUrl([

     

       230
       230
       +
               'client_assertion_type' => 'urn:ietf:params:oauth:client-assertion-type:jwt-bearer',

     

       231
       231
       +
               'client_assertion' => $token->toString()

     

       232
       232
       +
             ]);

     

       233
       233
       +
             Flight::redirect($auth_url);

     

       234
       234
       +
             die(1);

     

       235
       235
       +
           } else if (isset($_GET['code'], $_GET['iss'])) {

     

       236
       236
       +
             $storage->storeAccessToken($_GET['code'], $name);

     

       237
       237
       +
             $_SESSION['sbs_'.SITE_DOMAIN.'_pds'] = $_GET['iss'];

     

       238
       238
       +
             $_SESSION['sbs_'.SITE_DOMAIN.'_userinfo'] = $bskyToucher->getUserInfo();

     

       239
       239
       +
             Flight::redirect('/');

     

       240
       240
       +
             die(1);

     

       241
       241
       +
           } else if (isset($_GET['error'])) {

     

       242
       242
       +
             die(1);

     

       243
       243
       +
           }

     

       244
       244
       +
         } else {

     

       182
       245
        
           $latte = new Latte\Engine;

     

       183
       246
        
           $latte->render('./templates/login.latte', array_merge(Flight::get('standardParams'), [

     

       184
       247
        
             'mainClass' => 'form',

     
···

       187
       250
        
             'ogimage' => '',

     

       188
       251
        
             'ogurl' => 'https://'.SITE_DOMAIN.'/login'

     

       189
       252
        
           ]));

     

       190
       190
       -
           die(1);

     

       191
       253
        
         }

     

       192
       192
       -
         $username = $_GET['username'];

     

       193
       193
       -
         $bskyToucher = new BskyToucher();

     

       194
       194
       -
         $userInfo = $bskyToucher->getUserInfo($username);

     

       195
       195
       -
         if (!$userInfo) die(1);

     

       196
       196
       -
         $pds = $userInfo->pds;

     

       197
       197
       -
         $options = new OAuthOptions([

     

       198
       198
       -
         	'key'          => 'https://'.SITE_DOMAIN.CLIENT_ID,

     

       199
       199
       -
         	'secret'       => CLIENT_SECRET,

     

       200
       200
       -
         	'callbackURL'  => 'https://'.SITE_DOMAIN.'/login',

     

       201
       201
       -
         	'sessionStart' => true,

     

       202
       202
       -
           'sessionStorageVar' => 'sbs_'.SITE_DOMAIN

     

       203
       203
       -
         ]);

     

       204
       204
       -
         $connector = new React\Socket\Connector([

     

       205
       205
       -
           'dns' => '1.1.1.1'

     

       206
       206
       -
         ]);

     

       207
       207
       -
         $http = new React\Http\Browser($connector);

     

       208
       208
       -
         $httpFactory = new HttpFactory();

     

       209
       209
       -
         $token_builder = Builder::new(new JoseEncoder(), ChainedFormatter::default());

     

       210
       210
       -
         $algorithm    = new Sha256();

     

       211
       211
       -
         $signing_key   = InMemory::file(CERT_PATH);

     

       212
       212
       -
         $now   = new DateTimeImmutable();

     

       213
       213
       -
         $token = $token_builder

     

       214
       214
       -
           ->withHeader('alg', 'ES256')

     

       215
       215
       -
           ->withHeader('typ', 'JWT')

     

       216
       216
       -
           ->withHeader('kid', 'ocwgKj_O7H9at1sL6yWf9ZZ82NOM7D0xlN8HGIyWH6M')

     

       217
       217
       -
           ->issuedBy('https://'.SITE_DOMAIN.CLIENT_ID)

     

       218
       218
       -
           ->identifiedBy(uniqid())

     

       219
       219
       -
           ->relatedTo('https://'.SITE_DOMAIN.CLIENT_ID)

     

       220
       220
       -
           ->permittedFor($pds)

     

       221
       221
       -
           ->issuedAt($now->modify('-5 seconds'))

     

       222
       222
       -
           ->getToken($algorithm, $signing_key);

     

       223
       223
       -
         $client = new GuzzleHttp\Client([

     

       224
       224
       -
           'verify' => true,

     

       225
       225
       -
           'headers' => [

     

       226
       226
       -
             'User-Agent' => USER_AGENT_STR,

     

       227
       227
       -
             'Authorization' => 'Bearer: '.$token->toString()

     

       228
       228
       -
           ]

     

       229
       229
       -
         ]);

     

       230
       230
       -
         $provider = new BskyProvider($options, $client, $httpFactory, $httpFactory, $httpFactory);

     

       231
       231
       -
         $provider->setPds($pds);

     

       232
       232
       -
         $name = $provider->getName();

     

       233
       233
       -
         

     

       234
       234
       -
         if (isset($_GET['login']) && $_GET['login'] === $name) {

     

       235
       235
       -
           $auth_url = $provider->getAuthorizationUrl([

     

       236
       236
       -
             'client_assertion_type' => 'urn:ietf:params:oauth:client-assertion-type:jwt-bearer',

     

       237
       237
       -
             'client_assertion' => $token->toString()

     

       238
       238
       -
           ]);

     

       239
       239
       -
           header('Location: '.$auth_url);

     

       240
       240
       -
           die(1);

     

       241
       241
       -
         } else if (isset($_GET['code'], $_GET['state'])) {

     

       242
       242
       -
           $token = $provider->getAccessToken($_GET['code'], $_GET['state']);

     

       243
       243
       -
           $storage = new SessionStorage($options);

     

       244
       244
       -
           $storage->storeAccessToken($token, $name);

     

       245
       245
       -
         	header('Location: ?granted='.$name);

     

       246
       246
       -
           die(1);

     

       247
       247
       -
         } else if (isset($_GET['granted']) && $_GET['granted'] === $name) {

     

       248
       248
       -
           $tokenJSON = $provider->getAccessTokenFromStorage()->toJSON();

     

       249
       249
       -
           header('Location: https://'.SITE_DOMAIN);

     

       250
       250
       -
           die(1);

     

       251
       251
       -
         } else if (isset($_GET['error'])) {

     

       252
       252
       -
           die(1);

     

       253
       253
       -
         }

     

       254
       254
       -
         $latte = new Latte\Engine;

     

       255
       255
       -
         $latte->render('./templates/login.latte', array_merge(Flight::get('standardParams'), [

     

       256
       256
       -
           'mainClass' => 'form',

     

       257
       257
       -
           'ogtitle' => SITE_TITLE." | login",

     

       258
       258
       -
           'ogdesc' => SITE_DESC,

     

       259
       259
       -
           'ogimage' => '',

     

       260
       260
       -
           'ogurl' => 'https://'.SITE_DOMAIN.'/login'

     

       261
       261
       -
         ]));

     

       254
       254
       +
       });

     

       255
       255
       +
       

     

       256
       256
       +
       Flight::route('/logout', function(): void {

     

       257
       257
       +
         unset($_SESSION['sbs_'.SITE_DOMAIN]);

     

       258
       258
       +
         unset($_SESSION['sbs_'.SITE_DOMAIN.'_pds']);

     

       259
       259
       +
         unset($_SESSION['sbs_'.SITE_DOMAIN.'_userinfo']);

     

       260
       260
       +
         Flight::redirect('/');

     

       262
       261
        
       });

     

       263
       262
        
       

     

       264
       263
        
       Flight::route('/createaccount', function(): void {

+1 -1

templates/_partials/nav.latte

···

       1
       1
        
       <nav>

     

       2
       2
        
         <ul>

     

       3
       3
        
           {if $userAuth}

     

       4
       4
       -
             <li><a href="/">profile</a></li>

     

       4
       4
       +
             <li><a href="/u/{$userInfo->handle}">profile</a></li>

     

       5
       5
        
             <li><a href="/settings">settings</a></li>

     

       6
       6
        
             <li><a href="/logout">log out</a></li>

     

       7
       7
        
           {else}

templates/layout.latte

···

       24
       24
        
           data-theme="{$setTheme}"

     

       25
       25
        
           data-font="{$setFont}"

     

       26
       26
        
         >

     

       27
       27
       +
           <!--

     

       28
       28
       +
             {print_r($_SESSION)}

     

       29
       29
       +
             {print_r(PHP_SESSION_DISABLED)}

     

       30
       30
       +
           -->

     

       27
       31
        
           <div id="page">

     

       28
       32
        
             <header>

     

       29
       33
        
               <h1><a href="/">{include '_partials/logo.latte'}{$siteTitle}</a></h1>

Compare changes