From 5fa379c1695904dd41dbc595c9fb758415ab92f2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Filip=20S=CC=8Ctokovic=CC=81?= <filip.stokovic@gmail.com>
Date: Sun, 26 May 2024 04:05:16 +0200
Subject: [PATCH] chore: add redirects

---
 packages/zu-git-pass-client/.env                 |  1 +
 .../zu-git-pass-client/src/GitHubCallback.js     |  3 ++-
 packages/zu-git-pass-client/src/ZupassLogin.js   | 16 ++++++----------
 3 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/packages/zu-git-pass-client/.env b/packages/zu-git-pass-client/.env
index 15ca321..7eeec11 100644
--- a/packages/zu-git-pass-client/.env
+++ b/packages/zu-git-pass-client/.env
@@ -1,2 +1,3 @@
 REACT_APP_ZU_GIT_SERVER_API=https://api.zugitproof.berlin.chainsafe.dev
 REACT_APP_GITHUB_CLIENT_ID=Ov23liXuY3hXVMFNHo5X
+REACT_APP_DISCOURSE_URL=http://localhost:4200/auth/oauth2_basic/callback
diff --git a/packages/zu-git-pass-client/src/GitHubCallback.js b/packages/zu-git-pass-client/src/GitHubCallback.js
index 0a3cb75..b317eb8 100644
--- a/packages/zu-git-pass-client/src/GitHubCallback.js
+++ b/packages/zu-git-pass-client/src/GitHubCallback.js
@@ -1,4 +1,5 @@
 import { useEffect } from 'react';
+import { redirect } from 'react-router-dom';
 
 export default function GitHubCallback() {
 
@@ -15,7 +16,7 @@ export default function GitHubCallback() {
             })
             .then(response => response.json())
             .then(data => {
-                // close popup
+                redirect('/')
             });
         }
     }, []);
diff --git a/packages/zu-git-pass-client/src/ZupassLogin.js b/packages/zu-git-pass-client/src/ZupassLogin.js
index 9664ded..2e6ae63 100644
--- a/packages/zu-git-pass-client/src/ZupassLogin.js
+++ b/packages/zu-git-pass-client/src/ZupassLogin.js
@@ -1,7 +1,6 @@
 import { useCallback } from 'react';
 import { getWithoutProvingUrl } from '@pcd/passport-interface/PassportInterface';
 import { zupassPopupExecute } from '@pcd/passport-interface';
-import { MessagePCDPackage } from '@pcd/message-pcd'
 
 const constructProofUrl = () => {
     return getWithoutProvingUrl('https://zupass.org', window.location.href, 'message-pcd', true)
@@ -13,16 +12,13 @@ export default function ZupassLogin() {
 
         const result = await zupassPopupExecute(proofUrl)
 
-
         if (result.type !== 'pcd') return
 
-        console.log(result.pcdStr)
-
-        const pcd = MessagePCDPackage.deserialize(result.pcdStr)
+        //const pcd = MessagePCDPackage.deserialize(result.pcdStr)
 
-        console.log(pcd)
+        const discourseUrl = process.env.REACT_APP_DISCOURSE_URL // searchParams.get('discourse_url')
 
-        const discourseUrl = process.env.DISCOURSE_URL // searchParams.get('discourse_url')
+        window.location.href = discourseUrl
 
         try {
             const response = await fetch(discourseUrl, {
@@ -39,6 +35,8 @@ export default function ZupassLogin() {
 
             const result = await response.json();
             console.log("Success:", result);
+
+            window.location.href = discourseUrl
         } catch (error) {
             console.error("Error:", error);
         }
@@ -46,8 +44,6 @@ export default function ZupassLogin() {
 
 
     return (
-        <>
-            <button onClick={login}>Mit Zupass anmelden</button>
-        </>
+            <button onClick={login} className='btn-github'>Mit Zupass anmelden</button>
     );
 }