From 9a16dd229269b65aebe97d1fa8ce0aea771785ad Mon Sep 17 00:00:00 2001 From: plane000 Date: Sat, 8 Sep 2018 15:48:56 +0100 Subject: [PATCH] started to think about how ima do notes and groups --- logs.log | 202 +++++++++++++++++++++ src/models/database/database.js | 2 +- src/models/database/sqlite/database.sqlite | Bin 53248 -> 49152 bytes src/models/notes/groups.js | 3 + src/models/notes/notes.js | 5 + src/models/user/passwords.js | 11 +- 6 files changed, 218 insertions(+), 5 deletions(-) create mode 100644 src/models/notes/groups.js create mode 100644 src/models/notes/notes.js diff --git a/logs.log b/logs.log index a42a2a9..361a499 100644 --- a/logs.log +++ b/logs.log @@ -3076,3 +3076,205 @@ [2018-9-8 14:56:41] [READY] [2018-9-8 15:01:22] [HTTP-MIDDLEWARE] GET request to / [2018-9-8 15:01:22] [DEBUG] [D:/Programming/Projects/NoteService/note-service-server/src/controllers/middleware/rateLimits.js:14] New rate limiting bucket +[SYSTEM STARTING UP] +[2018-9-8 15:31:26] [INFO] Loading config +[2018-9-8 15:31:26] [INFO] LOADED: src/config/configs/server.json +[2018-9-8 15:31:26] [INFO] LOADED: src/config/configs/database.json +[2018-9-8 15:31:26] [INFO] Config loaded +[2018-9-8 15:31:26] [INFO] Connecting to SQLite Database +[2018-9-8 15:31:26] [SQLITE] Executing (default): CREATE TABLE IF NOT EXISTS `user` (`id` BIGINT UNIQUE PRIMARY KEY, `username` TEXT, `password` TEXT, `email` TEXT, `ip` TEXT, `lastupdated` TEXT, `verified` TINYINT(1), `authcode` TEXT, `timeauthed` TEXT, `createdAt` DATETIME NOT NULL, `updatedAt` DATETIME NOT NULL); +[2018-9-8 15:31:26] [SQLITE] Executing (default): PRAGMA INDEX_LIST(`user`) +[2018-9-8 15:31:26] [SQLITE] Executing (default): PRAGMA INDEX_INFO(`sqlite_autoindex_user_1`) +[2018-9-8 15:31:26] [SQLITE] Executing (default): CREATE TABLE IF NOT EXISTS `auth` (`id` BIGINT UNIQUE PRIMARY KEY, `token` TEXT, `passhash` TEXT, `createdAt` DATETIME NOT NULL, `updatedAt` DATETIME NOT NULL); +[2018-9-8 15:31:26] [SQLITE] Executing (default): PRAGMA INDEX_LIST(`auth`) +[2018-9-8 15:31:26] [SQLITE] Executing (default): PRAGMA INDEX_INFO(`sqlite_autoindex_auth_1`) +[2018-9-8 15:31:26] [SQLITE] Executing (default): CREATE TABLE IF NOT EXISTS `permanote` (`uid` BIGINT UNIQUE PRIMARY KEY, `endpoint` TEXT, `text` TEXT, `creatorid` BIGINT, `createdAt` DATETIME NOT NULL, `updatedAt` DATETIME NOT NULL); +[2018-9-8 15:31:26] [SQLITE] Executing (default): PRAGMA INDEX_LIST(`permanote`) +[2018-9-8 15:31:26] [SQLITE] Executing (default): PRAGMA INDEX_INFO(`sqlite_autoindex_permanote_1`) +[2018-9-8 15:31:26] [SQLITE] Executing (default): CREATE TABLE IF NOT EXISTS `group` (`id` BIGINT UNIQUE PRIMARY KEY, `creatorid` BIGINT, `order` INTEGER, `lastupdated` TEXT, `createdAt` DATETIME NOT NULL, `updatedAt` DATETIME NOT NULL); +[2018-9-8 15:31:26] [SQLITE] Executing (default): PRAGMA INDEX_LIST(`group`) +[2018-9-8 15:31:26] [SQLITE] Executing (default): PRAGMA INDEX_INFO(`sqlite_autoindex_group_1`) +[2018-9-8 15:31:26] [SQLITE] Executing (default): CREATE TABLE IF NOT EXISTS `note` (`id` BIGINT UNIQUE PRIMARY KEY, `content` TEXT, `parentgroup` BIGINT, `creatorid` BIGINT, `order` INTEGER, `catergory` TEXT, `endpoint` TEXT UNIQUE, `lastupdated` TEXT, `createdAt` DATETIME NOT NULL, `updatedAt` DATETIME NOT NULL); +[2018-9-8 15:31:26] [SQLITE] Executing (default): PRAGMA INDEX_LIST(`note`) +[2018-9-8 15:31:26] [SQLITE] Executing (default): PRAGMA INDEX_INFO(`sqlite_autoindex_note_1`) +[2018-9-8 15:31:26] [INFO] Connected to SQLite Database +[2018-9-8 15:31:26] [INFO] Server created +[2018-9-8 15:31:26] [INFO] HTTP service is listening at port 8080 +[2018-9-8 15:31:26] [INFO] Setting up API HTTP endpoints +[2018-9-8 15:31:26] [INFO] HTTP endpoints settup +[2018-9-8 15:31:26] [INFO] Initialized ratelimiting middleware +[2018-9-8 15:31:26] [READY] +[2018-9-8 15:31:42] [HTTP-MIDDLEWARE] POST request to /user +[2018-9-8 15:31:42] [DEBUG] [D:/Programming/Projects/NoteService/note-service-server/src/controllers/middleware/rateLimits.js:14] New rate limiting bucket +[2018-9-8 15:31:42] [SQLITE] Executing (default): SELECT `id`, `username`, `password`, `email`, `ip`, `lastupdated`, `verified`, `authcode`, `timeauthed`, `createdAt`, `updatedAt` FROM `user` AS `user` WHERE `user`.`username` = 'plane000' LIMIT 1; +[2018-9-8 15:31:42] [SQLITE] Executing (default): SELECT `id`, `username`, `password`, `email`, `ip`, `lastupdated`, `verified`, `authcode`, `timeauthed`, `createdAt`, `updatedAt` FROM `user` AS `user` WHERE `user`.`email` = 'playsplane@gmail.com' LIMIT 1; +[2018-9-8 15:31:50] [HTTP-MIDDLEWARE] POST request to /user +[2018-9-8 15:31:50] [SQLITE] Executing (default): SELECT `id`, `username`, `password`, `email`, `ip`, `lastupdated`, `verified`, `authcode`, `timeauthed`, `createdAt`, `updatedAt` FROM `user` AS `user` WHERE `user`.`username` = 'plane0s00' LIMIT 1; +[2018-9-8 15:31:50] [SQLITE] Executing (default): SELECT `id`, `username`, `password`, `email`, `ip`, `lastupdated`, `verified`, `authcode`, `timeauthed`, `createdAt`, `updatedAt` FROM `user` AS `user` WHERE `user`.`email` = 'plsaysplane@gmail.com' LIMIT 1; +[2018-9-8 15:32:03] [HTTP-MIDDLEWARE] POST request to /user +[2018-9-8 15:32:03] [SQLITE] Executing (default): SELECT `id`, `username`, `password`, `email`, `ip`, `lastupdated`, `verified`, `authcode`, `timeauthed`, `createdAt`, `updatedAt` FROM `user` AS `user` WHERE `user`.`username` = 'plane0s00' LIMIT 1; +[2018-9-8 15:32:03] [SQLITE] Executing (default): SELECT `id`, `username`, `password`, `email`, `ip`, `lastupdated`, `verified`, `authcode`, `timeauthed`, `createdAt`, `updatedAt` FROM `user` AS `user` WHERE `user`.`email` = 'plsaysplane@gmail.com' LIMIT 1; +[2018-9-8 15:32:04] [SQLITE] Executing (default): INSERT INTO `auth` (`id`,`token`,`passhash`,`createdAt`,`updatedAt`) VALUES (1536417123995,'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJlcnJvciI6ZmFsc2UsImNvZGUiOjIwMCwidHlwZSI6InN1Y2Nlc3MiLCJtZXNzYWdlIjoiU3VjY2VzcyIsImlhdCI6MTUzNjQxNzEyM30.-HMjEpEa12I2BfSECjZXuJqoLLc1xn5ch-JW6sYp9n8','$2b$10$JwaO2L52JiHLk30Tf4VUeevXAlIDgru2gfuT9dYCaHjR.HqR7tWw.','2018-09-08 14:32:03.997 +00:00','2018-09-08 14:32:03.997 +00:00'); +[2018-9-8 15:32:04] [SQLITE] Executing (default): INSERT INTO `user` (`id`,`username`,`password`,`email`,`ip`,`lastupdated`,`verified`,`authcode`,`timeauthed`,`createdAt`,`updatedAt`) VALUES (1536417123995,'plane0s00','$2b$10$JwaO2L52JiHLk30Tf4VUeevXAlIDgru2gfuT9dYCaHjR.HqR7tWw.','plsaysplane@gmail.com','::1','1536417124144',0,1234,'-1','2018-09-08 14:32:04.144 +00:00','2018-09-08 14:32:04.144 +00:00'); +[2018-9-8 15:32:04] [DEBUG] [D:/Programming/Projects/NoteService/note-service-server/src/models/user/user.js:14] New user [1536417123995] plane0s00 +[SYSTEM STARTING UP] +[2018-9-8 15:32:33] [INFO] Loading config +[2018-9-8 15:32:33] [INFO] LOADED: src/config/configs/server.json +[2018-9-8 15:32:33] [INFO] LOADED: src/config/configs/database.json +[2018-9-8 15:32:33] [INFO] Config loaded +[2018-9-8 15:32:33] [INFO] Connecting to SQLite Database +[2018-9-8 15:32:33] [SQLITE] Executing (default): CREATE TABLE IF NOT EXISTS `user` (`id` BIGINT UNIQUE PRIMARY KEY, `username` TEXT, `password` TEXT, `email` TEXT, `ip` TEXT, `lastupdated` TEXT, `verified` TINYINT(1), `authcode` TEXT, `timeauthed` TEXT, `createdAt` DATETIME NOT NULL, `updatedAt` DATETIME NOT NULL); +[2018-9-8 15:32:33] [SQLITE] Executing (default): PRAGMA INDEX_LIST(`user`) +[2018-9-8 15:32:33] [SQLITE] Executing (default): PRAGMA INDEX_INFO(`sqlite_autoindex_user_1`) +[2018-9-8 15:32:33] [SQLITE] Executing (default): CREATE TABLE IF NOT EXISTS `auth` (`id` BIGINT UNIQUE PRIMARY KEY, `token` TEXT, `passhash` TEXT, `createdAt` DATETIME NOT NULL, `updatedAt` DATETIME NOT NULL); +[2018-9-8 15:32:33] [SQLITE] Executing (default): PRAGMA INDEX_LIST(`auth`) +[2018-9-8 15:32:33] [SQLITE] Executing (default): PRAGMA INDEX_INFO(`sqlite_autoindex_auth_1`) +[2018-9-8 15:32:33] [SQLITE] Executing (default): CREATE TABLE IF NOT EXISTS `permanote` (`uid` BIGINT UNIQUE PRIMARY KEY, `endpoint` TEXT, `text` TEXT, `creatorid` BIGINT, `createdAt` DATETIME NOT NULL, `updatedAt` DATETIME NOT NULL); +[2018-9-8 15:32:33] [SQLITE] Executing (default): PRAGMA INDEX_LIST(`permanote`) +[2018-9-8 15:32:33] [SQLITE] Executing (default): PRAGMA INDEX_INFO(`sqlite_autoindex_permanote_1`) +[2018-9-8 15:32:33] [SQLITE] Executing (default): CREATE TABLE IF NOT EXISTS `group` (`id` BIGINT UNIQUE PRIMARY KEY, `creatorid` BIGINT, `order` INTEGER, `lastupdated` TEXT, `createdAt` DATETIME NOT NULL, `updatedAt` DATETIME NOT NULL); +[2018-9-8 15:32:33] [SQLITE] Executing (default): PRAGMA INDEX_LIST(`group`) +[2018-9-8 15:32:33] [SQLITE] Executing (default): PRAGMA INDEX_INFO(`sqlite_autoindex_group_1`) +[2018-9-8 15:32:33] [SQLITE] Executing (default): CREATE TABLE IF NOT EXISTS `note` (`id` BIGINT UNIQUE PRIMARY KEY, `content` TEXT, `parentgroup` BIGINT, `creatorid` BIGINT, `order` INTEGER, `catergory` TEXT, `endpoint` TEXT UNIQUE, `lastupdated` TEXT, `createdAt` DATETIME NOT NULL, `updatedAt` DATETIME NOT NULL); +[2018-9-8 15:32:33] [SQLITE] Executing (default): PRAGMA INDEX_LIST(`note`) +[2018-9-8 15:32:33] [SQLITE] Executing (default): PRAGMA INDEX_INFO(`sqlite_autoindex_note_1`) +[2018-9-8 15:32:33] [INFO] Connected to SQLite Database +[2018-9-8 15:32:33] [INFO] Server created +[2018-9-8 15:32:33] [INFO] HTTP service is listening at port 8080 +[2018-9-8 15:32:33] [INFO] Setting up API HTTP endpoints +[2018-9-8 15:32:33] [INFO] HTTP endpoints settup +[2018-9-8 15:32:33] [INFO] Initialized ratelimiting middleware +[2018-9-8 15:32:33] [READY] +[2018-9-8 15:32:33] [SQLITE] Executing (default): SELECT `id`, `username`, `password`, `email`, `ip`, `lastupdated`, `verified`, `authcode`, `timeauthed`, `createdAt`, `updatedAt` FROM `user` AS `user`; +[2018-9-8 15:32:33] [DEBUG] [D:/Programming/Projects/NoteService/note-service-server/src/app.js:11] [ + { + "id": 1536158305675, + "username": "plane000", + "password": "$2b$10$MAi9f0td3zagyFxEft6br.ku60grqTckzuVI1usbfqlyUo.bSbmHK", + "email": "playsplane@gmail.com", + "ip": "::1", + "lastupdated": "1536158305835", + "verified": false, + "authcode": "1234", + "timeauthed": "-1", + "createdAt": "2018-09-05T14:38:25.837Z", + "updatedAt": "2018-09-05T14:38:25.837Z" + }, + { + "id": 1536417123995, + "username": "plane0s00", + "password": "$2b$10$JwaO2L52JiHLk30Tf4VUeevXAlIDgru2gfuT9dYCaHjR.HqR7tWw.", + "email": "plsaysplane@gmail.com", + "ip": "::1", + "lastupdated": "1536417124144", + "verified": false, + "authcode": "1234", + "timeauthed": "-1", + "createdAt": "2018-09-08T14:32:04.144Z", + "updatedAt": "2018-09-08T14:32:04.144Z" + } +] +[SYSTEM STARTING UP] +[2018-9-8 15:35:03] [INFO] Loading config +[2018-9-8 15:35:03] [INFO] LOADED: src/config/configs/server.json +[2018-9-8 15:35:03] [INFO] LOADED: src/config/configs/database.json +[2018-9-8 15:35:03] [INFO] Config loaded +[2018-9-8 15:35:03] [INFO] Connecting to SQLite Database +[2018-9-8 15:35:03] [SQLITE] Executing (default): CREATE TABLE IF NOT EXISTS `user` (`id` BIGINT UNIQUE PRIMARY KEY, `username` TEXT, `password` TEXT, `email` TEXT, `ip` TEXT, `lastupdated` TEXT, `verified` TINYINT(1), `authcode` TEXT, `timeauthed` TEXT, `createdAt` DATETIME NOT NULL, `updatedAt` DATETIME NOT NULL); +[2018-9-8 15:35:03] [SQLITE] Executing (default): PRAGMA INDEX_LIST(`user`) +[2018-9-8 15:35:03] [SQLITE] Executing (default): PRAGMA INDEX_INFO(`sqlite_autoindex_user_1`) +[2018-9-8 15:35:03] [SQLITE] Executing (default): CREATE TABLE IF NOT EXISTS `auth` (`id` BIGINT UNIQUE PRIMARY KEY, `token` TEXT, `passhash` TEXT, `createdAt` DATETIME NOT NULL, `updatedAt` DATETIME NOT NULL); +[2018-9-8 15:35:03] [SQLITE] Executing (default): PRAGMA INDEX_LIST(`auth`) +[2018-9-8 15:35:03] [SQLITE] Executing (default): PRAGMA INDEX_INFO(`sqlite_autoindex_auth_1`) +[2018-9-8 15:35:03] [SQLITE] Executing (default): CREATE TABLE IF NOT EXISTS `permanote` (`uid` BIGINT UNIQUE PRIMARY KEY, `endpoint` TEXT, `text` TEXT, `creatorid` BIGINT, `createdAt` DATETIME NOT NULL, `updatedAt` DATETIME NOT NULL); +[2018-9-8 15:35:03] [SQLITE] Executing (default): PRAGMA INDEX_LIST(`permanote`) +[2018-9-8 15:35:03] [SQLITE] Executing (default): PRAGMA INDEX_INFO(`sqlite_autoindex_permanote_1`) +[2018-9-8 15:35:03] [SQLITE] Executing (default): CREATE TABLE IF NOT EXISTS `group` (`id` BIGINT UNIQUE PRIMARY KEY, `creatorid` BIGINT, `order` INTEGER, `lastupdated` TEXT, `createdAt` DATETIME NOT NULL, `updatedAt` DATETIME NOT NULL); +[2018-9-8 15:35:03] [SQLITE] Executing (default): PRAGMA INDEX_LIST(`group`) +[2018-9-8 15:35:03] [SQLITE] Executing (default): PRAGMA INDEX_INFO(`sqlite_autoindex_group_1`) +[2018-9-8 15:35:03] [SQLITE] Executing (default): CREATE TABLE IF NOT EXISTS `note` (`id` BIGINT UNIQUE PRIMARY KEY, `content` TEXT, `parentgroup` BIGINT, `creatorid` BIGINT, `order` INTEGER, `catergory` TEXT, `endpoint` TEXT UNIQUE, `lastupdated` TEXT, `createdAt` DATETIME NOT NULL, `updatedAt` DATETIME NOT NULL); +[2018-9-8 15:35:03] [SQLITE] Executing (default): PRAGMA INDEX_LIST(`note`) +[2018-9-8 15:35:03] [SQLITE] Executing (default): PRAGMA INDEX_INFO(`sqlite_autoindex_note_1`) +[2018-9-8 15:35:03] [INFO] Connected to SQLite Database +[2018-9-8 15:35:03] [INFO] Server created +[2018-9-8 15:35:03] [INFO] HTTP service is listening at port 8080 +[2018-9-8 15:35:03] [INFO] Setting up API HTTP endpoints +[2018-9-8 15:35:03] [INFO] HTTP endpoints settup +[2018-9-8 15:35:03] [INFO] Initialized ratelimiting middleware +[2018-9-8 15:35:03] [READY] +[SYSTEM STARTING UP] +[2018-9-8 15:38:05] [INFO] Loading config +[2018-9-8 15:38:05] [INFO] LOADED: src/config/configs/server.json +[2018-9-8 15:38:05] [INFO] LOADED: src/config/configs/database.json +[2018-9-8 15:38:05] [INFO] Config loaded +[2018-9-8 15:38:05] [INFO] Connecting to SQLite Database +[2018-9-8 15:38:06] [SQLITE] Executing (default): CREATE TABLE IF NOT EXISTS `user` (`id` BIGINT UNIQUE PRIMARY KEY, `username` TEXT, `password` TEXT, `email` TEXT, `ip` TEXT, `lastupdated` TEXT, `verified` TINYINT(1), `authcode` TEXT, `timeauthed` TEXT, `createdAt` DATETIME NOT NULL, `updatedAt` DATETIME NOT NULL); +[2018-9-8 15:38:06] [SQLITE] Executing (default): PRAGMA INDEX_LIST(`user`) +[2018-9-8 15:38:06] [SQLITE] Executing (default): PRAGMA INDEX_INFO(`sqlite_autoindex_user_1`) +[2018-9-8 15:38:06] [SQLITE] Executing (default): CREATE TABLE IF NOT EXISTS `auth` (`id` BIGINT UNIQUE PRIMARY KEY, `token` TEXT, `passhash` TEXT, `createdAt` DATETIME NOT NULL, `updatedAt` DATETIME NOT NULL); +[2018-9-8 15:38:06] [SQLITE] Executing (default): PRAGMA INDEX_LIST(`auth`) +[2018-9-8 15:38:06] [SQLITE] Executing (default): PRAGMA INDEX_INFO(`sqlite_autoindex_auth_1`) +[2018-9-8 15:38:06] [SQLITE] Executing (default): CREATE TABLE IF NOT EXISTS `permanote` (`uid` BIGINT UNIQUE PRIMARY KEY, `endpoint` TEXT, `text` TEXT, `creatorid` BIGINT, `createdAt` DATETIME NOT NULL, `updatedAt` DATETIME NOT NULL); +[2018-9-8 15:38:06] [SQLITE] Executing (default): PRAGMA INDEX_LIST(`permanote`) +[2018-9-8 15:38:06] [SQLITE] Executing (default): PRAGMA INDEX_INFO(`sqlite_autoindex_permanote_1`) +[2018-9-8 15:38:06] [SQLITE] Executing (default): CREATE TABLE IF NOT EXISTS `group` (`id` BIGINT UNIQUE PRIMARY KEY, `creatorid` BIGINT, `order` INTEGER, `lastupdated` TEXT, `createdAt` DATETIME NOT NULL, `updatedAt` DATETIME NOT NULL); +[2018-9-8 15:38:06] [SQLITE] Executing (default): PRAGMA INDEX_LIST(`group`) +[2018-9-8 15:38:06] [SQLITE] Executing (default): PRAGMA INDEX_INFO(`sqlite_autoindex_group_1`) +[2018-9-8 15:38:06] [SQLITE] Executing (default): CREATE TABLE IF NOT EXISTS `note` (`id` BIGINT UNIQUE PRIMARY KEY, `content` TEXT, `parentgroup` BIGINT, `creatorid` BIGINT, `order` INTEGER, `catergory` TEXT, `endpoint` TEXT UNIQUE, `lastupdated` TEXT, `createdAt` DATETIME NOT NULL, `updatedAt` DATETIME NOT NULL); +[2018-9-8 15:38:06] [SQLITE] Executing (default): PRAGMA INDEX_LIST(`note`) +[2018-9-8 15:38:06] [SQLITE] Executing (default): PRAGMA INDEX_INFO(`sqlite_autoindex_note_1`) +[2018-9-8 15:38:06] [INFO] Connected to SQLite Database +[2018-9-8 15:38:06] [INFO] Server created +[2018-9-8 15:38:06] [INFO] HTTP service is listening at port 8080 +[2018-9-8 15:38:06] [INFO] Setting up API HTTP endpoints +[2018-9-8 15:38:06] [INFO] HTTP endpoints settup +[2018-9-8 15:38:06] [INFO] Initialized ratelimiting middleware +[2018-9-8 15:38:06] [READY] +[2018-9-8 15:38:09] [HTTP-MIDDLEWARE] POST request to /login +[2018-9-8 15:38:09] [DEBUG] [D:/Programming/Projects/NoteService/note-service-server/src/controllers/middleware/rateLimits.js:14] New rate limiting bucket +[2018-9-8 15:38:09] [SQLITE] Executing (default): SELECT `id`, `username`, `password`, `email`, `ip`, `lastupdated`, `verified`, `authcode`, `timeauthed`, `createdAt`, `updatedAt` FROM `user` AS `user` WHERE `user`.`username` = 'plane000' LIMIT 1; +[SYSTEM STARTING UP] +[2018-9-8 15:39:43] [INFO] Loading config +[2018-9-8 15:39:43] [INFO] LOADED: src/config/configs/server.json +[2018-9-8 15:39:43] [INFO] LOADED: src/config/configs/database.json +[2018-9-8 15:39:43] [INFO] Config loaded +[2018-9-8 15:39:43] [INFO] Connecting to SQLite Database +[2018-9-8 15:39:43] [SQLITE] Executing (default): CREATE TABLE IF NOT EXISTS `user` (`id` BIGINT UNIQUE PRIMARY KEY, `username` TEXT, `password` TEXT, `email` TEXT, `ip` TEXT, `lastupdated` TEXT, `verified` TINYINT(1), `authcode` TEXT, `timeauthed` TEXT, `createdAt` DATETIME NOT NULL, `updatedAt` DATETIME NOT NULL); +[2018-9-8 15:39:44] [SQLITE] Executing (default): PRAGMA INDEX_LIST(`user`) +[2018-9-8 15:39:44] [SQLITE] Executing (default): PRAGMA INDEX_INFO(`sqlite_autoindex_user_1`) +[2018-9-8 15:39:44] [SQLITE] Executing (default): CREATE TABLE IF NOT EXISTS `auth` (`id` BIGINT UNIQUE PRIMARY KEY, `token` TEXT, `passhash` TEXT, `createdAt` DATETIME NOT NULL, `updatedAt` DATETIME NOT NULL); +[2018-9-8 15:39:44] [SQLITE] Executing (default): PRAGMA INDEX_LIST(`auth`) +[2018-9-8 15:39:44] [SQLITE] Executing (default): PRAGMA INDEX_INFO(`sqlite_autoindex_auth_1`) +[2018-9-8 15:39:44] [SQLITE] Executing (default): CREATE TABLE IF NOT EXISTS `permanote` (`uid` BIGINT UNIQUE PRIMARY KEY, `endpoint` TEXT, `text` TEXT, `creatorid` BIGINT, `createdAt` DATETIME NOT NULL, `updatedAt` DATETIME NOT NULL); +[2018-9-8 15:39:44] [SQLITE] Executing (default): PRAGMA INDEX_LIST(`permanote`) +[2018-9-8 15:39:44] [SQLITE] Executing (default): PRAGMA INDEX_INFO(`sqlite_autoindex_permanote_1`) +[2018-9-8 15:39:44] [SQLITE] Executing (default): CREATE TABLE IF NOT EXISTS `group` (`id` BIGINT UNIQUE PRIMARY KEY, `creatorid` BIGINT, `order` INTEGER, `lastupdated` TEXT, `createdAt` DATETIME NOT NULL, `updatedAt` DATETIME NOT NULL); +[2018-9-8 15:39:44] [SQLITE] Executing (default): PRAGMA INDEX_LIST(`group`) +[2018-9-8 15:39:44] [SQLITE] Executing (default): PRAGMA INDEX_INFO(`sqlite_autoindex_group_1`) +[2018-9-8 15:39:44] [SQLITE] Executing (default): CREATE TABLE IF NOT EXISTS `note` (`id` BIGINT UNIQUE PRIMARY KEY, `content` TEXT, `parentgroup` BIGINT, `creatorid` BIGINT, `order` INTEGER, `catergory` TEXT, `endpoint` TEXT UNIQUE, `lastupdated` TEXT, `createdAt` DATETIME NOT NULL, `updatedAt` DATETIME NOT NULL); +[2018-9-8 15:39:44] [SQLITE] Executing (default): PRAGMA INDEX_LIST(`note`) +[2018-9-8 15:39:44] [SQLITE] Executing (default): PRAGMA INDEX_INFO(`sqlite_autoindex_note_1`) +[2018-9-8 15:39:44] [SQLITE] Executing (default): PRAGMA INDEX_INFO(`sqlite_autoindex_note_2`) +[2018-9-8 15:39:44] [INFO] Connected to SQLite Database +[2018-9-8 15:39:44] [INFO] Server created +[2018-9-8 15:39:44] [INFO] HTTP service is listening at port 8080 +[2018-9-8 15:39:44] [INFO] Setting up API HTTP endpoints +[2018-9-8 15:39:44] [INFO] HTTP endpoints settup +[2018-9-8 15:39:44] [INFO] Initialized ratelimiting middleware +[2018-9-8 15:39:44] [READY] +[2018-9-8 15:39:51] [HTTP-MIDDLEWARE] POST request to /login +[2018-9-8 15:39:51] [DEBUG] [D:/Programming/Projects/NoteService/note-service-server/src/controllers/middleware/rateLimits.js:14] New rate limiting bucket +[2018-9-8 15:39:51] [SQLITE] Executing (default): SELECT `id`, `username`, `password`, `email`, `ip`, `lastupdated`, `verified`, `authcode`, `timeauthed`, `createdAt`, `updatedAt` FROM `user` AS `user` WHERE `user`.`username` = 'plane000' LIMIT 1; +[2018-9-8 15:40:00] [HTTP-MIDDLEWARE] POST request to /user +[2018-9-8 15:40:00] [SQLITE] Executing (default): SELECT `id`, `username`, `password`, `email`, `ip`, `lastupdated`, `verified`, `authcode`, `timeauthed`, `createdAt`, `updatedAt` FROM `user` AS `user` WHERE `user`.`username` = 'plane000' LIMIT 1; +[2018-9-8 15:40:00] [SQLITE] Executing (default): SELECT `id`, `username`, `password`, `email`, `ip`, `lastupdated`, `verified`, `authcode`, `timeauthed`, `createdAt`, `updatedAt` FROM `user` AS `user` WHERE `user`.`email` = 'plsaysplane@gmail.com' LIMIT 1; +[2018-9-8 15:40:00] [SQLITE] Executing (default): INSERT INTO `auth` (`id`,`token`,`passhash`,`createdAt`,`updatedAt`) VALUES (1536417600066,'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJlcnJvciI6ZmFsc2UsImNvZGUiOjIwMCwidHlwZSI6InN1Y2Nlc3MiLCJtZXNzYWdlIjoiU3VjY2VzcyIsImlhdCI6MTUzNjQxNzYwMH0.4orSGRhO3Ytug0hJsbfRMDme5xUs2l8lT8svCYcnQAw','$2b$10$pGQNawrnCc6M7Zg9LOFywu7KUaL0gD9JZGGz4z5GB6XX8YwK15RuC','2018-09-08 14:40:00.069 +00:00','2018-09-08 14:40:00.069 +00:00'); +[2018-9-8 15:40:00] [SQLITE] Executing (default): INSERT INTO `user` (`id`,`username`,`password`,`email`,`ip`,`lastupdated`,`verified`,`authcode`,`timeauthed`,`createdAt`,`updatedAt`) VALUES (1536417600066,'plane000','$2b$10$pGQNawrnCc6M7Zg9LOFywu7KUaL0gD9JZGGz4z5GB6XX8YwK15RuC','plsaysplane@gmail.com','::1','1536417600236',0,1234,'-1','2018-09-08 14:40:00.236 +00:00','2018-09-08 14:40:00.236 +00:00'); +[2018-9-8 15:40:00] [DEBUG] [D:/Programming/Projects/NoteService/note-service-server/src/models/user/user.js:14] New user [1536417600066] plane000 +[2018-9-8 15:40:43] [HTTP-MIDDLEWARE] POST request to /login +[2018-9-8 15:40:43] [SQLITE] Executing (default): SELECT `id`, `username`, `password`, `email`, `ip`, `lastupdated`, `verified`, `authcode`, `timeauthed`, `createdAt`, `updatedAt` FROM `user` AS `user` WHERE `user`.`username` = 'plane000' LIMIT 1; +[2018-9-8 15:40:43] [SQLITE] Executing (default): SELECT `id`, `token`, `passhash`, `createdAt`, `updatedAt` FROM `auth` AS `auth` WHERE `auth`.`id` = 1536417600066; +[2018-9-8 15:40:54] [HTTP-MIDDLEWARE] POST request to /auth/note +[2018-9-8 15:40:54] [SQLITE] Executing (default): SELECT `id`, `token`, `passhash`, `createdAt`, `updatedAt` FROM `auth` AS `auth` WHERE `auth`.`token` = 'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJlcnJvciI6ZmFsc2UsImNvZGUiOjIwMCwidHlwZSI6InN1Y2Nlc3MiLCJtZXNzYWdlIjoiU3VjY2VzcyIsImlhdCI6MTUzNjQxNzYwMH0.4orSGRhO3Ytug0hJsbfRMDme5xUs2l8lT8svCYcnQAw' LIMIT 1; +[2018-9-8 15:40:54] [SQLITE] Executing (default): SELECT `id`, `username`, `password`, `email`, `ip`, `lastupdated`, `verified`, `authcode`, `timeauthed`, `createdAt`, `updatedAt` FROM `user` AS `user` WHERE `user`.`id` = 1536417600066; +[2018-9-8 15:40:54] [DEBUG] [D:/Programming/Projects/NoteService/note-service-server/src/controllers/noteController.js:9] {"id":1536417600066,"username":"plane000","password":"$2b$10$pGQNawrnCc6M7Zg9LOFywu7KUaL0gD9JZGGz4z5GB6XX8YwK15RuC","email":"plsaysplane@gmail.com","ip":"::1","lastupdated":"1536417600236","verified":false,"authcode":"1234","timeauthed":"-1","createdAt":"2018-09-08T14:40:00.236Z","updatedAt":"2018-09-08T14:40:00.236Z"} diff --git a/src/models/database/database.js b/src/models/database/database.js index e4db138..c2768b2 100644 --- a/src/models/database/database.js +++ b/src/models/database/database.js @@ -29,6 +29,6 @@ export class Database extends BaseDatabase { Database.users = require('./users').UserTools; Database.auth = require('./tokens').TokenTools; -Database.permalink = require('./permaLink').PermaLinkTools; +Database.permalink = require('./permalinks').PermaLinkTools; Database.notegroup = require('./notegroups').NoteGroupTools; Database.note = require('./notes').NoteTools; diff --git a/src/models/database/sqlite/database.sqlite b/src/models/database/sqlite/database.sqlite index 3c4a24cef07b9b0d342fcb000fc9ec1a4c8f94f7..6fd543251ef9f8179ce599e07901ea4e3925418a 100644 GIT binary patch delta 613 zcmZozz}(QlJV9EJoq>UY2Z&*Sb)t^3GCPBwN&_$d4+d_oDGYqO`Oovd4+iw!XmQV+t4(q z)VUz1c=8;1Nf#4Cb29@2BV#i|BV!X?Ln8x23ta}dRLlY|#11kdqJ)oq5wgHHV zLw55|d1e6?kjpk1oZtg9CZDluuMe#7tBNf5^)S#g$uA0a56bX2jw~rnH^}fRPD%^% zb;(UNtq3hP%CX1^u_!Kcj!e!AbS$UDQ>gA!hdAHB%o30DfwBnaFDgh_)F1!={!OdX delta 1601 zcmb_cU1-}@7?onnj%_JwXj8XzZEhf=rCH3CWXZNzM-swHgC8-JT^*U7}i;Tf1c|vaW7I>XmXRHpJJqM8ymSxKc;>j`H1|1x*hnD zyygEraM!o(fAr<`wC_m!O28W&8^hmTwIsQ$RCTMnNau6E@J>2-c3PvFB2Nqt5PdxD8^=VsuD z^DT8~&evWhyupbH{93+SqNW%XsdKK`L!S6bVm6lmx!Jkp1X%A8>)_P7?VKiovqV)r zoW~Pfoaj_O+}m=I>EW%Ps1rl(8H}FU8U+IVM*9p-5y#sEfAHk+*l03|E1yn%@P4f< zRTT)~Br8uca56os#R|~6#9fut=E9Xk!4hO6RI&xA8ueVhbk%+>$=Ie`sF#~-dPrWC zD@$i4C;U)Zfb$6W{9 zoyKm#2P0kJJbLBbR)TqTKE07S4?|pbuBNT5tZoPwHFG*#Y%H&>#OjwD*3xQXkzHF% zo0sF^nl{G@rRUMKx4)A+?F%vHKiWrZxBbJN_B*j8$R`-hjeJc#rKZRyTcZcQB3tJO zFLC@R*0uk=`s=(3gvd8sDlHLD3w zGA&>gB@5IHT{Tb*t)Y~gKvgUgRCGfDm$X7b%cBxNGJ$4+yk51ms;!uzy=tH!LN?Tb zEH_Zj4&7thDOaDInQvm51vQmCcQ&#|&NHiN{XcSe5i%kd3q>N~0c!TM109R2W4SD+fLzq=ACYQ zk&)Sr6qjGhwfe*G%`jdJ@i)mgY|dr68#XP|Db=Nzo);WAEFoS n4lVdy1djYf*NE7KDE97Mh$7?Kg~;$BpNsIJy~vACvg>~Vrk>Nf diff --git a/src/models/notes/groups.js b/src/models/notes/groups.js new file mode 100644 index 0000000..cefe690 --- /dev/null +++ b/src/models/notes/groups.js @@ -0,0 +1,3 @@ +export class Groups { + +} diff --git a/src/models/notes/notes.js b/src/models/notes/notes.js new file mode 100644 index 0000000..bb96204 --- /dev/null +++ b/src/models/notes/notes.js @@ -0,0 +1,5 @@ +import {Groups} from './groups'; + +export class Notes extends Groups { + +} diff --git a/src/models/user/passwords.js b/src/models/user/passwords.js index 0484be9..12a037b 100644 --- a/src/models/user/passwords.js +++ b/src/models/user/passwords.js @@ -6,9 +6,10 @@ import {Logger} from '../logger'; export class Password extends User { static async gen(passwordSecret) { + let prehash = await sha256(passwordSecret); + let toHash = Buffer.from(prehash).toString('base64'); let salt = await bcrypt.genSaltSync(10); - let prehash = await sha256(passwordSecret) - let hash = await bcrypt.hashSync(prehash, salt); + let hash = await bcrypt.hashSync(toHash, salt); return hash; } @@ -16,10 +17,12 @@ export class Password extends User { static async compare(password, hashToCompare) { try { let prehash = await sha256(password); - let res = await bcrypt.compareSync(prehash, hashToCompare); + let toHash = Buffer.from(prehash).toString('base64'); + let res = await bcrypt.compareSync(toHash, hashToCompare); + return res; } catch (e) { - Logger.error(`Somthing went wrong with comparing password hashes: ${e}`); + Logger.error(`Somthing went wrong with comparing hashes: ${e}`); } } }