add dedicated auth/callback add dashboard auth

app.py

@@ -1,4 +1,4 @@
-from flask import Flask, render_template, request, send_file, jsonify, Response
+from flask import Flask, render_template, request, send_file, jsonify, Response, redirect, url_for
 import os
 import json
 import logging
@@ -68,6 +68,26 @@ def auth():
             return render_template('auth.html', auth_url=auth_url, auth_result=result)
     return render_template('auth.html', auth_url=auth_url)
 
+@app.route('/auth/callback', methods=['GET'])
+def auth_callback():
+    redirected_url = request.url
+    result = CALLBACK_MANAGER.handle_callback(redirected_url)
+    if "Authentication successful" in result:
+        return redirect(url_for('dashboard'))
+    return render_template('auth.html', auth_url=CALLBACK_MANAGER.get_auth_url(), auth_result=result)
+
+@app.route('/dashboard', methods=['GET'])
+def dashboard():
+    if not CALLBACK_MANAGER.access_token:
+        return render_template('auth.html', auth_url=CALLBACK_MANAGER.get_auth_url(), auth_result="<span style='color:#FF8C00;'>Please authenticate first.</span>")
+    
+    data = CALLBACK_MANAGER.get_patient_data()
+    if data.startswith('<span'):
+        return render_template('dashboard.html', error=data)
+    patients_data = json.loads(data)
+    patients = [entry['resource'] for entry in patients_data.get('entry', []) if entry['resource'].get('resourceType') == 'Patient']
+    return render_template('dashboard.html', patients=patients, authenticated=True)
+
 @app.route('/auth/patient-data', methods=['GET'])
 def patient_data():
     data = CALLBACK_MANAGER.get_patient_data()
@@ -79,14 +99,14 @@ def generate_meldrx_pdf():
     pdf_path = generate_pdf_from_meldrx(patient_data)
     return send_file(pdf_path, as_attachment=True, download_name="meldrx_patient_data.pdf")
 
-@app.route('/dashboard', methods=['GET'])
-def dashboard():
-    data = CALLBACK_MANAGER.get_patient_data()
-    if data.startswith('<span'):  # Indicates an error or unauthenticated state
-        return render_template('dashboard.html', error=data)
-    patients_data = json.loads(data)
-    patients = [entry['resource'] for entry in patients_data.get('entry', []) if entry['resource'].get('resourceType') == 'Patient']
-    return render_template('dashboard.html', patients=patients, authenticated=True)
+# @app.route('/dashboard', methods=['GET'])
+# def dashboard():
+#     data = CALLBACK_MANAGER.get_patient_data()
+#     if data.startswith('<span'):  # Indicates an error or unauthenticated state
+#         return render_template('dashboard.html', error=data)
+#     patients_data = json.loads(data)
+#     patients = [entry['resource'] for entry in patients_data.get('entry', []) if entry['resource'].get('resourceType') == 'Patient']
+#     return render_template('dashboard.html', patients=patients, authenticated=True)
 
 @app.route('/form', methods=['GET', 'POST'])
 def discharge_form():

utils/callbackmanager.py

@@ -25,17 +25,23 @@ class CallbackManager:
         self.api = MeldRxAPI(client_id, client_secret, workspace_id, redirect_uri)
         self.auth_code = None
         self.access_token = None
+        # Load token from file if it exists
+        token_path = '/tmp/access_token.txt'
+        if os.path.exists(token_path):
+            with open(token_path, 'r') as f:
+                self.access_token = f.read().strip()
+            self.api.access_token = self.access_token
 
     def handle_callback(self, callback_url: str) -> str:
-        """Handles the callback URL and extracts the code automatically."""
         self.auth_code = extract_code_from_url(callback_url)
         if not self.auth_code:
             return "No authentication code found in URL."
-
         if self.api.authenticate_with_code(self.auth_code):
             self.access_token = self.api.access_token
+            with open('/tmp/access_token.txt', 'w') as f:
+                f.write(self.access_token)
             return f"Authentication successful! Access Token: {self.access_token[:10]}... (truncated)"
-        return "Authentication failed. Please check the authorization code."
+    return "Authentication failed. Please check the authorization code."
 
     def get_auth_url(self) -> str:
         return self.api.get_authorization_url()