From 5298f8ea35a7109d025b2e9c053fd6c1bc61d35c Mon Sep 17 00:00:00 2001 From: Luke Edwards Date: Thu, 25 Apr 2019 22:01:16 -0700 Subject: [PATCH] =?UTF-8?q?fix:=20add=20timestamp=20columns=20to=20?= =?UTF-8?q?=E2=80=9Cusers"=20table?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- site/migrations/000-create-users.js | 4 +++- site/src/backend/auth.js | 4 +--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/site/migrations/000-create-users.js b/site/migrations/000-create-users.js index c528c66680..1598d16a6d 100644 --- a/site/migrations/000-create-users.js +++ b/site/migrations/000-create-users.js @@ -6,7 +6,9 @@ exports.up = DB => { name character varying(255), username character varying(255) not null, avatar text, - token character varying(255) not null + token character varying(255) not null, + created_at timestamp with time zone NOT NULL DEFAULT now(), + updated_at timestamp with time zone ); create unique index if not exists users_pkey ON users(id int4_ops); diff --git a/site/src/backend/auth.js b/site/src/backend/auth.js index 3ba233ad2a..5072f0c3cd 100644 --- a/site/src/backend/auth.js +++ b/site/src/backend/auth.js @@ -70,8 +70,6 @@ export function API() { if (GITHUB_CLIENT_ID) { app.get('/auth/login', (req, res) => { try { - console.log('inside'); - const Location = `${OAuth}/authorize?` + stringify({ scope: 'read:user', client_id: GITHUB_CLIENT_ID, @@ -108,7 +106,7 @@ export function API() { const [user] = await query(` insert into users(uid, name, username, avatar, token) values ($1, $2, $3, $4, $5) on conflict (uid) do update - set (name, username, avatar, token) = ($2, $3, $4, $5) + set (name, username, avatar, token, updated_at) = ($2, $3, $4, $5, now()) returning * `, [id, name, login, avatar_url, access_token]);