Merge pull request #393 from aXenDeveloper/improve_auth

refactor(backend): Authorization middleware for AdminCP

README.md

@@ -2,9 +2,9 @@
   <br>
   <a href="https://vitnode.com/" target="_blank">
     <picture>
-      <source media="(prefers-color-scheme: dark)" srcset="apps/docs/public/assets/vitnode_logo_dark.svg">
-      <source media="(prefers-color-scheme: light)" srcset="apps/docs/public/assets/vitnode_logo_light.svg">
-      <img alt="VitNode Logo" src="apps/docs/public/assets/vitnode_logo_light.svg" width="400">
+      <source media="(prefers-color-scheme: dark)" srcset="https://raw.githubusercontent.com/aXenDeveloper/vitnode/canary/apps/docs/assets/logo/vitnode_logo_dark.svg">
+      <source media="(prefers-color-scheme: light)" srcset="https://raw.githubusercontent.com/aXenDeveloper/vitnode/canary/apps/docs/assets/logo/vitnode_logo_light.svg">
+      <img alt="VitNode Logo" src="https://raw.githubusercontent.com/aXenDeveloper/vitnode/canary/apps/docs/assets/logo/vitnode_logo_light.svg" width="400">
     </picture>
   </a>
   <br>

apps/backend/schema.gql

@@ -201,9 +201,9 @@ type Mutation {
   core_members__avatar__delete: String!
   core_members__avatar__upload(file: Upload!): UploadAvatarCoreMembersObj!
   core_members__delete(id: Int!): String!
-  core_members__sign_up(email: String!, name: String!, newsletter: Boolean, password: String!): SignUpCoreMembersObj!
   core_sessions__sign_in(admin: Boolean, email: String!, password: String!, remember: Boolean): String!
   core_sessions__sign_out: String!
+  core_sessions__sign_up(email: String!, name: String!, newsletter: Boolean, password: String!): SignUpCoreSessionsObj!
 }
 
 type NavAdminPluginsAuthorization {
@@ -610,7 +610,7 @@ type ShowSettingsObj {
   site_short_name: String!
 }
 
-type SignUpCoreMembersObj {
+type SignUpCoreSessionsObj {
   email: String!
   group_id: Int!
   name: String!

apps/frontend/middleware.ts

@@ -1,10 +1,8 @@
 import { NextRequest } from 'next/server';
-import createIntlMiddleware from 'next-intl/middleware';
 import { createMiddleware } from 'vitnode-frontend/middleware';
 
 export default async function middleware(request: NextRequest) {
-  const handleI18nRouting = createIntlMiddleware(await createMiddleware());
-  const response = handleI18nRouting(request);
+  const response = await createMiddleware(request);
 
   return response;
 }

packages/backend/README.md

@@ -1,3 +1,16 @@
+<p align="center">
+  <br>
+  <a href="https://vitnode.com/" target="_blank">
+    <picture>
+      <source media="(prefers-color-scheme: dark)" srcset="https://raw.githubusercontent.com/aXenDeveloper/vitnode/canary/apps/docs/assets/logo/vitnode_logo_dark.svg">
+      <source media="(prefers-color-scheme: light)" srcset="https://raw.githubusercontent.com/aXenDeveloper/vitnode/canary/apps/docs/assets/logo/vitnode_logo_light.svg">
+      <img alt="VitNode Logo" src="https://raw.githubusercontent.com/aXenDeveloper/vitnode/canary/apps/docs/assets/logo/vitnode_logo_light.svg" width="400">
+    </picture>
+  </a>
+  <br>
+  <br>
+</p>
+
 # (Vitnode) Backend Package
 
 This package is used to create wrapper for a backend server in NestJS for the VitNode app.

packages/backend/src/core/members/members.module.ts

@@ -1,7 +1,5 @@
 import { Module } from '@nestjs/common';
 
-import { SignUpCoreMembersResolver } from './sign_up/sign_up.resolver';
-import { SignUpCoreMembersService } from './sign_up/sign_up.service';
 import { ShowCoreMembersService } from './show/show.service';
 import { ShowCoreMembersResolver } from './show/show.resolver';
 import { AvatarCoreMembers } from './avatar/avatar-core_members.module';
@@ -12,8 +10,6 @@ import { DeleteCoreMembersService } from './delete/delete.service';
   providers: [
     ShowCoreMembersService,
     ShowCoreMembersResolver,
-    SignUpCoreMembersResolver,
-    SignUpCoreMembersService,
     DeleteCoreMembersResolver,
     DeleteCoreMembersService,
   ],

packages/backend/src/core/sessions/sessions.module.ts

@@ -10,6 +10,8 @@ import { InternalAuthorizationCoreSessionsService } from './authorization/intern
 import { CoreSessionsCron } from './sessions.cron';
 import { DeviceSignInCoreSessionsService } from './sign_in/device.service';
 import { DevicesCoreSessionsModule } from './devices/devices.module';
+import { SignUpCoreSessionsResolver } from './sign_up/sign_up.resolver';
+import { SignUpCoreSessionsService } from './sign_up/sign_up.service';
 
 @Module({
   providers: [
@@ -20,6 +22,8 @@ import { DevicesCoreSessionsModule } from './devices/devices.module';
     SignOutCoreSessionsService,
     SignOutCoreSessionsResolver,
     CoreSessionsCron,
+    SignUpCoreSessionsResolver,
+    SignUpCoreSessionsService,
   ],
   imports: [DevicesCoreSessionsModule],
 })

packages/backend/src/core/members/sign_up/dto/sign_up.args.ts → packages/backend/src/core/sessions/sign_up/dto/sign_up.args.ts

@@ -13,7 +13,7 @@ import { TransformString } from '../../../../utils';
 export const nameRegex = /^(?!.* {2})[\p{L}\p{N}._@ -]*$/u;
 
 @ArgsType()
-export class SignUpCoreMembersArgs {
+export class SignUpCoreSessionsArgs {
   @Transform(TransformString)
   @Field(() => String)
   @IsEmail()

packages/backend/src/core/members/sign_up/dto/sign_up.obj.ts → packages/backend/src/core/sessions/sign_up/dto/sign_up.obj.ts

@@ -4,7 +4,7 @@ import { IsEmail, Matches, MaxLength, MinLength } from 'class-validator';
 import { nameRegex } from './sign_up.args';
 
 @ObjectType()
-export class SignUpCoreMembersObj {
+export class SignUpCoreSessionsObj {
   @Field(() => String)
   @IsEmail()
   email: string;

packages/backend/src/core/sessions/sign_up/helpers/avatar-color.service.ts

@@ -0,0 +1,38 @@
+import { Injectable } from '@nestjs/common';
+import { convertColor } from 'vitnode-shared';
+
+@Injectable()
+export class AvatarColorService {
+  private readonly hRange = [0, 360];
+  private readonly sRange = [50, 75];
+  private readonly lRange = [25, 60];
+
+  private readonly getHashOfString = (str: string) => {
+    let hash = 0;
+    for (let i = 0; i < str.length; i++) {
+      hash = str.charCodeAt(i) + ((hash << 5) - hash);
+    }
+    hash = Math.abs(hash);
+
+    return hash;
+  };
+
+  private readonly normalizeHash = (hash: number, min: number, max: number) => {
+    return Math.floor((hash % (max - min)) + min);
+  };
+
+  private readonly generateHSLFromName = (name: string) => {
+    const hash = this.getHashOfString(name);
+    const h = this.normalizeHash(hash, this.hRange[0], this.hRange[1]);
+    const s = this.normalizeHash(hash, this.sRange[0], this.sRange[1]);
+    const l = this.normalizeHash(hash, this.lRange[0], this.lRange[1]);
+
+    return [h, s, l];
+  };
+
+  generateAvatarColor = (name: string) => {
+    const hslName = this.generateHSLFromName(name);
+
+    return convertColor.hslToRgb(hslName[0], hslName[1], hslName[2]);
+  };
+}

packages/backend/src/core/sessions/sign_up/sign_up.resolver.ts

@@ -0,0 +1,20 @@
+import { Args, Context, Mutation, Resolver } from '@nestjs/graphql';
+
+import { SignUpCoreSessionsObj } from './dto/sign_up.obj';
+import { SignUpCoreSessionsService } from './sign_up.service';
+import { SignUpCoreSessionsArgs } from './dto/sign_up.args';
+
+import { Ctx } from '../../../utils';
+
+@Resolver()
+export class SignUpCoreSessionsResolver {
+  constructor(private readonly service: SignUpCoreSessionsService) {}
+
+  @Mutation(() => SignUpCoreSessionsObj)
+  async core_sessions__sign_up(
+    @Args() args: SignUpCoreSessionsArgs,
+    @Context() ctx: Ctx,
+  ): Promise<SignUpCoreSessionsObj> {
+    return this.service.signUp(args, ctx);
+  }
+}

packages/backend/src/core/members/sign_up/sign_up.service.ts → packages/backend/src/core/sessions/sign_up/sign_up.service.ts

@@ -4,9 +4,9 @@ import { count } from 'drizzle-orm';
 import { ConfigService } from '@nestjs/config';
 import { removeSpecialCharacters } from 'vitnode-shared';
 
-import { SignUpCoreMembersArgs } from './dto/sign_up.args';
-import { SignUpCoreMembersObj } from './dto/sign_up.obj';
-import { generateAvatarColor } from './functions/generate-avatar-color';
+import { SignUpCoreSessionsArgs } from './dto/sign_up.args';
+import { SignUpCoreSessionsObj } from './dto/sign_up.obj';
+import { AvatarColorService } from './helpers/avatar-color.service';
 
 import { DatabaseService } from '../../../database';
 import { core_users } from '../../../templates/core/admin/database/schema/users';
@@ -15,13 +15,15 @@ import { CustomError } from '../../../errors';
 import { getUserIp } from '../../../functions';
 
 @Injectable()
-export class SignUpCoreMembersService {
+export class SignUpCoreSessionsService extends AvatarColorService {
   constructor(
     private readonly databaseService: DatabaseService,
     private readonly configService: ConfigService,
-  ) {}
+  ) {
+    super();
+  }
 
-  protected getGroupId = async (): Promise<number> => {
+  private readonly getGroupId = async (): Promise<number> => {
     const countUsers = await this.databaseService.db
       .select({ count: count() })
       .from(core_users);
@@ -47,11 +49,10 @@ export class SignUpCoreMembersService {
   };
 
   async signUp(
-    { email: emailRaw, name, newsletter, password }: SignUpCoreMembersArgs,
+    { email: emailRaw, name, newsletter, password }: SignUpCoreSessionsArgs,
     { req }: Ctx,
-  ): Promise<SignUpCoreMembersObj> {
+  ): Promise<SignUpCoreSessionsObj> {
     const email = emailRaw.toLowerCase();
-
     const checkEmail = await this.databaseService.db.query.core_users.findFirst(
       {
         where: (table, { eq }) => eq(table.email, email),
@@ -91,7 +92,7 @@ export class SignUpCoreMembersService {
         name_seo: convertToNameSEO,
         newsletter,
         password: hashPassword,
-        avatar_color: generateAvatarColor(name),
+        avatar_color: this.generateAvatarColor(name),
         group_id: await this.getGroupId(),
         ip_address: getUserIp(req),
       })

packages/create-vitnode-app/README.md

@@ -1,3 +1,16 @@
+<p align="center">
+  <br>
+  <a href="https://vitnode.com/" target="_blank">
+    <picture>
+      <source media="(prefers-color-scheme: dark)" srcset="https://raw.githubusercontent.com/aXenDeveloper/vitnode/canary/apps/docs/assets/logo/vitnode_logo_dark.svg">
+      <source media="(prefers-color-scheme: light)" srcset="https://raw.githubusercontent.com/aXenDeveloper/vitnode/canary/apps/docs/assets/logo/vitnode_logo_light.svg">
+      <img alt="VitNode Logo" src="https://raw.githubusercontent.com/aXenDeveloper/vitnode/canary/apps/docs/assets/logo/vitnode_logo_light.svg" width="400">
+    </picture>
+  </a>
+  <br>
+  <br>
+</p>
+
 # (VitNode) Create App
 
 This package is a CLI tool to create a new VitNode app quickly.

packages/eslint-config-vitnode/README.md

@@ -1,3 +1,16 @@
+<p align="center">
+  <br>
+  <a href="https://vitnode.com/" target="_blank">
+    <picture>
+      <source media="(prefers-color-scheme: dark)" srcset="https://raw.githubusercontent.com/aXenDeveloper/vitnode/canary/apps/docs/assets/logo/vitnode_logo_dark.svg">
+      <source media="(prefers-color-scheme: light)" srcset="https://raw.githubusercontent.com/aXenDeveloper/vitnode/canary/apps/docs/assets/logo/vitnode_logo_light.svg">
+      <img alt="VitNode Logo" src="https://raw.githubusercontent.com/aXenDeveloper/vitnode/canary/apps/docs/assets/logo/vitnode_logo_light.svg" width="400">
+    </picture>
+  </a>
+  <br>
+  <br>
+</p>
+
 # (VitNode) ESLint Config
 
 Package providing ESLint & TSConfig configuration for VitNode projects.