Merge pull request #21 from jasonjoh/refactor

Refactor

Author: jasonjoh

.env.example

@@ -34,7 +34,7 @@ PUSHER_APP_SECRET=
 OAUTH_APP_ID=YOUR_APP_ID_HERE
 OAUTH_APP_PASSWORD=YOUR_APP_PASSWORD_HERE
 OAUTH_REDIRECT_URI=http://localhost:8000/authorize
-OAUTH_SCOPES='openid profile offline_access User.Read Mail.Read'
+OAUTH_SCOPES='openid profile offline_access User.Read Mail.Read Calendars.Read Contacts.Read'
 OAUTH_AUTHORITY=https://login.microsoftonline.com/common
 OAUTH_AUTHORIZE_ENDPOINT=/oauth2/v2.0/authorize
 OAUTH_TOKEN_ENDPOINT=/oauth2/v2.0/token

app/Http/Controllers/AuthController.php

@@ -27,7 +27,6 @@ public function signin()
     $authorizationUrl = $oauthClient->getAuthorizationUrl();
 
     // Save client state so we can validate in response
-    \Log::info('State for auth request: '.$oauthClient->getState());
     $_SESSION['oauth_state'] = $oauthClient->getState();
 
     // Redirect to authorization endpoint

app/Http/Controllers/OutlookController.php

@@ -34,13 +34,11 @@ public function mail()
 
     $getMessagesUrl = '/me/mailfolders/inbox/messages?'.http_build_query($messageQueryParams);
     $messages = $graph->createRequest('GET', $getMessagesUrl)
-                      ->addHeaders(array ('X-AnchorMailbox' => $user->getMail()))
                       ->setReturnType(Model\Message::class)
                       ->execute();
 
     return view('mail', array(
       'username' => $user->getDisplayName(),
-      'usermail' => $user->getMail(),
       'messages' => $messages
     ));
   }
@@ -71,13 +69,11 @@ public function calendar()
 
     $getEventsUrl = '/me/events?'.http_build_query($eventsQueryParams);
     $events = $graph->createRequest('GET', $getEventsUrl)
-                    ->addHeaders(array ('X-AnchorMailbox' => $user->getMail()))
                     ->setReturnType(Model\Event::class)
                     ->execute();
 
     return view('calendar', array(
       'username' => $user->getDisplayName(),
-      'usermail' => $user->getMail(),
       'events' => $events
     ));
   }
@@ -108,13 +104,11 @@ public function contacts()
 
     $getContactsUrl = '/me/contacts?'.http_build_query($contactsQueryParams);
     $contacts = $graph->createRequest('GET', $getContactsUrl)
-                      ->addHeaders(array ('X-AnchorMailbox' => $user->getMail()))
                       ->setReturnType(Model\Contact::class)
                       ->execute();
 
     return view('contacts', array(
       'username' => $user->getDisplayName(),
-      'usermail' => $user->getMail(),
       'contacts' => $contacts
     ));
   }

composer.json

@@ -9,7 +9,7 @@
         "laravel/framework": "5.4.*",
         "laravel/tinker": "~1.0",
         "league/oauth2-client": "^2.0",
-        "microsoft/microsoft-graph": "1.0.*"
+        "microsoft/microsoft-graph": "^1.0"
     },
     "require-dev": {
         "fzaninotto/faker": "~1.4",

resources/views/contacts.blade.php

@@ -13,7 +13,7 @@
       foreach($contacts as $contact) { ?>
     <div class="list-group-item">
       <h3 class="list-group-item-heading"><?php echo $contact->getGivenName().' '.$contact->getSurname() ?></h3>
-      <p class="list-group-item-heading"><?php echo $contact->getEmailAddresses()[0]['address']?></p>
+      <p class="list-group-item-heading"><?php if ($contact->getEmailAddresses()) echo $contact->getEmailAddresses()[0]['address']?></p>
     </div>
     <?php  }
     } ?>