| @@ -137,6 +137,7 @@ | ||
| 137 | 137 | * | 
| 138 | 138 | * @param OAuth2Provider An exsiting OAuth2Provider object | 
| 139 | 139 | * @param League\OAuth2\Client\Token\AccessToken An oauth2 token | 
| 140 | + * @param OAuth2Provider $oauth2 | |
| 140 | 141 | * @return string A GitHub user's primary email address, or empty string | 
| 141 | 142 | * if no such email address exists. | 
| 142 | 143 | */ | 
| @@ -7,10 +7,10 @@ | ||
| 7 | 7 | * require_once __DIR__ . '/index-functions.php'; | 
| 8 | 8 | */ | 
| 9 | 9 | |
| 10 | -use CILogon\Service\Util; | |
| 11 | 10 | use CILogon\Service\OAuth2Provider; | 
| 12 | -use League\OAuth2\Client\Token\AccessToken; | |
| 11 | +use CILogon\Service\Util; | |
| 13 | 12 | use Lcobucci\JWT\Parser; | 
| 13 | +use League\OAuth2\Client\Token\AccessToken; | |
| 14 | 14 | |
| 15 | 15 | /** | 
| 16 | 16 | * getUserAndRespond | 
| @@ -7,9 +7,9 @@ | ||
| 7 | 7 | * require_once __DIR__ . '/index-functions.php'; | 
| 8 | 8 | */ | 
| 9 | 9 | |
| 10 | -use CILogon\Service\Util; | |
| 11 | 10 | use CILogon\Service\Content; | 
| 12 | 11 | use CILogon\Service\Loggit; | 
| 12 | +use CILogon\Service\Util; | |
| 13 | 13 | |
| 14 | 14 | /** | 
| 15 | 15 | * printLogonPage | 
| @@ -7,9 +7,9 @@ | ||
| 7 | 7 | * require_once __DIR__ . '/index-functions.php'; | 
| 8 | 8 | */ | 
| 9 | 9 | |
| 10 | -use CILogon\Service\Util; | |
| 11 | 10 | use CILogon\Service\Content; | 
| 12 | 11 | use CILogon\Service\PortalCookie; | 
| 12 | +use CILogon\Service\Util; | |
| 13 | 13 | |
| 14 | 14 | /** | 
| 15 | 15 | * printMainCookiesPage | 
| @@ -7,8 +7,8 @@ | ||
| 7 | 7 | * require_once __DIR__ . '/index-functions.php'; | 
| 8 | 8 | */ | 
| 9 | 9 | |
| 10 | -use CILogon\Service\Util; | |
| 11 | 10 | use CILogon\Service\Content; | 
| 11 | +use CILogon\Service\Util; | |
| 12 | 12 | |
| 13 | 13 | /** | 
| 14 | 14 | * printLogonPage | 
| @@ -7,11 +7,11 @@ | ||
| 7 | 7 | * require_once __DIR__ . '/index-functions.php'; | 
| 8 | 8 | */ | 
| 9 | 9 | |
| 10 | -use CILogon\Service\Util; | |
| 11 | 10 | use CILogon\Service\Content; | 
| 12 | 11 | use CILogon\Service\DBService; | 
| 13 | -use CILogon\Service\MyProxy; | |
| 14 | 12 | use CILogon\Service\Loggit; | 
| 13 | +use CILogon\Service\MyProxy; | |
| 14 | +use CILogon\Service\Util; | |
| 15 | 15 | |
| 16 | 16 | /** | 
| 17 | 17 | * getUID | 
| @@ -7,10 +7,10 @@ | ||
| 7 | 7 | * require_once __DIR__ . '/index-functions.php'; | 
| 8 | 8 | */ | 
| 9 | 9 | |
| 10 | -use CILogon\Service\Util; | |
| 11 | 10 | use CILogon\Service\Content; | 
| 12 | 11 | use CILogon\Service\DBService; | 
| 13 | 12 | use CILogon\Service\Loggit; | 
| 13 | +use CILogon\Service\Util; | |
| 14 | 14 | |
| 15 | 15 | /** | 
| 16 | 16 | * printLogonPage | 
| @@ -317,7 +317,7 @@ | ||
| 317 | 317 | * the session variable 'client_error_msg' is set so it can be | 
| 318 | 318 | * displayed by the printOIDCErrorPage() function. | 
| 319 | 319 | * | 
| 320 | - * @return bool True if the various parameters related to the OIDC | |
| 320 | + * @return null|boolean True if the various parameters related to the OIDC | |
| 321 | 321 | * session are present. False otherwise. | 
| 322 | 322 | */ | 
| 323 | 323 | function verifyOIDCParams() | 
| @@ -7,11 +7,11 @@ | ||
| 7 | 7 | * require_once __DIR__ . '/index-functions.php'; | 
| 8 | 8 | */ | 
| 9 | 9 | |
| 10 | -use CILogon\Service\Util; | |
| 11 | 10 | use CILogon\Service\Content; | 
| 12 | -use CILogon\Service\PortalCookie; | |
| 13 | 11 | use CILogon\Service\DBService; | 
| 14 | 12 | use CILogon\Service\Loggit; | 
| 13 | +use CILogon\Service\PortalCookie; | |
| 14 | +use CILogon\Service\Util; | |
| 15 | 15 | |
| 16 | 16 | /** | 
| 17 | 17 | * printLogonPage | 
| @@ -7,10 +7,10 @@ | ||
| 7 | 7 | include_once __DIR__ . '/config.secrets.php'; | 
| 8 | 8 | require_once __DIR__ . '/index-functions.php'; | 
| 9 | 9 | |
| 10 | -use CILogon\Service\Util; | |
| 11 | 10 | use CILogon\Service\Content; | 
| 12 | -use CILogon\Service\ShibError; | |
| 13 | 11 | use CILogon\Service\Loggit; | 
| 12 | +use CILogon\Service\ShibError; | |
| 13 | +use CILogon\Service\Util; | |
| 14 | 14 | |
| 15 | 15 | Util::startPHPSession(); | 
| 16 | 16 | |
| @@ -7,8 +7,8 @@ | ||
| 7 | 7 | include_once __DIR__ . '/../../config.secrets.php'; | 
| 8 | 8 | require_once __DIR__ . '/index-functions.php'; | 
| 9 | 9 | |
| 10 | -use CILogon\Service\Util; | |
| 11 | 10 | use CILogon\Service\Loggit; | 
| 11 | +use CILogon\Service\Util; | |
| 12 | 12 | |
| 13 | 13 | Util::startPHPSession(); | 
| 14 | 14 | |