add initData
Change-Id: I08e5dfe42478e9ee02e48682634ecaa9ab34723b
diff --git a/app.js b/app.js
index 74c58b4..9bff634 100644
--- a/app.js
+++ b/app.js
@@ -259,13 +259,23 @@
app.post('/auth/local', passport.authenticate('local'), (req, res) => {
res.json({ loggedin: true, user: req.user.id })
})
- app.get('/auth', (req, res) => {
+
+ const getState = req => {
if (req.user) {
- res.json({ loggedin: true, username: req.user.username, type: req.user.type })
+ return { loggedin: true, username: req.user.username, type: req.user.type }
} else if (isSetupComplete()) {
- res.status(401).json({})
+ return {}
} else {
- res.status(401).json({ setupComplete: false })
+ return { setupComplete: false }
+ }
+ }
+
+ app.get('/auth', (req, res) => {
+ const state = getState(req)
+ if (req.user) {
+ res.json(state)
+ } else {
+ res.status(401).json(state)
}
})
@@ -278,7 +288,9 @@
app.use(express.static(path.join(__dirname, 'client', 'dist')))
app.use((req, res, next) => {
- res.sendFile(path.join(__dirname, 'client', 'dist', 'index.html'))
+ res.render(path.join(__dirname, 'client', 'dist', 'index.ejs'), {
+ initdata: JSON.stringify(getState(req))
+ })
})
const server = http.Server(app)