From 582e5c4a4f130fd033a4f5df31f123ec15a15518 Mon Sep 17 00:00:00 2001 From: Ulf Gebhardt Date: Fri, 22 Oct 2021 02:43:44 +0200 Subject: [PATCH] LoginUser Database Model --- .../0003-login_server_tables/LoginUser.ts | 56 +++++++++++++++++++ database/entity/LoginUser.ts | 1 + database/entity/index.ts | 2 + 3 files changed, 59 insertions(+) create mode 100644 database/entity/0003-login_server_tables/LoginUser.ts create mode 100644 database/entity/LoginUser.ts diff --git a/database/entity/0003-login_server_tables/LoginUser.ts b/database/entity/0003-login_server_tables/LoginUser.ts new file mode 100644 index 000000000..26614b4db --- /dev/null +++ b/database/entity/0003-login_server_tables/LoginUser.ts @@ -0,0 +1,56 @@ +import { BaseEntity, Entity, PrimaryGeneratedColumn, Column } from 'typeorm' + +// Moriz: I do not like the idea of having two user tables +@Entity('login_users') +export class LoginUser extends BaseEntity { + @PrimaryGeneratedColumn('increment', { unsigned: true }) + id: number + + @Column({ length: 191, unique: true }) + email: string + + @Column({ name: 'first_name', length: 150 }) + firstName: string + + @Column({ name: 'last_name', length: 255, default: '' }) + lastName: string + + @Column({ length: 255, default: '' }) + username: string + + @Column({ default: '' }) + description: string + + @Column({ type: 'bigint', default: 0, unsigned: true }) + password: string + + @Column({ name: 'pubkey', type: 'binary', length: 32, default: null, nullable: true }) + pubKey: Buffer + + @Column({ name: 'privkey', type: 'binary', length: 80, default: null, nullable: true }) + privKey: Buffer + + @Column({ name: 'email_hash', type: 'binary', length: 32, default: null, nullable: true }) + emailHash: Buffer + + @Column({ name: 'created', default: () => 'CURRENT_TIMESTAMP' }) + createdAt: Date + + @Column({ name: 'email_checked', default: 0 }) + emailChecked: boolean + + @Column({ name: 'passphrase_shown', default: 0 }) + passphraseShown: boolean + + @Column({ length: 4, default: 'de' }) + language: string + + @Column({ default: 0 }) + disabled: boolean + + @Column({ name: 'group_id', default: 0, unsigned: true }) + groupId: number + + @Column({ name: 'publisher_id', default: 0 }) + publisherId: number +} diff --git a/database/entity/LoginUser.ts b/database/entity/LoginUser.ts new file mode 100644 index 000000000..034f791cb --- /dev/null +++ b/database/entity/LoginUser.ts @@ -0,0 +1 @@ +export { LoginUser } from './0003-login_server_tables/LoginUser' diff --git a/database/entity/index.ts b/database/entity/index.ts index e18757ab8..1881b2932 100644 --- a/database/entity/index.ts +++ b/database/entity/index.ts @@ -1,4 +1,5 @@ import { Balance } from './Balance' +import { LoginUser } from './LoginUser' import { Migration } from './Migration' import { Transaction } from './Transaction' import { TransactionCreation } from './TransactionCreation' @@ -9,6 +10,7 @@ import { UserTransaction } from './UserTransaction' export const entities = [ Balance, + LoginUser, Migration, Transaction, TransactionCreation,