auth

app.py

@@ -84,15 +84,17 @@ params = {
     'redirect_uri': REDIRECT_URI,
     'response_mode': 'query',
     'scope': 'User.Read',
-    'state': '12345'
+    'state': '12345',
+    'prompt': 'login'  # This ensures the login prompt appears even if already logged in
 }
 
 # Construct the login URL
 login_url = f"{AUTH_URL}?{urlencode(params)}"
 
 def show_login_button():
-    return f'<a href="{login_url}" class="GFG"> Click here to login with Microsoft </a>'
+    return f'<a href="{login_url}" class="GFG">Click here to login with Microsoft</a>'
 
+# Function to exchange auth code for token
 def exchange_code_for_token(auth_code):
     data = {
         'grant_type': 'authorization_code',
@@ -101,7 +103,6 @@ def exchange_code_for_token(auth_code):
         'code': auth_code,
         'redirect_uri': REDIRECT_URI
     }
-    
     response = requests.post(TOKEN_URL, data=data)
     
     if response.status_code == 200:
@@ -111,17 +112,19 @@ def exchange_code_for_token(auth_code):
     else:
         return None
 
+# Function to handle redirect URL and extract the auth code
 def handle_redirect(url):
     parsed_url = urlparse(url)
     query_params = parse_qs(parsed_url.query)
     auth_code = query_params.get('code')
-
+    
     if auth_code:
         token = exchange_code_for_token(auth_code[0])
-        return token  # Return the token or handle accordingly
-    return None
+        if token:
+            return "Logged in", True  # Successfully logged in
+    return "Login failed", False
 
-# Function to retrieve answers using the RAG system
+# Function to retrieve answer using the RAG system
 @spaces.GPU(duration=60)
 def test_rag(query):
     books_retriever = books_db_client_retriever.run(query)
@@ -136,6 +139,7 @@ def test_rag(query):
     
     return corrected_text_books
 
+# Define the Gradio interface
 def chat(query, history=None):
     if history is None:
         history = []
@@ -144,20 +148,35 @@ def chat(query, history=None):
         history.append((query, answer))
     return history, ""  # Clear input after submission
 
-# Gradio interface
+# Function to clear input text
+def clear_input():
+    return "",  # Return empty string to clear input field
+
+
+# Gradio Interface
 with gr.Blocks() as interface:
     with gr.Tab("Login"):
         gr.Markdown("## Login Page")
         login_link = gr.HTML(show_login_button())
         
         # Hidden textbox for redirect URL
-        redirect_url_input = gr.Textbox(label="Redirect URL", visible=False)
+        redirect_url_input = gr.Textbox(label="Redirect URL", visible=True)  # URL from the Microsoft redirect
+
+        status_label = gr.Label(value="Not logged in")  # Label to show login status
         
-        # Handle redirect
+        def on_redirect(redirect_url):
+            # Extract and exchange token
+            status, logged_in = handle_redirect(redirect_url)
+            if logged_in:
+                return gr.update(visible=False), status, gr.update(visible=True), gr.update(visible=True), gr.update(visible=True)
+            else:
+                return gr.update(visible=True), status, gr.update(visible=False), gr.update(visible=False), gr.update(visible=False)
+        
+        # Handle redirect and switch to chatbot page upon login
         redirect_url_input.change(
-            handle_redirect,
+            on_redirect,
             inputs=[redirect_url_input],
-            outputs=[redirect_url_input],
+            outputs=[redirect_url_input, status_label, gr.Textbox.update(visible=True), gr.Button.update(visible=True), gr.Chatbot.update(visible=True)],
             show_progress=True
         )
         
@@ -169,13 +188,7 @@ with gr.Blocks() as interface:
         submit_btn = gr.Button("Submit", visible=False)
         chat_history = gr.Chatbot(label="Chat History", visible=False)
 
-        redirect_url_input.change(
-            handle_redirect,
-            inputs=[redirect_url_input],
-            outputs=[input_box, submit_btn, chat_history],  # Update visibility based on login
-            show_progress=True
-        )
-
+        # Chat submission
         submit_btn.click(chat, inputs=[input_box, chat_history], outputs=[chat_history, input_box])
 
-interface.launch()
+interface.launch()