Replace oauth2client with google-auth and google-auth-oauthlib in google-calendar integration

Author: PraveenNPatil07

Diff for: zulip/integrations/google/google-calendar

@@ -14,8 +14,8 @@ from typing import List, Optional, Set, Tuple
 import dateutil.parser
 import httplib2
 import pytz
-from oauth2client import client
-from oauth2client.file import Storage
+from google.oauth2.credentials import Credentials
+from google_auth_oauthlib.flow import InstalledAppFlow
 
 try:
     from googleapiclient import discovery
@@ -88,7 +88,7 @@ if not options.zulip_email:
 zulip_client = zulip.init_from_options(options)
 
 
-def get_credentials() -> client.Credentials:
+def get_credentials() -> Credentials:
     """Gets valid user credentials from storage.
 
     If nothing has been stored, or if the stored credentials are invalid,
@@ -101,9 +101,19 @@ def get_credentials() -> client.Credentials:
     try:
         credential_path = os.path.join(HOME_DIR, "google-credentials.json")
 
-        store = Storage(credential_path)
-        return store.get()
-    except client.Error:
+        if os.path.exists(credential_path):
+            # Load credentials from the file
+            credentials = Credentials.from_authorized_user_file(credential_path, SCOPES)
+        else:
+            # Run the OAuth flow to get new credentials
+            flow = InstalledAppFlow.from_client_secrets_file(CLIENT_SECRET_FILE, SCOPES)
+            credentials = flow.run_local_server(port=0)
+            # Save the credentials for the next run
+            with open(credential_path, "w") as token:
+                token.write(credentials.to_json())
+
+        return credentials
+    except FileNotFoundError:
         logging.exception("Error while trying to open the `google-credentials.json` file.")
         sys.exit(1)
     except OSError:
@@ -113,8 +123,7 @@ def get_credentials() -> client.Credentials:
 
 def populate_events() -> Optional[None]:
     credentials = get_credentials()
-    creds = credentials.authorize(httplib2.Http())
-    service = discovery.build("calendar", "v3", http=creds)
+    service = discovery.build("calendar", "v3", credentials=credentials)
 
     now = datetime.datetime.now(pytz.utc).isoformat()
     feed = (

Diff for: zulip/integrations/google/requirements.txt

@@ -1,2 +1,4 @@
 httplib2>=0.22.0
-oauth2client>=4.1.3
+google-auth>=2.0.0
+google-auth-oauthlib>=0.4.6
+google-api-python-client>=2.0.0

Diff for: zulip_bots/zulip_bots/bots/google_search/google_search.py

@@ -18,7 +18,7 @@ def google_search(keywords: str) -> List[Dict[str, str]]:
     # Gets all search URLs
     search = soup.find(id="search")
     assert isinstance(search, Tag)
-    anchors = search.findAll("a")
+    anchors = search.find_all("a")
     results = []
 
     for a in anchors:

Diff for: zulip_bots/zulip_bots/bots/twitpost/twitpost.py

@@ -23,7 +23,7 @@ def usage(self) -> str:
 
     def initialize(self, bot_handler: AbstractBotHandler) -> None:
         self.config_info = bot_handler.get_config_info("twitter")
-        auth = tweepy.OAuthHandler(
+        auth = tweepy.OAuth1UserHandler(
             self.config_info["consumer_key"], self.config_info["consumer_secret"]
         )
         auth.set_access_token(