From a825f98dc9e6eeb645de9529b1a84d5479c2d069 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marko=20Syd=C3=A4nmaa?= <L4072@student.jamk.fi>
Date: Tue, 18 Jun 2019 12:44:09 +0300
Subject: [PATCH] Removed password from game
---
src/game/game.dto.ts | 2 --
src/game/game.entity.ts | 11 +++--------
src/game/game.service.ts | 2 --
3 files changed, 3 insertions(+), 12 deletions(-)
diff --git a/src/game/game.dto.ts b/src/game/game.dto.ts
index d0d19dd..da61196 100644
--- a/src/game/game.dto.ts
+++ b/src/game/game.dto.ts
@@ -23,8 +23,6 @@ export class CreateGameDTO {
@IsJSON() @IsNotEmpty()
mapCoordinates: JSON;
- @IsString() @IsNotEmpty() @Length(3, 255)
- GM_Password?: string;
}
/*export class EditGameDTO {
diff --git a/src/game/game.entity.ts b/src/game/game.entity.ts
index 3db7f24..c086aae 100644
--- a/src/game/game.entity.ts
+++ b/src/game/game.entity.ts
@@ -1,5 +1,4 @@
import { Entity, Column, PrimaryGeneratedColumn, OneToMany, ManyToOne, Timestamp} from 'typeorm';
-import * as bcrypt from 'bcryptjs';
import {PersonEntity, PersonRoleEntity} from '../user/user.entity'
import {FactionEntity} from './faction.entity'
import {CoordinateEntity, MapEntity} from './coordinate.entity'
@@ -13,7 +12,6 @@ export class GameEntity {
@Column({type: 'text'}) gameDescription: string;
@Column({type: 'date'}) startDate: string;
@Column({type: 'date'}) endDate: string;
- @Column({type: 'text'}) GM_Password: string;
@ManyToOne(type => MapEntity, map => map.games)
map: MapEntity;
@@ -25,13 +23,10 @@ export class GameEntity {
objective_points: ObjectivePointEntity[];
gameObject() {
- const {gameId, gameName, gameDescription, startDate, endDate, factions, objective_points, map, GM_Password} = this;
- return {gameId, gameName, gameDescription, startDate, endDate, factions, objective_points, map, GM_Password};
+ const {gameId, gameName, gameDescription, startDate, endDate, factions, objective_points, map} = this;
+ return {gameId, gameName, gameDescription, startDate, endDate, factions, objective_points, map};
}
- async comparePassword(attempt: string) {
- return await bcrypt.compareSync(attempt, this.GM_Password);
- }
}
@Entity('Game_Person')
@@ -68,7 +63,7 @@ export class ObjectivePointEntity {
export class ObjectivePoint_HistoryEntity {
@PrimaryGeneratedColumn('uuid') oP_HistoryId: string;
@Column({type: 'timestamp'}) oP_HistoryTimestamp: Timestamp;
- @Column({/*type: 'timestamp'*/}) oP_HistoryStatus: number;
+ @Column({}) oP_HistoryStatus: number;
@ManyToOne(type => ObjectivePointEntity, objective_point => objective_point.op_history)
objective_point: ObjectivePointEntity;
diff --git a/src/game/game.service.ts b/src/game/game.service.ts
index 9a5cd1c..73cdd0d 100644
--- a/src/game/game.service.ts
+++ b/src/game/game.service.ts
@@ -78,8 +78,6 @@ export class GameService {
});
const game = await this.gameRepository.findOne({ where: { id: gameId } });
- const index = game.GM_Password.indexOf(json.password);
-
// create game_Person entry
/* const gamePerson = await this.game_PersonRepository.create({
faction,
--
GitLab