Update app.py

app.py

@@ -15,6 +15,13 @@ REDIRECT_URI = 'https://huggingface.co/spaces/awacke1/MSGraphAPI'  # 👈 Make s
 # 🎯 Define the scopes your app will need
 SCOPES = ['User.Read', 'Calendars.ReadWrite', 'Mail.ReadWrite', 'Notes.ReadWrite.All', 'Files.ReadWrite.All']
 
+# New function to generate PKCE code verifier and challenge
+def generate_pkce_codes():
+    code_verifier = secrets.token_urlsafe(64)
+    code_challenge = base64.urlsafe_b64encode(hashlib.sha256(code_verifier.encode()).digest()).decode().rstrip('=')
+    return code_verifier, code_challenge
+
+
 # 🛠️ Initialize the MSAL client
 def get_msal_app():
     return msal.ConfidentialClientApplication(
@@ -51,10 +58,66 @@ def get_access_token(code):
         #st.stop()
 
 
+def get_access_token(code, code_verifier):
+    client_instance = get_msal_app()
+    
+    st.write("Debug: MSAL App Configuration:")
+    st.write(f"Client ID: {APPLICATION_ID_KEY[:5]}...")
+    st.write(f"Authority: {AUTHORITY_URL}")
+    st.write(f"Redirect URI: {REDIRECT_URI}")
+    
+    try:
+        result = client_instance.acquire_token_by_authorization_code(
+            code=code,
+            scopes=SCOPES,
+            redirect_uri=REDIRECT_URI,
+            code_verifier=code_verifier  # Include the code verifier here
+        )
+        
+        if 'access_token' in result:
+            return result['access_token']
+        else:
+            error_description = result.get('error_description', 'No error description provided')
+            raise Exception(f"Error acquiring token: {error_description}")
+    except Exception as e:
+        st.error(f"Exception in get_access_token: {str(e)}")
+        raise
+        
 def process_query_parms():
     # ⚙️q= Run ArXiv search from query parameters
     try:
         query_params = st.query_params
+        st.write("Debug: All query parameters:", query_params)
+
+        if 'error' in query_params:
+            error = query_params.get('error')
+            error_description = query_params.get('error_description', 'No description provided')
+            st.error(f"Authentication Error: {error}")
+            st.error(f"Error Description: {urllib.parse.unquote(error_description)}")
+            st.stop()
+
+        if 'code' in query_params:
+            code = query_params.get('code')
+            st.write('🔑 Authorization Code Obtained:', code[:10] + '...')
+            
+            try:
+                # Retrieve the code verifier from session state
+                code_verifier = st.session_state.get('code_verifier')
+                if not code_verifier:
+                    st.error("Code verifier not found in session state.")
+                    st.stop()
+                
+                access_token = get_access_token(code, code_verifier)
+                st.session_state['access_token'] = access_token
+                st.success("Access token acquired successfully!")
+                st.rerun()
+            except Exception as e:
+                st.error(f"Error acquiring access token: {str(e)}")
+                st.stop()
+        else:
+            st.warning("No authorization code found in the query parameters.")
+
+        
         query = (query_params.get('q') or query_params.get('query') or [''])
         if len(query) > 1: 
             #result = search_arxiv(query)
@@ -85,225 +148,252 @@ def process_query_parms():
 # 🏃‍♂️ Main application function
 def main():
     st.title("🦄 Simple Streamlit App with MS Graph API")
+
+
     
-    # 🚀 Sidebar navigation
-    st.sidebar.title("Navigation")
-    menu = st.sidebar.radio("Go to", [
-        "1️⃣ Dashboard with Widgets",
-        "🏠 Landing Page",
-        "📅 Upcoming Events",
-        "📆 Schedule",
-        "📝 Agenda",
-        "🔍 Event Details",
-        "➕ Add Event",
-        "🔎 Filter By"
-    ])
-    
-    # 📝 M365 Products with MS Graph Integration & AI Features
-    st.sidebar.title("📝 M365 Products")
-    st.sidebar.write("Toggle integration for each product:")
-    
-    # 🎛️ Product Integration Toggles
-    products = {
-        "📧 Outlook": {
-            "ai_capabilities": "Copilot for enhanced email writing, calendar management, and scheduling.",
-            "graph_api": "Access to mail, calendar, contacts, and events."
-        },
-        "📒 OneNote": {
-            "ai_capabilities": "Content suggestion, note organization, and OCR for extracting text from images.",
-            "graph_api": "Manage notebooks, sections, and pages."
-        },
-        "📊 Excel": {
-            "ai_capabilities": "Copilot for advanced data analysis, data insights, and formula generation.",
-            "graph_api": "Create and manage worksheets, tables, charts, and workbooks."
-        },
-        "📄 Word": {
-            "ai_capabilities": "Copilot for document drafting, summarization, and grammar improvements.",
-            "graph_api": "Document content access, templates, and file management."
-        },
-        "🗃️ SharePoint": {
-            "ai_capabilities": "Intelligent search, document tagging, and metadata extraction.",
-            "graph_api": "Access to sites, lists, files, and document libraries."
-        },
-        "📅 Teams": {
-            "ai_capabilities": "Copilot for meeting summaries, transcription, and chat suggestions.",
-            "graph_api": "Manage chats, teams, channels, and meetings."
-        },
-        "💬 Viva": {
-            "ai_capabilities": "Personalized learning insights, well-being insights, and productivity suggestions.",
-            "graph_api": "Access to user analytics and learning modules."
-        },
-        "🚀 Power Platform": {
-            "ai_capabilities": "Automation with AI Builder, data insights, and custom AI models.",
-            "graph_api": "Automation workflows, app creation, and data visualization."
-        },
-        "🧠 Copilot": {
-            "ai_capabilities": "Embedded across Word, Excel, Outlook, Teams, and more for AI-driven productivity.",
-            "graph_api": "Underpins Copilot's access to data and integrations."
-        },
-        "🗂️ OneDrive": {
-            "ai_capabilities": "Intelligent file organization and search.",
-            "graph_api": "File and folder access, sharing, and metadata."
-        },
-        "💡 PowerPoint": {
-            "ai_capabilities": "Design suggestions, presentation summarization, and speaker coaching.",
-            "graph_api": "Presentation creation, slide management, and templates."
-        },
-        "📚 Microsoft Bookings": {
-            "ai_capabilities": "Automated scheduling and reminders.",
-            "graph_api": "Booking calendars, services, and appointment details."
-        },
-        "📓 Loop": {
-            "ai_capabilities": "Real-time collaboration and content suggestions.",
-            "graph_api": "Access to shared workspaces and collaborative pages."
-        },
-        "🗣️ Translator": {
-            "ai_capabilities": "Real-time language translation and text-to-speech.",
-            "graph_api": "Integrated into communication and translation services."
-        },
-        "📋 To Do & Planner": {
-            "ai_capabilities": "Task prioritization and smart reminders.",
-            "graph_api": "Task creation, management, and synchronization."
-        },
-        "🔗 Azure OpenAI Service": {
-            "ai_capabilities": "Access to GPT models for custom AI implementations.",
-            "graph_api": "Used indirectly for building custom AI models into workflows."
-        }
-    }
-    
-    # 🗳️ Create toggles for each product
-    selected_products = {}
-    for product, info in products.items():
-        selected = st.sidebar.checkbox(product)
-        if selected:
-            st.sidebar.write(f"**AI Capabilities:** {info['ai_capabilities']}")
-            st.sidebar.write(f"**Graph API:** {info['graph_api']}")
-            selected_products[product] = True
+    process_query_params()
     
-    # 🔑 Authentication
     if 'access_token' not in st.session_state:
-        # 🕵️‍♂️ Check for authorization code in query parameters
-        query_params = st.query_params
-        query = (query_params.get('code'))
-        #if len(query) > 1: 
-        
-        #st.write('Parsing query ' + query_params )
-        if 'code' in query_params:
-            #code = query_params['code'][0]
-            code = query_params.get('code')
-            
-            st.write('🔑Access Code Obtained from MS Graph Redirect🔑!:' + code)
-            
-            st.write('🔑 Acquiring access token from redirect URL for code parameter.')
-            access_token = get_access_token(code)
-            
-            st.session_state['access_token'] = access_token  # 🔑 Save it for later
-            
-            st.rerun()  # Reload the app to clear the code from URL
+        if 'code_verifier' not in st.session_state:
+            # Generate PKCE codes
+            code_verifier, code_challenge = generate_pkce_codes()
+            st.session_state['code_verifier'] = code_verifier
         else:
-            # 📢 Prompt user to log in
-            client_instance = get_msal_app()
-            authorization_url = client_instance.get_authorization_request_url(
-                scopes=SCOPES,
-                redirect_uri=REDIRECT_URI
-            )
-            st.write('👋 Please [click here]({}) to log in and authorize the app.'.format(authorization_url))
-            st.stop()
-
-                
-    else:
-        # 🥳 User is authenticated, proceed with the app
-        access_token = st.session_state['access_token']
-        headers = {'Authorization': 'Bearer ' + access_token}
+            code_verifier = st.session_state['code_verifier']
+            code_challenge = base64.urlsafe_b64encode(hashlib.sha256(code_verifier.encode()).digest()).decode().rstrip('=')
         
-        # 🤗 Greet the user
-        response = requests.get('https://graph.microsoft.com/v1.0/me', headers=headers)
-        if response.status_code == 200:
-            user_info = response.json()
-            st.sidebar.write(f"👋 Hello, {user_info['displayName']}!")
-        else:
-            st.error('Failed to fetch user info.')
-            st.write(response.text)
-        
-        # 🎛️ Handle menu options
-        if menu == "1️⃣ Dashboard with Widgets":
-            st.header("1️⃣ Dashboard with Widgets")
-            st.write("Widgets will be displayed here. 🎛️")
-            # Add your widgets here
-        
-        elif menu == "🏠 Landing Page":
-            st.header("🏠 Landing Page")
-            st.write("Welcome to the app! 🥳")
-            # Add landing page content here
-        
-        elif menu == "📅 Upcoming Events":
-            st.header("📅 Upcoming Events")
-            events = get_upcoming_events(access_token)
-            for event in events:
-                st.write(f"📆 {event['subject']} on {event['start']['dateTime']}")
-            # Display upcoming events
-        
-        elif menu == "📆 Schedule":
-            st.header("📆 Schedule")
-            schedule = get_schedule(access_token)
-            st.write(schedule)
-            # Display schedule
+        client_instance = get_msal_app()
+        auth_url = client_instance.get_authorization_request_url(
+            scopes=SCOPES,
+            redirect_uri=REDIRECT_URI,
+            code_challenge=code_challenge,
+            code_challenge_method="S256"
+        )
+        st.write('👋 Please [click here]({}) to log in and authorize the app.'.format(auth_url))
+        st.stop()
+    else:
+
+            
         
-        elif menu == "📝 Agenda":
-            st.header("📝 Agenda")
-            st.write("Your agenda for today. 📋")
-            # Display agenda
+        # 🚀 Sidebar navigation
+        st.sidebar.title("Navigation")
+        menu = st.sidebar.radio("Go to", [
+            "1️⃣ Dashboard with Widgets",
+            "🏠 Landing Page",
+            "📅 Upcoming Events",
+            "📆 Schedule",
+            "📝 Agenda",
+            "🔍 Event Details",
+            "➕ Add Event",
+            "🔎 Filter By"
+        ])
         
-        elif menu == "🔍 Event Details":
-            st.header("🔍 Event Details")
-            event_id = st.text_input("Enter Event ID")
-            if event_id:
-                event_details = get_event_details(access_token, event_id)
-                st.write(event_details)
-            # Display event details based on ID
+        # 📝 M365 Products with MS Graph Integration & AI Features
+        st.sidebar.title("📝 M365 Products")
+        st.sidebar.write("Toggle integration for each product:")
         
-        elif menu == "➕ Add Event":
-            st.header("➕ Add Event")
-            event_subject = st.text_input("Event Subject")
-            event_start = st.date_input("Event Start Date")
-            event_start_time = st.time_input("Event Start Time")
-            event_end = st.date_input("Event End Date")
-            event_end_time = st.time_input("Event End Time")
-            if st.button("Add Event"):
-                event_details = {
-                    "subject": event_subject,
-                    "start": {
-                        "dateTime": f"{event_start}T{event_start_time}",
-                        "timeZone": "UTC"
-                    },
-                    "end": {
-                        "dateTime": f"{event_end}T{event_end_time}",
-                        "timeZone": "UTC"
-                    }
-                }
-                add_event(access_token, event_details)
-                st.success("Event added successfully! 🎉")
-            # Form to add new event
+        # 🎛️ Product Integration Toggles
+        products = {
+            "📧 Outlook": {
+                "ai_capabilities": "Copilot for enhanced email writing, calendar management, and scheduling.",
+                "graph_api": "Access to mail, calendar, contacts, and events."
+            },
+            "📒 OneNote": {
+                "ai_capabilities": "Content suggestion, note organization, and OCR for extracting text from images.",
+                "graph_api": "Manage notebooks, sections, and pages."
+            },
+            "📊 Excel": {
+                "ai_capabilities": "Copilot for advanced data analysis, data insights, and formula generation.",
+                "graph_api": "Create and manage worksheets, tables, charts, and workbooks."
+            },
+            "📄 Word": {
+                "ai_capabilities": "Copilot for document drafting, summarization, and grammar improvements.",
+                "graph_api": "Document content access, templates, and file management."
+            },
+            "🗃️ SharePoint": {
+                "ai_capabilities": "Intelligent search, document tagging, and metadata extraction.",
+                "graph_api": "Access to sites, lists, files, and document libraries."
+            },
+            "📅 Teams": {
+                "ai_capabilities": "Copilot for meeting summaries, transcription, and chat suggestions.",
+                "graph_api": "Manage chats, teams, channels, and meetings."
+            },
+            "💬 Viva": {
+                "ai_capabilities": "Personalized learning insights, well-being insights, and productivity suggestions.",
+                "graph_api": "Access to user analytics and learning modules."
+            },
+            "🚀 Power Platform": {
+                "ai_capabilities": "Automation with AI Builder, data insights, and custom AI models.",
+                "graph_api": "Automation workflows, app creation, and data visualization."
+            },
+            "🧠 Copilot": {
+                "ai_capabilities": "Embedded across Word, Excel, Outlook, Teams, and more for AI-driven productivity.",
+                "graph_api": "Underpins Copilot's access to data and integrations."
+            },
+            "🗂️ OneDrive": {
+                "ai_capabilities": "Intelligent file organization and search.",
+                "graph_api": "File and folder access, sharing, and metadata."
+            },
+            "💡 PowerPoint": {
+                "ai_capabilities": "Design suggestions, presentation summarization, and speaker coaching.",
+                "graph_api": "Presentation creation, slide management, and templates."
+            },
+            "📚 Microsoft Bookings": {
+                "ai_capabilities": "Automated scheduling and reminders.",
+                "graph_api": "Booking calendars, services, and appointment details."
+            },
+            "📓 Loop": {
+                "ai_capabilities": "Real-time collaboration and content suggestions.",
+                "graph_api": "Access to shared workspaces and collaborative pages."
+            },
+            "🗣️ Translator": {
+                "ai_capabilities": "Real-time language translation and text-to-speech.",
+                "graph_api": "Integrated into communication and translation services."
+            },
+            "📋 To Do & Planner": {
+                "ai_capabilities": "Task prioritization and smart reminders.",
+                "graph_api": "Task creation, management, and synchronization."
+            },
+            "🔗 Azure OpenAI Service": {
+                "ai_capabilities": "Access to GPT models for custom AI implementations.",
+                "graph_api": "Used indirectly for building custom AI models into workflows."
+            }
+        }
         
-        elif menu == "🔎 Filter By":
-            st.header("🔎 Filter Events")
-            filter_criteria = st.text_input("Enter filter criteria")
-            if filter_criteria:
-                filtered_events = filter_events(access_token, filter_criteria)
-                for event in filtered_events:
-                    st.write(f"📅 {event['subject']} on {event['start']['dateTime']}")
-            # Filter events based on criteria
+        # 🗳️ Create toggles for each product
+        selected_products = {}
+        for product, info in products.items():
+            selected = st.sidebar.checkbox(product)
+            if selected:
+                st.sidebar.write(f"**AI Capabilities:** {info['ai_capabilities']}")
+                st.sidebar.write(f"**Graph API:** {info['graph_api']}")
+                selected_products[product] = True
         
-        # 🧩 Handle selected products
-        if selected_products:
-            st.header("🧩 M365 Product Integrations")
-            for product in selected_products:
-                st.subheader(f"{product}")
-                # Call the function corresponding to the product
-                handle_product_integration(access_token, product)
-        else:
-            st.write("No products selected.")
+        # 🔑 Authentication
+        if 'access_token' not in st.session_state:
+            # 🕵️‍♂️ Check for authorization code in query parameters
+            query_params = st.query_params
+            query = (query_params.get('code'))
+            #if len(query) > 1: 
+            
+            #st.write('Parsing query ' + query_params )
+            if 'code' in query_params:
+                #code = query_params['code'][0]
+                code = query_params.get('code')
+                
+                st.write('🔑Access Code Obtained from MS Graph Redirect🔑!:' + code)
+                
+                st.write('🔑 Acquiring access token from redirect URL for code parameter.')
+                access_token = get_access_token(code)
+                
+                st.session_state['access_token'] = access_token  # 🔑 Save it for later
+                
+                st.rerun()  # Reload the app to clear the code from URL
+            else:
+                # 📢 Prompt user to log in
+                client_instance = get_msal_app()
+                authorization_url = client_instance.get_authorization_request_url(
+                    scopes=SCOPES,
+                    redirect_uri=REDIRECT_URI
+                )
+                st.write('👋 Please [click here]({}) to log in and authorize the app.'.format(authorization_url))
+                st.stop()
     
+                    
+        else:
+            # 🥳 User is authenticated, proceed with the app
+            access_token = st.session_state['access_token']
+            headers = {'Authorization': 'Bearer ' + access_token}
+            
+            # 🤗 Greet the user
+            response = requests.get('https://graph.microsoft.com/v1.0/me', headers=headers)
+            if response.status_code == 200:
+                user_info = response.json()
+                st.sidebar.write(f"👋 Hello, {user_info['displayName']}!")
+            else:
+                st.error('Failed to fetch user info.')
+                st.write(response.text)
+            
+            # 🎛️ Handle menu options
+            if menu == "1️⃣ Dashboard with Widgets":
+                st.header("1️⃣ Dashboard with Widgets")
+                st.write("Widgets will be displayed here. 🎛️")
+                # Add your widgets here
+            
+            elif menu == "🏠 Landing Page":
+                st.header("🏠 Landing Page")
+                st.write("Welcome to the app! 🥳")
+                # Add landing page content here
+            
+            elif menu == "📅 Upcoming Events":
+                st.header("📅 Upcoming Events")
+                events = get_upcoming_events(access_token)
+                for event in events:
+                    st.write(f"📆 {event['subject']} on {event['start']['dateTime']}")
+                # Display upcoming events
+            
+            elif menu == "📆 Schedule":
+                st.header("📆 Schedule")
+                schedule = get_schedule(access_token)
+                st.write(schedule)
+                # Display schedule
+            
+            elif menu == "📝 Agenda":
+                st.header("📝 Agenda")
+                st.write("Your agenda for today. 📋")
+                # Display agenda
+            
+            elif menu == "🔍 Event Details":
+                st.header("🔍 Event Details")
+                event_id = st.text_input("Enter Event ID")
+                if event_id:
+                    event_details = get_event_details(access_token, event_id)
+                    st.write(event_details)
+                # Display event details based on ID
+            
+            elif menu == "➕ Add Event":
+                st.header("➕ Add Event")
+                event_subject = st.text_input("Event Subject")
+                event_start = st.date_input("Event Start Date")
+                event_start_time = st.time_input("Event Start Time")
+                event_end = st.date_input("Event End Date")
+                event_end_time = st.time_input("Event End Time")
+                if st.button("Add Event"):
+                    event_details = {
+                        "subject": event_subject,
+                        "start": {
+                            "dateTime": f"{event_start}T{event_start_time}",
+                            "timeZone": "UTC"
+                        },
+                        "end": {
+                            "dateTime": f"{event_end}T{event_end_time}",
+                            "timeZone": "UTC"
+                        }
+                    }
+                    add_event(access_token, event_details)
+                    st.success("Event added successfully! 🎉")
+                # Form to add new event
+            
+            elif menu == "🔎 Filter By":
+                st.header("🔎 Filter Events")
+                filter_criteria = st.text_input("Enter filter criteria")
+                if filter_criteria:
+                    filtered_events = filter_events(access_token, filter_criteria)
+                    for event in filtered_events:
+                        st.write(f"📅 {event['subject']} on {event['start']['dateTime']}")
+                # Filter events based on criteria
+            
+            # 🧩 Handle selected products
+            if selected_products:
+                st.header("🧩 M365 Product Integrations")
+                for product in selected_products:
+                    st.subheader(f"{product}")
+                    # Call the function corresponding to the product
+                    handle_product_integration(access_token, product)
+            else:
+                st.write("No products selected.")
+            pass
+
 # 🧩 Function to handle product integration
 def handle_product_integration(access_token, product):
     if product == "📧 Outlook":