|
@@ -402,7 +402,6 @@ const ProjectController = {
|
|
|
const timer = new metrics.Timer('project-list')
|
|
const timer = new metrics.Timer('project-list')
|
|
|
const userId = AuthenticationController.getLoggedInUserId(req)
|
|
const userId = AuthenticationController.getLoggedInUserId(req)
|
|
|
const currentUser = AuthenticationController.getSessionUser(req)
|
|
const currentUser = AuthenticationController.getSessionUser(req)
|
|
|
- let noV1Connection = false
|
|
|
|
|
let institutionLinkingError
|
|
let institutionLinkingError
|
|
|
async.parallel(
|
|
async.parallel(
|
|
|
{
|
|
{
|
|
@@ -424,7 +423,6 @@ const ProjectController = {
|
|
|
currentUser,
|
|
currentUser,
|
|
|
(error, hasPaidSubscription) => {
|
|
(error, hasPaidSubscription) => {
|
|
|
if (error != null && error instanceof V1ConnectionError) {
|
|
if (error != null && error instanceof V1ConnectionError) {
|
|
|
- noV1Connection = true
|
|
|
|
|
return cb(null, true)
|
|
return cb(null, true)
|
|
|
}
|
|
}
|
|
|
cb(error, hasPaidSubscription)
|
|
cb(error, hasPaidSubscription)
|
|
@@ -443,7 +441,6 @@ const ProjectController = {
|
|
|
|
|
|
|
|
UserGetter.getUserFullEmails(userId, (error, fullEmails) => {
|
|
UserGetter.getUserFullEmails(userId, (error, fullEmails) => {
|
|
|
if (error && error instanceof V1ConnectionError) {
|
|
if (error && error instanceof V1ConnectionError) {
|
|
|
- noV1Connection = true
|
|
|
|
|
return cb(null, result)
|
|
return cb(null, result)
|
|
|
}
|
|
}
|
|
|
|
|
|
|
@@ -593,7 +590,6 @@ const ProjectController = {
|
|
|
results.projects,
|
|
results.projects,
|
|
|
userId
|
|
userId
|
|
|
)
|
|
)
|
|
|
- const warnings = ProjectController._buildWarningsList(noV1Connection)
|
|
|
|
|
|
|
|
|
|
// in v2 add notifications for matching university IPs
|
|
// in v2 add notifications for matching university IPs
|
|
|
if (Settings.overleaf != null && req.ip !== user.lastLoginIp) {
|
|
if (Settings.overleaf != null && req.ip !== user.lastLoginIp) {
|
|
@@ -618,7 +614,6 @@ const ProjectController = {
|
|
|
userEmails,
|
|
userEmails,
|
|
|
hasSubscription: results.hasSubscription,
|
|
hasSubscription: results.hasSubscription,
|
|
|
institutionLinkingError,
|
|
institutionLinkingError,
|
|
|
- warnings,
|
|
|
|
|
zipFileSizeLimit: Settings.maxUploadSize
|
|
zipFileSizeLimit: Settings.maxUploadSize
|
|
|
}
|
|
}
|
|
|
|
|
|
|
@@ -1049,14 +1044,6 @@ const ProjectController = {
|
|
|
)
|
|
)
|
|
|
},
|
|
},
|
|
|
|
|
|
|
|
- _buildWarningsList(noConnection) {
|
|
|
|
|
- return noConnection
|
|
|
|
|
- ? [
|
|
|
|
|
- 'Error accessing Overleaf V1. Some of your projects or features may be missing.'
|
|
|
|
|
- ]
|
|
|
|
|
- : []
|
|
|
|
|
- },
|
|
|
|
|
-
|
|
|
|
|
_buildPortalTemplatesList(affiliations) {
|
|
_buildPortalTemplatesList(affiliations) {
|
|
|
if (affiliations == null) {
|
|
if (affiliations == null) {
|
|
|
affiliations = []
|
|
affiliations = []
|