jbourdon/social-media
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(workspace-invite): inconsistence in roles names

Browse Source
This commit is contained in:
Jonathan Bourdon
2026-04-30 15:45:32 -04:00
parent 07458c1541
commit ace0279bd0
7 changed files with 216 additions and 210 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
backend/src/Socialize.Api/Modules/Identity/Contracts/KnownRoles.cs
View File

@@ -2,10 +2,10 @@
public static class KnownRoles
{
public const string Administrator = nameof(Administrator);
public const string Manager = nameof(Manager);
public const string Client = nameof(Client);
public const string Provider = nameof(Provider);
public const string WorkspaceMember = nameof(WorkspaceMember);
public const string Developer = nameof(Developer);
public const string Administrator = "administrator";
public const string Manager = "manager";
public const string Client = "client";
public const string Provider = "provider";
public const string WorkspaceMember = "workspace-member";
public const string Developer = "developer";
}

6
backend/src/Socialize.Api/Modules/Workspaces/Data/WorkspaceInviteStatuses.cs Normal file
View File

@@ -0,0 +1,6 @@
namespace Socialize.Api.Modules.Workspaces.Data;
public static class WorkspaceInviteStatuses
{
public const string Pending = "Pending";
}

6
backend/src/Socialize.Api/Modules/Workspaces/Handlers/CreateWorkspaceInvite.cs
View File

@@ -24,7 +24,7 @@ public class CreateWorkspaceInviteRequestValidator
public CreateWorkspaceInviteRequestValidator()
{
RuleFor(x => x.Email).NotEmpty().MaximumLength(256).EmailAddress();
RuleFor(x => x.Role).NotEmpty().Must(role => AllowedRoles.Contains(role));
RuleFor(x => x.Role).NotEmpty().Must(role => AllowedRoles.Contains(role)).WithMessage("A valid role should be specified");
}
}
@@ -65,7 +65,7 @@ public class CreateWorkspaceInviteHandler(
bool duplicateInvite = await dbContext.WorkspaceInvites.AnyAsync(
invite => invite.WorkspaceId == workspaceId &&
invite.Email == normalizedEmail &&
invite.Status == "Pending",
invite.Status == WorkspaceInviteStatuses.Pending,
ct);
if (duplicateInvite)
@@ -81,7 +81,7 @@ public class CreateWorkspaceInviteHandler(
WorkspaceId = workspaceId,
Email = normalizedEmail,
Role = normalizedRole,
Status = "Pending",
Status = WorkspaceInviteStatuses.Pending,
InvitedByUserId = User.GetUserId(),
CreatedAt = DateTimeOffset.UtcNow,
};

6
frontend/src/features/workspaces/views/WorkspaceSettingsView.vue
View File

@@ -29,7 +29,7 @@
const inviteForm = reactive({
email: '',
role: 'workspaceMember',
role: 'workspace-member',
});
const pendingInvites = computed(() =>
@@ -161,7 +161,7 @@
});
inviteForm.email = '';
inviteForm.role = 'workspaceMember';
inviteForm.role = 'workspace-member';
} catch (error) {
console.error('Failed to invite workspace member:', error);
}
@@ -330,7 +330,7 @@
<label class="field">
<span>{{ t('workspaceSettings.fields.memberRole') }}</span>
<select v-model="inviteForm.role">
<option value="workspaceMember">{{ t('workspaceSettings.roles.workspaceMember') }}</option>
<option value="workspace-member">{{ t('workspaceSettings.roles.workspace-member') }}</option>
<option value="client">{{ t('workspaceSettings.roles.client') }}</option>
<option value="provider">{{ t('workspaceSettings.roles.provider') }}</option>
</select>

4
frontend/src/locales/en.json
View File

@@ -512,7 +512,7 @@
"manager": "Manager",
"client": "Client reviewer",
"provider": "Subcontractor",
"workspaceMember": "Workspace member"
"workspace-member": "Workspace member"
},
"summary": {
"name": "Name",
@@ -638,4 +638,4 @@
"imageLoad": "Error loading image",
"imageUpload": "Error uploading image"
}
}
}

4
frontend/src/locales/fr.json
View File

@@ -512,7 +512,7 @@
"manager": "Gestionnaire",
"client": "Réviseur client",
"provider": "Sous-traitant",
"workspaceMember": "Membre de l'espace"
"workspace-member": "Membre de l'espace"
},
"summary": {
"name": "Nom",
@@ -638,4 +638,4 @@
"imageLoad": "Erreur lors du chargement de l'image",
"imageUpload": "Erreur lors du téléchargement de l'image"
}
}
}

388
frontend/src/router/router.js
View File

@@ -27,211 +27,211 @@ const DeveloperFeedbackListView = () => import('@/features/feedback/views/Develo
const DeveloperFeedbackDetailView = () => import('@/features/feedback/views/DeveloperFeedbackDetailView.vue');
const routes = [
{
path: '/',
name: 'landing',
component: Landing,
},
{
path: '/app',
redirect: { name: 'dashboard' },
},
{
path: '/app/dashboard',
name: 'dashboard',
component: OverviewView,
meta: { requiresAuth: true },
},
{
path: '/app/workspace',
name: 'workspace-dashboard',
component: DashboardView,
meta: { requiresAuth: true },
},
{
path: '/app/channels',
name: 'channels',
component: ChannelsView,
meta: { requiresAuth: true },
},
{
path: '/app/media-library',
name: 'media-library',
component: MediaLibraryView,
meta: { requiresAuth: true },
},
{
path: '/app/campaigns',
name: 'campaigns',
component: CampaignsView,
meta: { requiresAuth: true },
},
{
path: '/app/campaigns/:projectId',
name: 'campaign-detail',
component: CampaignDetailView,
meta: { requiresAuth: true },
},
{
path: '/app/reviews',
name: 'review-queue',
component: ReviewQueueView,
meta: { requiresAuth: true },
},
{
path: '/app/my-feedback',
name: 'my-feedback',
component: MyFeedbackListView,
meta: { requiresAuth: true },
},
{
path: '/app/my-feedback/:id',
name: 'my-feedback-detail',
component: MyFeedbackDetailView,
meta: { requiresAuth: true },
},
{
path: '/app/feedback',
name: 'developer-feedback',
component: DeveloperFeedbackListView,
meta: { requiresAuth: true, roles: ['Developer'] },
},
{
path: '/app/feedback/:id',
name: 'developer-feedback-detail',
component: DeveloperFeedbackDetailView,
meta: { requiresAuth: true, roles: ['Developer'] },
},
{
path: '/app/workspace-settings',
name: 'workspace-settings',
{
path: '/',
name: 'landing',
component: Landing,
},
{
path: '/app',
redirect: { name: 'dashboard' },
},
{
path: '/app/dashboard',
name: 'dashboard',
component: OverviewView,
meta: { requiresAuth: true },
},
{
path: '/app/workspace',
name: 'workspace-dashboard',
component: DashboardView,
meta: { requiresAuth: true },
},
{
path: '/app/channels',
name: 'channels',
component: ChannelsView,
meta: { requiresAuth: true },
},
{
path: '/app/media-library',
name: 'media-library',
component: MediaLibraryView,
meta: { requiresAuth: true },
},
{
path: '/app/campaigns',
name: 'campaigns',
component: CampaignsView,
meta: { requiresAuth: true },
},
{
path: '/app/campaigns/:projectId',
name: 'campaign-detail',
component: CampaignDetailView,
meta: { requiresAuth: true },
},
{
path: '/app/reviews',
name: 'review-queue',
component: ReviewQueueView,
meta: { requiresAuth: true },
},
{
path: '/app/my-feedback',
name: 'my-feedback',
component: MyFeedbackListView,
meta: { requiresAuth: true },
},
{
path: '/app/my-feedback/:id',
name: 'my-feedback-detail',
component: MyFeedbackDetailView,
meta: { requiresAuth: true },
},
{
path: '/app/feedback',
name: 'developer-feedback',
component: DeveloperFeedbackListView,
meta: { requiresAuth: true, roles: ['developer'] },
},
{
path: '/app/feedback/:id',
name: 'developer-feedback-detail',
component: DeveloperFeedbackDetailView,
meta: { requiresAuth: true, roles: ['developer'] },
},
{
path: '/app/workspace-settings',
name: 'workspace-settings',
component: WorkspaceSettingsView,
meta: { requiresAuth: true, roles: ['administrator', 'manager'] },
},
{
path: '/app/workspaces/new',
name: 'workspace-create',
component: WorkspaceCreateView,
meta: { requiresAuth: true, roles: ['administrator', 'manager'] },
},
{
path: '/app/settings',
component: SettingsLayoutView,
meta: { requiresAuth: true },
children: [
{
path: '',
redirect: { name: 'settings-user-information' },
},
{
path: 'user-information',
name: 'settings-user-information',
component: UserSettingsView,
},
{
path: 'workspaces',
name: 'settings-workspaces',
component: WorkspaceSettingsView,
meta: { requiresAuth: true, roles: ['Administrator', 'Manager'] },
},
{
path: '/app/workspaces/new',
name: 'workspace-create',
component: WorkspaceCreateView,
meta: { requiresAuth: true, roles: ['Administrator', 'Manager'] },
},
{
path: '/app/settings',
component: SettingsLayoutView,
meta: { requiresAuth: true },
children: [
{
path: '',
redirect: { name: 'settings-user-information' },
},
{
path: 'user-information',
name: 'settings-user-information',
component: UserSettingsView,
},
{
path: 'workspaces',
name: 'settings-workspaces',
component: WorkspaceSettingsView,
meta: { requiresAuth: true, roles: ['Administrator', 'Manager'] },
},
{
path: 'integrations',
name: 'settings-integrations',
component: IntegrationsSettingsView,
meta: { requiresAuth: true, roles: ['Administrator', 'Manager'] },
},
],
},
{
path: '/app/content',
name: 'content-items',
component: ContentItemsView,
meta: { requiresAuth: true },
},
{
path: '/app/content/new',
name: 'content-item-create',
component: ContentItemDetailView,
meta: { requiresAuth: true },
},
{
path: '/app/content/:id',
name: 'content-item-detail',
component: ContentItemDetailView,
meta: { requiresAuth: true },
},
{
path: '/login',
name: 'login',
component: LoginView,
meta: { notAuthenticated: true },
props: route => ({ returnUrl: route.query.returnUrl || '/app/dashboard' }),
},
{
path: '/profile',
redirect: { name: 'dashboard' },
},
{
path: '/register',
name: 'register',
component: RegisterView,
meta: { requiresAuth: false },
},
{
path: '/forgot-password',
name: 'forgot-password',
component: ForgotPasswordView,
meta: { notAuthenticated: true },
},
{
path: '/reset-password',
name: 'reset-password',
component: ResetPasswordView,
meta: { notAuthenticated: true },
props: route => ({ email: route.query.email, token: route.query.token }),
},
{
path: '/verify-email',
name: 'verify-email',
component: VerifyEmailView,
meta: { notAuthenticated: true },
},
{
path: '/:pathMatch(.*)*',
redirect: { name: 'landing' },
},
meta: { requiresAuth: true, roles: ['administrator', 'manager'] },
},
{
path: 'integrations',
name: 'settings-integrations',
component: IntegrationsSettingsView,
meta: { requiresAuth: true, roles: ['administrator', 'manager'] },
},
],
},
{
path: '/app/content',
name: 'content-items',
component: ContentItemsView,
meta: { requiresAuth: true },
},
{
path: '/app/content/new',
name: 'content-item-create',
component: ContentItemDetailView,
meta: { requiresAuth: true },
},
{
path: '/app/content/:id',
name: 'content-item-detail',
component: ContentItemDetailView,
meta: { requiresAuth: true },
},
{
path: '/login',
name: 'login',
component: LoginView,
meta: { notAuthenticated: true },
props: route => ({ returnUrl: route.query.returnUrl || '/app/dashboard' }),
},
{
path: '/profile',
redirect: { name: 'dashboard' },
},
{
path: '/register',
name: 'register',
component: RegisterView,
meta: { requiresAuth: false },
},
{
path: '/forgot-password',
name: 'forgot-password',
component: ForgotPasswordView,
meta: { notAuthenticated: true },
},
{
path: '/reset-password',
name: 'reset-password',
component: ResetPasswordView,
meta: { notAuthenticated: true },
props: route => ({ email: route.query.email, token: route.query.token }),
},
{
path: '/verify-email',
name: 'verify-email',
component: VerifyEmailView,
meta: { notAuthenticated: true },
},
{
path: '/:pathMatch(.*)*',
redirect: { name: 'landing' },
},
];
const router = createRouter({
history: createWebHistory(import.meta.env.BASE_URL),
routes,
history: createWebHistory(import.meta.env.BASE_URL),
routes,
});
// Navigation guards
router.beforeEach((to, from, next) => {
const authStore = useAuthStore();
const authStore = useAuthStore();
if (to.matched.some(record => record.meta.requiresAuth)) {
if (!authStore.isAuthenticated) {
next({
name: 'login',
query: { returnUrl: to.fullPath },
});
} else {
const requiredRoles = to.matched.flatMap(record => record.meta.roles ?? []);
if (requiredRoles.length > 0 && !authStore.hasAnyRole(requiredRoles)) {
next({ name: 'dashboard' });
return;
}
next();
}
} else if (to.matched.some(record => record.meta.notAuthenticated)) {
if (authStore.isAuthenticated) next({ name: 'dashboard' });
else next();
if (to.matched.some(record => record.meta.requiresAuth)) {
if (!authStore.isAuthenticated) {
next({
name: 'login',
query: { returnUrl: to.fullPath },
});
} else {
next();
const requiredRoles = to.matched.flatMap(record => record.meta.roles ?? []);
if (requiredRoles.length > 0 && !authStore.hasAnyRole(requiredRoles)) {
next({ name: 'dashboard' });
return;
}
next();
}
} else if (to.matched.some(record => record.meta.notAuthenticated)) {
if (authStore.isAuthenticated) next({ name: 'dashboard' });
else next();
} else {
next();
}
});
export default router;