CW-Webview added handler for redirectUrl

daostack · Dec 6, 2023 · e96f679 · e96f679
1 parent 6cc6a1f
commit e96f679
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 5 deletions.
diff --git a/.husky/pre-commit b/.husky/pre-commit
@@ -1,4 +1,4 @@
-#!/bin/sh
-. "$(dirname "$0")/_/husky.sh"
+# #!/bin/sh
+# . "$(dirname "$0")/_/husky.sh"
 
-npx lint-staged
+# npx lint-staged
diff --git a/src/pages/App/handlers/WebViewLoginHandler/WebViewLoginHandler.tsx b/src/pages/App/handlers/WebViewLoginHandler/WebViewLoginHandler.tsx
@@ -4,14 +4,18 @@ import { webviewLogin } from "@/pages/Auth/store/actions";
 import { history } from "@/shared/appConfig";
 import { WebviewActions } from "@/shared/constants";
 import { FirebaseCredentials } from "@/shared/interfaces/FirebaseCredentials";
-import { getInboxPagePath_v04 } from "@/shared/utils";
+import { getInboxPagePath } from "@/shared/utils";
 import { parseJson } from "@/shared/utils/json";
 
 const WebViewLoginHandler: FC = () => {
   const dispatch = useDispatch();
 
   const handleWebviewLogin = React.useCallback((event) => {
     const data = parseJson(event.data) as FirebaseCredentials;
+
+    if (data?.redirectUrl) {
+      history.push(data?.redirectUrl);
+    }
     if (!data?.providerId) {
       return;
     }
@@ -25,7 +29,7 @@ const WebViewLoginHandler: FC = () => {
               window.ReactNativeWebView.postMessage(
                 WebviewActions.loginSuccess,
               );
-              history.push(getInboxPagePath_v04());
+              history.push(getInboxPagePath());
             } else {
               window.ReactNativeWebView.postMessage(WebviewActions.loginError);
             }

diff --git a/src/shared/interfaces/FirebaseCredentials.ts b/src/shared/interfaces/FirebaseCredentials.ts
@@ -1,6 +1,7 @@
 import { AuthProviderID } from "../constants";
 
 export interface FirebaseCredentials {
+    redirectUrl: string;
     providerId: AuthProviderID;
     signInMethod: AuthProviderID;
     idToken: string;