encrypt/gancio
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

could listen to unix socket, better conf

Browse Source
This commit is contained in:
lesion
2019-06-10 00:40:37 +02:00
parent d1a56e5135
commit b01f4ef04d
15 changed files with 107 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
server/api/controller/export.js
View File

@@ -42,7 +42,7 @@ const exportController = {
feed(res, events) {
res.type('application/rss+xml; charset=UTF-8')
res.render('feed/rss.pug', { events, config: process.env.config, moment })
res.render('feed/rss.pug', { events, config: process.env, moment })
},
ics(res, events) {

6
server/api/controller/settings.js
View File

@@ -1,8 +1,6 @@
const Mastodon = require('mastodon-api')
const { setting: Setting } = require('../models')
const baseurl = process.env.baseurl
const settingsController = {
async setAdminSetting(key, value) {
@@ -20,7 +18,7 @@ const settingsController = {
async getAuthURL(req, res) {
const instance = req.body.instance
const callback = `${baseurl}/api/settings/oauth`
const callback = `${process.env.baseurl}/api/settings/oauth`
const { client_id, client_secret } = await Mastodon.createOAuthApp(`https://${instance}/api/v1/apps`,
'gancio', 'read write', callback)
const url = await Mastodon.getAuthorizationUrl(client_id, client_secret,
@@ -33,7 +31,7 @@ const settingsController = {
async code(req, res) {
const code = req.query.code
let client_id, client_secret, instance
const callback = `${baseurl}/api/settings/oauth`
const callback = `${process.env.baseurl}/api/settings/oauth`
const settings = await settingsController.settings()

10
server/api/controller/user.js
View File

@@ -30,7 +30,7 @@ const userController = {
email: user.email,
scope: [user.is_admin ? 'admin' : 'user']
},
config.SECRET_CONF.secret
config.secret
)
res.json({ token: accessToken })
@@ -164,7 +164,7 @@ const userController = {
if (!user) return res.sendStatus(200)
user.recover_code = crypto.randomBytes(16).toString('hex')
mail.send(user.email, 'recover', { user, config: config.SHARED_CONF })
mail.send(user.email, 'recover', { user, config })
await user.save()
res.sendStatus(200)
@@ -208,7 +208,7 @@ const userController = {
const user = await User.findByPk(req.body.id)
if (user) {
if (!user.is_active && req.body.is_active) {
await mail.send(user.email, 'confirm', { user, config: config.SHARED_CONF })
await mail.send(user.email, 'confirm', { user, config })
}
await user.update(req.body)
res.json(user)
@@ -229,7 +229,7 @@ const userController = {
const user = await User.create(req.body)
try {
mail.send([user.email, config.SECRET_CONF.admin], 'register', { user, config: config.SHARED_CONF })
mail.send([user.email, config.admin], 'register', { user, config })
} catch (e) {
return res.status(400).json(e)
}
@@ -238,7 +238,7 @@ const userController = {
email: user.email,
scope: [user.is_admin ? 'admin' : 'user']
}
const token = jwt.sign(payload, config.SECRET_CONF.secret)
const token = jwt.sign(payload, config.secret)
res.json({ token, user })
} catch (e) {
res.status(404).json(e)