Merge pull request #1793 from SciPhi-AI/feature/add-oauth-callback-an…

…d-fix-event-stream

up

js/sdk/package.json

@@ -1,6 +1,6 @@
 {
   "name": "r2r-js",
-  "version": "0.4.12",
+  "version": "0.4.13",
   "description": "",
   "main": "dist/index.js",
   "browser": "dist/index.browser.js",

js/sdk/src/v3/clients/users.ts

@@ -539,4 +539,24 @@ export class UsersClient {
   async oauthGithubAuthorize(): Promise<{ redirect_url: string }> {
     return this.client.makeRequest("GET", "users/oauth/github/authorize");
   }
+
+  @feature("users.oauthGoogleCallback")
+  async oauthGoogleCallback(options: { code: string; state: string }): Promise<any> {
+    return this.client.makeRequest("POST", "users/oauth/google/callback", {
+      params: {
+        code: options.code,
+        state: options.state,
+      },
+    });
+  }
+
+  @feature("users.oauthGithubCallback")
+  async oauthGithubCallback(options: { code: string; state: string }): Promise<any> {
+    return this.client.makeRequest("POST", "users/oauth/github/callback", {
+      params: {
+        code: options.code,
+        state: options.state,
+      },
+    });
+  }
 }

py/core/main/api/v3/retrieval_router.py

@@ -446,7 +446,7 @@ async def stream_generator():
                         return
 
                 return StreamingResponse(
-                    stream_generator(), media_type="application/json"
+                    stream_generator(), media_type="text/event-stream"
                 )  # type: ignore
             else:
                 return response
@@ -673,7 +673,7 @@ async def stream_generator():
                             return
 
                     return StreamingResponse(
-                        stream_generator(), media_type="application/json"
+                        stream_generator(), media_type="text/event-stream"
                     )  # type: ignore
                 else:
                     return response

py/core/main/api/v3/users_router.py

@@ -142,8 +142,8 @@ def validate_password(password: str) -> bool:
 
             # if not validate_password(password):
             #     raise R2RException(
-            #         status_code=400,
-            #         message=f"Password must be at least 10 characters long and contain at least one uppercase letter, one lowercase letter, one digit, and one special character from '!@#$%^&*'.",
+            #         f"Password must be at least 10 characters long and contain at least one uppercase letter, one lowercase letter, one digit, and one special character from '!@#$%^&*'.",
+            #         400,
             #     )
 
             registration_response = await self.services.auth.register(
@@ -1790,7 +1790,7 @@ async def google_authorize():
 
         @self.router.get("/users/oauth/google/callback")
         async def google_callback(
-            request: Request, code: str = Query(...), state: str = Query(...)
+            code: str = Query(...), state: str = Query(...)
         ):
             """
             Google's callback that will receive the `code` and `state`.
@@ -1807,7 +1807,6 @@ async def google_callback(
                     "grant_type": "authorization_code",
                 },
             ).json()
-
             if "error" in token_data:
                 raise HTTPException(
                     status_code=400,
@@ -1839,6 +1838,7 @@ async def google_callback(
                 oauth_id=google_id,
                 email=email,
             )
+            print("token_response = ", token_response)
 
             # 4. Return tokens or redirect to your front-end
             #   Some people store tokens in a cookie or redirect to a front-end route passing them as a query param.