Merge pull request #67 from microsoftgraph/sdk-update

SDK Update

Author: jasonjoh

app-auth/graphapponlytutorial/main.py

@@ -4,6 +4,7 @@
 # <ProgramSnippet>
 import asyncio
 import configparser
+from msgraph.generated.models.o_data_errors.o_data_error import ODataError
 from graph import Graph
 
 async def main():
@@ -30,16 +31,21 @@ async def main():
         except ValueError:
             choice = -1
 
-        if choice == 0:
-            print('Goodbye...')
-        elif choice == 1:
-            await display_access_token(graph)
-        elif choice == 2:
-            await list_users(graph)
-        elif choice == 3:
-            await make_graph_call(graph)
-        else:
-            print('Invalid choice!\n')
+        try:
+            if choice == 0:
+                print('Goodbye...')
+            elif choice == 1:
+                await display_access_token(graph)
+            elif choice == 2:
+                await list_users(graph)
+            elif choice == 3:
+                await make_graph_call(graph)
+            else:
+                print('Invalid choice!\n')
+        except ODataError as odata_error:
+            print('Error:')
+            if odata_error.error:
+                print(odata_error.error.code, odata_error.error.message)
 # </ProgramSnippet>
 
 # <DisplayAccessTokenSnippet>
@@ -53,7 +59,7 @@ async def list_users(graph: Graph):
     users_page = await graph.get_users()
 
     # Output each users's details
-    if users_page is not None and users_page.value is not None:
+    if users_page and users_page.value:
         for user in users_page.value:
             print('User:', user.display_name)
             print('  ID:', user.id)

app-auth/graphapponlytutorial/pylintrc

@@ -576,5 +576,5 @@ preferred-modules=
 
 # Exceptions that will emit a warning when being caught. Defaults to
 # "BaseException, Exception".
-overgeneral-exceptions=BaseException,
-                       Exception
+overgeneral-exceptions=builtins.BaseException,
+                       builtins.Exception

user-auth/graphtutorial/graph.py

@@ -72,7 +72,7 @@ async def get_inbox(self):
             query_parameters= query_params
         )
 
-        messages = await self.user_client.me.mail_folders_by_id('inbox').messages.get(
+        messages = await self.user_client.me.mail_folders.by_mail_folder_id('inbox').messages.get(
                 request_configuration=request_config)
         return messages
     # </GetInboxSnippet>

user-auth/graphtutorial/main.py

@@ -4,6 +4,7 @@
 # <ProgramSnippet>
 import asyncio
 import configparser
+from msgraph.generated.models.o_data_errors.o_data_error import ODataError
 from graph import Graph
 
 async def main():
@@ -33,24 +34,29 @@ async def main():
         except ValueError:
             choice = -1
 
-        if choice == 0:
-            print('Goodbye...')
-        elif choice == 1:
-            await display_access_token(graph)
-        elif choice == 2:
-            await list_inbox(graph)
-        elif choice == 3:
-            await send_mail(graph)
-        elif choice == 4:
-            await make_graph_call(graph)
-        else:
-            print('Invalid choice!\n')
+        try:
+            if choice == 0:
+                print('Goodbye...')
+            elif choice == 1:
+                await display_access_token(graph)
+            elif choice == 2:
+                await list_inbox(graph)
+            elif choice == 3:
+                await send_mail(graph)
+            elif choice == 4:
+                await make_graph_call(graph)
+            else:
+                print('Invalid choice!\n')
+        except ODataError as odata_error:
+            print('Error:')
+            if odata_error.error:
+                print(odata_error.error.code, odata_error.error.message)
 # </ProgramSnippet>
 
 # <GreetUserSnippet>
 async def greet_user(graph: Graph):
     user = await graph.get_user()
-    if user is not None:
+    if user:
         print('Hello,', user.display_name)
         # For Work/school accounts, email is in mail property
         # Personal accounts, email is in userPrincipalName
@@ -66,13 +72,13 @@ async def display_access_token(graph: Graph):
 # <ListInboxSnippet>
 async def list_inbox(graph: Graph):
     message_page = await graph.get_inbox()
-    if message_page is not None and message_page.value is not None:
+    if message_page and message_page.value:
         # Output each message's details
         for message in message_page.value:
             print('Message:', message.subject)
             if (
-                message.from_ is not None and
-                message.from_.email_address is not None
+                message.from_ and
+                message.from_.email_address
             ):
                 print('  From:', message.from_.email_address.name or 'NONE')
             else:
@@ -90,7 +96,7 @@ async def send_mail(graph: Graph):
     # Send mail to the signed-in user
     # Get the user for their email address
     user = await graph.get_user()
-    if user is not None:
+    if user:
         user_email = user.mail or user.user_principal_name
 
         await graph.send_mail('Testing Microsoft Graph', 'Hello world!', user_email or '')

user-auth/graphtutorial/pylintrc

@@ -576,5 +576,5 @@ preferred-modules=
 
 # Exceptions that will emit a warning when being caught. Defaults to
 # "BaseException, Exception".
-overgeneral-exceptions=BaseException,
-                       Exception
+overgeneral-exceptions=builtins.BaseException,
+                       builtins.Exception