Commit f3e40035 authored by Lorenzo Trujillo Rojas's avatar Lorenzo Trujillo Rojas
Browse files

Merge branch 'main' into 'main' 

agregando login y signup de usuario

See merge request pueblosmagicosconia!10
parents f3420fe0 b0342ada

backend/src/admin/admin.controller.ts

+1 −30
Original line number Diff line number Diff line 
import {

  Controller,

  Get,

  Post,

  Body,

  Patch,

  Param,

  Delete,

} from '@nestjs/common';

import { Controller, Post, Body } from '@nestjs/common';

import { AdminService } from './admin.service';

import { CreateAdminDto } from './dto/create-admin.dto';

import { UpdateAdminDto } from './dto/update-admin.dto';



@Controller('admin')

export class AdminController {
@@ -19,24 +10,4 @@ export class AdminController { 
  create(@Body() createAdminDto: CreateAdminDto) {

    return this.adminService.create(createAdminDto);

  }



  @Get()

  findAll() {

    return this.adminService.findAll();

  }



  @Get(':id')

  findOne(@Param('id') id: string) {

    // return this.adminService.findOne(+id);

  }



  @Patch(':id')

  update(@Param('id') id: string, @Body() updateAdminDto: UpdateAdminDto) {

    return this.adminService.update(+id, updateAdminDto);

  }



  @Delete(':id')

  remove(@Param('id') id: string) {

    return this.adminService.remove(+id);

  }

}

backend/src/admin/admin.service.ts

+0 −13
Original line number Diff line number Diff line 
import { Injectable } from '@nestjs/common';

import { CreateAdminDto } from './dto/create-admin.dto';

import { UpdateAdminDto } from './dto/update-admin.dto';

import { Admin } from './entities/admin.entity';

import { Repository } from 'typeorm';

import { InjectRepository } from '@nestjs/typeorm';
@@ -14,19 +13,7 @@ export class AdminService { 
    await this.adminRepository.insert(createAdminDto);

  }



  findAll() {

    return `This action returns all admin`;

  }



  async findOne(email: string): Promise<Admin> {

    return await this.adminRepository.findOneByOrFail({ email });

  }



  update(id: number, updateAdminDto: UpdateAdminDto) {

    return `This action updates a #${id} admin`;

  }



  remove(id: number) {

    return `This action removes a #${id} admin`;

  }

}

backend/src/app.module.ts

+6 −3
Original line number Diff line number Diff line 
import { Module } from '@nestjs/common';

import { TypeOrmModule } from '@nestjs/typeorm';

import { DataSource } from 'typeorm';



import { AppController } from './app.controller';

import { AppService } from './app.service';

import { AdminModule } from './admin/admin.module';

import { Admin } from './admin/entities/admin.entity';

import { DbConstants } from './constants/db.constants';

import { AuthAdminModule } from './auth/admin/authAdmin.module';

import { UserModule } from './user/user.module';

import { User } from './user/entities/user.entity';

import { AuthUserModule } from './auth/user/authUser.module';

@Module({

  imports: [

    TypeOrmModule.forRoot({
@@ -17,11 +18,13 @@ import { AuthAdminModule } from './auth/admin/authAdmin.module'; 
      username: DbConstants.DB_USER,

      password: DbConstants.DB_PASSWORD,

      database: DbConstants.DB_NAME,

      entities: [Admin],

      entities: [Admin, User],

      synchronize: DbConstants.DB_SYNC,

    }),

    AuthAdminModule,

    AdminModule,

    UserModule,

    AuthUserModule,

  ],

  controllers: [AppController],

  providers: [AppService],

backend/src/auth/admin/authAdmincontroller.ts

+2 −4
Original line number Diff line number Diff line
@@ -3,7 +3,6 @@ import { AuthAdminService } from './authAdminservice'; 
import { CreateAdminDto } from 'src/admin/dto/create-admin.dto';

import { LoginAdminDto } from 'src/auth/admin/dto/login-admin.dto';

import {

  ApiBearerAuth,

  ApiBody,

  ApiCreatedResponse,

  ApiTags,
@@ -11,13 +10,12 @@ import { 
} from '@nestjs/swagger';

import { AdminSigninResDto } from './dto/admin-signin-res.dto';



@Controller('auth')

@Controller()

@ApiTags('Create admin account and sign in as admin')

export class AuthAdminController {

  constructor(private readonly authAdminService: AuthAdminService) {}



  @ApiBody({ type: CreateAdminDto })

  @ApiBearerAuth()

  @ApiCreatedResponse({

    content: {

      'application/json': {
@@ -34,7 +32,7 @@ export class AuthAdminController { 
      const accessToken = await this.authAdminService.signUp(createAdminDto);

      return { token: accessToken };

    } catch (e) {

      throw e;

      return e;

    }

  }

  @ApiBody({ type: LoginAdminDto })

backend/src/auth/user/authUser.module.ts

0 → 100644
+14 −0
Original line number Diff line number Diff line 
import { Module } from '@nestjs/common';

import { EncryptionService } from '../encryption/encryption.service';

import { TypeOrmModule } from '@nestjs/typeorm';

import { JwtService } from '@nestjs/jwt';

import { AuthUserController } from './authUsercontroller';

import { UserService } from 'src/user/user.service';

import { User } from 'src/user/entities/user.entity';

import { AuthUserService } from './authUserservice';

@Module({

  controllers: [AuthUserController],

  providers: [UserService, JwtService, EncryptionService, AuthUserService],

  imports: [TypeOrmModule.forFeature([User])],

})

export class AuthUserModule {}