Skip to content

Commit

Permalink
survey create: improve error message if max number of surveys is reac…
Browse files Browse the repository at this point in the history
…hed (#3601)

Co-authored-by: Stefano Ricci <[email protected]>
Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
3 people authored Oct 16, 2024

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature.
1 parent f0aa7f7 commit 9b1352a
Showing 2 changed files with 22 additions and 14 deletions.
15 changes: 11 additions & 4 deletions server/modules/auth/authApiMiddleware.js
Original file line number Diff line number Diff line change
@@ -3,6 +3,7 @@ import * as Request from '@server/utils/request'
import * as Authorizer from '@core/auth/authorizer'
import * as Survey from '@core/survey/survey'
import * as User from '@core/user/user'
import { StatusCodes } from '@core/systemError'

import UnauthorizedError from '@server/utils/unauthorizedError'
import * as SurveyManager from '@server/modules/survey/manager/surveyManager'
@@ -81,13 +82,19 @@ const requireUserPermission = (permissionFn) => async (req, _res, next) => {
}
}

export const requireLoggedInUser = async (req, _res, next) => {
const sendUnauthorizedError = ({ res, req = null }) => {
const userName = req ? User.getName(Request.getUser(req)) : null
const error = new UnauthorizedError(userName)
res.send(StatusCodes.UNAUTHORIZED, JSON.stringify(error))
}

export const requireLoggedInUser = async (req, res, next) => {
const user = Request.getUser(req)
return user ? next() : next(new UnauthorizedError())
return user ? next() : sendUnauthorizedError({ res })
}

// Survey
export const requireSurveyCreatePermission = async (req, _res, next) => {
export const requireSurveyCreatePermission = async (req, res, next) => {
const user = Request.getUser(req)
if (Authorizer.canCreateSurvey(user)) {
const ownedSurveys = await SurveyManager.countOwnedSurveys({ user })
@@ -97,7 +104,7 @@ export const requireSurveyCreatePermission = async (req, _res, next) => {
return
}
}
next(new UnauthorizedError(User.getName(user)))
sendUnauthorizedError({ req, res })
}
export const requireSurveyViewPermission = requireSurveyPermission(Authorizer.canViewSurvey)
export const requireSurveyEditPermission = requireSurveyPermission(Authorizer.canEditSurvey)
21 changes: 11 additions & 10 deletions webapp/components/survey/SurveyCreate/store/actions/useOnCreate.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import { useDispatch } from 'react-redux'

import * as Authorizer from '@core/auth/authorizer'
import { StatusCodes } from '@core/systemError'

import { SurveyActions } from '@webapp/store/survey'
import { JobActions } from '@webapp/store/app'
@@ -16,16 +17,16 @@ const sendSurveyCreateRequest = async ({ dispatch, newSurvey, user }) => {

return await API.insertSurvey({ newSurvey: { ...newSurvey, cloneFrom: cloneFromSurveyId } })
} catch (e) {
const maxSurveysCount = Authorizer.getMaxSurveysUserCanCreate(user)
const errorKey = Number.isNaN(maxSurveysCount)
? 'homeView.surveyCreate.error'
: 'homeView.surveyCreate.errorMaxSurveysCountExceeded'
dispatch(
NotificationActions.notifyError({
key: errorKey,
params: { maxSurveysCount },
})
)
let errorKey = null,
errorParams = null
if (e.status === StatusCodes.UNAUTHORIZED) {
const maxSurveysCount = Authorizer.getMaxSurveysUserCanCreate(user)
errorKey = 'homeView.surveyCreate.errorMaxSurveysCountExceeded'
errorParams = { maxSurveysCount }
} else {
errorKey = 'homeView.surveyCreate.error'
}
dispatch(NotificationActions.notifyError({ key: errorKey, params: errorParams }))
return null
}
}

0 comments on commit 9b1352a

Please sign in to comment.