fix localstorage listener

SOURC3XYZ · Oct 6, 2022 · 7b25716 · 7b25716
1 parent 20adc5f
commit 7b25716
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 7 deletions.
diff --git a/ui/front/src/apps/web/components/app.container.tsx b/ui/front/src/apps/web/components/app.container.tsx
@@ -20,12 +20,12 @@ import { useDispatch } from '@libs/redux';
 import OnboardingStep from '@components/shared/git-auth/onboarding/onboardingStep';
 import { Popup } from '@components/shared/popup';
 import { AchievementList } from '@components/shared/achievments';
+import ReferralProgramm from '@components/shared/referral-programm/referralProgramm';
 import { Footer } from './footer';
 import styles from './app.module.scss';
 import { Lendos } from './lendos';
 import { Header } from './header';
 import { routesData } from './routes';
-import ReferralProgramm from "@components/shared/referral-programm/referralProgramm";
 
 function Main() {
   const { isApiConnected, isOnLending, connectBeamApi } = useWebMain();
@@ -113,8 +113,8 @@ function Main() {
           element={<OnboardingStep />}
         />
         <Route
-            path="/referral-programm"
-            element={<ReferralProgramm />}
+          path="/referral-programm"
+          element={<ReferralProgramm />}
         />
         <Route
           path="/download"

diff --git a/ui/front/src/components/shared/git-auth/LoginSocialGithub.tsx b/ui/front/src/components/shared/git-auth/LoginSocialGithub.tsx
@@ -2,6 +2,8 @@
 /* eslint-disable jsx-a11y/click-events-have-key-events */
 /* eslint-disable jsx-a11y/no-static-element-interactions */
 /* eslint-disable @typescript-eslint/no-shadow */
+import { notification } from 'antd';
+import { NotificationPlacement } from 'antd/lib/notification';
 import React, {
   memo, useCallback, useEffect, useState
 } from 'react';
@@ -39,7 +41,6 @@ export function LoginSocialGithub({
   redirect_uri,
   allow_signup = false,
   children,
-  onReject,
   onResolve
 }: Props) {
   const [isProcessing, setIsProcessing] = useState(false);
@@ -65,18 +66,18 @@ export function LoginSocialGithub({
          && getAccessToken(code);
 
   const onChangeLocalStorage = () => {
-    window.removeEventListener('storage', onChangeLocalStorage, false);
     const code = localStorage.getItem('github');
     if (code) {
       setIsProcessing(true);
       handlePostMessage({ provider: 'github', type: 'code', code });
       localStorage.removeItem('instagram');
+      window.removeEventListener('storage', onChangeLocalStorage);
     }
   };
 
   const onLogin = () => {
     if (!isProcessing) {
-      window.addEventListener('storage', onChangeLocalStorage, false);
+      window.addEventListener('storage', onChangeLocalStorage);
       const oauthUrl = `
                 ${GITHUB_URL}/login/oauth/authorize?client_id=${client_id}&scope=${encodeURIComponent(scope)}&state=_github&allow_signup=${allow_signup}&redirect_uri=${encodeURIComponent(redirect_uri)}`;
 

diff --git a/ui/front/src/components/shared/git-auth/git-auth.tsx b/ui/front/src/components/shared/git-auth/git-auth.tsx
@@ -5,6 +5,8 @@ import { AC } from '@libs/action-creators';
 import { HOST } from '@components/shared/git-auth/profile/constants';
 import { useNavigate } from 'react-router-dom';
 import { getQueryParam } from '@libs/utils';
+import { notification } from 'antd';
+import { NotificationPlacement } from 'antd/lib/notification';
 import { NavButton } from '../nav-button';
 import styles from './git-auth.module.scss';
 import { Popup } from '../popup';
@@ -69,15 +71,22 @@ function GitConnectAuth({ name, small, why }:GitConnectAuthProps) {
                   .catch(() => {
                     setVisible(false);
                     setIsErr(true);
+                    notification.error({
+                      message: 'connection failed',
+                      placement: 'bottomRight' as NotificationPlacement
+                    });
                   });
                 setIsDisabled(true);
               })
               .catch(() => {
                 setVisible(false);
                 setIsErr(true);
+                notification.error({
+                  message: 'connection failed',
+                  placement: 'bottomRight' as NotificationPlacement
+                });
               });
           }}
-          onReject={({ data }) => console.log(data)}
           scope="read:user user:email repo"
         >
           <NavButton

diff --git a/ui/front/src/libs/redux/reducers/profiles.reducer.ts b/ui/front/src/libs/redux/reducers/profiles.reducer.ts
@@ -63,6 +63,7 @@ const reducer = (
     }
     case ACTIONS.GIT_USER_LOGOUT: {
       newState.data = defaultValue;
+      localStorage.clear();
       return newState;
     }
     default: