From 9aebee2c4abaf7e6bab5fa3a97a94044bdab70ae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gr=C3=A9goire=20Delattre?= Date: Sun, 13 Aug 2017 08:00:28 +0200 Subject: [PATCH] Add an "activated" field in the user table --- sql/dev/101_data.up.sql | 4 ++-- sql/migration/0005__user_activation.down.sql | 1 + sql/migration/0005__user_activation.up.sql | 3 +++ src/internal/users/users.go | 1 + 4 files changed, 7 insertions(+), 2 deletions(-) create mode 100644 sql/migration/0005__user_activation.down.sql create mode 100644 sql/migration/0005__user_activation.up.sql diff --git a/sql/dev/101_data.up.sql b/sql/dev/101_data.up.sql index 74355ba..ec5228f 100644 --- a/sql/dev/101_data.up.sql +++ b/sql/dev/101_data.up.sql @@ -1,2 +1,2 @@ -INSERT INTO users (name, hash, admin) VALUES ('test', '$2a$10$QHx07iyuxO1RcehgtjMgjOzv03Bx2eeSKvsxkoj9oR2NJ4cklh6ue', false); -INSERT INTO users (name, hash, admin) VALUES ('admin', '$2a$10$qAbyDZsHtcnhXhjhQZkD2uKlX72eMHsX8Hi2Cnl1vJUqHQiey2qa6', true); +INSERT INTO users (name, hash, admin, activated) VALUES ('test', '$2a$10$QHx07iyuxO1RcehgtjMgjOzv03Bx2eeSKvsxkoj9oR2NJ4cklh6ue', false, true); +INSERT INTO users (name, hash, admin, activated) VALUES ('admin', '$2a$10$qAbyDZsHtcnhXhjhQZkD2uKlX72eMHsX8Hi2Cnl1vJUqHQiey2qa6', true, true); diff --git a/sql/migration/0005__user_activation.down.sql b/sql/migration/0005__user_activation.down.sql new file mode 100644 index 0000000..5e861f8 --- /dev/null +++ b/sql/migration/0005__user_activation.down.sql @@ -0,0 +1 @@ +ALTER TABLE users DROP COLUMN activated; diff --git a/sql/migration/0005__user_activation.up.sql b/sql/migration/0005__user_activation.up.sql new file mode 100644 index 0000000..8b6c34b --- /dev/null +++ b/sql/migration/0005__user_activation.up.sql @@ -0,0 +1,3 @@ +ALTER TABLE users ADD COLUMN activated boolean NOT NULL DEFAULT false; +UPDATE users SET activated = true; +CREATE INDEX ON users (activated); diff --git a/src/internal/users/users.go b/src/internal/users/users.go index 861bcc1..880b0c4 100644 --- a/src/internal/users/users.go +++ b/src/internal/users/users.go @@ -44,6 +44,7 @@ type User struct { Name string Hash string Admin bool + Activated bool RawConfig types.JSONText }