Skip to content
Snippets Groups Projects
Commit 6a614069 authored by L4168's avatar L4168
Browse files

excluded passwords

parent 6f90e0ab
No related branches found
No related tags found
3 merge requests!59Development to master,!31Development,!28Group fix
...@@ -12,6 +12,7 @@ import { ...@@ -12,6 +12,7 @@ import {
import { GameEntity } from '../game/game.entity'; import { GameEntity } from '../game/game.entity';
import { Game_PersonEntity } from '../game/game.entity'; import { Game_PersonEntity } from '../game/game.entity';
import { MapDrawingEntity } from '../draw/coordinate.entity'; import { MapDrawingEntity } from '../draw/coordinate.entity';
import { Exclude } from 'class-transformer';
//Faction, PowerUp, Faction_powerUp, FP_History, Score //Faction, PowerUp, Faction_powerUp, FP_History, Score
...@@ -19,9 +20,12 @@ import { MapDrawingEntity } from '../draw/coordinate.entity'; ...@@ -19,9 +20,12 @@ import { MapDrawingEntity } from '../draw/coordinate.entity';
export class FactionEntity { export class FactionEntity {
@PrimaryGeneratedColumn('uuid') factionId: string; @PrimaryGeneratedColumn('uuid') factionId: string;
@Column('text') factionName: string; @Column('text') factionName: string;
@Column({ type: 'text' }) factionPassword: string;
@Column({ type: 'float' }) multiplier: number; @Column({ type: 'float' }) multiplier: number;
@Exclude()
@Column({ type: 'text' })
factionPassword: string;
@OneToMany(type => Game_PersonEntity, game_persons => game_persons.faction) @OneToMany(type => Game_PersonEntity, game_persons => game_persons.faction)
game_persons: Game_PersonEntity[]; game_persons: Game_PersonEntity[];
@ManyToOne(type => GameEntity, game => game.factions) @ManyToOne(type => GameEntity, game => game.factions)
......
...@@ -9,12 +9,16 @@ import * as bcrypt from 'bcryptjs'; ...@@ -9,12 +9,16 @@ import * as bcrypt from 'bcryptjs';
import * as jwt from 'jsonwebtoken'; import * as jwt from 'jsonwebtoken';
import { Game_PersonEntity } from '../game/game.entity'; import { Game_PersonEntity } from '../game/game.entity';
import { Exclude } from 'class-transformer';
@Entity('Person') @Entity('Person')
export class PersonEntity { export class PersonEntity {
@PrimaryGeneratedColumn('uuid') id: string; @PrimaryGeneratedColumn('uuid') id: string;
@Column({ type: 'text', unique: true }) name: string; @Column({ type: 'text', unique: true }) name: string;
@Column('text') password: string;
@Exclude()
@Column('text')
password: string;
@OneToMany(type => Game_PersonEntity, game_persons => game_persons.person) @OneToMany(type => Game_PersonEntity, game_persons => game_persons.person)
game_persons: Game_PersonEntity[]; game_persons: Game_PersonEntity[];
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment