@@ -11,14 +11,14 @@ |
||
| 11 | 11 | * but do not call any class to leave that all for Http server |
| 12 | 12 | */ |
| 13 | 13 | namespace cs\modules\Http_server; |
| 14 | -require DIR.'/core/loader_base.php'; //Inclusion of loader base |
|
| 14 | +require DIR.'/core/loader_base.php'; //Inclusion of loader base |
|
| 15 | 15 | @ini_set('error_log', LOGS.'/Http_server.log'); |
| 16 | -require __DIR__.'/functions.php'; //Inclusion of functions needed for http server |
|
| 16 | +require __DIR__.'/functions.php'; //Inclusion of functions needed for http server |
|
| 17 | 17 | \cs\Singleton\clean_classes_cache(); |
| 18 | -require __DIR__.'/Request.php'; //Inclusion of Request class, used for http server requests processing |
|
| 19 | -require __DIR__.'/Singleton.php'; //Inclusion of `Singleton` trait, specific for http server |
|
| 20 | -require __DIR__.'/Config.php'; //Inclusion of `cs\custom\Config` class, which is used instead original `cs\Config` for http server |
|
| 21 | -require __DIR__.'/User.php'; //Inclusion of `cs\custom\User` class, which is used instead original `cs\User` for http server |
|
| 18 | +require __DIR__.'/Request.php'; //Inclusion of Request class, used for http server requests processing |
|
| 19 | +require __DIR__.'/Singleton.php'; //Inclusion of `Singleton` trait, specific for http server |
|
| 20 | +require __DIR__.'/Config.php'; //Inclusion of `cs\custom\Config` class, which is used instead original `cs\Config` for http server |
|
| 21 | +require __DIR__.'/User.php'; //Inclusion of `cs\custom\User` class, which is used instead original `cs\User` for http server |
|
| 22 | 22 | /** |
| 23 | 23 | * Including of custom files |
| 24 | 24 | */ |
@@ -1,15 +1,15 @@ discard block |
||
| 1 | 1 | <?php |
| 2 | 2 | /** |
| 3 | - * @package Http server |
|
| 4 | - * @category modules |
|
| 5 | - * @author Nazar Mokrynskyi <[email protected]> |
|
| 6 | - * @copyright Copyright (c) 2015-2016, Nazar Mokrynskyi |
|
| 7 | - * @license MIT License, see license.txt |
|
| 8 | - */ |
|
| 3 | + * @package Http server |
|
| 4 | + * @category modules |
|
| 5 | + * @author Nazar Mokrynskyi <[email protected]> |
|
| 6 | + * @copyright Copyright (c) 2015-2016, Nazar Mokrynskyi |
|
| 7 | + * @license MIT License, see license.txt |
|
| 8 | + */ |
|
| 9 | 9 | /** |
| 10 | - * This is custom loader that includes basic files and defines constants, |
|
| 11 | - * but do not call any class to leave that all for Http server |
|
| 12 | - */ |
|
| 10 | + * This is custom loader that includes basic files and defines constants, |
|
| 11 | + * but do not call any class to leave that all for Http server |
|
| 12 | + */ |
|
| 13 | 13 | namespace cs\modules\Http_server; |
| 14 | 14 | require DIR.'/core/loader_base.php'; //Inclusion of loader base |
| 15 | 15 | @ini_set('error_log', LOGS.'/Http_server.log'); |
@@ -20,8 +20,8 @@ discard block |
||
| 20 | 20 | require __DIR__.'/Config.php'; //Inclusion of `cs\custom\Config` class, which is used instead original `cs\Config` for http server |
| 21 | 21 | require __DIR__.'/User.php'; //Inclusion of `cs\custom\User` class, which is used instead original `cs\User` for http server |
| 22 | 22 | /** |
| 23 | - * Including of custom files |
|
| 24 | - */ |
|
| 23 | + * Including of custom files |
|
| 24 | + */ |
|
| 25 | 25 | foreach (glob(CUSTOM.'/*.php') ?: [] as $custom) { |
| 26 | 26 | include $custom; |
| 27 | 27 | } |
@@ -11,8 +11,8 @@ |
||
| 11 | 11 | /** |
| 12 | 12 | * Time of start of execution, is used as current time |
| 13 | 13 | */ |
| 14 | -define('MICROTIME', microtime(true)); //Time in seconds (float) |
|
| 15 | -define('TIME', floor(MICROTIME)); //Time in seconds (integer) |
|
| 14 | +define('MICROTIME', microtime(true)); //Time in seconds (float) |
|
| 15 | +define('TIME', floor(MICROTIME)); //Time in seconds (integer) |
|
| 16 | 16 | define('DIR', realpath(__DIR__.'/../../..')); //Root directory |
| 17 | 17 | chdir(DIR); |
| 18 | 18 | $async = false; |
@@ -1,16 +1,16 @@ discard block |
||
| 1 | 1 | <?php |
| 2 | 2 | /** |
| 3 | - * @package Http server |
|
| 4 | - * @category modules |
|
| 5 | - * @author Nazar Mokrynskyi <[email protected]> |
|
| 6 | - * @copyright Copyright (c) 2015-2016, Nazar Mokrynskyi |
|
| 7 | - * @license MIT License, see license.txt |
|
| 8 | - */ |
|
| 3 | + * @package Http server |
|
| 4 | + * @category modules |
|
| 5 | + * @author Nazar Mokrynskyi <[email protected]> |
|
| 6 | + * @copyright Copyright (c) 2015-2016, Nazar Mokrynskyi |
|
| 7 | + * @license MIT License, see license.txt |
|
| 8 | + */ |
|
| 9 | 9 | use |
| 10 | 10 | cs\modules\Http_server\Request; |
| 11 | 11 | /** |
| 12 | - * Time of start of execution, is used as current time |
|
| 13 | - */ |
|
| 12 | + * Time of start of execution, is used as current time |
|
| 13 | + */ |
|
| 14 | 14 | define('MICROTIME', microtime(true)); //Time in seconds (float) |
| 15 | 15 | define('TIME', floor(MICROTIME)); //Time in seconds (integer) |
| 16 | 16 | define('DIR', realpath(__DIR__.'/../../..')); //Root directory |
@@ -24,8 +24,8 @@ discard block |
||
| 24 | 24 | } |
| 25 | 25 | require_once __DIR__.'/custom_loader.php'; |
| 26 | 26 | /** |
| 27 | - * Manually require composer autoloader because otherwise it will be included much later |
|
| 28 | - */ |
|
| 27 | + * Manually require composer autoloader because otherwise it will be included much later |
|
| 28 | + */ |
|
| 29 | 29 | require_once STORAGE.'/Composer/vendor/autoload.php'; |
| 30 | 30 | $loop = React\EventLoop\Factory::create(); |
| 31 | 31 | $socket = new React\Socket\Server($loop); |
@@ -29,7 +29,7 @@ |
||
| 29 | 29 | return strtolower($provider); |
| 30 | 30 | } |
| 31 | 31 | }; |
| 32 | - $providers = []; |
|
| 32 | + $providers = []; |
|
| 33 | 33 | foreach ($Config->module('HybridAuth')->providers as $provider => $provider_settings) { |
| 34 | 34 | if ($provider_settings['enabled']) { |
| 35 | 35 | $providers[$provider] = [ |
@@ -1,11 +1,11 @@ |
||
| 1 | 1 | <?php |
| 2 | 2 | /** |
| 3 | - * @package HybridAuth |
|
| 4 | - * @category modules |
|
| 5 | - * @author Nazar Mokrynskyi <[email protected]> |
|
| 6 | - * @copyright Copyright (c) 2012-2016, Nazar Mokrynskyi |
|
| 7 | - * @license MIT License, see license.txt |
|
| 8 | - */ |
|
| 3 | + * @package HybridAuth |
|
| 4 | + * @category modules |
|
| 5 | + * @author Nazar Mokrynskyi <[email protected]> |
|
| 6 | + * @copyright Copyright (c) 2012-2016, Nazar Mokrynskyi |
|
| 7 | + * @license MIT License, see license.txt |
|
| 8 | + */ |
|
| 9 | 9 | namespace cs; |
| 10 | 10 | Event::instance()->on( |
| 11 | 11 | 'admin/System/components/modules/install/after', |
@@ -13,6 +13,6 @@ |
||
| 13 | 13 | if ($data['name'] != 'HybridAuth') { |
| 14 | 14 | return; |
| 15 | 15 | } |
| 16 | - Config::instance()->module('HybridAuth')->providers = []; |
|
| 16 | + Config::instance()->module('HybridAuth')->providers = []; |
|
| 17 | 17 | } |
| 18 | 18 | ); |
@@ -1,11 +1,11 @@ |
||
| 1 | 1 | <?php |
| 2 | 2 | /** |
| 3 | - * @package HybridAuth |
|
| 4 | - * @category modules |
|
| 5 | - * @author Nazar Mokrynskyi <[email protected]> |
|
| 6 | - * @copyright Copyright (c) 2012-2016, Nazar Mokrynskyi |
|
| 7 | - * @license MIT License, see license.txt |
|
| 8 | - */ |
|
| 3 | + * @package HybridAuth |
|
| 4 | + * @category modules |
|
| 5 | + * @author Nazar Mokrynskyi <[email protected]> |
|
| 6 | + * @copyright Copyright (c) 2012-2016, Nazar Mokrynskyi |
|
| 7 | + * @license MIT License, see license.txt |
|
| 8 | + */ |
|
| 9 | 9 | namespace cs; |
| 10 | 10 | Event::instance()->on( |
| 11 | 11 | 'admin/System/components/modules/install/after', |
@@ -233,86 +233,86 @@ |
||
| 233 | 233 | return; |
| 234 | 234 | } |
| 235 | 235 | switch ($_GET['response_type']) { |
| 236 | - case 'code': |
|
| 237 | - _header( |
|
| 238 | - 'Location: '.http_build_url( |
|
| 239 | - urldecode($redirect_uri), |
|
| 240 | - [ |
|
| 241 | - 'code' => $code, |
|
| 242 | - 'state' => isset($_GET['state']) ? $_GET['state'] : false |
|
| 243 | - ] |
|
| 244 | - ), |
|
| 245 | - true, |
|
| 246 | - 302 |
|
| 247 | - ); |
|
| 248 | - $Page->Content = ''; |
|
| 249 | - return; |
|
| 250 | - case 'token': |
|
| 251 | - $token_data = $OAuth2->get_code($code, $client['id'], $client['secret'], $redirect_uri); |
|
| 252 | - if ($token_data) { |
|
| 253 | - unset($token_data['refresh_token']); |
|
| 236 | + case 'code': |
|
| 254 | 237 | _header( |
| 255 | - 'Location: '.uri_for_token( |
|
| 256 | - http_build_url( |
|
| 257 | - urldecode($redirect_uri), |
|
| 258 | - array_merge( |
|
| 259 | - $token_data, |
|
| 260 | - [ |
|
| 261 | - 'state' => isset($_GET['state']) ? $_GET['state'] : false |
|
| 262 | - ] |
|
| 263 | - ) |
|
| 264 | - ) |
|
| 238 | + 'Location: '.http_build_url( |
|
| 239 | + urldecode($redirect_uri), |
|
| 240 | + [ |
|
| 241 | + 'code' => $code, |
|
| 242 | + 'state' => isset($_GET['state']) ? $_GET['state'] : false |
|
| 243 | + ] |
|
| 265 | 244 | ), |
| 266 | 245 | true, |
| 267 | 246 | 302 |
| 268 | 247 | ); |
| 269 | 248 | $Page->Content = ''; |
| 270 | 249 | return; |
| 271 | - } else { |
|
| 272 | - error_redirect('server_error', "Server can't get token data, try later"); |
|
| 273 | - return; |
|
| 274 | - } |
|
| 275 | - case 'guest_token': |
|
| 276 | - _header('Cache-Control: no-store'); |
|
| 277 | - _header('Pragma: no-cache'); |
|
| 278 | - interface_off(); |
|
| 279 | - if ($User->user()) { |
|
| 280 | - $e = new ExitException( |
|
| 281 | - [ |
|
| 282 | - 'access_denied', |
|
| 283 | - 'Only guests, not users allowed to access this response_type' |
|
| 284 | - ], |
|
| 285 | - 403 |
|
| 286 | - ); |
|
| 287 | - $e->setJson(); |
|
| 288 | - throw $e; |
|
| 289 | - } |
|
| 290 | - $code = $OAuth2->add_code($client['id'], 'token', urldecode($_GET['redirect_uri'])); |
|
| 291 | - if (!$code) { |
|
| 292 | - $e = new ExitException( |
|
| 293 | - [ |
|
| 294 | - 'server_error', |
|
| 295 | - "Server can't generate code, try later" |
|
| 296 | - ], |
|
| 297 | - 500 |
|
| 298 | - ); |
|
| 299 | - $e->setJson(); |
|
| 300 | - throw $e; |
|
| 301 | - } |
|
| 302 | - $token_data = $OAuth2->get_code($code, $client['id'], $client['secret'], urldecode($_GET['redirect_uri'])); |
|
| 303 | - if ($token_data) { |
|
| 304 | - unset($token_data['refresh_token']); |
|
| 305 | - $Page->json($token_data); |
|
| 306 | - return; |
|
| 307 | - } else { |
|
| 308 | - $e = new ExitException( |
|
| 309 | - [ |
|
| 310 | - 'server_error', |
|
| 311 | - "Server can't get token data, try later" |
|
| 312 | - ], |
|
| 313 | - 500 |
|
| 314 | - ); |
|
| 315 | - $e->setJson(); |
|
| 316 | - throw $e; |
|
| 317 | - } |
|
| 250 | + case 'token': |
|
| 251 | + $token_data = $OAuth2->get_code($code, $client['id'], $client['secret'], $redirect_uri); |
|
| 252 | + if ($token_data) { |
|
| 253 | + unset($token_data['refresh_token']); |
|
| 254 | + _header( |
|
| 255 | + 'Location: '.uri_for_token( |
|
| 256 | + http_build_url( |
|
| 257 | + urldecode($redirect_uri), |
|
| 258 | + array_merge( |
|
| 259 | + $token_data, |
|
| 260 | + [ |
|
| 261 | + 'state' => isset($_GET['state']) ? $_GET['state'] : false |
|
| 262 | + ] |
|
| 263 | + ) |
|
| 264 | + ) |
|
| 265 | + ), |
|
| 266 | + true, |
|
| 267 | + 302 |
|
| 268 | + ); |
|
| 269 | + $Page->Content = ''; |
|
| 270 | + return; |
|
| 271 | + } else { |
|
| 272 | + error_redirect('server_error', "Server can't get token data, try later"); |
|
| 273 | + return; |
|
| 274 | + } |
|
| 275 | + case 'guest_token': |
|
| 276 | + _header('Cache-Control: no-store'); |
|
| 277 | + _header('Pragma: no-cache'); |
|
| 278 | + interface_off(); |
|
| 279 | + if ($User->user()) { |
|
| 280 | + $e = new ExitException( |
|
| 281 | + [ |
|
| 282 | + 'access_denied', |
|
| 283 | + 'Only guests, not users allowed to access this response_type' |
|
| 284 | + ], |
|
| 285 | + 403 |
|
| 286 | + ); |
|
| 287 | + $e->setJson(); |
|
| 288 | + throw $e; |
|
| 289 | + } |
|
| 290 | + $code = $OAuth2->add_code($client['id'], 'token', urldecode($_GET['redirect_uri'])); |
|
| 291 | + if (!$code) { |
|
| 292 | + $e = new ExitException( |
|
| 293 | + [ |
|
| 294 | + 'server_error', |
|
| 295 | + "Server can't generate code, try later" |
|
| 296 | + ], |
|
| 297 | + 500 |
|
| 298 | + ); |
|
| 299 | + $e->setJson(); |
|
| 300 | + throw $e; |
|
| 301 | + } |
|
| 302 | + $token_data = $OAuth2->get_code($code, $client['id'], $client['secret'], urldecode($_GET['redirect_uri'])); |
|
| 303 | + if ($token_data) { |
|
| 304 | + unset($token_data['refresh_token']); |
|
| 305 | + $Page->json($token_data); |
|
| 306 | + return; |
|
| 307 | + } else { |
|
| 308 | + $e = new ExitException( |
|
| 309 | + [ |
|
| 310 | + 'server_error', |
|
| 311 | + "Server can't get token data, try later" |
|
| 312 | + ], |
|
| 313 | + 500 |
|
| 314 | + ); |
|
| 315 | + $e->setJson(); |
|
| 316 | + throw $e; |
|
| 317 | + } |
|
| 318 | 318 | } |
@@ -1,16 +1,16 @@ discard block |
||
| 1 | 1 | <?php |
| 2 | 2 | /** |
| 3 | - * @package OAuth2 |
|
| 4 | - * @category modules |
|
| 5 | - * @author Nazar Mokrynskyi <[email protected]> |
|
| 6 | - * @copyright Copyright (c) 2011-2016, Nazar Mokrynskyi |
|
| 7 | - * @license MIT License, see license.txt |
|
| 8 | - */ |
|
| 3 | + * @package OAuth2 |
|
| 4 | + * @category modules |
|
| 5 | + * @author Nazar Mokrynskyi <[email protected]> |
|
| 6 | + * @copyright Copyright (c) 2011-2016, Nazar Mokrynskyi |
|
| 7 | + * @license MIT License, see license.txt |
|
| 8 | + */ |
|
| 9 | 9 | /** |
| 10 | - * Provides next events:<br> |
|
| 11 | - * OAuth2/custom_sign_in_page |
|
| 12 | - * OAuth2/custom_allow_access_page |
|
| 13 | - */ |
|
| 10 | + * Provides next events:<br> |
|
| 11 | + * OAuth2/custom_sign_in_page |
|
| 12 | + * OAuth2/custom_allow_access_page |
|
| 13 | + */ |
|
| 14 | 14 | namespace cs\modules\OAuth2; |
| 15 | 15 | use |
| 16 | 16 | h, |
@@ -46,8 +46,8 @@ discard block |
||
| 46 | 46 | $L = new Prefix('oauth2_'); |
| 47 | 47 | $Page = Page::instance(); |
| 48 | 48 | /** |
| 49 | - * Errors processing |
|
| 50 | - */ |
|
| 49 | + * Errors processing |
|
| 50 | + */ |
|
| 51 | 51 | if (!isset($_GET['client_id'])) { |
| 52 | 52 | error_redirect('invalid_request', 'client_id parameter required'); |
| 53 | 53 | return; |
@@ -115,8 +115,8 @@ discard block |
||
| 115 | 115 | } |
| 116 | 116 | } |
| 117 | 117 | /** |
| 118 | - * guest_token should return JSON data while all other works with redirects |
|
| 119 | - */ |
|
| 118 | + * guest_token should return JSON data while all other works with redirects |
|
| 119 | + */ |
|
| 120 | 120 | if ($_GET['response_type'] != 'guest_token') { |
| 121 | 121 | if (!isset($_GET['redirect_uri'])) { |
| 122 | 122 | $e = new ExitException( |
@@ -189,8 +189,8 @@ discard block |
||
| 189 | 189 | } |
| 190 | 190 | } |
| 191 | 191 | /** |
| 192 | - * Authorization processing |
|
| 193 | - */ |
|
| 192 | + * Authorization processing |
|
| 193 | + */ |
|
| 194 | 194 | if (isset($_POST['mode'])) { |
| 195 | 195 | switch ($_POST['mode']) { |
| 196 | 196 | case 'allow': |
@@ -31,19 +31,19 @@ |
||
| 31 | 31 | * @return string |
| 32 | 32 | */ |
| 33 | 33 | function http_build_url ($url, $parts) { |
| 34 | - $url = explode('?', $url, 2); |
|
| 35 | - $params = []; |
|
| 34 | + $url = explode('?', $url, 2); |
|
| 35 | + $params = []; |
|
| 36 | 36 | if (isset($url[1])) { |
| 37 | 37 | foreach (explode('&', $url[1]) as $u) { |
| 38 | - $params[] = $u; |
|
| 38 | + $params[] = $u; |
|
| 39 | 39 | } |
| 40 | 40 | unset($u, $url[1]); |
| 41 | 41 | } |
| 42 | - $url = $url[0]; |
|
| 42 | + $url = $url[0]; |
|
| 43 | 43 | foreach ($parts as $name => $value) { |
| 44 | - $params[] = $name.'='.urlencode($value); |
|
| 44 | + $params[] = $name.'='.urlencode($value); |
|
| 45 | 45 | } |
| 46 | 46 | unset($parts, $p); |
| 47 | - $params = array_unique($params); |
|
| 47 | + $params = array_unique($params); |
|
| 48 | 48 | return "$url?".implode('&', $params); |
| 49 | 49 | } |
@@ -1,19 +1,19 @@ discard block |
||
| 1 | 1 | <?php |
| 2 | 2 | /** |
| 3 | - * @package OAuth2 |
|
| 4 | - * @category modules |
|
| 5 | - * @author Nazar Mokrynskyi <[email protected]> |
|
| 6 | - * @copyright Copyright (c) 2011-2016, Nazar Mokrynskyi |
|
| 7 | - * @license MIT License, see license.txt |
|
| 8 | - */ |
|
| 3 | + * @package OAuth2 |
|
| 4 | + * @category modules |
|
| 5 | + * @author Nazar Mokrynskyi <[email protected]> |
|
| 6 | + * @copyright Copyright (c) 2011-2016, Nazar Mokrynskyi |
|
| 7 | + * @license MIT License, see license.txt |
|
| 8 | + */ |
|
| 9 | 9 | namespace cs\modules\OAuth2; |
| 10 | 10 | /** |
| 11 | - * Just replaces first "?" symbol by "#" |
|
| 12 | - * |
|
| 13 | - * @param string $str |
|
| 14 | - * |
|
| 15 | - * @return string |
|
| 16 | - */ |
|
| 11 | + * Just replaces first "?" symbol by "#" |
|
| 12 | + * |
|
| 13 | + * @param string $str |
|
| 14 | + * |
|
| 15 | + * @return string |
|
| 16 | + */ |
|
| 17 | 17 | function uri_for_token ($str) { |
| 18 | 18 | return implode( |
| 19 | 19 | '#', |
@@ -25,11 +25,11 @@ discard block |
||
| 25 | 25 | ); |
| 26 | 26 | } |
| 27 | 27 | /** |
| 28 | - * @param string $url |
|
| 29 | - * @param string[] $parts |
|
| 30 | - * |
|
| 31 | - * @return string |
|
| 32 | - */ |
|
| 28 | + * @param string $url |
|
| 29 | + * @param string[] $parts |
|
| 30 | + * |
|
| 31 | + * @return string |
|
| 32 | + */ |
|
| 33 | 33 | function http_build_url ($url, $parts) { |
| 34 | 34 | $url = explode('?', $url, 2); |
| 35 | 35 | $params = []; |
@@ -142,118 +142,118 @@ |
||
| 142 | 142 | * Tokens operations processing |
| 143 | 143 | */ |
| 144 | 144 | switch ($_POST['grant_type']) { |
| 145 | - case 'authorization_code': |
|
| 146 | - if (!isset($_POST['code'])) { |
|
| 147 | - $e = new ExitException( |
|
| 148 | - [ |
|
| 149 | - 'invalid_request', |
|
| 150 | - 'code parameter required' |
|
| 151 | - ], |
|
| 152 | - 400 |
|
| 153 | - ); |
|
| 154 | - $e->setJson(); |
|
| 155 | - throw $e; |
|
| 156 | - } |
|
| 157 | - $token_data = $OAuth2->get_code($_POST['code'], $client['id'], $client['secret'], urldecode($_POST['redirect_uri'])); |
|
| 158 | - if (!$token_data) { |
|
| 159 | - $e = new ExitException( |
|
| 160 | - [ |
|
| 161 | - 'access_denied', |
|
| 162 | - "Server can't get token data, check parameters and try again" |
|
| 163 | - ], |
|
| 164 | - 403 |
|
| 165 | - ); |
|
| 166 | - $e->setJson(); |
|
| 167 | - throw $e; |
|
| 168 | - } |
|
| 169 | - if ($token_data['expires_in'] < 0) { |
|
| 170 | - $e = new ExitException( |
|
| 171 | - [ |
|
| 172 | - 'access_denied', |
|
| 173 | - 'access_token expired' |
|
| 174 | - ], |
|
| 175 | - 403 |
|
| 176 | - ); |
|
| 177 | - $e->setJson(); |
|
| 178 | - throw $e; |
|
| 179 | - } |
|
| 180 | - $Page->json($token_data); |
|
| 181 | - return; |
|
| 182 | - case 'refresh_token': |
|
| 183 | - if (!isset($_POST['refresh_token'])) { |
|
| 184 | - $e = new ExitException( |
|
| 185 | - [ |
|
| 186 | - 'invalid_request', |
|
| 187 | - 'refresh_token parameter required' |
|
| 188 | - ], |
|
| 189 | - 400 |
|
| 190 | - ); |
|
| 191 | - $e->setJson(); |
|
| 192 | - throw $e; |
|
| 193 | - } |
|
| 194 | - $token_data = $OAuth2->refresh_token($_POST['refresh_token'], $client['id'], $client['secret']); |
|
| 195 | - if (!$token_data) { |
|
| 196 | - $e = new ExitException( |
|
| 197 | - [ |
|
| 198 | - 'access_denied', |
|
| 199 | - 'User session invalid' |
|
| 200 | - ], |
|
| 201 | - 403 |
|
| 202 | - ); |
|
| 203 | - $e->setJson(); |
|
| 204 | - throw $e; |
|
| 205 | - } |
|
| 206 | - $Page->json($token_data); |
|
| 207 | - return; |
|
| 208 | - case 'guest_token': |
|
| 209 | - if (User::instance()->user()) { |
|
| 210 | - $e = new ExitException( |
|
| 211 | - [ |
|
| 212 | - 'access_denied', |
|
| 213 | - 'Only guests, not user allowed to access this grant_type' |
|
| 214 | - ], |
|
| 215 | - 403 |
|
| 216 | - ); |
|
| 217 | - $e->setJson(); |
|
| 218 | - throw $e; |
|
| 219 | - } |
|
| 220 | - if (!$Config->module('OAuth2')->guest_tokens) { |
|
| 221 | - $e = new ExitException( |
|
| 222 | - [ |
|
| 223 | - 'access_denied', |
|
| 224 | - 'Guest tokens disabled' |
|
| 225 | - ], |
|
| 226 | - 403 |
|
| 227 | - ); |
|
| 228 | - $e->setJson(); |
|
| 229 | - throw $e; |
|
| 230 | - } |
|
| 231 | - $code = $OAuth2->add_code($client['id'], 'code', ''); |
|
| 232 | - if (!$code) { |
|
| 233 | - $e = new ExitException( |
|
| 234 | - [ |
|
| 235 | - 'server_error', |
|
| 236 | - "Server can't generate code, try later" |
|
| 237 | - ], |
|
| 238 | - 500 |
|
| 239 | - ); |
|
| 240 | - $e->setJson(); |
|
| 241 | - throw $e; |
|
| 242 | - } |
|
| 243 | - $token_data = $OAuth2->get_code($code, $client['id'], $client['secret'], ''); |
|
| 244 | - if ($token_data) { |
|
| 245 | - unset($token_data['refresh_token']); |
|
| 145 | + case 'authorization_code': |
|
| 146 | + if (!isset($_POST['code'])) { |
|
| 147 | + $e = new ExitException( |
|
| 148 | + [ |
|
| 149 | + 'invalid_request', |
|
| 150 | + 'code parameter required' |
|
| 151 | + ], |
|
| 152 | + 400 |
|
| 153 | + ); |
|
| 154 | + $e->setJson(); |
|
| 155 | + throw $e; |
|
| 156 | + } |
|
| 157 | + $token_data = $OAuth2->get_code($_POST['code'], $client['id'], $client['secret'], urldecode($_POST['redirect_uri'])); |
|
| 158 | + if (!$token_data) { |
|
| 159 | + $e = new ExitException( |
|
| 160 | + [ |
|
| 161 | + 'access_denied', |
|
| 162 | + "Server can't get token data, check parameters and try again" |
|
| 163 | + ], |
|
| 164 | + 403 |
|
| 165 | + ); |
|
| 166 | + $e->setJson(); |
|
| 167 | + throw $e; |
|
| 168 | + } |
|
| 169 | + if ($token_data['expires_in'] < 0) { |
|
| 170 | + $e = new ExitException( |
|
| 171 | + [ |
|
| 172 | + 'access_denied', |
|
| 173 | + 'access_token expired' |
|
| 174 | + ], |
|
| 175 | + 403 |
|
| 176 | + ); |
|
| 177 | + $e->setJson(); |
|
| 178 | + throw $e; |
|
| 179 | + } |
|
| 246 | 180 | $Page->json($token_data); |
| 247 | 181 | return; |
| 248 | - } else { |
|
| 249 | - $e = new ExitException( |
|
| 250 | - [ |
|
| 251 | - 'server_error', |
|
| 252 | - "Server can't get token data, try later" |
|
| 253 | - ], |
|
| 254 | - 500 |
|
| 255 | - ); |
|
| 256 | - $e->setJson(); |
|
| 257 | - throw $e; |
|
| 258 | - } |
|
| 182 | + case 'refresh_token': |
|
| 183 | + if (!isset($_POST['refresh_token'])) { |
|
| 184 | + $e = new ExitException( |
|
| 185 | + [ |
|
| 186 | + 'invalid_request', |
|
| 187 | + 'refresh_token parameter required' |
|
| 188 | + ], |
|
| 189 | + 400 |
|
| 190 | + ); |
|
| 191 | + $e->setJson(); |
|
| 192 | + throw $e; |
|
| 193 | + } |
|
| 194 | + $token_data = $OAuth2->refresh_token($_POST['refresh_token'], $client['id'], $client['secret']); |
|
| 195 | + if (!$token_data) { |
|
| 196 | + $e = new ExitException( |
|
| 197 | + [ |
|
| 198 | + 'access_denied', |
|
| 199 | + 'User session invalid' |
|
| 200 | + ], |
|
| 201 | + 403 |
|
| 202 | + ); |
|
| 203 | + $e->setJson(); |
|
| 204 | + throw $e; |
|
| 205 | + } |
|
| 206 | + $Page->json($token_data); |
|
| 207 | + return; |
|
| 208 | + case 'guest_token': |
|
| 209 | + if (User::instance()->user()) { |
|
| 210 | + $e = new ExitException( |
|
| 211 | + [ |
|
| 212 | + 'access_denied', |
|
| 213 | + 'Only guests, not user allowed to access this grant_type' |
|
| 214 | + ], |
|
| 215 | + 403 |
|
| 216 | + ); |
|
| 217 | + $e->setJson(); |
|
| 218 | + throw $e; |
|
| 219 | + } |
|
| 220 | + if (!$Config->module('OAuth2')->guest_tokens) { |
|
| 221 | + $e = new ExitException( |
|
| 222 | + [ |
|
| 223 | + 'access_denied', |
|
| 224 | + 'Guest tokens disabled' |
|
| 225 | + ], |
|
| 226 | + 403 |
|
| 227 | + ); |
|
| 228 | + $e->setJson(); |
|
| 229 | + throw $e; |
|
| 230 | + } |
|
| 231 | + $code = $OAuth2->add_code($client['id'], 'code', ''); |
|
| 232 | + if (!$code) { |
|
| 233 | + $e = new ExitException( |
|
| 234 | + [ |
|
| 235 | + 'server_error', |
|
| 236 | + "Server can't generate code, try later" |
|
| 237 | + ], |
|
| 238 | + 500 |
|
| 239 | + ); |
|
| 240 | + $e->setJson(); |
|
| 241 | + throw $e; |
|
| 242 | + } |
|
| 243 | + $token_data = $OAuth2->get_code($code, $client['id'], $client['secret'], ''); |
|
| 244 | + if ($token_data) { |
|
| 245 | + unset($token_data['refresh_token']); |
|
| 246 | + $Page->json($token_data); |
|
| 247 | + return; |
|
| 248 | + } else { |
|
| 249 | + $e = new ExitException( |
|
| 250 | + [ |
|
| 251 | + 'server_error', |
|
| 252 | + "Server can't get token data, try later" |
|
| 253 | + ], |
|
| 254 | + 500 |
|
| 255 | + ); |
|
| 256 | + $e->setJson(); |
|
| 257 | + throw $e; |
|
| 258 | + } |
|
| 259 | 259 | } |
@@ -1,11 +1,11 @@ discard block |
||
| 1 | 1 | <?php |
| 2 | 2 | /** |
| 3 | - * @package OAuth2 |
|
| 4 | - * @category modules |
|
| 5 | - * @author Nazar Mokrynskyi <[email protected]> |
|
| 6 | - * @copyright Copyright (c) 2011-2016, Nazar Mokrynskyi |
|
| 7 | - * @license MIT License, see license.txt |
|
| 8 | - */ |
|
| 3 | + * @package OAuth2 |
|
| 4 | + * @category modules |
|
| 5 | + * @author Nazar Mokrynskyi <[email protected]> |
|
| 6 | + * @copyright Copyright (c) 2011-2016, Nazar Mokrynskyi |
|
| 7 | + * @license MIT License, see license.txt |
|
| 8 | + */ |
|
| 9 | 9 | namespace cs\modules\OAuth2; |
| 10 | 10 | |
| 11 | 11 | use |
@@ -139,8 +139,8 @@ discard block |
||
| 139 | 139 | throw $e; |
| 140 | 140 | } |
| 141 | 141 | /** |
| 142 | - * Tokens operations processing |
|
| 143 | - */ |
|
| 142 | + * Tokens operations processing |
|
| 143 | + */ |
|
| 144 | 144 | switch ($_POST['grant_type']) { |
| 145 | 145 | case 'authorization_code': |
| 146 | 146 | if (!isset($_POST['code'])) { |
@@ -55,7 +55,7 @@ discard block |
||
| 55 | 55 | |
| 56 | 56 | const DEFAULT_IMAGE = 'components/modules/Shop/includes/img/no-image.svg'; |
| 57 | 57 | |
| 58 | - protected $data_model = [ |
|
| 58 | + protected $data_model = [ |
|
| 59 | 59 | 'id' => 'int', |
| 60 | 60 | 'date' => 'int', |
| 61 | 61 | 'category' => 'int', |
@@ -443,7 +443,7 @@ discard block |
||
| 443 | 443 | 'string' => '', |
| 444 | 444 | 'text' => '' |
| 445 | 445 | ]; |
| 446 | - $lang = ''; |
|
| 446 | + $lang = ''; |
|
| 447 | 447 | switch ($this->attribute_type_to_value_field($attribute_data['type'])) { |
| 448 | 448 | case 'numeric_value': |
| 449 | 449 | $value_type['numeric'] = $value; |
@@ -286,17 +286,20 @@ |
||
| 286 | 286 | $where = []; |
| 287 | 287 | $where_params = []; |
| 288 | 288 | foreach ($search_parameters as $key => $details) { |
| 289 | - if (isset($this->data_model[$key])) { // Property |
|
| 289 | + if (isset($this->data_model[$key])) { |
|
| 290 | +// Property |
|
| 290 | 291 | $where[] = "`i`.`$key` = '%s'"; |
| 291 | 292 | $where_params[] = $details; |
| 292 | - } elseif (is_numeric($key)) { // Tag |
|
| 293 | + } elseif (is_numeric($key)) { |
|
| 294 | +// Tag |
|
| 293 | 295 | $joins .= |
| 294 | 296 | "INNER JOIN `{$this->table}_tags` AS `t` |
| 295 | 297 | ON |
| 296 | 298 | `i`.`id` = `t`.`id` AND |
| 297 | 299 | `t`.`tag` = '%s'"; |
| 298 | 300 | $where_params[] = $details; |
| 299 | - } else { // Attribute |
|
| 301 | + } else { |
|
| 302 | +// Attribute |
|
| 300 | 303 | $field = @$this->attribute_type_to_value_field($Attributes->get($key)['type']); |
| 301 | 304 | if (!$field || empty($details)) { |
| 302 | 305 | continue; |
@@ -1,11 +1,11 @@ |
||
| 1 | 1 | <?php |
| 2 | 2 | /** |
| 3 | - * @package Shop |
|
| 4 | - * @category modules |
|
| 5 | - * @author Nazar Mokrynskyi <[email protected]> |
|
| 6 | - * @copyright Copyright (c) 2014-2016, Nazar Mokrynskyi |
|
| 7 | - * @license MIT License, see license.txt |
|
| 8 | - */ |
|
| 3 | + * @package Shop |
|
| 4 | + * @category modules |
|
| 5 | + * @author Nazar Mokrynskyi <[email protected]> |
|
| 6 | + * @copyright Copyright (c) 2014-2016, Nazar Mokrynskyi |
|
| 7 | + * @license MIT License, see license.txt |
|
| 8 | + */ |
|
| 9 | 9 | namespace cs\modules\Shop; |
| 10 | 10 | use |
| 11 | 11 | h, |
@@ -67,7 +67,7 @@ |
||
| 67 | 67 | |
| 68 | 68 | const PAYMENT_METHOD_CASH = 'shop:cash'; |
| 69 | 69 | |
| 70 | - protected $data_model = [ |
|
| 70 | + protected $data_model = [ |
|
| 71 | 71 | 'id' => 'int', |
| 72 | 72 | 'user' => 'int', |
| 73 | 73 | 'date' => 'int', |
@@ -1,11 +1,11 @@ |
||
| 1 | 1 | <?php |
| 2 | 2 | /** |
| 3 | - * @package Shop |
|
| 4 | - * @category modules |
|
| 5 | - * @author Nazar Mokrynskyi <[email protected]> |
|
| 6 | - * @copyright Copyright (c) 2014-2016, Nazar Mokrynskyi |
|
| 7 | - * @license MIT License, see license.txt |
|
| 8 | - */ |
|
| 3 | + * @package Shop |
|
| 4 | + * @category modules |
|
| 5 | + * @author Nazar Mokrynskyi <[email protected]> |
|
| 6 | + * @copyright Copyright (c) 2014-2016, Nazar Mokrynskyi |
|
| 7 | + * @license MIT License, see license.txt |
|
| 8 | + */ |
|
| 9 | 9 | namespace cs\modules\Shop; |
| 10 | 10 | use |
| 11 | 11 | h, |