avraham/pastebin
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

refuses to load private bins; fixed NodeJS startup error connectiong to Postgres

Browse Source
This commit is contained in:
brian
2021-04-13 00:52:57 -04:00
parent 8432255890
commit 555e33040b
8 changed files with 150 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.gitignore
+1
View File
@@ -107,3 +107,4 @@ dist
# Stores VSCode versions used for testing VSCode extensions
.vscode-test
pgdata
docker-compose.yml
+2 -2
View File
@@ -37,7 +37,7 @@ services:
environment:
- POSTGRES_USER=pastebin
- POSTGRES_PASSWORD=buginoo
#volumes:
# - ./postgres/pgdata:/var/lib/postgresql/data
volumes:
- ./postgres/pgdata:/var/lib/postgresql/data
expose:
- "5432"
nginx/public_html/App.js
+1
View File
@@ -27,6 +27,7 @@ function App(vnode_init){
const o = function(handler){ return handler.bind(null, s, dispatch); }
const o1 = function(handler, p1){ return handler.bind(null, s, dispatch, p1); }
return m('.app', {key: 'app'}, [
m('.error-message', {key:'error-message'}, s.error_message),
m('.top', {key: 'top'}, [
m('.top-left', {key: 'top-left'}, [
m('button', {key: 'button', onclick: o(new_note_handler)}, 'New Note...'),
nginx/public_html/handlers/App.js
+21 -6
View File
@@ -10,7 +10,12 @@ const preventDblClickSelection = function(e){
const load_notes = function(state, dispatch){
api.post('/load-notes', {bin_id: state.bin_id})
.then(res=>{
dispatch('notes-loaded', res.notes);
if(res.success===true){
dispatch('notes-loaded', res.notes);
}
else if(res.authorized===false){
dispatch('notes-unauthorized');
}
});
};
const runSearch = function(state, dispatch){
@@ -86,11 +91,21 @@ const choose_bin_handler = function(state, dispatch, bin_id){
dispatch('bin-requested', bin_id);
api.post('/load-bin', {bin_id})
.then(res=>{
dispatch('bin-loaded', res.bin);
});
api.post('/load-notes', {bin_id})
.then(res=>{
dispatch('notes-loaded', res.notes);
if(res.success===true){
dispatch('bin-loaded', res.bin);
api.post('/load-notes', {bin_id})
.then(res=>{
if(res.success===true && res.authorized===true){
dispatch('notes-loaded', res.notes);
}
else if(res.success===false && res.authorized===false){
dispatch('notes-unauthorized');
}
});
}
else if(res.success===false && res.authorized==false){
dispatch('bin-unauthorized');
}
});
};
nginx/public_html/handlers/index.js
+18 -4
View File
@@ -3,11 +3,18 @@ import api from '../api.js';
const initial_load_bin_handler = function(state, dispatch, bin_id){
api.post('/load-bin', {bin_id})
.then(res => {
dispatch('bin-loaded', res.bin);
if(res.success===false && res.authorized===false){
dispatch('bin-unauthorized');
}
else{
dispatch('bin-loaded', res.bin);
}
});
api.post('/load-notes', {bin_id})
.then(res => {
dispatch('notes-loaded', res.notes);
if(res.success===true){
dispatch('notes-loaded', res.notes);
}
});
};
@@ -22,11 +29,18 @@ const hash_change_handler = function(state, dispatch, e){
dispatch('bin-requested', bin_id);
api.post('/load-bin', {bin_id})
.then(res=>{
dispatch('bin-loaded', res.bin);
if(res.success==true){
dispatch('bin-loaded', res.bin);
}
else if(res.authorized===false){
dispatch('bin-unauthorized');
}
});
api.post('/load-notes', {bin_id})
.then(res => {
dispatch('notes-loaded', res.notes);
if(res.success==true){
dispatch('notes-loaded', res.notes);
}
});
}
};
nginx/public_html/index.css
+10
View File
@@ -14,6 +14,16 @@ body{
}
/* end full-page app */
.error-message{
position: fixed;
top: 0px;
margin-top: 1rem;
width: 40%;
margin-right: auto;
margin-left: auto;
background-color: #ee8888;
}
.app{
height: 100%;
width: 100%;
nginx/public_html/index.js
+5 -2
View File
@@ -99,12 +99,14 @@ function addToBinListIfLoggedIn(state){
const reducer = handleActions({
'new-bin': (s, bin) => { i(s,bin); ref(s,s,'bin_id',bin.id); s.notes=[]; s.temp_bin_name=bin.id; },
'bin-requested': (s, bin_id) => { i(s,{id:bin_id}); ref(s,s,'bin_id',bin_id); s.notes = []; },
'bin-requested': (s, bin_id) => { i(s,{id:bin_id}); ref(s,s,'bin_id',bin_id); s.notes = []; s.error_message=''; },
'bin-loaded': (s, bin) => { i(s,bin); ref(s,s,'bin_id',bin.id); s.temp_bin_name=bin.name; },
'bin-unauthorized': (s) => { s.error_message = 'Not authorized to load bin. Please sign-in.'; },
'update-search-term': (s, search_term) => { s.search_term=search_term; },
'update-search-results': (s, _notes) => { integrateAll(s,s.notes,'note_id',_notes); s.notes =_notes.map(n=>({is_editing: false, temp_text: '', bin_id: s.bin_id, note_id:n.id})); },
'add-note': (s, {id, date}) => { i(s, {id: id, text: '', modified: date}); s.notes.unshift({is_editing: true, temp_text: '', bin_id: s.bin_id, is_focused:true, is_new: true, note_id: id}); },
'notes-loaded': (s, _notes) => { integrateAll(s,_notes); s.notes = _notes.map(n=>({is_editing: false, temp_text: n.text, bin_id: s.bin_id, note_id:n.id})); },
'notes-unauthorized': (s) => { s.error_message = 'Not authorized to load notes in bin. Please sign-in.'; },
'immediately-cancel-note': (s, note_id) => { disintegrate(s,note_id); s.notes.splice(s.notes.findIndex(n=>n.note_id===note_id), 1); },
'update-note-text': (s, {id, text}) => { const note_s=s.notes.find(n=>n.note_id===id); note_s.is_new=false; s.db[note_s.note_id].model.text=text; }, // updates underlying note text (i.e. the "model", not the app note_state) "in the background" (e.g. from a server-pushed update), regardless of whether it's being edited; "save" is a separate action, below
'update-note-editing': (s, {id, is_editing}) => { const note_s=s.notes.find(n=>n.note_id===id); note_s.is_editing=is_editing; note_s.temp_text=s.db[note_s.note_id].model.text; },
@@ -146,7 +148,8 @@ const reducer = handleActions({
ref_count: 1,
model: {id: bin_id, name: bin_id, user_id: ''}
}
}
},
error_message: ''
//search_result_notes: []
});
node/server.js
+92 -57
View File
@@ -30,40 +30,13 @@ const load_notes_stmt =
+" JOIN note AS n"
+" ON n.id = bn.note_id"
+" WHERE bn.bin_id = $1";
// {bin_id}
router.post('/load-notes', (req, res)=>{
const bin_id = req.body.bin_id;
db.query(load_notes_stmt, [bin_id])
.then(result => {
res.json({success:true, notes:result.rows})
});
});
const load_bin_stmt =
"SELECT b.id, b.name FROM bin AS b"
"SELECT b.id, b.name, bu.user_id as owner_user_id, s.user_id as session_user_id FROM bin AS b"
+" FULL JOIN bin_user AS bu" // we want the bin regardless of whether it has an associated user, hence LEFT JOIN
+" ON bu.bin_id = b.id"
+" INNER JOIN session AS s"
+" ON (bu.bin_id IS NULL) OR (s.id = $2 AND s.user_id = bu.user_id)"
+" FULL JOIN session AS s"
+" ON s.id = $2"
+" WHERE b.id = $1";
router.post('/load-bin', (req, res)=>{
const {bin_id, session_id} = req.body;
// if a bin has no associated user, it's considered public and can be accessed even when not logged-in.
// if a bin has an associated user, it can only be accessed by that user
db.query(load_bin_stmt, [bin_id, session_id])
.then(result => {
const bin = result.rows[0];
// if a bin with given id was found:
if(result.rows.length>0){
res.json({success:true, bin:{id:bin.id, name:bin.name}});
}
else{
res.json({success:true, bin:{id:bin_id, name:bin_id}});
}
});
// {status: 'ok', bin:{id:bin.id}, notes: bin.notes}
});
const search_stmt =
"SELECT n.id, n.text, n.modified FROM note AS n"
+" INNER JOIN bin_note AS bn"
@@ -71,15 +44,6 @@ const search_stmt =
+" WHERE n.text LIKE '%' || $1 || '%'"; // need to use string concat otherwise the `$1` is viewed as part of the string instead of a placeholder
const order_desc_stmt = " ORDER BY n.modified DESC";
const order_asc_stmt = " ORDER BY n.modified ASC";
// {search_term, sorting, bin_id}
router.post('/search', (req, res)=>{
const {search_term, bin_id, sorting} = req.body;
db.query(search_stmt+(sorting==='old->new'?order_asc_stmt:order_desc_stmt), [search_term, bin_id])
.then(result => {
res.json({success:true, notes:result.rows});
});
});
const upsert_note_stmt =
"INSERT INTO note (id, text, modified) VALUES ($1, $2, NOW())"
+" ON CONFLICT (id)"
@@ -97,6 +61,93 @@ const upsert_bin_user_stmt =
+" (SELECT $1, s.user_id FROM session AS s WHERE s.id = $2)"
+" ON CONFLICT (bin_id, user_id)"
+" DO NOTHING";
const login_check_stmt =
"SELECT id, password FROM user_ AS u"
+" WHERE u.username = $1";
const register_stmt =
"INSERT INTO user_ (id, username, password) VALUES ($1, $2, $3)";
const session_create_stmt =
"INSERT INTO session (id, user_id) VALUES ($1, $2)";
const user_bin_list_stmt =
"SELECT b.id, b.name FROM bin_user AS bu"
+" INNER JOIN bin AS b"
+" ON bu.bin_id = b.id"
+" WHERE bu.user_id = $1";
const delete_session_stmt =
"DELETE FROM session WHERE id = $1";
const rename_bin_stmt =
"INSERT INTO bin (id, name) VALUES ($1, $2)"
+" ON CONFLICT (id)"
+" DO UPDATE SET name = EXCLUDED.name;";
// {bin_id}
router.post('/load-notes', (req, res)=>{
const {bin_id, session_id} = req.body;
db.query(load_bin_stmt, [bin_id, session_id])
.then(bin_result =>{
if(bin_result.rows.length > 0){
const bin = bin_result.rows[0];
// if it's a public bin:
if(bin.owner_user_id===null){
db.query(load_notes_stmt, [bin_id])
.then(result => {
res.json({success:true, authorized:false, notes:result.rows})
});
}
// if it's a private bin, and the owner is signed-in:
else if(bin.owner_user_id===bin.session_user_id){
db.query(load_notes_stmt, [bin_id])
.then(result => {
res.json({success:true, authorized:true, notes:result.rows})
});
}
else{
res.json({success:false, authorized:false});
}
}
});
});
router.post('/load-bin', (req, res)=>{
const {bin_id, session_id} = req.body;
// if a bin has no associated user, it's considered public and can be accessed even when not logged-in.
// if a bin has an associated user, it can only be accessed by that user
db.query(load_bin_stmt, [bin_id, session_id])
.then(result => {
const bin = result.rows[0];
// if a bin with given id was found:
if(result.rows.length>0){
const bin = result.rows[0];
// if it's a public bin:
if(bin.owner_user_id===null){
res.json({success:true, authorized:false, bin:{id:bin.id, name:bin.name}});
}
// if it's a private bin, and the owner is signed-in:
else if(bin.owner_user_id===bin.session_user_id){
res.json({success:true, authorized:true, bin:{id:bin.id, name:bin.name}});
}
else{
res.json({success:false, authorized:false});
}
}
else{
res.json({success:true, authorized:true, bin:{id:bin_id, name:bin_id}});
}
});
// {status: 'ok', bin:{id:bin.id}, notes: bin.notes}
});
// {search_term, sorting, bin_id}
router.post('/search', (req, res)=>{
const {search_term, bin_id, sorting} = req.body;
db.query(search_stmt+(sorting==='old->new'?order_asc_stmt:order_desc_stmt), [search_term, bin_id])
.then(result => {
res.json({success:true, notes:result.rows});
});
});
// {bin_id, note_id, text}
router.post('/save', (req, res)=>{
const {bin_id, note_id, text, session_id} = req.body;
@@ -116,18 +167,6 @@ router.post('/save', (req, res)=>{
// {status: 'ok'}
});
const login_check_stmt =
"SELECT id, password FROM user_ AS u"
+" WHERE u.username = $1";
const register_stmt =
"INSERT INTO user_ (id, username, password) VALUES ($1, $2, $3)";
const session_create_stmt =
"INSERT INTO session (id, user_id) VALUES ($1, $2)";
const user_bin_list_stmt =
"SELECT b.id, b.name FROM bin_user AS bu"
+" INNER JOIN bin AS b"
+" ON bu.bin_id = b.id"
+" WHERE bu.user_id = $1";
router.post('/login', (req, res)=>{
const {username, password} = req.body;
const password_from_client=password;
@@ -165,17 +204,13 @@ router.post('/login', (req, res)=>{
});
});
const delete_session_stmt =
"DELETE FROM session WHERE id = $1";
router.post('/logout', (req, res)=>{
db.query(delete_session_stmt, [req.body.session_id]);
res.json({success:true});
});
const rename_bin_stmt =
"INSERT INTO bin (id, name) VALUES ($1, $2)"
+" ON CONFLICT (id)"
+" DO UPDATE SET name = EXCLUDED.name;";
router.post('/bin-rename', (req,res)=>{
const {bin_id, name, session_id} = req.body;
db.query(rename_bin_stmt, [bin_id, name])