sasjs/server
1
0
Fork 0
mirror of https://github.com/sasjs/server.git synced 2026-01-09 15:30:05 +00:00
Code Issues Projects Releases Wiki Activity

fix: provide clientId to web component

Browse Source
This commit is contained in:
Saad Jutt
2022-04-19 21:26:55 +05:00
parent 8a3fe8b217
commit db70b1ce55
2 changed files with 13 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
api/src/routes/web/web.ts
View File

@@ -5,12 +5,17 @@ import { getWebBuildFolderPath } from '../../utils'
const webRouter = express.Router() const webRouter = express.Router()
const codeToInject = ` const jsCodeForDesktopMode = `
<script> <script>
localStorage.setItem('accessToken', JSON.stringify('accessToken')) localStorage.setItem('accessToken', JSON.stringify('accessToken'))
localStorage.setItem('refreshToken', JSON.stringify('refreshToken')) localStorage.setItem('refreshToken', JSON.stringify('refreshToken'))
</script>` </script>`
const jsCodeForServerMode = `
<script>
localStorage.setItem('CLIENT_ID', '${process.env.CLIENT_ID}')
</script>`
webRouter.get('/', async (_, res) => { webRouter.get('/', async (_, res) => {
let content: string let content: string
try { try {
@@ -21,14 +26,12 @@ webRouter.get('/', async (_, res) => {
} }
const { MODE } = process.env const { MODE } = process.env
if (MODE?.trim() !== 'server') { const codeToInject =
const injectedContent = content.replace('</head>', `${codeToInject}</head>`) MODE?.trim() === 'server' ? jsCodeForServerMode : jsCodeForDesktopMode
const injectedContent = content.replace('</head>', `${codeToInject}</head>`)
res.setHeader('Content-Type', 'text/html') res.setHeader('Content-Type', 'text/html')
return res.send(injectedContent) return res.send(injectedContent)
}
return res.send(content)
}) })
export default webRouter export default webRouter

5
web/src/components/login.tsx
View File

@@ -45,13 +45,12 @@ const Login = ({ setTokens, getCodeOnly }: any) => {
error = false error = false
setErrorMessage('') setErrorMessage('')
e.preventDefault() e.preventDefault()
let clientId = process.env.CLIENT_ID let clientId = process.env.CLIENT_ID ?? localStorage.getItem('CLIENT_ID')
if (getCodeOnly) { if (getCodeOnly) {
const params = new URLSearchParams(location.search) const params = new URLSearchParams(location.search)
const responseType = params.get('response_type') const responseType = params.get('response_type')
if (responseType === 'code') if (responseType === 'code') clientId = params.get('client_id')
clientId = params.get('client_id') ?? undefined
} }
const { code } = await getAuthCode({ const { code } = await getAuthCode({