Merge pull request #4 from dragoni7/OAuth

OAuth
dragoni7 · Jun 25, 2024 · 6ec0ccd · 6ec0ccd
2 parents 5135f3b + 37d7970
commit 6ec0ccd
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 11 deletions.
diff --git a/src/app/routes/Landing.tsx b/src/app/routes/Landing.tsx
@@ -1,10 +1,10 @@
 import { useNavigate } from 'react-router'
 
-import { useEffect} from "react"
+import React, { useEffect} from "react"
 import BungieLogin from '../../features/auth/BungieLogin'
 import { regenerateTokens } from '../../lib/bungie_api/TokenService'
 import { isAuthenticated } from '../../lib/bungie_api/AuthService'
-
+import { Container, Grid, Paper } from '@mui/material'
 
 export const LandingRoute = () => {
 
@@ -24,15 +24,28 @@ export const LandingRoute = () => {
             else {
                 console.log("Not authenticated")
             }
-           }, 50)
+           }, 300)
     }, [])
 
     return (
-        <div>
-            Welcome
-            <br />
-            Log in to use app
-            <BungieLogin />
-        </div>
+        <React.Fragment>
+            <Container maxWidth='md'>
+                <Paper elevation={8} square={false} sx={{bgcolor:'#375873', marginTop: 10 }}>
+                    <Grid container spacing={3} direction={"column"} justifyContent={"space-around"} alignItems={'center'} padding={6}>
+                        <Grid item md={12} marginBottom={12}>
+                            <h1>
+                                D2Loadouts
+                            </h1>
+                        </Grid>
+                        <Grid item md={12}>
+                            D2Loadouts requires permission to read your Destiny 2 information
+                        </Grid>
+                        <Grid item md={3}>
+                            <BungieLogin />
+                        </Grid>
+                    </Grid>
+                </Paper>
+            </Container>
+        </React.Fragment>
     )
 }
diff --git a/src/features/auth/BungieLogin.tsx b/src/features/auth/BungieLogin.tsx
@@ -7,7 +7,7 @@ const BungieLogin: React.FC = () => {
         authenticate()
     }
 
-    return ( <button onClick={onLogIn}>Log In</button> )
+    return ( <button onClick={onLogIn}>Authorize with Bungie.net</button> )
 }
 
 export default BungieLogin
diff --git a/src/lib/bungie_api/TokenService.ts b/src/lib/bungie_api/TokenService.ts
@@ -45,7 +45,7 @@ export function regenerateTokens(): boolean {
 }
 
 export function generateToken(refresh: boolean, authCode=""): Tokens | null {
-    const REFRESH_TOKEN = getTokens()?.refreshToken
+    const REFRESH_TOKEN = getTokens()?.refreshToken?.value
     var returnToken = null
 
     let body = refresh === false ?