Merge pull request #7 from rootinc/rename-config-constants

Rename Config Constants

Author: danieltjewett

README.md

@@ -12,7 +12,7 @@ Route::get('/login/azurecallback', '\RootInc\LaravelAzureMiddleware\Azure@azurec
 ```
 
 3. In our `App\Http\Kernel.php` add `'azure' => \RootInc\LaravelAzureMiddleware\Azure::class,` most likely to the `$routeMiddleware` array.
-4. In our `.env` add `TENANT_ID, CLIENT_ID, CLIENT_SECRET and RESOURCE`.  We can get these values/read more here: https://portal.azure.com/
+4. In our `.env` add `AZURE_TENANT_ID, AZURE_CLIENT_ID, AZURE_CLIENT_SECRET and AZURE_RESOURCE`.  We can get these values/read more here: https://portal.azure.com/
 5. Within our app on https://portal.azure.com/ point `reply url` to the `/login/azurecallback` route with the full url (ex: http://thewebsite.com/login/azurecallback).
 6. Add the `azure` middleware to your route groups on any routes that needs protected by auth and enjoy :tada:
 7. If you need custom callbacks, see [Extended Installation](#extended-installation).

src/Azure.php

@@ -42,11 +42,11 @@ public function handle($request, Closure $next)
         $client = new Client();
 
         try {
-            $response = $client->request('POST', $this->baseUrl . env('TENANT_ID') . $this->route . "token", [
+            $response = $client->request('POST', $this->baseUrl . env('AZURE_TENANT_ID') . $this->route . "token", [
                 'form_params' => [
                     'grant_type' => 'refresh_token',
-                    'client_id' => env('CLIENT_ID'),
-                    'client_secret' => env('CLIENT_SECRET'),
+                    'client_id' => env('AZURE_CLIENT_ID'),
+                    'client_secret' => env('AZURE_CLIENT_SECRET'),
                     'refresh_token' => $refresh_token
                 ]
             ]);
@@ -64,7 +64,7 @@ public function handle($request, Closure $next)
 
     public function azure(Request $request)
     {
-        return redirect()->away( $this->baseUrl . env('TENANT_ID') . $this->route . "authorize?response_type=code&client_id=" . env('CLIENT_ID') . "&resource=" . urlencode(env('RESOURCE')) );
+        return redirect()->away( $this->baseUrl . env('AZURE_TENANT_ID') . $this->route . "authorize?response_type=code&client_id=" . env('AZURE_CLIENT_ID') . "&resource=" . urlencode(env('AZURE_RESOURCE')) );
     }
 
     public function azurecallback(Request $request)
@@ -74,11 +74,11 @@ public function azurecallback(Request $request)
         $code = $request->input('code');
 
         try {
-            $response = $client->request('POST', $this->baseUrl . env('TENANT_ID') . $this->route . "token", [
+            $response = $client->request('POST', $this->baseUrl . env('AZURE_TENANT_ID') . $this->route . "token", [
                 'form_params' => [
                     'grant_type' => 'authorization_code',
-                    'client_id' => env('CLIENT_ID'),
-                    'client_secret' => env('CLIENT_SECRET'),
+                    'client_id' => env('AZURE_CLIENT_ID'),
+                    'client_secret' => env('AZURE_CLIENT_SECRET'),
                     'code' => $code
                 ]
             ]);