Add edit profile for superadmin

packages/server/profile/profile.controller.js

@@ -2,14 +2,17 @@ const asyncHandler = require('express-async-handler');
 const profileService = require('./profile.service');
 const mailingService = require('../mailing/mailing.service');
 const groupService = require('../group/group.service');
+const { NotFound } = require('http-errors');
 
 module.exports = {
- create: asyncHandler(create),
+ createProfile: asyncHandler(createProfile),
+ updateProfile: asyncHandler(updateProfile),
  sendCampaignMail: asyncHandler(sendCampaignMail),
  deleteProfile: asyncHandler(deleteProfile),
  profileListEditor: asyncHandler(profileListEditor),
  getCampaignMail: asyncHandler(getCampaignMail),
  readProfile: asyncHandler(readProfile),
+ readProfileForAdmin: asyncHandler(readProfileForAdmin),
 };
 
 /**
@@ -27,11 +30,11 @@ module.exports = {
  * @apiUse profile
  */
 
-async function create(req, res) {
+async function createProfile(req, res) {
  const { user } = req;
  const { name, type, apiKey, _company, ...additionalApiData } = req.body;
 
- const response = await profileService.create({
+ const response = await profileService.createProfile({
  user,
  name,
  type,
@@ -43,6 +46,39 @@ async function create(req, res) {
  res.json(response);
 }
 
+/**
+ * @api {post} /profiles/:profileId profile edition
+ * @apiPermission admin
+ * @apiName UpdateProfile
+ * @apiGroup Profiles
+ *
+ * @apiParam (Body) {String} name profile name.
+ * @apiParam (Body) {String} type Profile type
+ * @apiParam (Body) {String} apiKey the provider key
+ * @apiParam (Body) {String} _company the ID of the group
+ * @apiParam (Body) {String} data the data to be used with the adequat ESP provider
+ *
+ * @apiUse profile
+ * @apiSuccess {profile} profile updated
+ */
+
+async function updateProfile(req, res) {
+ const { user } = req;
+ const { name, type, apiKey, _company, id, ...additionalApiData } = req.body;
+
+ const response = await profileService.updateProfile({
+ user,
+ id,
+ name,
+ type,
+ apiKey,
+ _company,
+ additionalApiData,
+ });
+
+ res.json(response);
+}
+
 /**
  * @api {post} /profiles/send-campaign-mail send campaign mail to ESP
  * @apiPermission admin
@@ -166,3 +202,31 @@ async function readProfile(req, res) {
 
  res.send({ result: getProfileResult });
 }
+
+/**
+ * @api {get} /profiles/:profileId/admin Get profile detail for admin
+ * @apiPermission admin
+ * @apiName ProfileCampaign
+ * @apiGroup Profiles
+ *
+ * @apiParam {string} profileId
+ *
+ */
+async function readProfileForAdmin(req, res) {
+ const { user, params } = req;
+ const { profileId } = params;
+
+ if (!user.isAdmin) {
+ throw new NotFound();
+ }
+ await profileService.checkIfUserIsAuthorizedToAccessProfile({
+ user,
+ profileId,
+ });
+
+ console.log({ profileId });
+
+ const getProfileResult = await profileService.findOne(profileId);
+
+ res.send({ result: getProfileResult });
+}

packages/server/profile/profile.routes.js

@@ -8,14 +8,16 @@ const profiles = require('./profile.controller.js');
 
 const { GUARD_USER, GUARD_ADMIN } = require('../account/auth.guard.js');
 
-router.post('/', GUARD_ADMIN, profiles.create);
+router.post('/', GUARD_ADMIN, profiles.createProfile);
+router.post('/:profileId', GUARD_ADMIN, profiles.updateProfile);
 router.post(
  '/:mailingId/send-campaign-mail',
  GUARD_USER,
  profiles.sendCampaignMail
 );
 router.delete('/:profileId', GUARD_ADMIN, profiles.deleteProfile);
 router.get('/:profileId', GUARD_USER, profiles.readProfile);
+router.get('/:profileId/admin', GUARD_ADMIN, profiles.readProfileForAdmin);
 router.get(
  '/:groupId/profile-list-for-editor',
  GUARD_USER,

packages/server/profile/profile.service.js

@@ -14,7 +14,8 @@ const mailingService = require('../mailing/mailing.service.js');
 const groupService = require('../group/group.service.js');
 
 module.exports = {
- create,
+ createProfile,
+ updateProfile,
  sendCampaignMail,
  findAllByGroup,
  deleteProfile,
@@ -35,7 +36,13 @@ async function checkIfUserIsAuthorizedToAccessProfile({ user, profileId }) {
  }
 }
 
-async function create({ name, type, apiKey, _company, additionalApiData }) {
+async function createProfile({
+ name,
+ type,
+ apiKey,
+ _company,
+ additionalApiData,
+}) {
  const espProvider = new EspProvider({
  apiKey,
  type,
@@ -59,6 +66,41 @@ async function create({ name, type, apiKey, _company, additionalApiData }) {
  });
 }
 
+async function updateProfile({
+ id,
+ name,
+ type,
+ apiKey,
+ _company,
+ additionalApiData,
+}) {
+ await findOne(id);
+
+ const espProvider = new EspProvider({
+ apiKey,
+ type,
+ name,
+ _company,
+ additionalApiData,
+ });
+
+ const espConnectionResult = await espProvider.connectApi();
+ if (!espConnectionResult) {
+ throw new NotFound(ERROR_CODES.PROFILE_NOT_FOUND);
+ }
+
+ return Profiles.updateOne(
+ { _id: Types.ObjectId(id) },
+ {
+ name,
+ type,
+ apiKey,
+ _company,
+ additionalApiData,
+ }
+ );
+}
+
 async function sendCampaignMail({
  user,
  espSendingMailData,

packages/server/workspace/workspace.routes.js

@@ -4,7 +4,6 @@ const express = require('express');
 const { guard, GUARD_GROUP_ADMIN } = require('../account/auth.guard');
 
 const router = express.Router();
-const Roles = require('../account/roles.js');
 
 const workspacesController = require('./workspace.controller.js');
 
@@ -18,7 +17,7 @@ router.post('/', GUARD_GROUP_ADMIN, workspacesController.createWorkspace);
 
 router.put(
  '/:workspaceId',
- guard([Roles.SUPER_ADMIN, Roles.GROUP_ADMIN]),
+ guard(GUARD_GROUP_ADMIN),
  workspacesController.updateWorkspace
 );
 

packages/ui/components/group/profile-tab.vue

@@ -10,7 +10,7 @@ export default {
  BsProfilesTable,
  },
  data() {
- return { profiles: [], loading: false };
+ return { profiles: [], loading: false, groupId: null };
  },
  async mounted() {
  await this.fetchData();
@@ -22,6 +22,7 @@ export default {
  $axios,
  $route: { params },
  } = this;
+ this.groupId = params.groupId;
  this.loading = true;
  const { items } = await $axios.$get(groupsProfiles(params));
  this.profiles = items;
@@ -51,6 +52,7 @@ export default {
  <v-card-text>
  <bs-profiles-table
  :profiles="profiles"
+ :group-id="groupId"
  :loading="loading"
  @delete="handleDelete"
  />

packages/ui/components/profiles/esp/SENDINBLUEComponent.vue

@@ -8,16 +8,18 @@ export default {
  props: {
  disabled: { type: Boolean, default: false },
  isLoading: { type: Boolean, default: false },
+ profileData: { type: Object, default: () => ({}) },
  },
  data() {
  return {
  submitStatus: null,
  profile: {
- name: '',
- apiKey: '',
- senderName: '',
- senderMail: '',
- replyTo: '',
+ id: this.profileData.id ?? '',
+ name: this.profileData.name ?? '',
+ apiKey: this.profileData.apiKey ?? '',
+ senderName: this.profileData.senderName ?? '',
+ senderMail: this.profileData.senderMail ?? '',
+ replyTo: this.profileData.replyTo ?? '',
  type: 'SENDINBLUE',
  },
  };

packages/ui/components/profiles/profile-form.vue

@@ -2,9 +2,7 @@
 import { validationMixin } from 'vuelidate';
 import SENDINBLUEComponent from '../../components/profiles/esp/SENDINBLUEComponent';
 import ACTITOComponent from '../../components/profiles/esp/ACTITOComponent';
-import { mapMutations } from 'vuex';
-import { PAGE, SHOW_SNACKBAR } from '~/store/page';
-import { groupsItem, getProfiles } from '~/helpers/api-routes';
+import { groupsItem } from '~/helpers/api-routes';
 import { ESP_TYPES } from '~/helpers/constants/esp-type';
 
 export default {
@@ -16,6 +14,7 @@ export default {
  mixins: [validationMixin],
  props: {
  title: { type: String, default: '' },
+ profile: { type: Object, default: () => ({}) },
  },
  data: () => {
  return {
@@ -40,43 +39,12 @@ export default {
  },
  },
  async mounted() {
+ if (this.profile.type) {
+ this.selectedEsp = this.profile.type;
+ }
  await this.fetchGroup();
  },
  methods: {
- ...mapMutations(PAGE, { showSnackbar: SHOW_SNACKBAR }),
- async createProfile(data) {
- const { $axios, $route } = this;
- const { groupId } = $route.params;
- try {
- console.log({ data });
- this.loading = true;
- await $axios.$post(getProfiles(), {
- _company: groupId,
- ...data,
- });
- this.showSnackbar({
- text: this.$t('snackbars.created'),
- color: 'success',
- });
- this.$router.push(`/groups/${groupId}`);
- } catch (error) {
- switch (error?.response?.status) {
- case 401:
- this.showSnackbar({
- text: this.$t('forms.profile.errors.apiKey.unauthorized'),
- color: 'error',
- });
- break;
- default:
- this.showSnackbar({
- text: this.$t('global.errors.errorOccured'),
- color: 'error',
- });
- }
- } finally {
- this.loading = false;
- }
- },
  handleEspChange(value) {
  this.selectedEsp = value;
  },
@@ -90,6 +58,9 @@ export default {
  console.log(error);
  }
  },
+ handleSubmit(newProfile) {
+ this.$emit('submit', newProfile);
+ },
  },
 };
 </script>
@@ -131,9 +102,10 @@ export default {
  <client-only>
  <component
  :is="selectedEspName"
+ :profile-data="profile"
  :disabled="!group.downloadMailingWithFtpImages"
  :loading="loading"
- @submit="createProfile($event)"
+ @submit="handleSubmit"
  />
  </client-only>
  </v-col>

packages/ui/components/profiles/table.vue

@@ -15,6 +15,7 @@ export default {
  props: {
  profiles: { type: Array, default: () => [] },
  loading: { type: Boolean, default: false },
+ groupId: { type: String, default: null },
  },
  data() {
  return {
@@ -93,8 +94,11 @@ export default {
  </template>
  <template #item.actions="{ item }">
  <profiles-actions-dropdown>
- <profiles-actions-dropdown-item icon="edit" disabled>
- {{ $t('profiles.edit') }}
+ <profiles-actions-dropdown-item
+ icon="delete"
+ :to="`/groups/${groupId}/profiles/${item.id}`"
+ >
+ {{ $t('global.edit') }}
  </profiles-actions-dropdown-item>
  <profiles-actions-dropdown-item
  icon="delete"

packages/ui/helpers/api-routes.js

@@ -209,3 +209,7 @@ export function getProfiles() {
 export function getProfileId(getProfileId) {
  return `/profiles/${getProfileId}`;
 }
+
+export function getProfileForAdmin(getProfileId) {
+ return `/profiles/${getProfileId}/admin`;
+}

packages/ui/helpers/locales/en.js

@@ -47,6 +47,7 @@ export default {
  mailing: 'Email | Emails',
  newMailing: 'Add an email',
  newProfile: 'Add an export profile',
+ editProfile: 'Edit export profile {name}',
  profile: 'Profile | Profiles',
  user: 'User | Users',
  newUser: 'Add a user',

packages/ui/helpers/locales/fr.js

@@ -50,6 +50,7 @@ export default {
  newUser: 'Ajouter un utilisateur',
  newTeam: 'Ajouter un workspace',
  newProfile: 'Ajouter un profil d\'exportation',
+ editProfile: 'Éditer le profil d\'exportation {name}',
  profile: 'Profil | Profils',
  newTag: 'Ajouter un tag',
  backToMails: 'Retour aux emails',