feat: update MagicLinkEmailStrategy to create user if not found and improve email context handling

Author: tomast1337

server/src/auth/strategies/magicLinkEmail.strategy.spec.ts

@@ -107,8 +107,6 @@ describe('MagicLinkEmailStrategy', () => {
 
       expect(mockUserService.findByEmail).toHaveBeenCalledWith(email);
 
-      expect(mockUserService.createWithEmail).toHaveBeenCalledWith(email);
-
       expect(mockMailingService.sendEmail).toHaveBeenCalledWith({
         to: email,
         context: {
@@ -134,20 +132,21 @@ describe('MagicLinkEmailStrategy', () => {
       expect(result).toEqual(user);
     });
 
-    it('should log an error if user is not found', async () => {
+    it('should create a new user if not found and return the user', async () => {
       const payload = { destination: '[email protected]' };
 
       mockUserService.findByEmail.mockResolvedValue(null);
-
-      const loggerSpy = jest.spyOn(MagicLinkEmailStrategy.logger, 'error');
+      mockUserService.createWithEmail.mockResolvedValue({
+        email: '[email protected]',
+        username: 'test',
+      });
 
       const result = await strategy.validate(payload);
 
-      expect(loggerSpy).toHaveBeenCalledWith(
-        'User not found: [email protected]',
-      );
-
-      expect(result).toBeNull();
+      expect(result).toEqual({
+        email: '[email protected]',
+        username: 'test',
+      });
     });
   });
 });

server/src/auth/strategies/magicLinkEmail.strategy.ts

@@ -53,17 +53,14 @@ export class MagicLinkEmailStrategy extends PassportStrategy(
       mailingService: MailingService,
     ) =>
     async (email: string, magicLink: string) => {
-      let user = await userService.findByEmail(email);
+      const user = await userService.findByEmail(email);
 
       if (!user) {
-        // Create user if not found
-        user = await userService.createWithEmail(email);
-
         mailingService.sendEmail({
           to: email,
           context: {
             magicLink: magicLink,
-            username: user.username,
+            username: email.split('@')[0],
           },
           subject: 'Welcome to Noteblock.world',
           template: 'magic-link-new-account',
@@ -89,11 +86,7 @@ export class MagicLinkEmailStrategy extends PassportStrategy(
     const user = await this.userService.findByEmail(payload.destination);
 
     if (!user) {
-      MagicLinkEmailStrategy.logger.error(
-        `User not found: ${payload.destination}`,
-      );
-
-      return null;
+      return await this.userService.createWithEmail(payload.destination);
     }
 
     MagicLinkEmailStrategy.logger.debug(`User found: ${user.username}`);