@@ -13,7 +13,7 @@ |
||
| 13 | 13 | */ |
| 14 | 14 | public function up() |
| 15 | 15 | { |
| 16 | - Schema::table('users', function (Blueprint $table) { |
|
| 16 | + Schema::table('users', function(Blueprint $table) { |
|
| 17 | 17 | // Users must be able to support blank passwords for external identity |
| 18 | 18 | $table->string('password')->nullable()->change(); |
| 19 | 19 | // We need a new string field to store the oauth provider unique id in |
@@ -39,7 +39,7 @@ |
||
| 39 | 39 | |
| 40 | 40 | public static function userCallback($callback) |
| 41 | 41 | { |
| 42 | - if (! is_callable($callback)) { |
|
| 42 | + if (!is_callable($callback)) { |
|
| 43 | 43 | throw new \Exception('Must provide a callable.'); |
| 44 | 44 | } |
| 45 | 45 | |
@@ -7,9 +7,9 @@ |
||
| 7 | 7 | |
| 8 | 8 | class User extends Authenticatable implements |
| 9 | 9 | \Illuminate\Contracts\Auth\Authenticatable, |
| 10 | - \Illuminate\Contracts\Auth\Access\Authorizable, |
|
| 11 | - \Illuminate\Contracts\Auth\CanResetPassword, |
|
| 12 | - \Tymon\JWTAuth\Contracts\JWTSubject |
|
| 10 | + \Illuminate\Contracts\Auth\Access\Authorizable, |
|
| 11 | + \Illuminate\Contracts\Auth\CanResetPassword, |
|
| 12 | + \Tymon\JWTAuth\Contracts\JWTSubject |
|
| 13 | 13 | { |
| 14 | 14 | use Notifiable; |
| 15 | 15 | use \Silber\Bouncer\Database\HasRolesAndAbilities; |
@@ -6,7 +6,7 @@ discard block |
||
| 6 | 6 | |
| 7 | 7 | // Redirect requests to /api to the swagger documentation |
| 8 | 8 | //$api->any('', function (Illuminate\Http\Request $request) { |
| 9 | - $api->any('', function () { |
|
| 9 | + $api->any('', function() { |
|
| 10 | 10 | return redirect('api/documentation/'); |
| 11 | 11 | }); |
| 12 | 12 | |
@@ -17,6 +17,6 @@ discard block |
||
| 17 | 17 | * @SWG\Response(response="200", description="Hello world example") |
| 18 | 18 | * ) |
| 19 | 19 | **/ |
| 20 | - $api->any('/api/hello', function () { |
|
| 20 | + $api->any('/api/hello', function() { |
|
| 21 | 21 | return 'hello world'; |
| 22 | 22 | }); |
@@ -24,7 +24,7 @@ |
||
| 24 | 24 | * @SWG\Response(response="200", description="Hello world example") |
| 25 | 25 | * ) |
| 26 | 26 | **/ |
| 27 | -Route::middleware('api')->get('/hello', function (Request $request) { |
|
| 27 | +Route::middleware('api')->get('/hello', function(Request $request) { |
|
| 28 | 28 | return 'hello world'; |
| 29 | 29 | }); |
| 30 | 30 | |
@@ -46,9 +46,9 @@ |
||
| 46 | 46 | public function buildOpenIdConfigUrl() |
| 47 | 47 | { |
| 48 | 48 | $this->openIdConfigUrl = $this->baseUrl.'/' |
| 49 | - .$this->tenantName.'/' |
|
| 50 | - .$this->version.'/' |
|
| 51 | - .$this->wellKnownOpenIdConfig; |
|
| 49 | + .$this->tenantName.'/' |
|
| 50 | + .$this->version.'/' |
|
| 51 | + .$this->wellKnownOpenIdConfig; |
|
| 52 | 52 | } |
| 53 | 53 | |
| 54 | 54 | public function downloadOpenIdConfig() |
@@ -35,7 +35,7 @@ |
||
| 35 | 35 | if ($tenantName != 'common') { |
| 36 | 36 | // Make sure the tenant is formatted like xyzcorp.onmicrosoft.com |
| 37 | 37 | $regex = '/\.onmicrosoft\.com/'; |
| 38 | - if (! preg_match($regex, $tenantName, $hits)) { |
|
| 38 | + if (!preg_match($regex, $tenantName, $hits)) { |
|
| 39 | 39 | // Append the suffix if it is missing |
| 40 | 40 | $tenantName .= '.onmicrosoft.com'; |
| 41 | 41 | } |
@@ -13,7 +13,7 @@ discard block |
||
| 13 | 13 | public function __construct($azureActiveDirectory) |
| 14 | 14 | { |
| 15 | 15 | // IF they didnt pre-populate all our AAD stuff then make a new one for the common tenant |
| 16 | - if (! $azureActiveDirectory) { |
|
| 16 | + if (!$azureActiveDirectory) { |
|
| 17 | 17 | $azureActiveDirectory = new AzureActiveDirectory(); |
| 18 | 18 | } |
| 19 | 19 | $this->azureActiveDirectory = $azureActiveDirectory; |
@@ -27,7 +27,7 @@ discard block |
||
| 27 | 27 | |
| 28 | 28 | protected function getAccessToken() |
| 29 | 29 | { |
| 30 | - if (! $this->accessToken) { |
|
| 30 | + if (!$this->accessToken) { |
|
| 31 | 31 | $this->authenticateAsApplication(); |
| 32 | 32 | } |
| 33 | 33 | |
@@ -57,7 +57,7 @@ discard block |
||
| 57 | 57 | */ |
| 58 | 58 | public function check() |
| 59 | 59 | { |
| 60 | - return ! is_null($this->user()); |
|
| 60 | + return !is_null($this->user()); |
|
| 61 | 61 | } |
| 62 | 62 | |
| 63 | 63 | /** |
@@ -67,7 +67,7 @@ discard block |
||
| 67 | 67 | */ |
| 68 | 68 | public function guest() |
| 69 | 69 | { |
| 70 | - return ! $this->check(); |
|
| 70 | + return !$this->check(); |
|
| 71 | 71 | } |
| 72 | 72 | |
| 73 | 73 | /** |
@@ -77,7 +77,7 @@ discard block |
||
| 77 | 77 | */ |
| 78 | 78 | public function user() |
| 79 | 79 | { |
| 80 | - if (! is_null($this->user)) { |
|
| 80 | + if (!is_null($this->user)) { |
|
| 81 | 81 | return $this->user; |
| 82 | 82 | } |
| 83 | 83 | } |
@@ -72,7 +72,7 @@ |
||
| 72 | 72 | $destination = $request->session() |
| 73 | 73 | ->get('oauthIntendedUrl'); |
| 74 | 74 | // If there is no intended destination url, use the default |
| 75 | - if (! $destination) { |
|
| 75 | + if (!$destination) { |
|
| 76 | 76 | $destination = config('enterpriseauth.redirect_on_login'); |
| 77 | 77 | } |
| 78 | 78 | \Illuminate\Support\Facades\Log::info('AUTH success USER ID '.$user->id.' with redirect url '.$destination); |
@@ -39,8 +39,8 @@ discard block |
||
| 39 | 39 | public function buildAuthUrl() |
| 40 | 40 | { |
| 41 | 41 | $url = $this->azureActiveDirectory->authorizationEndpoint |
| 42 | - .'?' |
|
| 43 | - .$this->buildAuthUrlQueryString(); |
|
| 42 | + .'?' |
|
| 43 | + .$this->buildAuthUrlQueryString(); |
|
| 44 | 44 | |
| 45 | 45 | return $url; |
| 46 | 46 | } |
@@ -70,7 +70,7 @@ discard block |
||
| 70 | 70 | |
| 71 | 71 | // Check to see if there is an intended destination url saved |
| 72 | 72 | $destination = $request->session() |
| 73 | - ->get('oauthIntendedUrl'); |
|
| 73 | + ->get('oauthIntendedUrl'); |
|
| 74 | 74 | // If there is no intended destination url, use the default |
| 75 | 75 | if (! $destination) { |
| 76 | 76 | $destination = config('enterpriseauth.redirect_on_login'); |
@@ -96,7 +96,7 @@ discard block |
||
| 96 | 96 | 'client_secret' => env('AZURE_AD_CLIENT_SECRET'), |
| 97 | 97 | 'redirect_uri' => ENV('AZURE_AD_CALLBACK_URL'), |
| 98 | 98 | 'grant_type' => 'authorization_code', |
| 99 | - ], |
|
| 99 | + ], |
|
| 100 | 100 | ]; |
| 101 | 101 | $response = $guzzle->post($url, $parameters); |
| 102 | 102 | $responseObject = json_decode($response->getBody()); |