Merge pull request #29 from oxygenpay/develop

merge: develop
oxygenpay · Aug 17, 2023 · 2761fee · 2761fee
2 parents 253b60c + a76367e
commit 2761fee
Show file tree

Hide file tree

Showing 8 changed files with 71 additions and 32 deletions.
diff --git a/internal/db/repository/users.sql.go b/internal/db/repository/users.sql.go
diff --git a/internal/service/user/service_google.go b/internal/service/user/service_google.go
@@ -15,7 +15,7 @@ import (
 )
 
 func (s *Service) ResolveWithGoogle(ctx context.Context, user *auth.GoogleUser) (*User, error) {
-	entry, err := s.store.GetUserByGoogleID(ctx, repository.StringToNullable(user.Sub))
+	entry, err := s.store.GetUserByEmail(ctx, user.Email)
 	switch {
 	case errors.Is(err, pgx.ErrNoRows):
 		return s.registerGoogleUser(ctx, user)
@@ -57,6 +57,8 @@ func (s *Service) registerGoogleUser(ctx context.Context, user *auth.GoogleUser)
 func (s *Service) updateGoogleUser(ctx context.Context, userID int64, user *auth.GoogleUser) (*User, error) {
 	entry, err := s.store.UpdateUser(ctx, repository.UpdateUserParams{
 		ID:              userID,
+		SetGoogleID:     true,
+		GoogleID:        repository.StringToNullable(user.Sub),
 		Name:            user.Name,
 		ProfileImageUrl: repository.StringToNullable(user.Picture),
 		UpdatedAt:       time.Now(),

diff --git a/pkg/api-kms/v1/client/wallet/create_b_s_c_transaction_parameters.go b/pkg/api-kms/v1/client/wallet/create_b_s_c_transaction_parameters.go
diff --git a/pkg/api-kms/v1/client/wallet/create_b_s_c_transaction_responses.go b/pkg/api-kms/v1/client/wallet/create_b_s_c_transaction_responses.go
diff --git a/pkg/api-kms/v1/client/wallet/wallet_client.go b/pkg/api-kms/v1/client/wallet/wallet_client.go
diff --git a/scripts/queries/users.sql b/scripts/queries/users.sql
@@ -31,10 +31,11 @@ RETURNING *;
 
 -- name: UpdateUser :one
 UPDATE users
-SET name = $1,
-    profile_image_url= $2,
-    updated_at = $3
-WHERE id = $4
+SET name = $2,
+    profile_image_url= $3,
+    google_id = CASE WHEN @set_google_id::boolean THEN $4 ELSE users.google_id END,
+    updated_at = $5
+WHERE id = $1
 RETURNING *;
 
 -- name: UpdateUserPassword :one

diff --git a/ui-dashboard/src/app.tsx b/ui-dashboard/src/app.tsx
@@ -98,6 +98,7 @@ const App: React.FC = () => {
     const [user, setUser] = React.useState<User>();
     const [isSupportFormOpen, setIsSupportFormOpen] = React.useState<boolean>(false);
     const [isFormSubmitting, setIsFormSubmitting] = React.useState<boolean>(false);
+    const [isLoading, setIsLoading] = React.useState<boolean>(true);
 
     const loadUserInfo = async () => {
         let newMerchantId = merchantId;
@@ -112,7 +113,11 @@ const App: React.FC = () => {
                         posthog?.reset(true);
                     }
 
-                    navigate("/login");
+                    navigate("/login", {
+                        state: {
+                            isNeedLogout: true
+                        }
+                    });
                 }
             }
         };
@@ -127,7 +132,11 @@ const App: React.FC = () => {
                         posthog?.reset(true);
                     }
 
-                    navigate("/login");
+                    navigate("/login", {
+                        state: {
+                            isNeedLogout: true
+                        }
+                    });
                 }
             }
         };
@@ -154,6 +163,7 @@ const App: React.FC = () => {
             if (!newMerchantId) return;
 
             await getMerchant(newMerchantId);
+            setIsLoading(false);
         };
 
         await getCookie();
@@ -210,7 +220,11 @@ const App: React.FC = () => {
         }
 
         await authProvider.logout();
-        navigate("/login");
+        navigate("/login", {
+            state: {
+                isNeedLogout: true
+            }
+        });
     };
 
     const userMenu: MenuProps["items"] = [
@@ -277,6 +291,7 @@ const App: React.FC = () => {
                                     )}
                                 </RouteContext.Consumer>
                             }
+                            loading={isLoading}
                             actionsRender={() => {
                                 return [
                                     !isManageMerchantsActive ? (

diff --git a/ui-dashboard/src/pages/login-page/login-page.tsx b/ui-dashboard/src/pages/login-page/login-page.tsx
@@ -1,7 +1,8 @@
 import "./login-page.scss";
 
 import * as React from "react";
-import {useNavigate} from "react-router-dom";
+import {AxiosError} from "axios";
+import {useNavigate, useLocation} from "react-router-dom";
 import {Modal, Button, Typography, Form, Input, notification} from "antd";
 import {GoogleOutlined, CheckOutlined} from "@ant-design/icons";
 import logoImg from "/fav/android-chrome-192x192.png";
@@ -15,12 +16,17 @@ import SpinWithMask from "src/components/spin-with-mask/spin-with-mask";
 
 const b = bevis("login-page");
 
+interface LoginState {
+    isNeedLogout: boolean;
+}
+
 const LoginPage: React.FC = () => {
     const [form] = Form.useForm<UserCreateForm>();
     const [api, contextHolder] = notification.useNotification();
     const [isFormSubmitting, setIsFormSubmitting] = React.useState<boolean>(false);
     const [providersList, setProvidersList] = React.useState<AuthProvider[]>([]);
     const navigate = useNavigate();
+    const state: LoginState = useLocation().state;
 
     const openNotification = (title: string, description: string) => {
         api.info({
@@ -60,7 +66,21 @@ const LoginPage: React.FC = () => {
 
     useMount(async () => {
         window.addEventListener("popstate", () => navigate("/login", {replace: true}));
-        localStorage.remove("merchantId");
+
+        if (state?.isNeedLogout) {
+            localStorage.remove("merchantId");
+        } else {
+            try {
+                await authProvider.getCookie();
+                await authProvider.getMe();
+                navigate("/");
+            } catch (e) {
+                if (e instanceof AxiosError && e.response?.status === 401) {
+                    localStorage.remove("merchantId");
+                }
+            }
+        }
+
         const availProviders = await authProvider.getProviders();
         setProvidersList(availProviders ?? []);
     });