Skip to content

FORMS-1155 lock down form version viewing #1777

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
BrandonSharratt wants to merge 4 commits into
base: main
Choose a base branch
from
Open

FORMS-1155 lock down form version viewing #1777

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
8d92371
change backend and frontend
BrandonSharratt Oct 25, 2025
a24bad0
Merge branch 'main' into feature/no_manage_without_perm
BrandonSharratt Oct 25, 2025
917233e
Merge branch 'main' into feature/no_manage_without_perm
nimya-aot Oct 30, 2025
b26abee
Merge branch 'main' into feature/no_manage_without_perm
BrandonSharratt Nov 5, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 13 additions & 5 deletions app/frontend/src/components/forms/manage/ManageLayout.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,11 @@ import { useI18n } from 'vue-i18n';

import ManageForm from '~/components/forms/manage/ManageForm.vue';
import ManageFormActions from '~/components/forms/manage/ManageFormActions.vue';
import { useNotificationStore } from '~/store/notification';
import { useFormStore } from '~/store/form';
import { FormPermissions } from '~/utils/constants';

const { locale } = useI18n({ useScope: 'global' });
const { locale, t } = useI18n({ useScope: 'global' });

const properties = defineProps({
f: {
Expand All @@ -19,17 +20,24 @@ const properties = defineProps({

const loading = ref(true);

const notificationStore = useNotificationStore();

const { form, permissions, isRTL } = storeToRefs(useFormStore());

onMounted(async () => {
loading.value = true;

const formStore = useFormStore();

await Promise.all([
formStore.fetchForm(properties.f),
formStore.getFormPermissionsForUser(properties.f),
]);
await formStore.fetchForm(properties.f);

if (formStore.form.versions) {
await formStore.getFormPermissionsForUser(properties.f);
} else {
notificationStore.addNotification({
text: t('trans.baseSecure.401UnAuthorizedErrMsg'),
Copy link
Contributor

@jasonchung1871 jasonchung1871 Nov 10, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If this fails, a more appropriate message should be considered. It could be an error message specifically for getFormPermissionsForUser failing.

});
}

if (permissions.value.includes(FormPermissions.DESIGN_READ))
await formStore.fetchDrafts(properties.f);
Expand Down
2 changes: 1 addition & 1 deletion app/src/forms/form/controller.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ module.exports = {
},
readForm: async (req, res, next) => {
try {
const response = await service.readForm(req.params.formId, req.query);
const response = await service.readForm(req.params.formId, req.query, req.currentUser);
res.status(200).json(response);
} catch (error) {
next(error);
Expand Down
25 changes: 20 additions & 5 deletions app/src/forms/form/service.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ const { ref } = require('objection');
const uuid = require('uuid');
const { EmailTypes, ScheduleType } = require('../common/constants');
const eventService = require('../event/eventService');
const authService = require('../auth/service');
const moment = require('moment');
const {
DocumentTemplate,
Expand Down Expand Up @@ -380,16 +381,30 @@ const service = {
}
},

readForm: (formId, params = {}) => {
readForm: async (formId, params = {}, currentUser = null) => {
params = queryUtils.defaultActiveOnly(params);
return Form.query()

let hasPermissionsForVersions = true;
// Making an assumption that user is turned away before this if it's protected and they're not logged in
if (currentUser !== null && currentUser !== undefined) {
const forms = await authService.getUserForms(currentUser, {
...params,
active: true,
formId: formId,
});
hasPermissionsForVersions = forms.some((f) => f.permissions.includes(Permissions.DESIGN_CREATE));
}

const query = Form.query()
.findById(formId)
.modify('filterActive', params.active)
.allowGraph('[formMetadata,identityProviders,versions]')
.withGraphFetched('formMetadata')
.withGraphFetched('identityProviders(orderDefault)')
.withGraphFetched('versions(selectWithoutSchema, orderVersionDescending)')
.throwIfNotFound();
.withGraphFetched('identityProviders(orderDefault)');
if (hasPermissionsForVersions) {
query.withGraphFetched('versions(selectWithoutSchema, orderVersionDescending)');
}
return query.throwIfNotFound();
},

readFormOptions: (formId, params = {}) => {
Expand Down