backend-plus 2.5.1-betha.0 → 2.5.2-betha.4

package/install/get_app_user-fun.sql

@@ -1,6 +1,6 @@
-create or replace function get_app_user() returns text
+create or replace function get_app_user(p_var text default 'user') returns text
   stable language sql
 as
 $sql$
-  select split_part(current_setting('application_name'),' ',1);
+  select current_setting('backend_plus._' || p_var);
 $sql$;

package/lib/backend-plus.d.ts

@@ -415,6 +415,7 @@ export interface AppConfigLogin
     {
         schema: string                     // schema of the user table
         table: string                      // user table
+        from: string                       // complete expression to get table or join where get the user
         userFieldname: string              // fieldname in user table that stores the user name
         passFieldname: string              // fieldname in user table that stores the password hash
         rolFieldname: string               // fieldname in user table that stores the rol

package/lib/backend-plus.js

@@ -780,16 +780,17 @@ AppBackend.prototype.start = function start(opts){
                 }
                 be.config.db.search_path = be.config.db.search_path ?? [be.config.db.schema, 'public'];
                 be.getDbClient = function getDbClient(req){
-                    var paramsDb = be.DoubleDragon?.dbParams?.[req?.user?.[be.config.login.userFieldName]] ?? be.config.db;
+                    var username = req?.user?.[be.config.login.userFieldName];
+                    var paramsDb = be.DoubleDragon?.dbParams?.[username] ?? be.config.db;
                     return pg.connect(paramsDb).then(function(client){
                         var dbAppName=req?(
                             ((req.user||{})[be.config.login.userFieldName]||'!logged')+
                             ' '+(req.machineId||'?')+
                             ' '+(((req.useragent)||{}).shortDescription||'?')
                         ):'!app local internal';
-                        return client.query(
-                            "SET application_name = "+be.db.quoteLiteral(dbAppName)
-                        ).execute().then(function(){
+                        return client.executeSentences([
+                            "SET application_name = "+be.db.quoteLiteral(dbAppName),
+                        ]).then(function(){
                             var search_path = be.config.db.search_path;
                             if(search_path.length>0){
                                 return client.query("set SEARCH_PATH TO "+be.db.quoteIdentList(search_path)).execute().then(function(){
@@ -798,6 +799,14 @@ AppBackend.prototype.start = function start(opts){
                             }else{
                                 return client;
                             }
+                        }).then(function(client){
+                            if(username){
+                                return client.query(`SELECT set_app_user(${be.db.quoteLiteral(username)})`).execute().then(function(){
+                                    return client;
+                                });
+                            }else{
+                                return client;
+                            }
                         }).then(function(client){
                             if(be.config["client-setup"].lang=='es'){
                                 return client.query("set datestyle TO iso,dmy").execute().then(function(){
@@ -1012,13 +1021,17 @@ AppBackend.prototype.start = function start(opts){
                     }
                     be.getDbClient(req).then(function(cli){
                         client = cli;
+                        return client.query("select set_app_user('!login')").execute();
+                    }).then(function(){
                         var infoFieldList=be.config.login.infoFieldList||(be.config.login.rolFieldName?[be.config.login.userFieldName,be.config.login.rolFieldName]:[be.config.login.userFieldName]);
                         return client.query(
                             "SELECT  "+infoFieldList.map(function(fieldOrPair){ return fieldOrPair.split(' as ').map(function(ident){ return be.db.quoteIdent(ident)}).join(' as '); })+
                                 ", "+be.config.login.activeClausule+" as active "+
                                 ", "+be.config.login.lockedClausule+" as locked "+
-                            "  FROM  "+(be.config.login.schema?be.db.quoteIdent(be.config.login.schema)+'.':'')
-                                      +be.db.quoteIdent(be.config.login.table)+
+                            "  FROM  "+(be.config.login.from ?? (
+                                (be.config.login.schema?be.db.quoteIdent(be.config.login.schema)+'.':'')+
+                                be.db.quoteIdent(be.config.login.table)
+                            ))+
                             "  WHERE "+be.db.quoteIdent(be.config.login.userFieldName)+" = $1 "+
                             "    AND "+be.db.quoteIdent(be.config.login.passFieldName)+" = $2 ",
                             [username, md5(password+username)]
@@ -2935,6 +2948,37 @@ AppBackend.prototype.dumpDbSchemaPartial = async function dumpDbSchemaPartial(pa
             throw err;
         }
     }
+    lines.push(`
+create or replace function set_app_user(p_user text) returns text
+  secirotu definer volatile language plpgsql
+as
+$body$
+declare
+    ${be.config.login.infoFieldList.map(fieldName => `
+        ${db.quoteIdent('v_'+fieldName)} text;`
+    ).join('')}
+begin
+    if p_user = '!login' then
+        ${be.config.login.infoFieldList.map(fieldName => `
+        set backend_plus._${fieldName} = '!';`).join('')}
+
+        set backend_plus._mode = login;
+    else
+        select ${be.config.login.infoFieldList.map(fieldName => db.quoteIdent(fieldName)).join(', ')}
+            into ${be.config.login.infoFieldList.map(fieldName => db.quoteIdent('v_'+fieldName)).join(', ')}
+            from usuarios u left join personas p using (idper)
+                where u."usuario" = p_user;
+        ${be.config.login.infoFieldList.map(fieldName => `
+        perform set_config('backend_plus._${fieldName}', v_${fieldName}, false);`).join('')}
+
+        set backend_plus._mode = normal;
+    end if;
+    perform set_config('backend_plus._user', p_user, false);
+    return p_user;
+end;    
+$body$;
+
+    `)
     var enancePart= 'do $SQL_ENANCE$\n begin\n' + enanceLines.join('\n')+'\n' + 'end\n$SQL_ENANCE$;';
     var someNotFound=false;
     try {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "backend-plus",
   "description": "Backend for the anti Pareto rule",
-  "version": "2.5.1-betha.0",
+  "version": "2.5.2-betha.4",
   "author": "Codenautas <codenautas@googlegroups.com>",
   "license": "MIT",
   "repository": "codenautas/backend-plus",
@@ -83,7 +83,7 @@
     "@types/js-yaml": "^4.0.9",
     "@types/mocha": "^10.0.10",
     "@types/multiparty": "~4.2.1",
-    "@types/node": "^22.15.21",
+    "@types/node": "^22.15.29",
     "@types/nodemailer": "^6.4.17",
     "@types/numeral": "~2.0.5",
     "@types/session-file-store": "^1.2.5",