amy/donetick-fe
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix the URl for google auth

Browse source
This commit is contained in:
Mo Tarbin 2025-01-10 00:38:13 -05:00
parent 13bfe66c9f
commit 46f7f51d3a
1 changed files with 76 additions and 72 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

48
src/views/Authorization/LoginView.jsx
View file

@ -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',
@ -151,10 +150,11 @@ const LoginView = () => {
}}
onClick={() => {
Navigate('/login/settings')
}
}
> <Settings /></IconButton>
}}
>
{' '}
<Settings />
</IconButton>
{/* <img
src='/src/assets/logo.svg'
alt='logo'
@ -335,24 +335,29 @@ const LoginView = () => {
</div>
</Button>
</LoginSocialGoogle>
</Box> )}
</Box>
)}
{Capacitor.isNativePlatform() && (
<Box sx={{ width: '100%' }}>
<Button fullWidth variant='soft' size='lg' sx={{ mt: 3, mb: 2 }}
<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);
})
GoogleAuth.signIn().then(user => {
console.log('Google user', user)
loggedWithProvider("google", user.authentication)
});
}}>
loggedWithProvider('google', user.authentication)
})
}}
>
<div className='flex gap-2'>
<GoogleIcon />
Continue with Google
@ -361,7 +366,6 @@ const LoginView = () => {
</Box>
)}
<Button
onClick={() => {
Navigate('/signup')