diff --git a/api/src/main/nim/personal_measure_apipkg/api.nim b/api/src/main/nim/personal_measure_apipkg/api.nim index f59f3a3..9dd1f06 100644 --- a/api/src/main/nim/personal_measure_apipkg/api.nim +++ b/api/src/main/nim/personal_measure_apipkg/api.nim @@ -312,6 +312,7 @@ proc start*(ctx: PMApiContext): void = var newToken = ApiToken( userId: session.user.id, name: jsonBody.getOrFail("name").getStr, + created: getTime().utc, expires: none[DateTime](), hashedToken: "") @@ -523,7 +524,7 @@ proc start*(ctx: PMApiContext): void = message: jsonBody.getOrFail("message").getStr, scope: jsonBody.getOrFail("scope").getStr, stacktrace: jsonBody.getIfExists("stacktrace").getStr(""), - timestamp: jsonBody.getOrFail("timestampe").getStr.parseIso8601 + timestamp: jsonBody.getOrFail("timestamp").getStr.parseIso8601 ) resp(Http200, $(%ctx.db.createClientLogEntry(logEntry)), JSON) except BadRequestError: jsonResp(Http400, getCurrentExceptionMsg()) @@ -541,7 +542,7 @@ proc start*(ctx: PMApiContext): void = message: it.getOrFail("message").getStr, scope: it.getOrFail("scope").getStr, stacktrace: it.getIfExists("stacktrace").getStr(""), - timestamp: it.getOrFail("timestampe").getStr.parseIso8601 + timestamp: it.getOrFail("timestamp").getStr.parseIso8601 )) resp(Http200, $(%respMsgs), JSON) except BadRequestError: jsonResp(Http400, getCurrentExceptionMsg()) diff --git a/api/src/main/nim/personal_measure_apipkg/models.nim b/api/src/main/nim/personal_measure_apipkg/models.nim index 139b505..70f9e7c 100644 --- a/api/src/main/nim/personal_measure_apipkg/models.nim +++ b/api/src/main/nim/personal_measure_apipkg/models.nim @@ -13,6 +13,7 @@ type id*: UUID userId*: UUID name*:string + created*: DateTime expires*: Option[DateTime] hashedToken*: string @@ -74,7 +75,8 @@ proc `%`*(tok: ApiToken): JsonNode = result = %*{ "id": $tok.id, "userId": $tok.userId, - "name": tok.name + "name": tok.name, + "created": tok.created } if tok.expires.isSome: diff --git a/api/src/main/sql/migrations/20190214122514-initial-schema-up.sql b/api/src/main/sql/migrations/20190214122514-initial-schema-up.sql index 44e249d..192d4e6 100644 --- a/api/src/main/sql/migrations/20190214122514-initial-schema-up.sql +++ b/api/src/main/sql/migrations/20190214122514-initial-schema-up.sql @@ -14,6 +14,7 @@ create table "api_tokens" ( id uuid default uuid_generate_v4() primary key, user_id uuid not null references users (id) on delete cascade on update cascade, name varchar not null, + created timestamp with time zone not null default current_timestamp, expires timestamp with time zone default null, hashed_token varchar not null );