flet-web 0.70.0.dev5073__py3-none-any.whl → 0.70.0.dev5103__py3-none-any.whl

flet_web/fastapi/flet_app.py

@@ -108,10 +108,9 @@ class FletApp(Connection):
         """
         self.__websocket = websocket
 
-        self.client_ip = (
-            self.__websocket.client.host if self.__websocket.client else ""
-        ).split(":")[0]
+        self.client_ip = self.__websocket.client.host if self.__websocket.client else ""
         self.client_user_agent = self.__websocket.headers.get("user-agent", "")
+        self.__oauth_state_id = self.__websocket.cookies.get("flet_oauth_state")
 
         self.pubsubhub = app_manager.get_pubsubhub(self.__main, loop=self.loop)
         self.page_url = str(websocket.url).rsplit("/", 1)[0]
@@ -165,16 +164,20 @@ class FletApp(Connection):
                 f"{self.__session.id}"
             )
         except BrokenPipeError:
-            logger.info(f"Session handler terminated: {self.__session.id}")
+            logger.info(
+                "Session handler terminated: "
+                f"{self.__session.id if self.__session else ''}"
+            )
         except Exception as e:
             print(
-                f"Unhandled error processing page session {self.__session.id}:",
+                "Unhandled error processing page session: "
+                f"{self.__session.id if self.__session else ''}",
                 traceback.format_exc(),
             )
-            assert self.__session
-            self.__session.error(
-                f"There was an error while processing your request: {e}"
-            )
+            if self.__session:
+                self.__session.error(
+                    f"There was an error while processing your request: {e}"
+                )
 
     async def __send_loop(self):
         assert self.__websocket
@@ -224,6 +227,14 @@ class FletApp(Connection):
                     self.__get_unique_session_id(req.session_id)
                 )
 
+            oauth_state = None
+            if self.__oauth_state_id:
+                oauth_state = app_manager.retrieve_state(self.__oauth_state_id)
+                if oauth_state:
+                    self.__session = await app_manager.get_session(
+                        oauth_state.session_id
+                    )
+
             # re-create session
             if self.__session is None:
                 new_session = True
@@ -274,6 +285,16 @@ class FletApp(Connection):
                 ):
                     self.__session.page.go(self.__session.page.route)
 
+                if oauth_state:
+                    await self.__session.page._authorize_callback_async(
+                        {
+                            "state": self.__oauth_state_id,
+                            "code": oauth_state.code,
+                            "error": oauth_state.error,
+                            "error_description": oauth_state.error_description,
+                        }
+                    )
+
         elif action == ClientAction.CONTROL_EVENT:
             req = ControlEventBody(**body)
             task = asyncio.create_task(
@@ -329,7 +350,10 @@ class FletApp(Connection):
         app_manager.store_state(state_id, state)
 
     def __get_unique_session_id(self, session_id: str):
-        client_hash = sha1(f"{self.client_ip}{self.client_user_agent}")
+        ip = self.client_ip
+        if ip in ["127.0.0.1", "::1"]:
+            ip = ""
+        client_hash = sha1(f"{ip}{self.client_user_agent}")
         return f"{self.page_name}_{session_id}_{client_hash}"
 
     def dispose(self):

flet_web/fastapi/flet_app_manager.py

@@ -83,6 +83,8 @@ class FletAppManager:
         if session_id in self.__sessions:
             session = self.__sessions[session_id]
             await session.connect(conn)
+        else:
+            raise Exception(f"Session has expired or not found: {session_id}")
 
     async def disconnect_session(self, session_id: str, session_timeout_seconds: int):
         logger.info(f"Session disconnected: {session_id}")

flet_web/fastapi/flet_oauth.py

@@ -34,22 +34,35 @@ class FletOAuth:
         if not session:
             raise HTTPException(status_code=500, detail="Session not found")
 
-        await session.page._authorize_callback_async(
-            {
-                "state": state_id,
-                "code": request.query_params.get("code"),
-                "error": request.query_params.get("error"),
-                "error_description": request.query_params.get("error_description"),
-            }
-        )
+        state.code = request.query_params.get("code")
+        state.error = request.query_params.get("error")
+        state.error_description = request.query_params.get("error_description")
 
         if state.complete_page_url:
-            return RedirectResponse(state.complete_page_url)
+            app_manager.store_state(state_id, state)
+            response = RedirectResponse(state.complete_page_url)
+            response.set_cookie(
+                "flet_oauth_state",
+                state_id,
+                max_age=300,
+                httponly=True,
+                secure=False,
+                samesite="strict",
+            )
+            return response
         else:
+            await session.page._authorize_callback_async(
+                {
+                    "state": state_id,
+                    "code": state.code,
+                    "error": state.error,
+                    "error_description": state.error_description,
+                }
+            )
             html_content = (
                 state.complete_page_html
                 if state.complete_page_html
-                else f"""
+                else """
             <!DOCTYPE html>
             <html>
             <head>

flet_web/fastapi/oauth_state.py

@@ -7,5 +7,8 @@ from typing import Optional
 class OAuthState:
     session_id: str
     expires_at: datetime
-    complete_page_url: Optional[str] = dataclasses.field(default=None)
-    complete_page_html: Optional[str] = dataclasses.field(default=None)
+    complete_page_url: Optional[str] = None
+    complete_page_html: Optional[str] = None
+    code: Optional[str] = None
+    error: Optional[str] = None
+    error_description: Optional[str] = None

flet_web/fastapi/serve_fastapi_web_app.py

@@ -86,7 +86,9 @@ async def serve_fastapi_web_app(
             no_cdn=no_cdn,
         ),
     )
-    config = uvicorn.Config(app, host=host, port=port, log_level=log_level)
+    config = uvicorn.Config(
+        app, host=host, port=port, log_level=log_level, ws="websockets-sansio"
+    )
     server = uvicorn.Server(config)
 
     if blocking:

flet_web/version.py

@@ -1 +1 @@
-version = "0.70.0.dev5073"
+version = "0.70.0.dev5103"

flet_web/web/flutter_bootstrap.js

@@ -54,7 +54,7 @@ if (flet.noCdn) {
 _flutter.loader.load({
     config: flutterConfig,
     serviceWorkerSettings: {
-        serviceWorkerVersion: "3955429167",
+        serviceWorkerVersion: "994449865",
     },
     onEntrypointLoaded: async function (engineInitializer) {
         loading.classList.add('main_done');

flet_web/web/flutter_service_worker.js

@@ -3,7 +3,7 @@ const MANIFEST = 'flutter-app-manifest';
 const TEMP = 'flutter-temp-cache';
 const CACHE_NAME = 'flutter-app-cache';
 
-const RESOURCES = {"main.dart.js": "799e2ed6593526c548340d3c9530aef8",
+const RESOURCES = {"main.dart.js": "fb992f35a5981ffb83bdfcd54ac46de6",
 "manifest.json": "58765f937ba0d0c40a3a714c5c1adb87",
 "python-worker.js": "26eb131f3acb5ce232fea72da957e8ce",
 "canvaskit/skwasm.wasm": "39dd80367a4e71582d234948adc521c0",
@@ -15,8 +15,8 @@ const RESOURCES = {"main.dart.js": "799e2ed6593526c548340d3c9530aef8",
 "canvaskit/skwasm.js.symbols": "e72c79950c8a8483d826a7f0560573a1",
 "canvaskit/canvaskit.js": "728b2d477d9b8c14593d4f9b82b484f3",
 "canvaskit/canvaskit.wasm": "7a3f4ae7d65fc1de6a6e7ddd3224bc93",
-"flutter_bootstrap.js": "812b77f89a79f5af6b6dadab9ef06de5",
-"main.dart.wasm": "df354fd5d7980be1545e3aa7fb401dcc",
+"flutter_bootstrap.js": "48940264e5a3a73f0e8d6ae7499e5dbd",
+"main.dart.wasm": "83590ca576a8e8db2afb0935bebdccb0",
 "favicon.png": "302ac04c14db027d016d1fe74c6a80a0",
 "flutter.js": "83d881c1dbb6d6bcd6b42e274605b69c",
 "index.html": "55e4a5140b3c5f98b694331a15299630",
@@ -41,7 +41,7 @@ const RESOURCES = {"main.dart.js": "799e2ed6593526c548340d3c9530aef8",
 "icons/icon-maskable-192.png": "c1c2210feeb444cf800a5ce0d06eff16",
 "icons/loading-animation.png": "41a96047dbd2463a50c46ad3bf6ff158",
 "icons/icon-maskable-512.png": "aa798e6d780ff109da17c3a98d5f2619",
-"main.dart.mjs": "9d192e550261d7bd7190b4b37c54c123",
+"main.dart.mjs": "62f3b36ccda8945e684f8f6eea86b238",
 "python.js": "352c5261eadd3cc73ac082984266c0fc",
 "version.json": "3fea9d9c7b4ca6955aa03e762e0d2e13"};
 // The application shell files that are downloaded before a service worker can