backend-plus 1.16.6 → 1.16.9

package/for-client/new-pass-enter.jade

@@ -54,7 +54,7 @@ html(lang=lang)
           td
           td
             input(type="submit", value=msgs.chpass.button)
-        each errorLine in (flash.error||[])
+        each errorLine in (flash && flash.error||[])
           tr(style={color:'red'})
             td.error-message(colspan=5)=errorLine
     if strength

package/for-client/new-password.jade

@@ -34,7 +34,7 @@ html(lang=lang)
           td.formlabel.buttonmargin
           td(colspan=4)
             input.submit(id="login", type="submit", value=msgs.newPassword.button)
-        each errorLine in (flash.error||[])
+        each errorLine in (flash && flash.error||[])
           tr(style={color:'red'})
             td.error-message(colspan=5)=errorLine
         if forget

package/lib/backend-plus.d.ts

@@ -77,7 +77,7 @@ export interface ContextForDump extends Context {
 
 export type InformProgressFunction=(opts:Error|{data:any}|{start:any}|{message:string}|{message?:string, lengthComputable:boolean, loaded:number, total:number, force?:boolean})=>void
 
-export type ProcedureContext=Context & {
+export interface ProcedureContext extends Context{
     client:Client
     doing:string
     informProgress:InformProgressFunction
@@ -371,6 +371,7 @@ export class AppBackend{
     procedureDefCompleter(procedureDef:ProcedureDef):ProcedureDef
     tableDefAdapt(tableDef:TableDefinition, context:Context):TableDefinition
     pushApp(dirname:string):void
+    dumpDbTableFields(tableDefinition:TableDefinition):string[]
     dumpDbSchemaPartial(partialTableStructures:TableDefinitions, opts?:DumpOptions):Promise<{mainSql:string; enancePart:string}> 
     getContextForDump(): ContextForDump
     getClientSetupForSendToFrontEnd(req:Request):ClientSetup

package/lib/backend-plus.js

@@ -896,7 +896,6 @@ AppBackend.prototype.start = function start(opts){
         }
         if(be.config.server["base-url"] && be.config.server["base-url"]!='/'){
             mainApp.get('/favicon.ico', function(req,res,next){
-                console.log('quieren el favicon')
                 MiniTools.serveFile(__dirname+'/../for-client/img/warning128.png')(req,res,next)
             })
         }
@@ -967,6 +966,9 @@ AppBackend.prototype.start = function start(opts){
                             }else if(data.row.locked){
                                 done(null,false,{message:be.messages.unlogged.login.lockedFail});
                             }else{
+                                if(req.query["return-to"]){
+                                    req.session.loginReturnTo = req.query["return-to"];
+                                }
                                 done(null, data.row);
                             }
                         }else{
@@ -2463,6 +2465,31 @@ AppBackend.prototype.dumpFkConstraint = function dumpFkConstraint(fk, tableDef,
     return {consName, clause, sourceFieldList};
 }
 
+AppBackend.prototype.dumpDbTableFields = function dumpDbTableFields(tableDef, opts = {}, complements = null){
+    var db = this.db;
+    var fields=[];
+    tableDef.fields.forEach(function(fieldDef){
+        if(!fieldDef.clientSide && fieldDef.inTable!==false && !fieldDef.inJoin && !(tableDef.sql.fields[fieldDef.name]||{}).expr || fieldDef.inTable){
+            var fieldType=typeDb[fieldDef.typeName]||'"'+fieldDef.typeName+'"';
+            if(fieldDef.sizeByte==4){
+                fieldType = 'integer';
+            }
+            fields.push(
+                '  '+db.quoteIdent(fieldDef.name)+
+                ' '+(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':'')+
+                (fieldDef.generatedAs!=null?` generated always as (${fieldDef.generatedAs}) stored`:'')
+            );
+            if(complements){
+                complements(fieldDef)
+            }
+        }
+    });
+    return fields
+}
+
 AppBackend.prototype.dumpDbSchemaPartial = async function dumpDbSchemaPartial(partialTableStructures, opts = {}){
     var complete = opts.complete;
     var be = this;
@@ -2530,21 +2557,8 @@ AppBackend.prototype.dumpDbSchemaPartial = async function dumpDbSchemaPartial(pa
                     throw new Error('table '+tableDef.sql.tableName+' has viewBody. It must has isTable=false');
                 }
                 lines.push('create table '+cualQuoteTableName+' (');
-                var fields=[];
-                tableDef.fields.forEach(function(fieldDef){
-                    if(!fieldDef.clientSide && fieldDef.inTable!==false && !fieldDef.inJoin && !(tableDef.sql.fields[fieldDef.name]||{}).expr || fieldDef.inTable){
-                        var fieldType=typeDb[fieldDef.typeName]||'"'+fieldDef.typeName+'"';
-                        if(fieldDef.sizeByte==4){
-                            fieldType = 'integer';
-                        }
-                        fields.push(
-                            '  '+db.quoteIdent(fieldDef.name)+
-                            ' '+(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':'')+
-                            (fieldDef.generatedAs!=null?` generated always as (${fieldDef.generatedAs}) stored`:'')
-                        );
+                var fields = be.dumpDbTableFields(tableDef, opts,
+                    function complements(fieldDef){
                         if(fieldDef.sequence && !fieldDef.sequence.name){
                             tablesWithStrictSequence[tableName]={}
                         }
@@ -2569,11 +2583,11 @@ AppBackend.prototype.dumpDbSchemaPartial = async function dumpDbSchemaPartial(pa
                                 ' alter column '+db.quoteIdent(fieldDef.name)+' set not null;'
                             );
                         }
+                        if(fieldDef.sequence && fieldDef.sequence.name){
+                            fieldsForSequences.push(fieldDef);
+                        }
                     }
-                    if(fieldDef.sequence && fieldDef.sequence.name){
-                        fieldsForSequences.push(fieldDef);
-                    }
-                });
+                );
                 lines.push(fields.join(', \n'));
                 if(tableDef.primaryKey){
                     lines.push(', primary key ('+tableDef.primaryKey.map(function(name){ return db.quoteIdent(name); }).join(', ')+')');

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "backend-plus",
   "description": "Backend for typed controls",
-  "version": "1.16.6",
+  "version": "1.16.9",
   "author": "Codenautas <codenautas@googlegroups.com>",
   "license": "MIT",
   "repository": "codenautas/backend-plus",
@@ -32,7 +32,7 @@
     "ajax-best-promise": "^0.3.7",
     "backend-skins": "^0.1.15",
     "best-globals": "^1.0.3",
-    "big.js": "^6.1.1",
+    "big.js": "^6.2.0",
     "body-parser": "^1.20.0",
     "cast-error": "^0.1.0",
     "castellano": "^0.1.3",
@@ -41,10 +41,10 @@
     "dialog-promise": "^0.9.15",
     "discrepances": "^0.2.6",
     "express": "^4.18.1",
-    "express-session": "^1.17.2",
+    "express-session": "^1.17.3",
     "express-useragent": "^1.0.15",
     "fs-extra": "^10.1.0",
-    "js-to-html": "^1.3.1",
+    "js-to-html": "^1.3.2",
     "js-yaml": "^4.1.0",
     "json4all": "^1.1.0",
     "lazy-some": "^0.1.0",
@@ -52,9 +52,9 @@
     "login-plus": "^1.6.2",
     "memorystore": "^1.6.7",
     "mini-tools": "^1.11.2",
-    "moment": "^2.29.3",
+    "moment": "^2.29.4",
     "multiparty": "^4.2.3",
-    "nodemailer": "^6.7.5",
+    "nodemailer": "^6.7.7",
     "numeral": "^2.0.6",
     "pg-promise-strict": "^1.2.6",
     "pikaday": "^1.8.2",
@@ -67,14 +67,14 @@
     "session-file-store": "^1.5.0",
     "sql-tools": "^0.1.2",
     "stack-trace": "^0.0.10",
-    "stylus": "0.56.0",
+    "stylus": "0.58.1",
     "type-store": "^0.2.41",
     "typed-controls": "^0.10.0",
     "xlsx": "^0.18.5",
     "xlsx-style": "^0.8.13"
   },
   "devDependencies": {
-    "@types/big.js": "^6.1.3",
+    "@types/big.js": "^6.1.5",
     "@types/expect.js": "~0.3.29",
     "@types/express": "^4.17.13",
     "@types/express-useragent": "^1.0.2",
@@ -82,7 +82,7 @@
     "@types/js-yaml": "^4.0.5",
     "@types/mocha": "^9.1.1",
     "@types/multiparty": "~0.0.33",
-    "@types/node": "^17.0.31",
+    "@types/node": "^18.0.3",
     "@types/nodemailer": "^6.4.4",
     "@types/numeral": "~2.0.2",
     "@types/session-file-store": "^1.2.2",
@@ -90,7 +90,7 @@
     "@types/websql": "~0.0.27",
     "esprima": "^4.0.1",
     "expect.js": "~0.3.1",
-    "karma": "6.3.19",
+    "karma": "6.4.0",
     "karma-chrome-launcher": "^3.1.1",
     "karma-expect": "^1.1.3",
     "karma-firefox-launcher": "^2.1.2",
@@ -99,11 +99,11 @@
     "kill-9": "~0.4.3",
     "mocha": "^10.0.0",
     "nyc": "^15.1.0",
-    "puppeteer": "^13.7.0",
+    "puppeteer": "^15.3.2",
     "sinon": "^14.0.0",
-    "supertest": "^6.2.3",
+    "supertest": "^6.2.4",
     "types.d.ts": "~0.6.7",
-    "typescript": "^4.6.4",
+    "typescript": "^4.7.4",
     "why-is-node-running": "^2.2.2"
   },
   "engines": {

package/unlogged/auto-login.js

@@ -4,6 +4,7 @@ function gotoEmptyFieldOrSubmit(event){
     if(location.hash){
         sessionStorage.setItem('backend-plus-hash-redirect',location.hash);
     }
+    var loginForm = document.getElementById('loginForm');
     if(document.getElementById('username').value==''){
         document.getElementById('username').focus();
         event.preventDefault();
@@ -15,6 +16,9 @@ function gotoEmptyFieldOrSubmit(event){
             loginForm.submit();
         },500);
     }
+    if(location.search){
+        loginForm.action = loginForm.action + location.search;
+    }
 }
 
 window.addEventListener('load',function(){
@@ -42,6 +46,8 @@ window.addEventListener('load',function(){
         setTimeout(function(){
             location = gotoLoginElement.href;
         },5000)
+        gotoLoginElement.focus()
+    }else{
+        controlar_compatibilidad();
     }
-    controlar_compatibilidad();
 })