Introduced etag caching and SessionState class

apps/api/src/app.module.ts

@@ -19,6 +19,7 @@ import { ReceiptModule } from '~/modules/organization/receipt/receipt.module';
 import { StatisticsModule } from '~/modules/organization/statistics/statistics.module';
 import { CacheModule } from '@nestjs/cache-manager';
 import { redisStore } from 'cache-manager-redis-yet';
+import { UserModule } from '~/modules/user/user.module';
 
 @Module({
   imports: [
@@ -73,6 +74,7 @@ import { redisStore } from 'cache-manager-redis-yet';
     RouterModule,
 
     AuthModule,
+    UserModule,
     OrganizationModule,
     TransactionModule,
     StatisticsModule,

apps/api/src/modules/auth/auth.module.ts

@@ -4,7 +4,7 @@ import { JwtModule } from '@nestjs/jwt';
 
 import { JwtStrategy } from '~/modules/auth/jwt.strategy';
 import { LocalStrategy } from '~/modules/auth/local.strategy';
-import { UserModule } from '~/modules/organization/user/user.module';
+import { UserModule } from '~/modules/user/user.module';
 
 import { AuthController } from './auth.controller';
 import { AuthService } from './auth.service';

apps/api/src/modules/auth/auth.service.ts

@@ -1,12 +1,16 @@
-import { BadRequestException, Injectable } from '@nestjs/common';
+import {
+  BadRequestException,
+  Injectable,
+  NotFoundException,
+} from '@nestjs/common';
 import { JwtService } from '@nestjs/jwt';
 import * as bcrypt from 'bcrypt';
 
 import { SignInDto } from '~/dtos/auth/sign-in.dto';
 import { CreateUserDto } from '~/dtos/users/create-user.dto';
 import { GetUserDto } from '~/dtos/users/get-user.dto';
 import { User } from '~/entities/user/user.entity';
-import { UserService } from '~/modules/organization/user/user.service';
+import { UserService } from '~/modules/user/user.service';
 import { InjectRepository } from '@nestjs/typeorm';
 import { Repository } from 'typeorm';
 import { Session } from '~/entities/session/session.entity';
@@ -64,10 +68,14 @@ export class AuthService {
   }
 
   async signUp(user: CreateUserDto) {
-    const existingUser = await this.userService.findOneByEmail(user.email);
+    try {
+      await this.userService.findOneByEmail(user.email);
 
-    if (existingUser) {
       throw new BadRequestException('Email already exists');
+    } catch (err) {
+      if (!(err instanceof NotFoundException)) {
+        throw err;
+      }
     }
 
     const hashedPassword = await bcrypt.hash(user.password, 10);

apps/api/src/modules/organization/organization.module.ts

@@ -5,7 +5,7 @@ import { Organization } from '~/entities/organization/organization.entity';
 import { User } from '~/entities/user/user.entity';
 import { OrganizationController } from '~/modules/organization/organization.controller';
 import { OrganizationService } from '~/modules/organization/organization.service';
-import { UserModule } from '~/modules/organization/user/user.module';
+import { UserModule } from '~/modules/user/user.module';
 import { SecretModule } from '~/modules/organization/secret/secret.module';
 import { Secret } from '~/entities/secret/secret.entity';
 

apps/api/src/modules/organization/organization.service.ts

@@ -5,7 +5,7 @@ import { Repository } from 'typeorm';
 import { CreateOrganizationDto } from '~/dtos/organization/create-organization.dto';
 import { Organization } from '~/entities/organization/organization.entity';
 import { User } from '~/entities/user/user.entity';
-import { UserService } from '~/modules/organization/user/user.service';
+import { UserService } from '~/modules/user/user.service';
 import { SecretService } from '~/modules/organization/secret/secret.service';
 import { Secret } from '~/entities/secret/secret.entity';
 import { CreateSecretDto } from '~/dtos/secret/create-secret.dto';

apps/api/src/modules/organization/statistics/statistics.module.ts

@@ -5,7 +5,7 @@ import { StatisticsController } from '~/modules/organization/statistics/statisti
 import { TransactionModule } from '~/modules/organization/transaction/transaction.module';
 import { TypeOrmModule } from '@nestjs/typeorm';
 import { Transaction } from '~/entities/transaction/transaction.entity';
-import { UserModule } from '~/modules/organization/user/user.module';
+import { UserModule } from '~/modules/user/user.module';
 
 @Module({
   imports: [

apps/api/src/modules/organization/transaction/transaction.module.ts

@@ -6,7 +6,7 @@ import { OrganizationModule } from '~/modules/organization/organization.module';
 import { TransactionItemModule } from '~/modules/organization/transaction/transaction-item/transaction-item.module';
 import { TransactionController } from '~/modules/organization/transaction/transaction.controller';
 import { TransactionService } from '~/modules/organization/transaction/transaction.service';
-import { UserModule } from '~/modules/organization/user/user.module';
+import { UserModule } from '~/modules/user/user.module';
 
 @Module({
   imports: [

apps/api/src/modules/organization/transaction/transaction.service.ts

@@ -8,7 +8,7 @@ import { Transaction } from '~/entities/transaction/transaction.entity';
 import { TransactionItem } from '~/entities/transaction/transactionItem.entity';
 import { TransactionItemCategory } from '~/entities/transaction/transactionItemCategory.entity';
 import { OrganizationService } from '~/modules/organization/organization.service';
-import { UserService } from '~/modules/organization/user/user.service';
+import { UserService } from '~/modules/user/user.service';
 import {
   FilterOperator,
   paginate,

apps/api/src/modules/router/router.module.ts

@@ -4,6 +4,7 @@ import { TransactionModule } from '~/modules/organization/transaction/transactio
 import { StatisticsModule } from '~/modules/organization/statistics/statistics.module';
 import { ReceiptModule } from '~/modules/organization/receipt/receipt.module';
 import { Module } from '@nestjs/common';
+import { UserModule } from '~/modules/user/user.module';
 
 @Module({
   imports: [
@@ -26,6 +27,10 @@ import { Module } from '@nestjs/common';
           },
         ],
       },
+      {
+        path: 'users',
+        module: UserModule,
+      },
     ]),
   ],
 })

apps/api/src/modules/user/user.controller.ts

@@ -0,0 +1,15 @@
+import { Controller, Get } from '@nestjs/common';
+
+import { GetUserDto } from '~/dtos/users/get-user.dto';
+import { AuthUser, User } from '~/modules/decorators/user.decorator';
+import { UserService } from './user.service';
+
+@Controller()
+export class UserController {
+  constructor(private readonly userService: UserService) {}
+
+  @Get('me')
+  me(@User() user: AuthUser): Promise<GetUserDto> {
+    return this.userService.findOneByEmail(user.email);
+  }
+}

apps/api/src/modules/organization/user/user.module.ts → apps/api/src/modules/user/user.module.ts

@@ -2,8 +2,8 @@ import { Module } from '@nestjs/common';
 import { TypeOrmModule } from '@nestjs/typeorm';
 
 import { User } from '~/entities/user/user.entity';
-import { UserController } from '~/modules/organization/user/user.controller';
-import { UserService } from '~/modules/organization/user/user.service';
+import { UserController } from './user.controller';
+import { UserService } from './user.service';
 
 @Module({
   imports: [TypeOrmModule.forFeature([User])],

apps/web/app/api/User/UserApi.server.ts

@@ -0,0 +1,21 @@
+import { userMeSchema } from '~/api/User/userApi.contracts';
+import { typedFetch, TypedFetch } from '~/utils/fetch';
+
+export class UserApi {
+  private readonly baseUrl = '/users';
+  private readonly client: TypedFetch;
+
+  constructor(client: TypedFetch = typedFetch) {
+    this.client = client;
+  }
+
+  me() {
+    return this.client(userMeSchema, `${this.baseUrl}/me`);
+  }
+
+  meWithSessionCookie(cookie: string) {
+    return this.client(userMeSchema, `${this.baseUrl}/me`, {
+      headers: { Cookie: cookie },
+    });
+  }
+}

apps/web/app/api/User/userApi.contracts.ts

@@ -0,0 +1,6 @@
+import { z } from 'zod';
+
+export const userMeSchema = z.object({
+  email: z.string().email(),
+  id: z.string(),
+});

apps/web/app/api/User/userApi.types.ts

@@ -0,0 +1,5 @@
+import { z } from 'zod';
+
+import { userMeSchema } from './userApi.contracts';
+
+export type UserMeDto = z.TypeOf<typeof userMeSchema>;

apps/web/app/pages/auth/signin/action.server.ts

@@ -2,8 +2,9 @@ import { json, redirect } from '@remix-run/node';
 import { parseWithZod } from '@conform-to/zod';
 
 import { AuthApi } from '~/api/Auth/AuthApi.server';
+import { UserApi } from '~/api/User/UserApi.server';
 import { routes } from '~/routes';
-import { setAuthSession } from '~/session.server';
+import { SessionState } from '~/session.server';
 import { actionHandler } from '~/utils/action.server';
 
 import { schema } from './schema';
@@ -19,10 +20,22 @@ export const action = actionHandler({
     }
 
     const authApi = new AuthApi(fetch);
-
     const response = await authApi.signIn(submission.value);
+
+    const sessionCookie = response.headers.get('Set-Cookie')!;
+
+    const userApi = new UserApi(fetch);
+    const { data: user } = await userApi.meWithSessionCookie(sessionCookie);
+
+    const session = await SessionState.fromRequest(request);
+
     return redirect(routes.dashboard.getPath(), {
-      headers: { 'Set-cookie': await setAuthSession(request, response) },
+      headers: {
+        'Set-cookie': await session
+          .setAuthCookie(sessionCookie)
+          .setCurrentUser(user)
+          .commit(),
+      },
     });
   },
 });

apps/web/app/pages/auth/signout/action.server.ts

@@ -1,13 +1,15 @@
 import { redirect } from '@remix-run/node';
 
 import { routes } from '~/routes';
-import { logout } from '~/session.server';
+import { SessionState } from '~/session.server';
 import { actionHandler } from '~/utils/action.server';
 
 export const action = actionHandler({
   post: async ({ request }) => {
+    const sessionState = await SessionState.fromRequest(request);
+
     return redirect(routes.signIn.getPath(), {
-      headers: { 'Set-cookie': await logout(request) },
+      headers: { 'Set-cookie': await sessionState.logout() },
     });
   },
 });

apps/web/app/pages/auth/signup/action.server.ts

@@ -3,8 +3,9 @@ import { parseWithZod } from '@conform-to/zod';
 
 import { signUpSchema } from '~/api/Auth/authApi.contracts';
 import { AuthApi } from '~/api/Auth/AuthApi.server';
+import { UserApi } from '~/api/User/UserApi.server';
 import { routes } from '~/routes';
-import { setAuthSession } from '~/session.server';
+import { SessionState } from '~/session.server';
 import { actionHandler } from '~/utils/action.server';
 
 export const action = actionHandler({
@@ -21,8 +22,26 @@ export const action = actionHandler({
 
     const response = await authApi.signUp(submission.value);
 
-    return redirect(routes.signIn.getPath(), {
-      headers: { 'Set-cookie': await setAuthSession(request, response) },
+    const sessionCookie = response.headers.get('Set-Cookie')!;
+
+    const userApi = new UserApi(fetch);
+    const { data: user } = await userApi.meWithSessionCookie(sessionCookie);
+
+    const session = await SessionState.fromRequest(request);
+
+    return redirect(routes.newOrganization.getPath(), {
+      headers: {
+        'Set-cookie': await session
+          .setAuthCookie(sessionCookie)
+          .setCurrentUser(user)
+          .setToasts({
+            success: {
+              title: 'Account created successfully!',
+              description: 'You can now create a new organization.',
+            },
+          })
+          .commit(),
+      },
     });
   },
 });

apps/web/app/pages/dashboard/layout/loader.server.ts

@@ -2,7 +2,7 @@ import { redirect } from '@remix-run/node';
 
 import { OrganizationApi } from '~/api/Organization/OrganizationApi.server';
 import { routes } from '~/routes';
-import { getLastOrganization, requireSignedIn } from '~/session.server';
+import { requireSignedIn, SessionState } from '~/session.server';
 import { loaderHandler } from '~/utils/loader.server';
 
 export const loader = loaderHandler(async ({ request }, { fetch }) => {
@@ -14,7 +14,9 @@ export const loader = loaderHandler(async ({ request }, { fetch }) => {
 
   if (data.length <= 0) return redirect(routes.newOrganization.getPath());
 
-  const lastOrganization = await getLastOrganization(request);
+  const sessionState = await SessionState.fromRequest(request);
+  const lastOrganization = sessionState.organizationName;
+
   if (lastOrganization) {
     return redirect(routes.organization.getPath(lastOrganization));
   }

apps/web/app/pages/dashboard/organization/new/action.server.ts

@@ -4,6 +4,7 @@ import { parseWithZod } from '@conform-to/zod';
 import { createOrganizationSchema } from '~/api/Organization/organizationApi.contracts';
 import { OrganizationApi } from '~/api/Organization/OrganizationApi.server';
 import { routes } from '~/routes';
+import { SessionState } from '~/session.server';
 import { actionHandler } from '~/utils/action.server';
 
 export const action = actionHandler({
@@ -21,6 +22,15 @@ export const action = actionHandler({
 
     const { data } = await organizationApi.create(submission.value);
 
-    return redirect(routes.organization.getPath(data.name));
+    const sessionData = await SessionState.fromRequest(request);
+    sessionData
+      .setOrganizationName(data.name)
+      .setToasts({ success: 'Organization created' });
+
+    return redirect(routes.organization.getPath(data.name), {
+      headers: {
+        'Set-Cookie': await sessionData.commit(),
+      },
+    });
   },
 });

apps/web/app/pages/dashboard/organization/receipts/new/action.server.ts

@@ -4,7 +4,7 @@ import { parseWithZod } from '@conform-to/zod';
 import { createTransactionSchema } from '~/api/Transaction/transactionApi.contracts';
 import { TransactionApi } from '~/api/Transaction/TransactionApi.server';
 import { routes } from '~/routes';
-import { requireSignedIn, setServerToasts } from '~/session.server';
+import { requireSignedIn, SessionState } from '~/session.server';
 import { actionHandler } from '~/utils/action.server';
 import { assert } from '~/utils/assert';
 
@@ -26,14 +26,18 @@ export const action = actionHandler({
 
     await transactionApi.create(params.organizationName, submission.value);
 
+    const sessionState = await SessionState.fromRequest(request);
+
     return redirect(routes.organization.getPath(params.organizationName), {
       headers: {
-        'Set-Cookie': await setServerToasts(request, {
-          success: {
-            title: 'Transaction created',
-            description: `You've successfully created the transaction`,
-          },
-        }),
+        'Set-Cookie': await sessionState
+          .setToasts({
+            success: {
+              title: 'Transaction created',
+              description: `You've successfully created the transaction`,
+            },
+          })
+          .commit(),
       },
     });
   },