Skip to content

Free, Open Source, Self-Hosted WhatsApp API Gateway

fix(group): trim the invite code on join as the preview does

Yudhi Armyndharis54e429ad8b87
diff --git a/src/modules/group/group.service.spec.ts b/src/modules/group/group.service.spec.ts
index 1cad0e824..6a8a7d934 100644
--- a/src/modules/group/group.service.spec.ts
+++ b/src/modules/group/group.service.spec.ts
@@ -193,6 +193,16 @@ describe('GroupService', () => {
expect(joinGroupViaInviteCode).toHaveBeenCalledWith('CODE123');
});
+ // Same rule as the join-info preview, so a code that previews also joins.
+ it('joinGroupViaInviteCode sends the trimmed code and refuses a blank one locally', () => {
+ const joinGroupViaInviteCode = jest.fn().mockResolvedValue('[email protected]');
+ const svc = makeService({ joinGroupViaInviteCode });
+ void svc.joinGroupViaInviteCode('s1', ' CODE123 ');
+ expect(joinGroupViaInviteCode).toHaveBeenCalledWith('CODE123');
+ expect(() => svc.joinGroupViaInviteCode('s1', ' ')).toThrow(BadRequestException);
+ expect(joinGroupViaInviteCode).toHaveBeenCalledTimes(1);
+ });
+
describe('getGroupSettings', () => {
it('maps the settings fields from getGroupInfo', async () => {
const svc = makeService({
diff --git a/src/modules/group/group.service.ts b/src/modules/group/group.service.ts
index 91cba8c50..b12b55d4e 100644
--- a/src/modules/group/group.service.ts
+++ b/src/modules/group/group.service.ts
@@ -173,14 +173,22 @@ export class GroupService {
* client error it is.
*/
getGroupJoinInfo(sessionId: string, inviteCode: string) {
- if (!inviteCode?.trim()) {
- throw new BadRequestException('An invite code is required');
- }
- return this.getEngine(sessionId).getGroupJoinInfo(inviteCode.trim());
+ const code = this.requireInviteCode(inviteCode);
+ return this.getEngine(sessionId).getGroupJoinInfo(code);
}
+ /** Same rule as the preview, so a code that previews also joins. */
joinGroupViaInviteCode(sessionId: string, inviteCode: string) {
- return this.getEngine(sessionId).joinGroupViaInviteCode(inviteCode);
+ const code = this.requireInviteCode(inviteCode);
+ return this.getEngine(sessionId).joinGroupViaInviteCode(code);
+ }
+
+ private requireInviteCode(inviteCode: string): string {
+ const code = inviteCode?.trim();
+ if (!code) {
+ throw new BadRequestException('An invite code is required');
+ }
+ return code;
}
/**