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

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

@@ -172,6 +172,10 @@ export type SequenceDefinition = {
     name:string
     firstValue:number
     prefix?:string /* Prefix for the generated value */
+} 
+export type SequenceMadMaxDefinition = {
+    madMax: string[] // grouping of mad max sequences
+    firstValue?: number
 }
 export type ExportMetadataDefinition={ /* TODO: define */ }
 export type PostInputOptions='upperSpanish' | 'upperWithoutDiacritics' | 'parseDecimal'
@@ -185,7 +189,7 @@ export type FieldDefinition = EditableDbDefinition & {
     defaultValue?:any
     defaultDbValue?:PgKnownDbValues|string
     clientSide?:string         /* keyof: myOwn.clientSides */
-    isName?:boolean
+    isName?:boolean|'known'    /* is a name but it is a well known name (because the user uses it to thier code or because the code is enugh expresive)
     isPk?:number               /* internal: pos in the primaryKey array */
     serverSide?:boolean        /* default:!clientSide if the value is retrived from the database */
     inTable?:boolean           /* default:!clientSide && !sql.fields[...].expr. Is a real fisical field in the table */
@@ -218,11 +222,8 @@ export type FieldDefinition = EditableDbDefinition & {
     alwaysShow?:boolean /* show when appears in fixed fields */
     suggestingKeys?:string[]
     postInput?:PostInputOptions
-} & ({} | {
-    sequence:SequenceDefinition
-    nullable:true
-    editable:false
-})
+    sequence?: SequenceDefinition|SequenceMadMaxDefinition
+}
 export type EditableDbDefinition = {
     editable?:boolean
     allow?:{
@@ -415,6 +416,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

@@ -20,6 +20,7 @@ MiniTools.globalOpts.serveErr.propertiesWhiteList=['message','detail','code','ta
 var crypto = require('crypto');
 var serveContent = require('serve-content');
 var pg = require('pg-promise-strict');
+var pgTriggers = require('pg-triggers');
 var SessionFileStore = require('session-file-store');
 var memorystore = require('memorystore');
 var jsToHtml=require('js-to-html');
@@ -780,16 +781,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 +800,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 +1022,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)]
@@ -2409,10 +2423,16 @@ AppBackend.prototype.addLoggedServices = function addLoggedServices(){
             throw err;
         }
     });
-    be.app.get('/--version',function(req,res,next){
+    be.app.get('/--version',async function(req,res,next){
+        var simpleGit = require('simple-git');
+        var git = simpleGit(process.cwd());
         var info=[
             html.h1(be.messages.server.versions),
             html.h3([packagejson.name,' ',packagejson.version]),
+            html.ul([
+                html.li([(await git.revparse(['HEAD'])).trim()]),
+                ...((git.tags().all || []).map(tag => html.li([tag]))),
+            ])
         ];
         Promise.resolve().then(function(){
             if(be.isAdmin(req)){
@@ -2640,7 +2660,16 @@ AppBackend.prototype.dumpFkConstraint = function dumpFkConstraint(fk, tableDef,
     return {consName, clause, sourceFieldList};
 }
 
+AppBackend.prototype.isGeneratedSequence = function isGeneratedSequence(sequence, not){
+    return sequence && ((!sequence.name && !sequence.madMax) == !not)
+}
+
+AppBackend.prototype.isSequenceNonGenerated = function isSequenceNonGenerated(sequence){
+    return this.isGeneratedSequence(sequence, true);
+}
+
 AppBackend.prototype.dumpDbTableFields = function dumpDbTableFields(tableDef, opts = {}, complements = null){
+    var be = this;
     var db = this.db;
     var fields=[];
     tableDef.fields.forEach(function(fieldDef){
@@ -2654,7 +2683,7 @@ AppBackend.prototype.dumpDbTableFields = function dumpDbTableFields(tableDef, op
                 ' '+(fieldDef.dataLength?(fieldType=='text'?'varchar':fieldType)+'('+fieldDef.dataLength+')':fieldType)+
                 (fieldDef.defaultValue!=null?' default '+db.quoteLiteral(fieldDef.defaultValue):'')+
                 (fieldDef.defaultDbValue!=null?' default '+fieldDef.defaultDbValue:'')+
-                (fieldDef.sequence && !fieldDef.sequence.name?' generated always as identity':'')+
+                (be.isGeneratedSequence(fieldDef.sequence)?' generated always as identity':'')+
                 (fieldDef.generatedAs!=null?` generated always as (${fieldDef.generatedAs}) stored`:'')
             );
             if(complements){
@@ -2761,7 +2790,7 @@ AppBackend.prototype.dumpDbSchemaPartial = async function dumpDbSchemaPartial(pa
                 lines.push('create table '+cualQuoteTableName+' (');
                 var fields = be.dumpDbTableFields(tableDef, opts,
                     function complements(fieldDef){
-                        if(fieldDef.sequence && !fieldDef.sequence.name){
+                        if(be.isGeneratedSequence(fieldDef.sequence)){
                             tablesWithStrictSequence[tableName]={}
                         }
                         if(fieldDef.typeName==='text' && !fieldDef.allowEmptyText){
@@ -2785,7 +2814,7 @@ AppBackend.prototype.dumpDbSchemaPartial = async function dumpDbSchemaPartial(pa
                                 ' alter column '+db.quoteIdent(fieldDef.name)+' set not null;'
                             );
                         }
-                        if(fieldDef.sequence && fieldDef.sequence.name){
+                        if(be.isSequenceNonGenerated(fieldDef.sequence)){
                             fieldsForSequences.push(fieldDef);
                         }
                     }
@@ -2888,19 +2917,26 @@ AppBackend.prototype.dumpDbSchemaPartial = async function dumpDbSchemaPartial(pa
                 });
                 lines.push(tableDef.sql.postCreateSqls);
                 lines.push('');
-                fieldsForSequences.forEach(function(fieldDef) {
+                await Promise.all(fieldsForSequences.map(async function(fieldDef) {
                     var sequence = fieldDef.sequence;
-                    lines.push("CREATE SEQUENCE "+db.quoteIdent(sequence.name)+" START "+db.quoteInteger(sequence.firstValue||1)+";");
-                    lines.push(
-                        "ALTER TABLE "+cualQuoteTableName+
-                        " ALTER COLUMN "+db.quoteIdent(fieldDef.name)+
-                        (sequence.prefix==null
-                        ?" SET DEFAULT nextval("+db.quoteLiteral(sequence.name)+"::regclass);"
-                        :" SET DEFAULT ("+db.quoteLiteral(sequence.prefix)+" || nextval("+db.quoteLiteral(sequence.name)+"::regclass)::text);"
-                        )
-                    );
-                    lines.push('GRANT USAGE, SELECT ON SEQUENCE '+db.quoteIdent(sequence.name)+' TO '+user+';');
-                });
+                    if (sequence.name) {
+                        if (sequence.madMax) throw new Error('a sequence with madMax cannot have name');
+                        lines.push("CREATE SEQUENCE "+db.quoteIdent(sequence.name)+" START "+db.quoteInteger(sequence.firstValue||1)+";");
+                        lines.push(
+                            "ALTER TABLE "+cualQuoteTableName+
+                            " ALTER COLUMN "+db.quoteIdent(fieldDef.name)+
+                            (sequence.prefix==null
+                            ?" SET DEFAULT nextval("+db.quoteLiteral(sequence.name)+"::regclass);"
+                            :" SET DEFAULT ("+db.quoteLiteral(sequence.prefix)+" || nextval("+db.quoteLiteral(sequence.name)+"::regclass)::text);"
+                            )
+                        );
+                        lines.push('GRANT USAGE, SELECT ON SEQUENCE '+db.quoteIdent(sequence.name)+' TO '+user+';');
+                    } else if (sequence.madMax) {
+                        lines.push(await pgTriggers.dumpMaxIdTrigger(tableDef.sql.tableName, fieldDef.name, {grouping: sequence.madMax.grouping, firstValue: sequence.firstValue}));
+                    } else {
+                        throw new Error('a sequence without madMax nor name');
+                    }
+                }));
                 lines.push('');
                 if(tableDef.sql.policies.enabled){
                     policyLines.push(`ALTER TABLE ${cualQuoteTableName} ENABLE ROW LEVEL SECURITY;`);
@@ -2935,6 +2971,40 @@ AppBackend.prototype.dumpDbSchemaPartial = async function dumpDbSchemaPartial(pa
             throw err;
         }
     }
+    lines.push(`
+create or replace function set_app_user(p_user text) returns text
+  security 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 ${(be.config.login.from ?? (
+                (be.config.login.schema?be.db.quoteIdent(be.config.login.schema)+'.':'')+
+                be.db.quoteIdent(be.config.login.table)))}
+                where ${db.quoteIdent(be.config.login.userFieldName)} = 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/lib/table-def-adapt.js

@@ -137,6 +137,9 @@ function tableDefAdapt(tableDef, context){
         resultTableDef.field[fieldDef.name]=fieldDef;
         if(fieldDef.isName){
             resultTableDef.nameFields.push(fieldDef.name);
+            if (fieldDef.isName == 'known' && resultTableDef.hiddenColumns && !resultTableDef.hiddenColumns.includes(fieldDef.name)) {
+                resultTableDef.hiddenColumns.push(fieldDef.name);
+            }
         }
         return fieldDef;
     });

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.12",
   "author": "Codenautas <codenautas@googlegroups.com>",
   "license": "MIT",
   "repository": "codenautas/backend-plus",
@@ -35,13 +35,13 @@
     "best-globals": "^2.0.1",
     "big.js": "^7.0.1",
     "body-parser": "^2.2.0",
-    "cast-error": "^0.1.1",
+    "cast-error": "^0.1.2",
     "castellano": "^0.1.4",
     "connect-pg-simple": "^10.0.0",
     "cookie-parser": "^1.4.7",
     "cors": "^2.8.5",
-    "dialog-promise": "^0.10.1",
-    "discrepances": "^0.2.8",
+    "dialog-promise": "^0.10.2",
+    "discrepances": "^0.2.9",
     "express": "^5.1.0",
     "express-session": "^1.18.1",
     "express-useragent": "^1.0.15",
@@ -51,14 +51,15 @@
     "json4all": "^1.4.0",
     "lazy-some": "^0.1.0",
     "like-ar": "^0.5.1",
-    "login-plus": "^1.7.2",
+    "login-plus": "^1.7.3",
     "memorystore": "^1.6.7",
-    "mini-tools": "^1.13.2",
+    "mini-tools": "^1.13.3",
     "moment": "^2.30.1",
     "multiparty": "^4.2.3",
     "nodemailer": "^7.0.3",
     "numeral": "^2.0.6",
-    "pg-promise-strict": "^1.4.2",
+    "pg-promise-strict": "^1.4.3",
+    "pg-triggers": "0.4.3",
     "pikaday": "^1.8.2",
     "pug": "^3.0.3",
     "read-yaml-promise": "^1.0.2",
@@ -67,6 +68,7 @@
     "self-explain": "^0.11.0",
     "serve-content": "^0.4.0",
     "session-file-store": "^1.5.0",
+    "simple-git": "^3.18.0",
     "sql-tools": "^0.1.2",
     "stack-trace": "^0.0.10",
     "stylus": "0.64.0",
@@ -77,13 +79,13 @@
   "devDependencies": {
     "@types/big.js": "^6.2.2",
     "@types/expect.js": "~0.3.32",
-    "@types/express": "^5.0.2",
+    "@types/express": "^5.0.3",
     "@types/express-useragent": "^1.0.5",
     "@types/fs-extra": "^11.0.4",
     "@types/js-yaml": "^4.0.9",
     "@types/mocha": "^10.0.10",
     "@types/multiparty": "~4.2.1",
-    "@types/node": "^22.15.21",
+    "@types/node": "^24.0.3",
     "@types/nodemailer": "^6.4.17",
     "@types/numeral": "~2.0.5",
     "@types/session-file-store": "^1.2.5",
@@ -98,10 +100,10 @@
     "karma-ie-launcher": "^1.0.0",
     "karma-mocha": "^2.0.1",
     "kill-9": "~0.4.3",
-    "mocha": "^11.5.0",
+    "mocha": "^11.7.0",
     "nyc": "^17.1.0",
-    "puppeteer": "^24.9.0",
-    "sinon": "^20.0.0",
+    "puppeteer": "^24.10.2",
+    "sinon": "^21.0.0",
     "supertest": "^7.1.1",
     "types.d.ts": "~0.6.22",
     "typescript": "^5.8.3",