update main.yml & check.yml with OAuth

.github/workflows/check.yml

@@ -124,20 +124,27 @@ jobs:
           cat > upload_to_drive.py << 'EOF'
           import os
           import json
-          from google.oauth2 import service_account
+          from google.oauth2.credentials import Credentials
+          from google.auth.transport.requests import Request
           from googleapiclient.discovery import build
           from googleapiclient.http import MediaFileUpload
           import mimetypes
 
-          # Load credentials from environment
-          credentials_json = os.environ['GOOGLE_CREDENTIALS']
-          credentials_info = json.loads(credentials_json)
-          credentials = service_account.Credentials.from_service_account_info(credentials_info)
+          # Load OAuth credentials from environment
+          oauth_token_json = os.environ['GOOGLE_OAUTH_TOKEN']
+          token_info = json.loads(oauth_token_json)
+
+          # Create credentials from the token info
+          credentials = Credentials.from_authorized_user_info(token_info)
+
+          # Refresh the token if needed
+          if credentials.expired and credentials.refresh_token:
+              credentials.refresh(Request())
 
           # Build the Drive service
           service = build('drive', 'v3', credentials=credentials)
 
-          # Target folder ID - IMPORTANT: This must be the shared folder ID
+          # Target folder ID - This is where files will be uploaded
           FOLDER_ID = '1-8HJcWxsUUQIj9OMXQeoeULS06RA9Hg9'
 
           def get_mime_type(file_path):
@@ -163,10 +170,10 @@ jobs:
                   ).execute()
                   print(f'Updated: {file_name} (ID: {updated_file.get("id")})')
               else:
-                  # Create new file - CRITICAL: Must specify parent folder
+                  # Create new file
                   file_metadata = {
                       'name': file_name,
-                      'parents': [parent_folder_id]  # This line is crucial!
+                      'parents': [parent_folder_id]
                   }
                   file = drive_service.files().create(
                       body=file_metadata,
@@ -243,8 +250,7 @@ jobs:
               test_results = service.files().list(q=test_query, pageSize=1).execute()
               print(f"Successfully accessed folder. Found {len(test_results.get('files', []))} items (showing 1 max)")
           except Exception as e:
-              print(f"ERROR: Cannot access folder {FOLDER_ID}. Make sure the service account has Editor access to this folder.")
-              print(f"Service account email should be in the folder sharing settings.")
+              print(f"ERROR: Cannot access folder {FOLDER_ID}. Error: {e}")
               exit(1)
 
           # Upload all files to Google Drive (excluding MD files)
@@ -254,4 +260,5 @@ jobs:
           print("Upload completed - MD files were skipped, PDFs were uploaded!")
           EOF
           
-          python upload_to_drive.py
+          python upload_to_drive.py
+          

.github/workflows/main.yml

@@ -113,20 +113,27 @@ jobs:
           cat > upload_to_drive.py << 'EOF'
           import os
           import json
-          from google.oauth2 import service_account
+          from google.oauth2.credentials import Credentials
+          from google.auth.transport.requests import Request
           from googleapiclient.discovery import build
           from googleapiclient.http import MediaFileUpload
           import mimetypes
 
-          # Load credentials from environment
-          credentials_json = os.environ['GOOGLE_CREDENTIALS']
-          credentials_info = json.loads(credentials_json)
-          credentials = service_account.Credentials.from_service_account_info(credentials_info)
+          # Load OAuth credentials from environment
+          oauth_token_json = os.environ['GOOGLE_OAUTH_TOKEN']
+          token_info = json.loads(oauth_token_json)
+
+          # Create credentials from the token info
+          credentials = Credentials.from_authorized_user_info(token_info)
+
+          # Refresh the token if needed
+          if credentials.expired and credentials.refresh_token:
+              credentials.refresh(Request())
 
           # Build the Drive service
           service = build('drive', 'v3', credentials=credentials)
 
-          # Target folder ID - IMPORTANT: This must be the shared folder ID
+          # Target folder ID - This is where files will be uploaded
           FOLDER_ID = '1-8HJcWxsUUQIj9OMXQeoeULS06RA9Hg9'
 
           def get_mime_type(file_path):
@@ -152,10 +159,10 @@ jobs:
                   ).execute()
                   print(f'Updated: {file_name} (ID: {updated_file.get("id")})')
               else:
-                  # Create new file - CRITICAL: Must specify parent folder
+                  # Create new file
                   file_metadata = {
                       'name': file_name,
-                      'parents': [parent_folder_id]  # This line is crucial!
+                      'parents': [parent_folder_id]
                   }
                   file = drive_service.files().create(
                       body=file_metadata,
@@ -232,8 +239,7 @@ jobs:
               test_results = service.files().list(q=test_query, pageSize=1).execute()
               print(f"Successfully accessed folder. Found {len(test_results.get('files', []))} items (showing 1 max)")
           except Exception as e:
-              print(f"ERROR: Cannot access folder {FOLDER_ID}. Make sure the service account has Editor access to this folder.")
-              print(f"Service account email should be in the folder sharing settings.")
+              print(f"ERROR: Cannot access folder {FOLDER_ID}. Error: {e}")
               exit(1)
 
           # Upload all files to Google Drive (excluding MD files)