Spaces:

euler314
/

Purchase_record

Sleeping

App Files Files Community

euler314 commited on Feb 8

Commit

6bed1e4

verified ·

1 Parent(s): 0718aa4

Update app.py

Browse files

Files changed (1) hide show

app.py +14 -72

app.py CHANGED Viewed

@@ -1,34 +1,26 @@
-from flask import Flask, request, jsonify, render_template_string, redirect, session
-from google_auth_oauthlib.flow import Flow
-from google.oauth2.credentials import Credentials
 from googleapiclient.discovery import build
 from googleapiclient.http import MediaIoBaseUpload
 import os
 import io
 import datetime
 app = Flask(__name__)
-app.secret_key = os.environ.get('FLASK_SECRET_KEY')
 SPREADSHEET_ID = '1rcIJflbC1VIc70F6dnASLFvGQ90TXHhCx0iyxsXR7Ww'
 FOLDER_ID = '1brmLNqOMCvRS0TDY6ECHvIBmlRx8pcPz'
-# OAuth 2.0 configuration
-CLIENT_CONFIG = {
-    "web": {
-        "client_id": os.environ.get('GOOGLE_CLIENT_ID'),
-        "client_secret": os.environ.get('GOOGLE_CLIENT_SECRET'),
-        "auth_uri": "https://accounts.google.com/o/oauth2/auth",
-        "token_uri": "https://oauth2.googleapis.com/token",
-        "redirect_uris": ["https://euler314-purchase-record.hf.space/oauth2callback"]
-    }
-}
-SCOPES = [
-    'https://www.googleapis.com/auth/spreadsheets',
-    'https://www.googleapis.com/auth/drive.file'
-]
 HTML_TEMPLATE = '''
 <!DOCTYPE html>
@@ -158,59 +150,10 @@ HTML_TEMPLATE = '''
 @app.route('/')
 def index():
-    if 'credentials' not in session:
-        return redirect('/login')
     return render_template_string(HTML_TEMPLATE)
-@app.route('/login')
-def login():
-    flow = Flow.from_client_config(
-        CLIENT_CONFIG,
-        scopes=SCOPES,
-        redirect_uri=CLIENT_CONFIG['web']['redirect_uris'][0]
-    )
-    authorization_url, state = flow.authorization_url(
-        access_type='offline',
-        include_granted_scopes='true'
-    )
-    session['state'] = state
-    return redirect(authorization_url)
-@app.route('/oauth2callback')
-def oauth2callback():
-    flow = Flow.from_client_config(
-        CLIENT_CONFIG,
-        scopes=SCOPES,
-        state=session['state'],
-        redirect_uri=CLIENT_CONFIG['web']['redirect_uris'][0]
-    )
-    authorization_response = request.url
-    flow.fetch_token(authorization_response=authorization_response)
-    credentials = flow.credentials
-    session['credentials'] = {
-        'token': credentials.token,
-        'refresh_token': credentials.refresh_token,
-        'token_uri': credentials.token_uri,
-        'client_id': credentials.client_id,
-        'client_secret': credentials.client_secret,
-        'scopes': credentials.scopes
-    }
-    return redirect('/')
-def get_credentials():
-    if 'credentials' not in session:
-        return None
-    return Credentials(**session['credentials'])
 @app.route('/submit', methods=['POST'])
 def submit():
-    credentials = get_credentials()
-    if not credentials:
-        return jsonify({'success': False, 'message': 'Authentication required'})
     try:
         name = request.form['name']
         student_id = request.form['studentId']
@@ -219,7 +162,7 @@ def submit():
         file = request.files['receipt']
         # Upload file to Drive
-        drive_service = build('drive', 'v3', credentials=credentials)
         file_metadata = {
             'name': f"{student_id}_{datetime.datetime.now().strftime('%Y%m%d_%H%M%S')}_{file.filename}",
@@ -241,7 +184,7 @@ def submit():
         file_url = uploaded_file.get('webViewLink', '')
         # Update Google Sheet
-        sheets_service = build('sheets', 'v4', credentials=credentials)
         timestamp = datetime.datetime.now().strftime('%Y-%m-%d %H:%M:%S')
         ip_address = request.remote_addr
@@ -262,5 +205,4 @@ def submit():
         return jsonify({'success': False, 'message': f'Error: {str(e)}'})
 if __name__ == '__main__':
-    os.environ['OAUTHLIB_INSECURE_TRANSPORT'] = '1'
     app.run(host='0.0.0.0', port=7860)

+from flask import Flask, request, jsonify, render_template_string
+from google.oauth2.service_account import Credentials
 from googleapiclient.discovery import build
 from googleapiclient.http import MediaIoBaseUpload
 import os
 import io
 import datetime
+import json
 app = Flask(__name__)
 SPREADSHEET_ID = '1rcIJflbC1VIc70F6dnASLFvGQ90TXHhCx0iyxsXR7Ww'
 FOLDER_ID = '1brmLNqOMCvRS0TDY6ECHvIBmlRx8pcPz'
+# Create service account credentials from environment variable
+CREDS_JSON = os.environ.get('GOOGLE_CREDENTIALS')
+if CREDS_JSON:
+    CREDS_INFO = json.loads(CREDS_JSON)
+    CREDENTIALS = Credentials.from_service_account_info(
+        CREDS_INFO,
+        scopes=['https://www.googleapis.com/auth/spreadsheets',
+                'https://www.googleapis.com/auth/drive.file']
+    )
 HTML_TEMPLATE = '''
 <!DOCTYPE html>
 @app.route('/')
 def index():
     return render_template_string(HTML_TEMPLATE)
 @app.route('/submit', methods=['POST'])
 def submit():
     try:
         name = request.form['name']
         student_id = request.form['studentId']
         file = request.files['receipt']
         # Upload file to Drive
+        drive_service = build('drive', 'v3', credentials=CREDENTIALS)
         file_metadata = {
             'name': f"{student_id}_{datetime.datetime.now().strftime('%Y%m%d_%H%M%S')}_{file.filename}",
         file_url = uploaded_file.get('webViewLink', '')
         # Update Google Sheet
+        sheets_service = build('sheets', 'v4', credentials=CREDENTIALS)
         timestamp = datetime.datetime.now().strftime('%Y-%m-%d %H:%M:%S')
         ip_address = request.remote_addr
         return jsonify({'success': False, 'message': f'Error: {str(e)}'})
 if __name__ == '__main__':
     app.run(host='0.0.0.0', port=7860)