Merge pull request #2998 from overleaf/as-beta-page-updates

Update beta program page to include feedback survey link

GitOrigin-RevId: 549cd2be01b8f64d952d0347c8c102d0d2efae24
This commit is contained in:
Alasdair Smith
2020-07-14 14:24:25 +01:00
committed by Copybot
parent d4d6e2c45d
commit 2556fded1e
4 changed files with 66 additions and 97 deletions

View File

@@ -1,60 +1,47 @@
/* eslint-disable
camelcase,
no-unused-vars,
*/
// TODO: This file was created by bulk-decaffeinate.
// Fix any style issues and re-enable lint.
/*
* decaffeinate suggestions:
* DS102: Remove unnecessary code created because of implicit returns
* DS207: Consider shorter variations of null checks
* Full docs: https://github.com/decaffeinate/decaffeinate/blob/master/docs/suggestions.md
*/
let BetaProgramController
const BetaProgramHandler = require('./BetaProgramHandler')
const UserGetter = require('../User/UserGetter')
const Settings = require('settings-sharelatex')
const logger = require('logger-sharelatex')
const AuthenticationController = require('../Authentication/AuthenticationController')
module.exports = BetaProgramController = {
const BetaProgramController = {
optIn(req, res, next) {
const user_id = AuthenticationController.getLoggedInUserId(req)
logger.log({ user_id }, 'user opting in to beta program')
if (user_id == null) {
const userId = AuthenticationController.getLoggedInUserId(req)
logger.log({ userId }, 'user opting in to beta program')
if (userId == null) {
return next(new Error('no user id in session'))
}
return BetaProgramHandler.optIn(user_id, function(err) {
BetaProgramHandler.optIn(userId, function(err) {
if (err) {
return next(err)
}
return res.redirect('/beta/participate')
res.redirect('/beta/participate')
})
},
optOut(req, res, next) {
const user_id = AuthenticationController.getLoggedInUserId(req)
logger.log({ user_id }, 'user opting out of beta program')
if (user_id == null) {
const userId = AuthenticationController.getLoggedInUserId(req)
logger.log({ userId }, 'user opting out of beta program')
if (userId == null) {
return next(new Error('no user id in session'))
}
return BetaProgramHandler.optOut(user_id, function(err) {
BetaProgramHandler.optOut(userId, function(err) {
if (err) {
return next(err)
}
return res.redirect('/beta/participate')
res.redirect('/beta/participate')
})
},
optInPage(req, res, next) {
const user_id = AuthenticationController.getLoggedInUserId(req)
logger.log({ user_id }, 'showing beta participation page for user')
return UserGetter.getUser(user_id, function(err, user) {
const userId = AuthenticationController.getLoggedInUserId(req)
logger.log({ user_id: userId }, 'showing beta participation page for user')
UserGetter.getUser(userId, function(err, user) {
if (err) {
logger.warn({ err, user_id }, 'error fetching user')
logger.warn({ err, userId }, 'error fetching user')
return next(err)
}
return res.render('beta_program/opt_in', {
res.render('beta_program/opt_in', {
title: 'sharelatex_beta_program',
user,
languages: Settings.languages
@@ -62,3 +49,5 @@ module.exports = BetaProgramController = {
})
}
}
module.exports = BetaProgramController