Merge branch 'develop' of https://github.com/OpenNBS/NoteBlockWorld into feature/login-by-email

Author: tomast1337

README.md

@@ -1,5 +1,7 @@
 <p align="center">
-  <img src="img/header.png" alt="Note Block World header" />
+  <a href="https://noteblock.world">
+    <img src="img/header.png" alt="Note Block World header" />
+  </a>
 </p>
 
 <p align="center">
@@ -9,15 +11,15 @@
 </p>
 
 <p align="center">
-  👥 <a href="https://discord.gg/open-note-block-studio-608692895179997252">Discord</a> • 
+  👥 <a href="https://discord.gg/note-block-world-608692895179997252">Discord</a> • 
   📆 <a href="https://github.com/orgs/OpenNBS/projects/4">Roadmap</a> • 
   🗨 <a href="https://github.com/OpenNBS/NoteBlockWorld/issues/new/choose">Feedback</a> • 
   ☕ <a href="https://opencollective.com/opennbs/donate">Buy us a coffee!</a>
 </p>
 
 ## ℹ About the project
 
-**Note Block World** is a collaborative, social website where users can share their note block songs made with [Note Block Studio](https://noteblock.studio/). Our goal is to give the NBS community a platform to share their creations with the world, discover new music and connect with other creators!
+[**Note Block World**](https://noteblock.world/) is a collaborative, social website where users can share their note block songs made with [Note Block Studio](https://noteblock.studio/). Our goal is to give the NBS community a platform to share their creations with the world, discover new music and connect with other creators!
 
 ## 💬 Issues/Feedback
 
@@ -27,7 +29,7 @@ If you have found an issue or would like to suggest a feature, please open a [ne
 
 We welcome contributions to the project! Read our [contributor guide](CONTRIBUTING.md) to set up the project and get started.
 
-Please [open an issue](/issues/new/choose) discussing the changes you would like to make before submitting a pull request. Alternatively, you can join our [Discord server](https://discord.gg/open-note-block-studio-608692895179997252) to discuss the changes with our development team!
+Please [open an issue](/issues/new/choose) discussing the changes you would like to make before submitting a pull request. Alternatively, you can join our [Discord server](https://discord.gg/note-block-world-608692895179997252) to discuss the changes with our development team!
 
 ## ❤ Donate
 
@@ -38,6 +40,7 @@ Thanks to all our current and past sponsors for helping us keep Note Block World
 ###### Supporters
 
 <img src="https://opencollective.com/opennbs/backers.svg" height="48px"/>
+<img src="https://opencollective.com/opennbs/sponsors.svg" height="48px"/>
 
 ---
 

pnpm-lock.yaml

@@ -23,7 +23,6 @@
     "@aws-sdk/client-s3": "^3.717.0",
     "@aws-sdk/s3-request-presigner": "^3.717.0",
     "@encode42/nbs.js": "^5.0.2",
-    "@nestjs-modules/mailer": "^2.0.2",
     "@nestjs/common": "^10.4.15",
     "@nestjs/config": "^3.3.0",
     "@nestjs/core": "^10.4.15",
@@ -32,7 +31,6 @@
     "@nestjs/passport": "^10.0.3",
     "@nestjs/platform-express": "^10.4.15",
     "@nestjs/swagger": "^7.4.2",
-    "@nestjs/throttler": "^6.3.0",
     "@types/passport-discord": "^0.1.14",
     "@types/uuid": "^9.0.8",
     "axios": "^1.7.9",
@@ -50,7 +48,6 @@
     "passport-google-oauth20": "^2.0.0",
     "passport-jwt": "^4.0.1",
     "passport-local": "^1.0.0",
-    "passport-magic-login": "^1.2.2",
     "reflect-metadata": "^0.1.14",
     "rxjs": "^7.8.1",
     "uuid": "^9.0.1",

server/package.json

@@ -23,8 +23,8 @@ export class AuthModule {
         ConfigModule.forRoot(),
         MailingModule,
         JwtModule.registerAsync({
-          imports: [ConfigModule],
           inject: [ConfigService],
+          imports: [ConfigModule],
           useFactory: async (config: ConfigService) => {
             const JWT_SECRET = config.get('JWT_SECRET');
             const JWT_EXPIRES_IN = config.get('JWT_EXPIRES_IN');
@@ -61,58 +61,58 @@ export class AuthModule {
             configService.getOrThrow<string>('COOKIE_EXPIRES_IN'),
         },
         {
-          provide: 'SERVER_URL',
           inject: [ConfigService],
+          provide: 'SERVER_URL',
           useFactory: (configService: ConfigService) =>
             configService.getOrThrow<string>('SERVER_URL'),
         },
         {
-          provide: 'MAGIC_LINK_SECRET',
           inject: [ConfigService],
+          provide: 'MAGIC_LINK_SECRET',
           useFactory: (configService: ConfigService) =>
             configService.getOrThrow<string>('MAGIC_LINK_SECRET'),
         },
         {
-          provide: 'FRONTEND_URL',
           inject: [ConfigService],
+          provide: 'FRONTEND_URL',
           useFactory: (configService: ConfigService) =>
             configService.getOrThrow<string>('FRONTEND_URL'),
         },
         {
-          provide: 'JWT_SECRET',
           inject: [ConfigService],
+          provide: 'JWT_SECRET',
           useFactory: (configService: ConfigService) =>
             configService.getOrThrow<string>('JWT_SECRET'),
         },
         {
-          provide: 'JWT_EXPIRES_IN',
           inject: [ConfigService],
+          provide: 'JWT_EXPIRES_IN',
           useFactory: (configService: ConfigService) =>
             configService.getOrThrow<string>('JWT_EXPIRES_IN'),
         },
         {
-          provide: 'JWT_REFRESH_SECRET',
           inject: [ConfigService],
+          provide: 'JWT_REFRESH_SECRET',
           useFactory: (configService: ConfigService) =>
             configService.getOrThrow<string>('JWT_REFRESH_SECRET'),
         },
         {
-          provide: 'JWT_REFRESH_EXPIRES_IN',
           inject: [ConfigService],
+          provide: 'JWT_REFRESH_EXPIRES_IN',
           useFactory: (configService: ConfigService) =>
             configService.getOrThrow<string>('JWT_REFRESH_EXPIRES_IN'),
         },
         {
-          provide: 'WHITELISTED_USERS',
           inject: [ConfigService],
+          provide: 'WHITELISTED_USERS',
           useFactory: (configService: ConfigService) =>
             configService.getOrThrow<string>('WHITELISTED_USERS'),
         },
         {
-          provide: 'APP_DOMAIN',
           inject: [ConfigService],
+          provide: 'APP_DOMAIN',
           useFactory: (configService: ConfigService) =>
-            configService.getOrThrow<string>('APP_DOMAIN'),
+            configService.get<string>('APP_DOMAIN'),
         },
       ],
       exports: [AuthService],

server/src/auth/auth.module.ts

@@ -226,52 +226,6 @@ describe('AuthService', () => {
   }); // TODO: implement tests for googleLogin
 
   describe('githubLogin', () => {
-    it('should generate token and redirect if user is whitelisted', async () => {
-      const req: Partial<Request> = {
-        user: {
-          accessToken: 'test-access-token',
-          profile: {
-            username: 'testuser',
-            photos: [{ value: 'http://example.com/photo.jpg' }],
-          },
-        } as GithubAccessToken,
-      };
-
-      const res: Partial<Response> = {
-        redirect: jest.fn(),
-      };
-
-      jest.spyOn(authService as any, 'verifyWhitelist').mockResolvedValue(true);
-
-      jest
-        .spyOn(authService as any, 'verifyAndGetUser')
-        .mockResolvedValue({ id: 'user-id' });
-
-      jest
-        .spyOn(authService as any, 'GenTokenRedirect')
-        .mockImplementation((user, res: any) => {
-          res.redirect('/dashboard');
-        });
-
-      mockAxios.get.mockResolvedValue({
-        data: [{ email: '[email protected]', primary: true }],
-      } as any);
-
-      await authService.githubLogin(req as Request, res as Response);
-
-      expect((authService as any).verifyWhitelist).toHaveBeenCalledWith(
-        'testuser',
-      );
-
-      expect((authService as any).verifyAndGetUser).toHaveBeenCalledWith({
-        username: 'testuser',
-        email: '[email protected]',
-        profileImage: 'http://example.com/photo.jpg',
-      });
-
-      expect(res.redirect).toHaveBeenCalledWith('/dashboard');
-    });
-
     it('should redirect to login if user is not whitelisted', async () => {
       const req: Partial<Request> = {
         user: {
@@ -304,50 +258,6 @@ describe('AuthService', () => {
   });
 
   describe('discordLogin', () => {
-    it('should generate token and redirect if user is whitelisted', async () => {
-      const req: Partial<Request> = {
-        user: {
-          profile: {
-            id: 'discord-user-id',
-            username: 'testuser',
-            email: '[email protected]',
-            avatar: 'avatar-hash',
-          },
-        } as DiscordUser,
-      };
-
-      const res: Partial<Response> = {
-        redirect: jest.fn(),
-      };
-
-      jest.spyOn(authService as any, 'verifyWhitelist').mockResolvedValue(true);
-
-      jest
-        .spyOn(authService as any, 'verifyAndGetUser')
-        .mockResolvedValue({ id: 'user-id' });
-
-      jest
-        .spyOn(authService as any, 'GenTokenRedirect')
-        .mockImplementation((user, res: any) => {
-          res.redirect('/dashboard');
-        });
-
-      await authService.discordLogin(req as Request, res as Response);
-
-      expect((authService as any).verifyWhitelist).toHaveBeenCalledWith(
-        'testuser',
-      );
-
-      expect((authService as any).verifyAndGetUser).toHaveBeenCalledWith({
-        username: 'testuser',
-        email: '[email protected]',
-        profileImage:
-          'https://cdn.discordapp.com/avatars/discord-user-id/avatar-hash.png',
-      });
-
-      expect(res.redirect).toHaveBeenCalledWith('/dashboard');
-    });
-
     it('should redirect to login if user is not whitelisted', async () => {
       const req: Partial<Request> = {
         user: {

server/src/auth/auth.service.spec.ts

@@ -97,14 +97,8 @@ export class EnvironmentVariables {
   @IsString()
   DISCORD_WEBHOOK_URL: string;
 
-  // mailing
   @IsString()
-  @IsNotEmpty()
-  MAIL_TRANSPORT: string;
-
-  @IsString()
-  @IsNotEmpty()
-  MAIL_FROM: string;
+  COOKIE_EXPIRES_IN: string;
 }
 
 export function validate(config: Record<string, unknown>) {

server/src/config/EnvironmentVariables.ts

@@ -25,10 +25,10 @@ import { SongService } from './song.service';
     SongUploadService,
     SongWebhookService,
     {
+      inject: [ConfigService],
       provide: 'DISCORD_WEBHOOK_URL',
       useFactory: (configService: ConfigService) =>
         configService.getOrThrow('DISCORD_WEBHOOK_URL'),
-      inject: [ConfigService],
     },
   ],
   controllers: [SongController, MySongsController],

server/src/song/song.module.ts

@@ -1,6 +1,6 @@
 Have you got any question, suggestion or feedback? We'd love to hear from you!
 
-To report an issue or suggest a new feature, please [open a new issue](https://github.com/issues/new/choose) in our GitHub repository. Make sure to search the existing issues to see if your suggestion has already been made. Also, check our [project roadmap](https://github.com/orgs/OpenNBS/projects/4) to see if the feature you want is already planned!
+To report an issue or suggest a new feature, please [open a new issue](https://github.com/OpenNBS/NoteBlockWorld/issues/new/choose) in our GitHub repository. Make sure to search the existing issues to see if your suggestion has already been made. Also, check our [project roadmap](https://github.com/orgs/OpenNBS/projects/4) to see if the feature you want is already planned!
 
 For general support, or if you'd just like to have a chat, the fastest way to get in touch with us is by joining our public community on [Discord](https://discord.gg/note-block-world-608692895179997252). We're always happy to help!