ETA/ETAApi
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(v2): Remove custom hooks; fix(v1): Remove company from JWT context gen

Browse Source
This commit is contained in:
Josepablo C
2024-08-14 10:14:25 -06:00
parent 41ae6354fa
commit 55f155af03
6 changed files with 53 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
v2/server/src/Apps/Account/Controller/hooks.js
View File

@@ -135,7 +135,7 @@ module.exports = {
AppInit,
hooks : {
before: {
/**Array of middleware functions*/
/**Array of middleware functions or objects lile { endpoint, middleware }*/
all : [],
del : [],
get : [],
@@ -145,17 +145,7 @@ module.exports = {
},
after: {
/**Array of middleware functions*/
all : [],
del : [],
get : [],
patch : [],
post : [],
put : []
},
custom: {
/**Array of objects like { endpoint, middleware }*/
/**Array of middleware functions or objects lile { endpoint, middleware }*/
all : [
{ '/register': dummy_middleware }
],
@@ -174,6 +164,6 @@ module.exports = {
{ '/recover' : post_recover }
],
put : []
}
},
}
};

16
v2/server/src/Apps/Company/Controller/hooks.js
View File

@@ -16,7 +16,7 @@ module.exports = {
AppInit,
hooks : {
before: {
/**Array of middleware functions*/
/**Array of middleware functions or objects lile { endpoint, middleware }*/
all : [],
del : [],
get : [],
@@ -26,23 +26,13 @@ module.exports = {
},
after: {
/**Array of middleware functions*/
all : [],
del : [],
get : [],
patch : [],
post : [],
put : []
},
custom: {
/**Array of objects like { endpoint, middleware }*/
/**Array of middleware functions or objects lile { endpoint, middleware }*/
all : [ { "/test" : dummy_middleware } ],
del : [],
get : [],
patch : [],
post : [],
put : []
}
},
}
};

59
v2/server/src/Apps/Lib/index.js
View File

@@ -9,13 +9,10 @@ class GenericController{
}
init(){
const { before, after, custom } = this.hooks;
const { before, after } = this.hooks;
if( before ){
this.populate_hooks( before );
}
if( custom ){
this.populate_custom_hooks( custom );
}
if( after ){
this.populate_hooks( after );
}
@@ -25,30 +22,31 @@ class GenericController{
populate_hooks( hooks ){
if( (hooks.all) && (hooks.all.length > 0) ){
this.router.use( hooks.all );
this.populate_hooks_by_verb( 'all' , hooks.all );
}
if( (hooks.delete) && (hooks.delete.length > 0) ){
this.router.delete( hooks.del );
this.populate_hooks_by_verb( 'del', hooks.del );
}
if( (hooks.get) && (hooks.get.length > 0) ){
this.router.get( hooks.get );
this.populate_hooks_by_verb( 'get', hooks.get );
}
if( (hooks.patch) && (hooks.patch.length > 0) ){
this.router.patch( hooks.patch );
this.populate_hooks_by_verb( 'patch', hooks.patch );
}
if( (hooks.post) && (hooks.post.length > 0) ){
this.router.post( hooks.post );
this.populate_hooks_by_verb( 'post', hooks.post );
}
if( (hooks.put) && (hooks.put.length > 0) ){
this.router.put( hooks.put );
this.populate_hooks_by_verb( 'put', hooks.put );
}
}
add_custom_hook( http_verb, endpoint, middleware ){
add_hook_with_endpoint( http_verb, endpoint, middleware ){
switch( http_verb ){
case 'all':
this.router.use( endpoint , middleware );
@@ -73,16 +71,45 @@ class GenericController{
}
}
populate_custom_hooks( hooks ){
for (let http_verb in hooks ){
for (let custom_hook of hooks[ http_verb ]){
add_simple_hook( http_verb, middleware ){
switch( http_verb ){
case 'all':
this.router.use( middleware );
break;
case 'del':
this.router.delete( middleware );
break;
case 'get':
this.router.get( middleware );
break;
case 'patch':
this.router.patch( middleware );
break;
case 'post':
this.router.post( middleware );
break;
case 'put':
this.router.put( middleware );
break;
default:
return;
}
}
populate_hooks_by_verb( http_verb, hook_list ){
for (let custom_hook of hook_list ){
if( typeof custom_hook === "object" ){
for (let entry of Object.entries(custom_hook) ){
const endpoint = entry[0];
const callback = entry[1];
this.add_custom_hook( http_verb, endpoint, callback );
/// Add this hook as an (endpoint, middleware function) pair
this.add_hook_with_endpoint( http_verb, endpoint, callback );
}
}else{
/// Add this hook as a middleware function
this.add_simple_hook( http_verb, custom_hook );
}
}
}
}
}

14
v2/server/src/Apps/PrivateResources/Controller/hooks.js
View File

@@ -19,7 +19,7 @@ module.exports = {
AppInit : initEvents, /// Dummy App Init
hooks : {
before: {
/**Array of middleware functions*/
/**Array of middleware functions or objects lile { endpoint, middleware }*/
all : [],
del : [],
get : [ test ],
@@ -29,17 +29,7 @@ module.exports = {
},
after: {
/**Array of middleware functions*/
all : [],
del : [],
get : [],
patch : [],
post : [],
put : []
},
custom: {
/**Array of objects like { endpoint, middleware }*/
/**Array of middleware functions or objects lile { endpoint, middleware }*/
all : [],
del : [],
get : [],