benkyd/note-service-server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

resolved merge conflict

Browse Source
This commit is contained in:
Ben
2018-09-11 22:03:29 +01:00
parent b793c05d16 9a16dd2292
commit 9067731cec
13 changed files with 1525 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/controllers/noteController.js
View File

@@ -6,6 +6,7 @@ import {PermaLink} from '../models/permalinks/permalink';
export class NoteController extends ControllerHandler {
static async newNote(req, res, next) {
<<<<<<< HEAD
let errors = new API.errors(res);
// Logger.debug(JSON.stringify(req.user, false, 4));
@@ -18,6 +19,9 @@ export class NoteController extends ControllerHandler {
if (!creatorid) errors.addError(403, 'Forbidden');
=======
Logger.debug(JSON.stringify(req.user));
>>>>>>> 9a16dd229269b65aebe97d1fa8ce0aea771785ad
next();

4
src/models/database/database.js
View File

@@ -29,4 +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;

24
src/models/database/notes.js
View File

@@ -19,7 +19,7 @@ export class NoteTools extends BaseDatabase {
});
return note;
} catch (e) {
Logger.error(`An error occured while inserting group ${id}: ${e}`);
Logger.error(`An error occured while inserting note ${id}: ${e}`);
return -1;
}
}
@@ -31,7 +31,7 @@ export class NoteTools extends BaseDatabase {
await Note.destroy({where: {id: id}});
return 1;
} catch (e) {
Logger.error(`An error occured while inserting group ${id}: ${e}`);
Logger.error(`An error occured while deleting note ${id}: ${e}`);
return -1;
}
}
@@ -43,7 +43,7 @@ export class NoteTools extends BaseDatabase {
await Note.update({endpoint: endpoint}, {where: {id: id}});
await this.updateLastUpdateTime(id);
} catch (e) {
Logger.error(`An error occured while inserting group ${id}: ${e}`);
Logger.error(`An error occured while editing note ${id}: ${e}`);
return -1;
}
}
@@ -56,7 +56,7 @@ export class NoteTools extends BaseDatabase {
if (note == null) return -1;
return note;
} catch (e) {
Logger.error(`An error occured while inserting group ${id}: ${e}`);
Logger.error(`An error occured while getting note ${id}: ${e}`);
return -1;
}
}
@@ -69,7 +69,7 @@ export class NoteTools extends BaseDatabase {
await this.updateLastUpdatedTime(id);
return 1;
} catch (e) {
Logger.error(`An error occured while inserting group ${id}: ${e}`);
Logger.error(`An error occured while updating note ${id}: ${e}`);
return -1;
}
}
@@ -82,7 +82,7 @@ export class NoteTools extends BaseDatabase {
await this.updateLastUpdatedTime(id);
return 1;
} catch (e) {
Logger.error(`An error occured while inserting group ${id}: ${e}`);
Logger.error(`An error occured while updating note catergory ${id}: ${e}`);
return -1;
}
}
@@ -95,7 +95,7 @@ export class NoteTools extends BaseDatabase {
await this.updateLastUpdatedTime(id);
return 1;
} catch (e) {
Logger.error(`An error occured while inserting group ${id}: ${e}`);
Logger.error(`An error occured while reordering note ${id}: ${e}`);
return -1;
}
}
@@ -108,7 +108,7 @@ export class NoteTools extends BaseDatabase {
await this.updateLastUpdatedTime(id);
return 1;
} catch (e) {
Logger.error(`An error occured while inserting group ${id}: ${e}`);
Logger.error(`An error occured while renaming note ${id}: ${e}`);
return -1;
}
}
@@ -121,7 +121,7 @@ export class NoteTools extends BaseDatabase {
if (note == null) return -1;
return note;
} catch (e) {
Logger.error(`An error occured while inserting group ${id}: ${e}`);
Logger.error(`An error occured while getting note ${id}: ${e}`);
return -1;
}
}
@@ -134,7 +134,7 @@ export class NoteTools extends BaseDatabase {
if (note == null) return -1;
return note;
} catch (e) {
Logger.error(`An error occured while inserting group ${id}: ${e}`);
Logger.error(`An error occured while getting notes from ${userid}: ${e}`);
return -1;
}
}
@@ -147,7 +147,7 @@ export class NoteTools extends BaseDatabase {
if (note == null) return -1;
return note;
} catch (e) {
Logger.error(`An error occured while inserting group ${id}: ${e}`);
Logger.error(`An error occured while getting notes from group ${groupid}: ${e}`);
return -1;
}
}
@@ -159,7 +159,7 @@ export class NoteTools extends BaseDatabase {
await Note.update({lastupdated: new Date().getTime()}, {where: {id: id}});
return 1;
} catch (e) {
Logger.error(`An error occured while inserting group ${id}: ${e}`);
Logger.error(`An error occured while updating note update time ${id}: ${e}`);
return -1;
}
}

56
src/models/database/permaLink.js
View File

@@ -1,56 +0,0 @@
import Sequelize from 'sequelize';
import {BaseDatabase} from './baseDatabase';
import {Logger} from '../logger';
export class PermaLinkTools extends BaseDatabase {
static async listAll() {
let PermaNote = BaseDatabase.PermaNote;
return PermaNote.findAll();
}
static async newNote(uid, endpoint, text, id) {
let PermaNote = BaseDatabase.PermaNote;
id = id || null;
try {
let note = await PermaNote.create({
uid: uid,
endpoint: endpoint,
text: text,
creatorid: id
});
return note;
} catch (e) {
Logger.error(`An error occured while inserting user a note with the endpoint ${endpoint} into permanote table: ${e}`);
return -1;
}
}
static async getNoteByUID(uid) {
let PermaNote = BaseDatabase.PermaNote;
try {
let note = await PermaNote.findOne({where: {uid: uid}});
if (note == null) return -1;
return note;
} catch (e) {
Logger.error(`An error occured while querying for a permanote by uid ${uid}: ${e}`);
return -1;
}
}
static async getNoteByEndpoint(endpoint) {
let PermaNote = BaseDatabase.PermaNote;
try {
let note = await PermaNote.findOne({where: {endpoint: endpoint}});
if (note == null) return -1;
return note;
} catch (e) {
Logger.error(`An error occured while querying for a permanote by endpoint ${endpoint}: ${e}`);
return -1;
}
}
}

BIN
src/models/database/sqlite/database.sqlite
View File

Binary file not shown.

3
src/models/logger.js
View File

@@ -1,4 +1,5 @@
const colours = require('colors/safe');
const StackTrace = require('stacktrace-js');
const fs = require('fs');
let LogLevel = 1;
@@ -47,7 +48,7 @@ export class Logger {
static debug(message) {
if (LogLevel > 1) return;
let d = new Date();
fs.appendFileSync(logPath, `[${d.toLocaleString()}] [DEBUG] ${message} \n`);
fs.appendFileSync(logPath, `[${d.toLocaleString()}] [DEBUG] [${StackTrace.getSync()[1].fileName + ':' + StackTrace.getSync()[1].lineNumber}] ${message} \n`);
console.log('[' + d.toLocaleString() + '] ['
+ colours.cyan('DEBUG') + '] ' + message);
}

3
src/models/notes/groups.js Normal file
View File

@@ -0,0 +1,3 @@
export class Groups {
}

5
src/models/notes/notes.js Normal file
View File

@@ -0,0 +1,5 @@
import {Groups} from './groups';
export class Notes extends Groups {
}

11
src/models/user/passwords.js
View File

@@ -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}`);
}
}
}