From af0bcdb0952510e17113ed9c8c026d0c51f74752 Mon Sep 17 00:00:00 2001 From: Arthur DANJOU Date: Wed, 30 Jun 2021 20:54:21 +0200 Subject: [PATCH] Working --- .../migrations/1603020084373_subscribers.ts | 2 +- database/migrations/1605956543449_files.ts | 2 +- database/migrations/1605956711010_posts.ts | 2 +- database/migrations/1608409476823_locations.ts | 2 +- database/migrations/1608415261417_projects.ts | 2 +- database/migrations/1618661863952_forms.ts | 2 +- .../migrations/1621542488791_golden_messages.ts | 2 +- ...42495694_users.ts => 1625078903131_users.ts} | 17 +++++++++++++++-- ...pi_tokens.ts => 1625078908619_api_tokens.ts} | 2 +- 9 files changed, 23 insertions(+), 10 deletions(-) rename database/migrations/{1621542495694_users.ts => 1625078903131_users.ts} (54%) rename database/migrations/{1625068552541_api_tokens.ts => 1625078908619_api_tokens.ts} (90%) diff --git a/database/migrations/1603020084373_subscribers.ts b/database/migrations/1603020084373_subscribers.ts index 6a3d955..4f8d405 100644 --- a/database/migrations/1603020084373_subscribers.ts +++ b/database/migrations/1603020084373_subscribers.ts @@ -7,7 +7,7 @@ export default class Subscribers extends BaseSchema { this.schema.createTable(this.tableName, (table) => { table.increments('id').primary() table.string('email').notNullable() - table.timestamps(true) + table.timestamps() }) } diff --git a/database/migrations/1605956543449_files.ts b/database/migrations/1605956543449_files.ts index 80c4793..0d504f9 100644 --- a/database/migrations/1605956543449_files.ts +++ b/database/migrations/1605956543449_files.ts @@ -8,7 +8,7 @@ export default class Pictures extends BaseSchema { table.increments('id').primary() table.string('label').notNullable() table.string('file_name').notNullable() - table.timestamps(true) + table.timestamps() }) } diff --git a/database/migrations/1605956711010_posts.ts b/database/migrations/1605956711010_posts.ts index 078bb96..e84df85 100644 --- a/database/migrations/1605956711010_posts.ts +++ b/database/migrations/1605956711010_posts.ts @@ -8,7 +8,7 @@ export default class Posts extends BaseSchema { table.increments('id').primary() table.string('slug').notNullable() table.integer('likes').notNullable() - table.timestamps(true) + table.timestamps() }) } diff --git a/database/migrations/1608409476823_locations.ts b/database/migrations/1608409476823_locations.ts index b754533..90eeaef 100644 --- a/database/migrations/1608409476823_locations.ts +++ b/database/migrations/1608409476823_locations.ts @@ -9,7 +9,7 @@ export default class Locations extends BaseSchema { table.string('place') table.string('left') table.date('since') - table.timestamps(true) + table.timestamps() }) } diff --git a/database/migrations/1608415261417_projects.ts b/database/migrations/1608415261417_projects.ts index 08b29cf..37ab903 100644 --- a/database/migrations/1608415261417_projects.ts +++ b/database/migrations/1608415261417_projects.ts @@ -10,7 +10,7 @@ export default class Projects extends BaseSchema { table.string('description') table.string('url') table.integer('progress') - table.timestamps(true) + table.timestamps() }) } diff --git a/database/migrations/1618661863952_forms.ts b/database/migrations/1618661863952_forms.ts index c0c7ab2..b452ac6 100644 --- a/database/migrations/1618661863952_forms.ts +++ b/database/migrations/1618661863952_forms.ts @@ -10,7 +10,7 @@ export default class Forms extends BaseSchema { table.string('email') table.string('subject') table.string('content') - table.timestamps(true) + table.timestamps() }) } diff --git a/database/migrations/1621542488791_golden_messages.ts b/database/migrations/1621542488791_golden_messages.ts index e0c4fb9..a954528 100644 --- a/database/migrations/1621542488791_golden_messages.ts +++ b/database/migrations/1621542488791_golden_messages.ts @@ -8,7 +8,7 @@ export default class GoldenMessages extends BaseSchema { table.increments('id') table.integer('user_id').notNullable() table.string('message') - table.timestamps(true) + table.timestamps() }) } diff --git a/database/migrations/1621542495694_users.ts b/database/migrations/1625078903131_users.ts similarity index 54% rename from database/migrations/1621542495694_users.ts rename to database/migrations/1625078903131_users.ts index 1935443..5cf3df1 100644 --- a/database/migrations/1621542495694_users.ts +++ b/database/migrations/1625078903131_users.ts @@ -1,4 +1,5 @@ import BaseSchema from '@ioc:Adonis/Lucid/Schema' +import Hash from "@ioc:Adonis/Core/Hash"; export default class Users extends BaseSchema { protected tableName = 'users' @@ -8,14 +9,26 @@ export default class Users extends BaseSchema { table.increments('id').primary() table.string('username', 255).notNullable() table.string('email', 255).notNullable() - table.string('password', 180).notNullable() + table.string('password', 180).defaultTo(this.randomPassword()).notNullable() table.boolean('is_confirmed').defaultTo(false).notNullable() table.string('remember_me_token').defaultTo(null).nullable() table.string('confirmation_token').defaultTo(null).nullable() - table.timestamps(true) + table.timestamps() }) } + private randomPassword (): string { + let password = '' + const char = 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789!.:=+-_$*^&@#%ù/àçè()é"' + const size = 64 + for (let i = 0; i < size; i++) { + password += char.charAt(Math.random() * char.length) + } + console.log(password) + console.log(Hash.make(password)) + return password + } + public async down () { this.schema.dropTable(this.tableName) } diff --git a/database/migrations/1625068552541_api_tokens.ts b/database/migrations/1625078908619_api_tokens.ts similarity index 90% rename from database/migrations/1625068552541_api_tokens.ts rename to database/migrations/1625078908619_api_tokens.ts index ed8d363..3c8a659 100644 --- a/database/migrations/1625068552541_api_tokens.ts +++ b/database/migrations/1625078908619_api_tokens.ts @@ -11,7 +11,7 @@ export default class ApiTokens extends BaseSchema { table.string('type').notNullable() table.string('token', 64).notNullable() table.timestamp('expires_at', { useTz: true }).nullable() - table.timestamp('created_at', { useTz: true }).notNullable() + table.timestamps() }) }