Merge pull request googleworkspace#60 from slokhorst/update-auth

[WIP] Switch sheets/quickstart to from oauth2client to google-auth

Author: Eric Koleda

admin_sdk/directory/README.md

@@ -8,7 +8,7 @@ Directory API.
 ## Install
 
 ```
-pip install --upgrade google-api-python-client oauth2client
+pip install --upgrade google-api-python-client google-auth-httplib2 google-auth-oauthlib pickle
 ```
 
 ## Run

admin_sdk/directory/quickstart.py

@@ -14,26 +14,39 @@
 
 # [START admin_sdk_directory_quickstart]
 from __future__ import print_function
+import pickle
+import os.path
 from googleapiclient.discovery import build
-from httplib2 import Http
-from oauth2client import file, client, tools
+from google_auth_oauthlib.flow import InstalledAppFlow
+from google.auth.transport.requests import Request
 
-# If modifying these scopes, delete the file token.json.
+# If modifying these scopes, delete the file token.pickle.
 SCOPES = 'https://www.googleapis.com/auth/admin.directory.user'
 
 def main():
     """Shows basic usage of the Admin SDK Directory API.
     Prints the emails and names of the first 10 users in the domain.
     """
-    # The file token.json stores the user's access and refresh tokens, and is
+    creds = None
+    # The file token.pickle stores the user's access and refresh tokens, and is
     # created automatically when the authorization flow completes for the first
     # time.
-    store = file.Storage('token.json')
-    creds = store.get()
-    if not creds or creds.invalid:
-        flow = client.flow_from_clientsecrets('credentials.json', SCOPES)
-        creds = tools.run_flow(flow, store)
-    service = build('admin', 'directory_v1', http=creds.authorize(Http()))
+    if os.path.exists('token.pickle'):
+        with open('token.pickle', 'rb') as token:
+            creds = pickle.load(token)
+    # If there are no (valid) credentials available, let the user log in.
+    if not creds or not creds.valid:
+        if creds and creds.expired and creds.refresh_token:
+            creds.refresh(Request())
+        else:
+            flow = InstalledAppFlow.from_client_secrets_file(
+                'credentials.json', SCOPES)
+            creds = flow.run_local_server()
+        # Save the credentials for the next run
+        with open('token.pickle', 'wb') as token:
+            pickle.dump(creds, token)
+
+    service = build('admin', 'directory_v1', credentials=creds)
 
     # Call the Admin SDK Directory API
     print('Getting the first 10 users in the domain')

admin_sdk/reports/README.md

@@ -8,7 +8,7 @@ that makes requests to the Google Admin SDK Reports API.
 ## Install
 
 ```
-pip install --upgrade google-api-python-client oauth2client
+pip install --upgrade google-api-python-client google-auth-httplib2 google-auth-oauthlib pickle
 ```
 
 ## Run

admin_sdk/reports/quickstart.py

@@ -14,26 +14,39 @@
 
 # [START admin_sdk_reports_quickstart]
 from __future__ import print_function
+import pickle
+import os.path
 from googleapiclient.discovery import build
-from httplib2 import Http
-from oauth2client import file, client, tools
+from google_auth_oauthlib.flow import InstalledAppFlow
+from google.auth.transport.requests import Request
 
-# If modifying these scopes, delete the file token.json.
+# If modifying these scopes, delete the file token.pickle.
 SCOPES = 'https://www.googleapis.com/auth/admin.reports.audit.readonly'
 
 def main():
     """Shows basic usage of the Admin SDK Reports API.
     Prints the time, email, and name of the last 10 login events in the domain.
     """
-    # The file token.json stores the user's access and refresh tokens, and is
+    creds = None
+    # The file token.pickle stores the user's access and refresh tokens, and is
     # created automatically when the authorization flow completes for the first
     # time.
-    store = file.Storage('token.json')
-    creds = store.get()
-    if not creds or creds.invalid:
-        flow = client.flow_from_clientsecrets('credentials.json', SCOPES)
-        creds = tools.run_flow(flow, store)
-    service = build('admin', 'reports_v1', http=creds.authorize(Http()))
+    if os.path.exists('token.pickle'):
+        with open('token.pickle', 'rb') as token:
+            creds = pickle.load(token)
+    # If there are no (valid) credentials available, let the user log in.
+    if not creds or not creds.valid:
+        if creds and creds.expired and creds.refresh_token:
+            creds.refresh(Request())
+        else:
+            flow = InstalledAppFlow.from_client_secrets_file(
+                'credentials.json', SCOPES)
+            creds = flow.run_local_server()
+        # Save the credentials for the next run
+        with open('token.pickle', 'wb') as token:
+            pickle.dump(creds, token)
+
+    service = build('admin', 'reports_v1', credentials=creds)
 
     # Call the Admin SDK Reports API
     print('Getting the last 10 login events')

admin_sdk/reseller/README.md

@@ -8,7 +8,7 @@ that makes requests to the Google Admin SDK Reseller API.
 ## Install
 
 ```
-pip install --upgrade google-api-python-client oauth2client
+pip install --upgrade google-api-python-client google-auth-httplib2 google-auth-oauthlib pickle
 ```
 
 ## Run

admin_sdk/reseller/quickstart.py

@@ -14,26 +14,39 @@
 
 # [START admin_sdk_reseller_quickstart]
 from __future__ import print_function
+import pickle
+import os.path
 from googleapiclient.discovery import build
-from httplib2 import Http
-from oauth2client import file, client, tools
+from google_auth_oauthlib.flow import InstalledAppFlow
+from google.auth.transport.requests import Request
 
-# If modifying these scopes, delete the file token.json.
+# If modifying these scopes, delete the file token.pickle.
 SCOPES = 'https://www.googleapis.com/auth/apps.order'
 
 def main():
     """Calls the Admin SDK Reseller API. Prints the customer ID, SKU ID,
     and plan name of the first 10 subscriptions managed by the domain.
     """
-    # The file token.json stores the user's access and refresh tokens, and is
+    creds = None
+    # The file token.pickle stores the user's access and refresh tokens, and is
     # created automatically when the authorization flow completes for the first
     # time.
-    store = file.Storage('token.json')
-    creds = store.get()
-    if not creds or creds.invalid:
-        flow = client.flow_from_clientsecrets('credentials.json', SCOPES)
-        creds = tools.run_flow(flow, store)
-    service = build('reseller', 'v1', http=creds.authorize(Http()))
+    if os.path.exists('token.pickle'):
+        with open('token.pickle', 'rb') as token:
+            creds = pickle.load(token)
+    # If there are no (valid) credentials available, let the user log in.
+    if not creds or not creds.valid:
+        if creds and creds.expired and creds.refresh_token:
+            creds.refresh(Request())
+        else:
+            flow = InstalledAppFlow.from_client_secrets_file(
+                'credentials.json', SCOPES)
+            creds = flow.run_local_server()
+        # Save the credentials for the next run
+        with open('token.pickle', 'wb') as token:
+            pickle.dump(creds, token)
+
+    service = build('reseller', 'v1', credentials=creds)
 
     # Call the Admin SDK Reseller API
     print('Getting the first 10 subscriptions')

apps_script/quickstart/README.md

@@ -8,7 +8,7 @@ that makes requests to the Google Apps Script API.
 ## Install
 
 ```
-pip install --upgrade google-api-python-client oauth2client
+pip install --upgrade google-api-python-client google-auth-httplib2 google-auth-oauthlib pickle
 ```
 
 ## Run

apps_script/quickstart/quickstart.py

@@ -19,12 +19,14 @@
 project, and log the script's URL to the user.
 """
 from __future__ import print_function
+import pickle
+import os.path
 from googleapiclient import errors
 from googleapiclient.discovery import build
-from httplib2 import Http
-from oauth2client import file, client, tools
+from google_auth_oauthlib.flow import InstalledAppFlow
+from google.auth.transport.requests import Request
 
-# If modifying these scopes, delete the file token.json.
+# If modifying these scopes, delete the file token.pickle.
 SCOPES = 'https://www.googleapis.com/auth/script.projects'
 
 SAMPLE_CODE = '''
@@ -43,15 +45,26 @@
 def main():
     """Calls the Apps Script API.
     """
-    # The file token.json stores the user's access and refresh tokens, and is
+    creds = None
+    # The file token.pickle stores the user's access and refresh tokens, and is
     # created automatically when the authorization flow completes for the first
     # time.
-    store = file.Storage('token.json')
-    creds = store.get()
-    if not creds or creds.invalid:
-        flow = client.flow_from_clientsecrets('credentials.json', SCOPES)
-        creds = tools.run_flow(flow, store)
-    service = build('script', 'v1', http=creds.authorize(Http()))
+    if os.path.exists('token.pickle'):
+        with open('token.pickle', 'rb') as token:
+            creds = pickle.load(token)
+    # If there are no (valid) credentials available, let the user log in.
+    if not creds or not creds.valid:
+        if creds and creds.expired and creds.refresh_token:
+            creds.refresh(Request())
+        else:
+            flow = InstalledAppFlow.from_client_secrets_file(
+                'credentials.json', SCOPES)
+            creds = flow.run_local_server()
+        # Save the credentials for the next run
+        with open('token.pickle', 'wb') as token:
+            pickle.dump(creds, token)
+
+    service = build('script', 'v1', credentials=creds)
 
     # Call the Apps Script API
     try:

calendar/quickstart/README.md

@@ -8,7 +8,7 @@ makes requests to the Google Calendar API.
 ## Install
 
 ```
-pip install --upgrade google-api-python-client oauth2client
+pip install --upgrade google-api-python-client google-auth-httplib2 google-auth-oauthlib pickle
 ```
 
 ## Run

calendar/quickstart/quickstart.py

@@ -15,26 +15,39 @@
 # [START calendar_quickstart]
 from __future__ import print_function
 import datetime
+import pickle
+import os.path
 from googleapiclient.discovery import build
-from httplib2 import Http
-from oauth2client import file, client, tools
+from google_auth_oauthlib.flow import InstalledAppFlow
+from google.auth.transport.requests import Request
 
-# If modifying these scopes, delete the file token.json.
+# If modifying these scopes, delete the file token.pickle.
 SCOPES = 'https://www.googleapis.com/auth/calendar.readonly'
 
 def main():
     """Shows basic usage of the Google Calendar API.
     Prints the start and name of the next 10 events on the user's calendar.
     """
-    # The file token.json stores the user's access and refresh tokens, and is
+    creds = None
+    # The file token.pickle stores the user's access and refresh tokens, and is
     # created automatically when the authorization flow completes for the first
     # time.
-    store = file.Storage('token.json')
-    creds = store.get()
-    if not creds or creds.invalid:
-        flow = client.flow_from_clientsecrets('credentials.json', SCOPES)
-        creds = tools.run_flow(flow, store)
-    service = build('calendar', 'v3', http=creds.authorize(Http()))
+    if os.path.exists('token.pickle'):
+        with open('token.pickle', 'rb') as token:
+            creds = pickle.load(token)
+    # If there are no (valid) credentials available, let the user log in.
+    if not creds or not creds.valid:
+        if creds and creds.expired and creds.refresh_token:
+            creds.refresh(Request())
+        else:
+            flow = InstalledAppFlow.from_client_secrets_file(
+                'credentials.json', SCOPES)
+            creds = flow.run_local_server()
+        # Save the credentials for the next run
+        with open('token.pickle', 'wb') as token:
+            pickle.dump(creds, token)
+
+    service = build('calendar', 'v3', credentials=creds)
 
     # Call the Calendar API
     now = datetime.datetime.utcnow().isoformat() + 'Z' # 'Z' indicates UTC time