feat(tenancy): add resend invitation for pending team members
Some checks failed
Some checks failed
New resend_invitation() service method regenerates the token and
resends the invitation email for pending members.
Available on all frontends:
- Merchant: POST /merchants/account/team/stores/{sid}/members/{uid}/resend
- Store: POST /store/team/members/{uid}/resend
UI: paper-airplane icon appears on pending members in both merchant
and store team pages.
i18n: resend_invitation + invitation_resent keys in 4 locales.
Also translated previously untranslated invitation_sent_successfully
in fr/de/lb.
Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
This commit is contained in:
@@ -51,6 +51,7 @@
|
|||||||
"title": "Team",
|
"title": "Team",
|
||||||
"total_members": "Mitglieder gesamt",
|
"total_members": "Mitglieder gesamt",
|
||||||
"personal_info": "Persönliche Informationen",
|
"personal_info": "Persönliche Informationen",
|
||||||
|
"resend_invitation": "Einladung erneut senden",
|
||||||
"save_profile": "Profil speichern",
|
"save_profile": "Profil speichern",
|
||||||
"view_member": "Mitglied anzeigen",
|
"view_member": "Mitglied anzeigen",
|
||||||
"account_information": "Kontoinformationen",
|
"account_information": "Kontoinformationen",
|
||||||
@@ -75,7 +76,8 @@
|
|||||||
"please_fix_the_errors_before_saving": "Please fix the errors before saving",
|
"please_fix_the_errors_before_saving": "Please fix the errors before saving",
|
||||||
"profile_updated_successfully": "Profile updated successfully",
|
"profile_updated_successfully": "Profile updated successfully",
|
||||||
"email_is_required": "Email is required",
|
"email_is_required": "Email is required",
|
||||||
"invitation_sent_successfully": "Invitation sent successfully",
|
"invitation_sent_successfully": "Einladung erfolgreich gesendet",
|
||||||
|
"invitation_resent": "Einladung erneut gesendet",
|
||||||
"team_member_updated": "Team member updated",
|
"team_member_updated": "Team member updated",
|
||||||
"team_member_removed": "Team member removed",
|
"team_member_removed": "Team member removed",
|
||||||
"invalid_merchant_url": "Invalid merchant URL",
|
"invalid_merchant_url": "Invalid merchant URL",
|
||||||
|
|||||||
@@ -51,6 +51,7 @@
|
|||||||
"title": "Team",
|
"title": "Team",
|
||||||
"total_members": "Total Members",
|
"total_members": "Total Members",
|
||||||
"personal_info": "Personal Information",
|
"personal_info": "Personal Information",
|
||||||
|
"resend_invitation": "Resend Invitation",
|
||||||
"save_profile": "Save Profile",
|
"save_profile": "Save Profile",
|
||||||
"view_member": "View Member",
|
"view_member": "View Member",
|
||||||
"account_information": "Account Information",
|
"account_information": "Account Information",
|
||||||
@@ -76,6 +77,7 @@
|
|||||||
"profile_updated_successfully": "Profile updated successfully",
|
"profile_updated_successfully": "Profile updated successfully",
|
||||||
"email_is_required": "Email is required",
|
"email_is_required": "Email is required",
|
||||||
"invitation_sent_successfully": "Invitation sent successfully",
|
"invitation_sent_successfully": "Invitation sent successfully",
|
||||||
|
"invitation_resent": "Invitation resent successfully",
|
||||||
"team_member_updated": "Team member updated",
|
"team_member_updated": "Team member updated",
|
||||||
"team_member_removed": "Team member removed",
|
"team_member_removed": "Team member removed",
|
||||||
"invalid_merchant_url": "Invalid merchant URL",
|
"invalid_merchant_url": "Invalid merchant URL",
|
||||||
|
|||||||
@@ -51,6 +51,7 @@
|
|||||||
"title": "Équipe",
|
"title": "Équipe",
|
||||||
"total_members": "Membres totaux",
|
"total_members": "Membres totaux",
|
||||||
"personal_info": "Informations personnelles",
|
"personal_info": "Informations personnelles",
|
||||||
|
"resend_invitation": "Renvoyer l'invitation",
|
||||||
"save_profile": "Enregistrer le profil",
|
"save_profile": "Enregistrer le profil",
|
||||||
"view_member": "Voir le membre",
|
"view_member": "Voir le membre",
|
||||||
"account_information": "Informations du compte",
|
"account_information": "Informations du compte",
|
||||||
@@ -75,7 +76,8 @@
|
|||||||
"please_fix_the_errors_before_saving": "Please fix the errors before saving",
|
"please_fix_the_errors_before_saving": "Please fix the errors before saving",
|
||||||
"profile_updated_successfully": "Profile updated successfully",
|
"profile_updated_successfully": "Profile updated successfully",
|
||||||
"email_is_required": "Email is required",
|
"email_is_required": "Email is required",
|
||||||
"invitation_sent_successfully": "Invitation sent successfully",
|
"invitation_sent_successfully": "Invitation envoyée avec succès",
|
||||||
|
"invitation_resent": "Invitation renvoyée avec succès",
|
||||||
"team_member_updated": "Team member updated",
|
"team_member_updated": "Team member updated",
|
||||||
"team_member_removed": "Team member removed",
|
"team_member_removed": "Team member removed",
|
||||||
"invalid_merchant_url": "Invalid merchant URL",
|
"invalid_merchant_url": "Invalid merchant URL",
|
||||||
|
|||||||
@@ -51,6 +51,7 @@
|
|||||||
"title": "Team",
|
"title": "Team",
|
||||||
"total_members": "Memberen total",
|
"total_members": "Memberen total",
|
||||||
"personal_info": "Perséinlech Informatiounen",
|
"personal_info": "Perséinlech Informatiounen",
|
||||||
|
"resend_invitation": "Aluedung nei schécken",
|
||||||
"save_profile": "Profil späicheren",
|
"save_profile": "Profil späicheren",
|
||||||
"view_member": "Member kucken",
|
"view_member": "Member kucken",
|
||||||
"account_information": "Konto Informatiounen",
|
"account_information": "Konto Informatiounen",
|
||||||
@@ -75,7 +76,8 @@
|
|||||||
"please_fix_the_errors_before_saving": "Please fix the errors before saving",
|
"please_fix_the_errors_before_saving": "Please fix the errors before saving",
|
||||||
"profile_updated_successfully": "Profile updated successfully",
|
"profile_updated_successfully": "Profile updated successfully",
|
||||||
"email_is_required": "Email is required",
|
"email_is_required": "Email is required",
|
||||||
"invitation_sent_successfully": "Invitation sent successfully",
|
"invitation_sent_successfully": "Aluedung erfollegräich geschéckt",
|
||||||
|
"invitation_resent": "Aluedung nei geschéckt",
|
||||||
"team_member_updated": "Team member updated",
|
"team_member_updated": "Team member updated",
|
||||||
"team_member_removed": "Team member removed",
|
"team_member_removed": "Team member removed",
|
||||||
"invalid_merchant_url": "Invalid merchant URL",
|
"invalid_merchant_url": "Invalid merchant URL",
|
||||||
|
|||||||
@@ -299,6 +299,26 @@ async def merchant_team_update_role(
|
|||||||
return {"message": "Role updated successfully"}
|
return {"message": "Role updated successfully"}
|
||||||
|
|
||||||
|
|
||||||
|
@_account_router.post("/team/stores/{store_id}/members/{user_id}/resend")
|
||||||
|
async def merchant_team_resend_invitation(
|
||||||
|
store_id: int,
|
||||||
|
user_id: int,
|
||||||
|
current_user: UserContext = Depends(get_current_merchant_api),
|
||||||
|
merchant=Depends(get_merchant_for_current_user),
|
||||||
|
db: Session = Depends(get_db),
|
||||||
|
):
|
||||||
|
"""Resend invitation to a pending team member."""
|
||||||
|
from app.modules.tenancy.services.store_team_service import store_team_service
|
||||||
|
|
||||||
|
store = merchant_store_service.validate_store_ownership(db, merchant.id, store_id)
|
||||||
|
inviter = merchant_store_service.get_user(db, current_user.id)
|
||||||
|
result = store_team_service.resend_invitation(
|
||||||
|
db, store=store, user_id=user_id, inviter=inviter,
|
||||||
|
)
|
||||||
|
db.commit()
|
||||||
|
return result
|
||||||
|
|
||||||
|
|
||||||
@_account_router.delete("/team/stores/{store_id}/members/{user_id}", status_code=204)
|
@_account_router.delete("/team/stores/{store_id}/members/{user_id}", status_code=204)
|
||||||
async def merchant_team_remove_member(
|
async def merchant_team_remove_member(
|
||||||
store_id: int,
|
store_id: int,
|
||||||
|
|||||||
@@ -303,6 +303,26 @@ def update_team_member(
|
|||||||
return TeamMemberResponse(**member)
|
return TeamMemberResponse(**member)
|
||||||
|
|
||||||
|
|
||||||
|
@store_team_router.post("/members/{user_id}/resend")
|
||||||
|
def resend_team_invitation(
|
||||||
|
user_id: int,
|
||||||
|
request: Request,
|
||||||
|
db: Session = Depends(get_db),
|
||||||
|
current_user: UserContext = Depends(require_store_owner),
|
||||||
|
):
|
||||||
|
"""
|
||||||
|
Resend invitation to a pending team member.
|
||||||
|
|
||||||
|
**Required:** Store owner role
|
||||||
|
"""
|
||||||
|
store = request.state.store
|
||||||
|
result = store_team_service.resend_invitation(
|
||||||
|
db, store=store, user_id=user_id, inviter=current_user,
|
||||||
|
)
|
||||||
|
db.commit()
|
||||||
|
return result
|
||||||
|
|
||||||
|
|
||||||
@store_team_router.delete("/members/{user_id}")
|
@store_team_router.delete("/members/{user_id}")
|
||||||
def remove_team_member(
|
def remove_team_member(
|
||||||
user_id: int,
|
user_id: int,
|
||||||
|
|||||||
@@ -907,6 +907,69 @@ class StoreTeamService:
|
|||||||
db.flush()
|
db.flush()
|
||||||
return role
|
return role
|
||||||
|
|
||||||
|
def resend_invitation(
|
||||||
|
self,
|
||||||
|
db: Session,
|
||||||
|
store: Store,
|
||||||
|
user_id: int,
|
||||||
|
inviter: User,
|
||||||
|
) -> dict[str, Any]:
|
||||||
|
"""
|
||||||
|
Resend invitation to a pending team member.
|
||||||
|
|
||||||
|
Generates a new token and resends the email.
|
||||||
|
Only works for pending invitations (not yet accepted).
|
||||||
|
"""
|
||||||
|
store_user = (
|
||||||
|
db.query(StoreUser)
|
||||||
|
.filter(
|
||||||
|
StoreUser.store_id == store.id,
|
||||||
|
StoreUser.user_id == user_id,
|
||||||
|
)
|
||||||
|
.first()
|
||||||
|
)
|
||||||
|
|
||||||
|
if not store_user:
|
||||||
|
raise UserNotFoundException(str(user_id))
|
||||||
|
|
||||||
|
if store_user.invitation_accepted_at is not None:
|
||||||
|
raise InvalidInvitationTokenException("Invitation already accepted")
|
||||||
|
|
||||||
|
# Generate new token and update sent time
|
||||||
|
new_token = self._generate_invitation_token()
|
||||||
|
store_user.invitation_token = new_token
|
||||||
|
store_user.invitation_sent_at = datetime.utcnow()
|
||||||
|
db.flush()
|
||||||
|
|
||||||
|
# Get role name for email
|
||||||
|
role_name = store_user.role.name if store_user.role else "member"
|
||||||
|
|
||||||
|
# Send email
|
||||||
|
try:
|
||||||
|
self._send_invitation_email(
|
||||||
|
db=db,
|
||||||
|
email=store_user.user.email,
|
||||||
|
store=store,
|
||||||
|
token=new_token,
|
||||||
|
inviter=inviter,
|
||||||
|
role_name=role_name,
|
||||||
|
)
|
||||||
|
except Exception: # noqa: EXC003
|
||||||
|
logger.exception(
|
||||||
|
f"Failed to resend invitation email to {store_user.user.email}"
|
||||||
|
)
|
||||||
|
|
||||||
|
logger.info(
|
||||||
|
f"Resent invitation to {store_user.user.email} for store "
|
||||||
|
f"{store.store_code} by {inviter.username}"
|
||||||
|
)
|
||||||
|
|
||||||
|
return {
|
||||||
|
"email": store_user.user.email,
|
||||||
|
"store_code": store.store_code,
|
||||||
|
"invitation_sent": True,
|
||||||
|
}
|
||||||
|
|
||||||
def _send_invitation_email(
|
def _send_invitation_email(
|
||||||
self,
|
self,
|
||||||
db: Session,
|
db: Session,
|
||||||
|
|||||||
@@ -226,6 +226,31 @@ function merchantTeam() {
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Resend invitation to a pending member
|
||||||
|
*/
|
||||||
|
async resendInvitation(member) {
|
||||||
|
if (!member.stores || member.stores.length === 0) return;
|
||||||
|
|
||||||
|
this.saving = true;
|
||||||
|
try {
|
||||||
|
// Resend for the first pending store
|
||||||
|
const pendingStore = member.stores.find(s => s.is_pending) || member.stores[0];
|
||||||
|
await apiClient.post(
|
||||||
|
`/merchants/account/team/stores/${pendingStore.store_id}/members/${member.user_id}/resend`
|
||||||
|
);
|
||||||
|
|
||||||
|
Utils.showToast(I18n.t('tenancy.messages.invitation_resent'), 'success');
|
||||||
|
merchantTeamLog.info('Resent invitation to:', member.email);
|
||||||
|
await this.loadTeamData();
|
||||||
|
} catch (error) {
|
||||||
|
merchantTeamLog.error('Failed to resend invitation:', error);
|
||||||
|
Utils.showToast(error.message || 'Failed to resend invitation', 'error');
|
||||||
|
} finally {
|
||||||
|
this.saving = false;
|
||||||
|
}
|
||||||
|
},
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Update member role for a specific store
|
* Update member role for a specific store
|
||||||
*/
|
*/
|
||||||
|
|||||||
@@ -212,6 +212,25 @@ function storeTeam() {
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Resend invitation to a pending member
|
||||||
|
*/
|
||||||
|
async resendInvitation(member) {
|
||||||
|
this.saving = true;
|
||||||
|
try {
|
||||||
|
await apiClient.post(`/store/team/members/${member.id}/resend`);
|
||||||
|
|
||||||
|
Utils.showToast(I18n.t('tenancy.messages.invitation_resent'), 'success');
|
||||||
|
storeTeamLog.info('Resent invitation to:', member.email);
|
||||||
|
await this.loadMembers();
|
||||||
|
} catch (error) {
|
||||||
|
storeTeamLog.error('Failed to resend invitation:', error);
|
||||||
|
Utils.showToast(error.message || 'Failed to resend invitation', 'error');
|
||||||
|
} finally {
|
||||||
|
this.saving = false;
|
||||||
|
}
|
||||||
|
},
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Confirm remove member
|
* Confirm remove member
|
||||||
*/
|
*/
|
||||||
|
|||||||
@@ -151,6 +151,13 @@
|
|||||||
</template>
|
</template>
|
||||||
<template x-if="!member.is_owner">
|
<template x-if="!member.is_owner">
|
||||||
<div class="flex items-center gap-2">
|
<div class="flex items-center gap-2">
|
||||||
|
<button x-show="getMemberStatus(member) === 'pending'"
|
||||||
|
@click="resendInvitation(member)"
|
||||||
|
:disabled="saving"
|
||||||
|
class="p-1.5 text-gray-500 hover:text-green-600 dark:text-gray-400 dark:hover:text-green-400 hover:bg-gray-100 dark:hover:bg-gray-700 rounded-lg transition-colors"
|
||||||
|
:title="$t('tenancy.team.resend_invitation')">
|
||||||
|
<span x-html="$icon('paper-airplane', 'w-4 h-4')"></span>
|
||||||
|
</button>
|
||||||
<button @click="openEditModal(member)"
|
<button @click="openEditModal(member)"
|
||||||
class="p-1.5 text-gray-500 hover:text-purple-600 dark:text-gray-400 dark:hover:text-purple-400 hover:bg-gray-100 dark:hover:bg-gray-700 rounded-lg transition-colors"
|
class="p-1.5 text-gray-500 hover:text-purple-600 dark:text-gray-400 dark:hover:text-purple-400 hover:bg-gray-100 dark:hover:bg-gray-700 rounded-lg transition-colors"
|
||||||
:title="$t('tenancy.team.edit_member')">
|
:title="$t('tenancy.team.edit_member')">
|
||||||
|
|||||||
@@ -115,6 +115,16 @@
|
|||||||
<!-- Actions -->
|
<!-- Actions -->
|
||||||
<td class="px-4 py-3">
|
<td class="px-4 py-3">
|
||||||
<div class="flex items-center space-x-2 text-sm">
|
<div class="flex items-center space-x-2 text-sm">
|
||||||
|
<!-- Resend invitation - pending only -->
|
||||||
|
<button
|
||||||
|
@click="resendInvitation(member)"
|
||||||
|
:disabled="saving"
|
||||||
|
class="p-1 text-gray-500 hover:text-green-600 dark:text-gray-400 dark:hover:text-green-400"
|
||||||
|
title="Resend Invitation"
|
||||||
|
x-show="member.invitation_pending"
|
||||||
|
>
|
||||||
|
<span x-html="$icon('paper-airplane', 'w-5 h-5')"></span>
|
||||||
|
</button>
|
||||||
<!-- Edit button - not for owners -->
|
<!-- Edit button - not for owners -->
|
||||||
<button
|
<button
|
||||||
@click="openEditModal(member)"
|
@click="openEditModal(member)"
|
||||||
|
|||||||
Reference in New Issue
Block a user