From 46f7f51d3aebd7a2fe15932172dbf9568ededaf9 Mon Sep 17 00:00:00 2001
From: Mo Tarbin <mhed.t91@gmail.com>
Date: Fri, 10 Jan 2025 00:38:13 -0500
Subject: [PATCH] Fix the URl for google auth

---
 src/views/Authorization/LoginView.jsx | 148 +++++++++++++-------------
 1 file changed, 76 insertions(+), 72 deletions(-)

diff --git a/src/views/Authorization/LoginView.jsx b/src/views/Authorization/LoginView.jsx
index b75581f..6a3eb2d 100644
--- a/src/views/Authorization/LoginView.jsx
+++ b/src/views/Authorization/LoginView.jsx
@@ -1,3 +1,6 @@
+import { Capacitor } from '@capacitor/core'
+import { GoogleAuth } from '@codetrix-studio/capacitor-google-auth'
+import { Settings } from '@mui/icons-material'
 import GoogleIcon from '@mui/icons-material/Google'
 import {
   Avatar,
@@ -15,15 +18,11 @@ import Cookies from 'js-cookie'
 import React from 'react'
 import { useNavigate } from 'react-router-dom'
 import { LoginSocialGoogle } from 'reactjs-social-login'
-import { API_URL, GOOGLE_CLIENT_ID, REDIRECT_URL } from '../../Config'
+import { GOOGLE_CLIENT_ID, REDIRECT_URL } from '../../Config'
 import { UserContext } from '../../contexts/UserContext'
 import Logo from '../../Logo'
 import { GetUserProfile, login } from '../../utils/Fetcher'
-import { GoogleAuth } from '@codetrix-studio/capacitor-google-auth';
-import { Capacitor } from '@capacitor/core'
-import { Settings } from '@mui/icons-material'
-
-
+import { apiManager } from '../../utils/TokenManager'
 
 const LoginView = () => {
   const { userProfile, setUserProfile } = React.useContext(UserContext)
@@ -34,7 +33,6 @@ const LoginView = () => {
   const handleSubmit = async e => {
     e.preventDefault()
     login(username, password)
-   
       .then(response => {
         if (response.status === 200) {
           return response.json().then(data => {
@@ -63,7 +61,8 @@ const LoginView = () => {
   }
 
   const loggedWithProvider = function (provider, data) {
-    return fetch(API_URL + `/auth/${provider}/callback`, {
+    const baseURL = apiManager.getApiURL()
+    return fetch(`${baseURL}/auth/${provider}/callback`, {
       method: 'POST',
       headers: {
         'Content-Type': 'application/json',
@@ -141,20 +140,21 @@ const LoginView = () => {
             boxShadow: 'md',
           }}
         >
-         <IconButton 
-        //  on top right of the screen:
-          sx={{
-            position: 'absolute',
-            top: 2,
-            right: 2,
-            color: 'black',
-          }}
-          onClick={() => {
-            Navigate('/login/settings')
-
-          }
-          }
-          > <Settings /></IconButton>
+          <IconButton
+            //  on top right of the screen:
+            sx={{
+              position: 'absolute',
+              top: 2,
+              right: 2,
+              color: 'black',
+            }}
+            onClick={() => {
+              Navigate('/login/settings')
+            }}
+          >
+            {' '}
+            <Settings />
+          </IconButton>
           {/* <img
             src='/src/assets/logo.svg'
             alt='logo'
@@ -301,32 +301,61 @@ const LoginView = () => {
           )}
           <Divider> or </Divider>
           {!Capacitor.isNativePlatform() && (
-          <Box sx={{ width: '100%' }}>
-            <LoginSocialGoogle
-              client_id={GOOGLE_CLIENT_ID}
-              redirect_uri={REDIRECT_URL}
-              scope='openid profile email'
-              discoveryDocs='claims_supported'
-              access_type='online'
-              isOnlyGetToken={true}
-              onResolve={({ provider, data }) => {
-                loggedWithProvider(provider, data)
-              }}
-              onReject={err => {
-                setError("Couldn't log in with Google, please try again")
-              }}
-            >
+            <Box sx={{ width: '100%' }}>
+              <LoginSocialGoogle
+                client_id={GOOGLE_CLIENT_ID}
+                redirect_uri={REDIRECT_URL}
+                scope='openid profile email'
+                discoveryDocs='claims_supported'
+                access_type='online'
+                isOnlyGetToken={true}
+                onResolve={({ provider, data }) => {
+                  loggedWithProvider(provider, data)
+                }}
+                onReject={err => {
+                  setError("Couldn't log in with Google, please try again")
+                }}
+              >
+                <Button
+                  variant='soft'
+                  color='neutral'
+                  size='lg'
+                  fullWidth
+                  sx={{
+                    width: '100%',
+                    mt: 1,
+                    mb: 1,
+                    border: 'moccasin',
+                    borderRadius: '8px',
+                  }}
+                >
+                  <div className='flex gap-2'>
+                    <GoogleIcon />
+                    Continue with Google
+                  </div>
+                </Button>
+              </LoginSocialGoogle>
+            </Box>
+          )}
+
+          {Capacitor.isNativePlatform() && (
+            <Box sx={{ width: '100%' }}>
               <Button
-                variant='soft'
-                color='neutral'
-                size='lg'
                 fullWidth
-                sx={{
-                  width: '100%',
-                  mt: 1,
-                  mb: 1,
-                  border: 'moccasin',
-                  borderRadius: '8px',
+                variant='soft'
+                size='lg'
+                sx={{ mt: 3, mb: 2 }}
+                onClick={() => {
+                  GoogleAuth.initialize({
+                    clientId: import.meta.env.VITE_APP_GOOGLE_CLIENT_ID,
+                    scopes: ['profile', 'email', 'openid'],
+                    grantOfflineAccess: true,
+                  })
+                  GoogleAuth.signIn().then(user => {
+                    console.log('Google user', user)
+
+                    loggedWithProvider('google', user.authentication)
+                  })
                 }}
               >
                 <div className='flex gap-2'>
@@ -334,33 +363,8 @@ const LoginView = () => {
                   Continue with Google
                 </div>
               </Button>
-            </LoginSocialGoogle>
-          </Box> )}
-
-          {Capacitor.isNativePlatform() && (
-          <Box sx={{ width: '100%' }}>
-          <Button fullWidth variant='soft' size='lg' sx={{ mt: 3, mb: 2 }}
-          onClick={()=>{
-            GoogleAuth.initialize({
-              clientId: import.meta.env.VITE_APP_GOOGLE_CLIENT_ID,
-              scopes: ['profile', 'email','openid'],
-              grantOfflineAccess: true,
-            });
-            GoogleAuth.signIn().then((user) => {
-              console.log("Google user", user);
-
-              loggedWithProvider("google", user.authentication) 
-            });
-            
-          }}>
-                <div className='flex gap-2'>
-                  <GoogleIcon />
-                  Continue with Google
-                </div>
-          </Button>
-          </Box>
+            </Box>
           )}
-          
 
           <Button
             onClick={() => {