backend-plus 1.11.10 → 1.11.14

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -63,6 +63,6 @@ html(lang=lang)
63
63
  input(type="submit", value=msgs.chpass.button)
64
64
  each errorLine in (flash.error||[])
65
65
  tr(style={color:'red'})
66
- td(colspan=5)=errorLine
66
+ td.error-message(colspan=5)=errorLine
67
67
  if strength
68
68
  script(src="strength-pass.js")
@@ -46,7 +46,7 @@ html(lang=lang)
46
46
  input.submit(id="login", type="submit", value=msgs.login.button)
47
47
  each errorLine in (flash.error||[])
48
48
  tr(style={color:'red'})
49
- td(colspan=5)=errorLine
49
+ td.error-message(colspan=5)=errorLine
50
50
  if forget
51
51
  tr
52
52
  td.iconostd
@@ -553,7 +553,7 @@ myOwn.rigthMenuDoneFunLocation = function rigthMenuDoneFunLocation(newLocation){
553
553
  myOwn.rightMenuOpts = function rightMenuOpts(){
554
554
  return [
555
555
  // {label:my.messages.user, startGroud:'true'},
556
- {img:my.path.img+'chpass.png', label:my.messages.chpass, doneFun:my.rigthMenuDoneFunLocation('chpass')},
556
+ {id:'right-menu-chpass', img:my.path.img+'chpass.png', label:my.messages.chpass, doneFun:my.rigthMenuDoneFunLocation('chpass')},
557
557
  ]
558
558
  };
559
559
 
@@ -279,7 +279,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
279
279
  for (var i = 0; i < rowResultSetList.length; i++) {
280
280
  var result = rowResultSetList.item(i);
281
281
  if (copyResults) {
282
- result = (0, best_globals_1.changing)(result, {});
282
+ result = best_globals_1.changing(result, {});
283
283
  }
284
284
  arr.push(result);
285
285
  }
@@ -1 +1 @@
1
- {"version":3,"file":"my-websqldb.js","sourceRoot":"","sources":["../src/for-client/my-websqldb.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"my-websqldb.js","sourceRoot":"","sources":["../src/for-client/my-websqldb.ts"],"names":[],"mappings":"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"}
@@ -56,6 +56,6 @@ html(lang=lang)
56
56
  input(type="submit", value=msgs.chpass.button)
57
57
  each errorLine in (flash.error||[])
58
58
  tr(style={color:'red'})
59
- td(colspan=5)=errorLine
59
+ td.error-message(colspan=5)=errorLine
60
60
  if strength
61
61
  script(src="strength-pass.js")
@@ -36,7 +36,7 @@ html(lang=lang)
36
36
  input.submit(id="login", type="submit", value=msgs.newPassword.button)
37
37
  each errorLine in (flash.error||[])
38
38
  tr(style={color:'red'})
39
- td(colspan=5)=errorLine
39
+ td.error-message(colspan=5)=errorLine
40
40
  if forget
41
41
  tr
42
42
  td.iconostd
@@ -26,7 +26,7 @@ var jsToHtml=require('js-to-html');
26
26
  var html=jsToHtml.html;
27
27
  var packagejson = require(process.cwd()+'/package.json');
28
28
  var stackTrace = require('stack-trace');
29
- var locatePath = require('locate-path');
29
+ var locatePath = require('@upgraded/locate-path');
30
30
  var jsYaml = require('js-yaml');
31
31
  var nodemailer = require('nodemailer');
32
32
  var os = require('os');
@@ -140,10 +140,6 @@ AppBackend.prototype.configStaticConfig = function configStaticConfig(){
140
140
  chPassUrlPath: /chpass
141
141
  activeClausule: true
142
142
  lockedClausule: false
143
- messages:
144
- userOrPassFail: username or password error
145
- lockedFail: user account is locked
146
- inactiveFail: user account is marked as inactive
147
143
  keepAlive: 1800
148
144
  db:
149
145
  motor: postgresql
@@ -189,7 +185,13 @@ AppBackend.prototype.i18n.messages.en={
189
185
  username: "username",
190
186
  password: "password",
191
187
  button: "Sign In",
192
- forget: "Forgot your password?"
188
+ forget: "Forgot your password?",
189
+ userOrPassFail: "username or password error",
190
+ lockedFail: "user account is locked",
191
+ inactiveFail: "user account is marked as inactive",
192
+ internalError: "internal error",
193
+ passTooShort: "pass too short (minimum length $1)",
194
+ passDoesntMatch: "pass doesn't match"
193
195
  },
194
196
  newPassword:{
195
197
  button: "Reset password",
@@ -265,7 +267,13 @@ AppBackend.prototype.i18n.messages.es={
265
267
  username: "usuario",
266
268
  password: "clave",
267
269
  button: "Entrar",
268
- forget: "me olvidé la clave"
270
+ forget: "me olvidé la clave",
271
+ userOrPassFail: "usuario o clave incorrecta",
272
+ lockedFail: "usuario bloqueado",
273
+ inactiveFail: "el usuario está marcado como inactivo",
274
+ internalError: "error interno en login",
275
+ passTooShort: "la clave es demasiado corta (el mínimo es $1)",
276
+ passDoesntMatch: "las claves no coinciden"
269
277
  },
270
278
  newPassword:{
271
279
  button: "Obtener una nueva contraseña",
@@ -811,17 +819,17 @@ AppBackend.prototype.start = function start(opts){
811
819
  return Path.join(__dirname,'../for-client/login');
812
820
  }).then(function(loginFile){
813
821
  be.config.login.plus.loginPageServe=function(req,res,next){
814
- return MiniTools.serveJade(loginFile,be.optsGenericForFiles(req).jade)(req,res,next);
822
+ return MiniTools.serveJade(loginFile,be.optsGenericForFiles(req,{withFlash:true}).jade)(req,res,next);
815
823
  };
816
824
  be.config.login.plus.newPassPageServe=function(req,res,next){
817
- return MiniTools.serveJade(loginFile.replace(/\blogin\b/,'new-password'),be.optsGenericForFiles(req).jade)(req,res,next);
825
+ return MiniTools.serveJade(loginFile.replace(/\blogin\b/,'new-password'),be.optsGenericForFiles(req,{withFlash:true}).jade)(req,res,next);
818
826
  };
819
827
  be.config.login.plus.newPassPageServe2=function(req,res,next){
820
- return MiniTools.serveJade(loginFile.replace(/\blogin\b/,'new-password-result'),be.optsGenericForFiles(req).jade)(req,res,next);
828
+ return MiniTools.serveJade(loginFile.replace(/\blogin\b/,'new-password-result'),be.optsGenericForFiles(req,{withFlash:true}).jade)(req,res,next);
821
829
  };
822
830
  be.config.login.plus.newPassPageEnter=function(username, token){
823
831
  return function(req,res,next){
824
- return MiniTools.serveJade(loginFile.replace(/\blogin\b/,'new-pass-enter'),{...be.optsGenericForFiles(req).jade, username, token})(req,res,next);
832
+ return MiniTools.serveJade(loginFile.replace(/\blogin\b/,'new-pass-enter'),{...be.optsGenericForFiles(req,{withFlash:true}).jade, username, token})(req,res,next);
825
833
  }
826
834
  };
827
835
  })
@@ -904,7 +912,8 @@ AppBackend.prototype.start = function start(opts){
904
912
  schrödinger:function(){
905
913
  mainApp.use(be.config.server["base-url"], unloggedApp);
906
914
  be.addSchrödingerServices(mainApp, be.config.server["base-url"]);
907
- }
915
+ },
916
+ messages: be.messages.unlogged.login
908
917
  }
909
918
  if(be.config.login.unloggedLandPage){
910
919
  loginPlusOpts.noLoggedUrlPath=be.config.login.unloggedLandPage;
@@ -941,20 +950,20 @@ AppBackend.prototype.start = function start(opts){
941
950
  }).then(function(data){
942
951
  if(data.rowCount==1){
943
952
  if(!data.row.active){
944
- done(null,false,{message:be.config.login.messages.inactiveFail});
953
+ done(null,false,{message:be.messages.unlogged.login.inactiveFail});
945
954
  }else if(data.row.locked){
946
- done(null,false,{message:be.config.login.messages.lockedFail});
955
+ done(null,false,{message:be.messages.unlogged.login.lockedFail});
947
956
  }else{
948
957
  done(null, data.row);
949
958
  }
950
959
  }else{
951
- done(null,false,{message:be.config.login.messages.userOrPassFail});
960
+ done(null,false,{message:be.messages.unlogged.login.userOrPassFail});
952
961
  }
953
962
  }).then(function(){
954
963
  client.done();
955
964
  }).catch(function(err){
956
965
  if(be.config.login["double-dragon"]){
957
- done(null,false,{message:be.config.login.messages.userOrPassFail});
966
+ done(null,false,{message:be.messages.unlogged.login.userOrPassFail});
958
967
  }
959
968
  if(client && typeof client.done === "function"){
960
969
  client.done();
@@ -967,36 +976,44 @@ AppBackend.prototype.start = function start(opts){
967
976
  });
968
977
  }
969
978
  );
979
+ be.changePassword=async function(client,username,oldPassword,newPassword){
980
+ var sql = "UPDATE "+(be.config.login.schema?be.db.quoteIdent(be.config.login.schema)+'.':'')+
981
+ be.db.quoteIdent(be.config.login.table)+
982
+ "\n SET "+be.db.quoteIdent(be.config.login.passFieldName)+" = $2 "+
983
+ "\n WHERE "+be.db.quoteIdent(be.config.login.userFieldName)+" = $1 "+
984
+ (oldPassword!==false?"\n AND "+be.db.quoteIdent(be.config.login.passFieldName)+" = $3 ":"")+
985
+ "\n RETURNING 1 as ok";
986
+ var params = [username, md5(newPassword+username.toLowerCase())]
987
+ if(oldPassword!==false){
988
+ params.push(md5(oldPassword+username.toLowerCase()))
989
+ }
990
+ var result = await client.query(sql, params).fetchOneRowIfExists();
991
+ var ok = result.rowCount == 1;
992
+ if(ok && be.config.login['double-dragon']){
993
+ sql = "ALTER USER " +be.db.quoteIdent(username) + " WITH PASSWORD " + be.db.quoteLiteral(newPassword);
994
+ await client.query(sql,[]).execute();
995
+ }
996
+ return ok;
997
+ }
970
998
  be.passwordChanger=function(req, username, oldPassword, newPassword, done) {
971
- var client;
972
- be.getDbClient(req).then(function(cli){
973
- client = cli;
974
- var sql = "UPDATE "+(be.config.login.schema?be.db.quoteIdent(be.config.login.schema)+'.':'')+
975
- be.db.quoteIdent(be.config.login.table)+
976
- "\n SET "+be.db.quoteIdent(be.config.login.passFieldName)+" = $2 "+
977
- "\n WHERE "+be.db.quoteIdent(be.config.login.userFieldName)+" = $1 "+
978
- (oldPassword!==false?"\n AND "+be.db.quoteIdent(be.config.login.passFieldName)+" = $3 ":"")+
979
- "\n RETURNING 1 as ok";
980
- var params = [username, md5(newPassword+username.toLowerCase())]
981
- if(oldPassword!==false){
982
- params.push(md5(oldPassword+username.toLowerCase()))
983
- }
984
- return client.query(sql, params).fetchOneRowIfExists();
985
- }).then(function(result){
986
- client.done();
987
- if(result.rowCount){
988
- done(null,true);
989
- }else{
990
- done(null,false,{message: be.messages.server.oldPassDontMatch});
991
- }
992
- }).catch(function(err){
993
- if(client && client.done){
994
- client.done();
995
- }
996
- console.log('error changing pass',err);
997
- console.log('stack',err.stack);
998
- throw err;
999
- }).catch(done);
999
+ if(be.config.login.disableChangePassword){
1000
+ done(null,false,'el cambio de contraseña está deshabilitado');
1001
+ }else{
1002
+ var client;
1003
+ be.inTransaction(req,function(cli){
1004
+ client = cli;
1005
+ return be.changePassword(client,username,oldPassword,newPassword)
1006
+ }).then(function(ok){
1007
+ done(null,ok,ok?null:be.messages.server.oldPassDontMatch);
1008
+ }).catch(function(err){
1009
+ //if(client && client.done){
1010
+ // client.done();
1011
+ //}
1012
+ console.log('error changing pass',err);
1013
+ console.log('stack',err.stack);
1014
+ throw err;
1015
+ }).catch(done);
1016
+ }
1000
1017
  }
1001
1018
  mainApp.loginPlusManager.setPasswordChanger(be.passwordChanger);
1002
1019
  if(be.config.devel.delay){
@@ -1058,6 +1075,7 @@ AppBackend.prototype.start = function start(opts){
1058
1075
  }).catch(function(err){
1059
1076
  if(err.dumping=='ok'){
1060
1077
  console.log('db struct dumped');
1078
+ process.exit(0);
1061
1079
  return;
1062
1080
  }
1063
1081
  console.log('ERROR',err.stack || err);
@@ -1595,7 +1613,7 @@ function resolve_module_dir(moduleName,path){
1595
1613
  return Path.join(Path.dirname(baseDir),path||'');
1596
1614
  }
1597
1615
 
1598
- AppBackend.prototype.optsGenericForFiles = function optsGenericForFiles(req){
1616
+ AppBackend.prototype.optsGenericForFiles = function optsGenericForFiles(req, opts){
1599
1617
  var be = this;
1600
1618
  var title=be.config['client-setup'].formTitle;
1601
1619
  var skin=be.config['client-setup'].skin;
@@ -1606,10 +1624,10 @@ AppBackend.prototype.optsGenericForFiles = function optsGenericForFiles(req){
1606
1624
  skin:skin,
1607
1625
  skinUrl:skinUrl,
1608
1626
  formTitle:title,
1627
+ ...(opts?.withFlash ? {flash:req?.flash?.()} : {}),
1609
1628
  msgs:changing(be.messages.unlogged, req?.user?be.messages.logged:{chpass:be.messages.logged.chpass}),
1610
1629
  modules:req?.user?be.clientModules():[],
1611
1630
  lang:be.config["client-setup"].lang,
1612
- flash:req?.flash?.()||{},
1613
1631
  username:req?.user?req.user[be.config.login.userFieldName]:'',
1614
1632
  forget:be.config.login.forget?.urlPath
1615
1633
  },
@@ -629,17 +629,12 @@ ProcedureTables = [
629
629
  {name:'user'},
630
630
  {name:'newpass'},
631
631
  ],
632
- coreFunction:function(context, parameters){
632
+ coreFunction:async function(context, parameters){
633
633
  if(context.be.isAdmin(context) && context.user[context.be.config.login.userFieldName]!=parameters.user){
634
- var qUser = context.be.db.quoteIdent(context.be.config.login.userFieldName);
635
- var qPass = context.be.db.quoteIdent(context.be.config.login.passFieldName);
636
- var qTable = context.be.db.quoteIdent(context.be.config.login.table);
637
- return context.client.query(
638
- "UPDATE "+qTable+" SET "+qPass+" = md5($1||"+qUser+") WHERE "+qUser+" = $2 RETURNING 'ok' as ok",
639
- [parameters.newpass, parameters.user]
640
- ).fetchUniqueRow().then(function(result){
641
- return result.row.ok==='ok';
642
- });
634
+ var ok = await context.be.changePassword(context.client,parameters.user,false,parameters.newpass);
635
+ if(ok){
636
+ return ok
637
+ }
643
638
  }
644
639
  throw changing(new Error("not allowed"), {status: 401});
645
640
  }
package/package.json CHANGED
@@ -1,7 +1,7 @@
1
1
  {
2
2
  "name": "backend-plus",
3
3
  "description": "Backend for typed controls",
4
- "version": "1.11.10",
4
+ "version": "1.11.14",
5
5
  "author": "Codenautas <codenautas@googlegroups.com>",
6
6
  "license": "MIT",
7
7
  "repository": "codenautas/backend-plus",
@@ -36,7 +36,7 @@
36
36
  "castellano": "~0.1.3",
37
37
  "connect-pg-simple": "^7.0.0",
38
38
  "cookie-parser": "^1.4.5",
39
- "dialog-promise": "~0.9.12",
39
+ "dialog-promise": "~0.9.14",
40
40
  "discrepances": "~0.2.6",
41
41
  "express": "^4.17.1",
42
42
  "express-session": "^1.17.2",
@@ -47,11 +47,11 @@
47
47
  "json4all": "^1.1.0",
48
48
  "lazy-some": "~0.1.0",
49
49
  "like-ar": "~0.3.6",
50
- "locate-path": "^6.0.0",
51
- "login-plus": "^1.5.7",
50
+ "@upgraded/locate-path": "^6.0.0-alfa.1",
51
+ "login-plus": "^1.6.1",
52
52
  "memorystore": "^1.6.6",
53
53
  "mini-tools": "^1.11.1",
54
- "nodemailer": "^6.6.5",
54
+ "nodemailer": "^6.7.0",
55
55
  "moment": "^2.29.1",
56
56
  "multiparty": "^4.2.2",
57
57
  "numeral": "^2.0.6",
@@ -62,14 +62,14 @@
62
62
  "regexplicit": "~0.1.3",
63
63
  "require-bro": "~0.2.2",
64
64
  "self-explain": "~0.10.22",
65
- "serve-content": "~0.3.14",
65
+ "serve-content": "~0.3.16",
66
66
  "session-file-store": "^1.5.0",
67
67
  "sql-tools": "~0.1.0",
68
68
  "stack-trace": "~0.0.10",
69
69
  "stylus": "~0.55.0",
70
70
  "type-store": "~0.2.41",
71
71
  "typed-controls": "~0.9.0",
72
- "xlsx": "^0.17.2",
72
+ "xlsx": "^0.17.3",
73
73
  "xlsx-style": "^0.8.13"
74
74
  },
75
75
  "devDependencies": {
@@ -82,7 +82,7 @@
82
82
  "@types/mocha": "^9.0.0",
83
83
  "@types/nodemailer": "^6.4.4",
84
84
  "@types/multiparty": "~0.0.33",
85
- "@types/node": "^16.10.2",
85
+ "@types/node": "^16.10.8",
86
86
  "@types/numeral": "~2.0.2",
87
87
  "@types/session-file-store": "^1.2.2",
88
88
  "@types/stack-trace": "~0.0.29",
@@ -101,8 +101,8 @@
101
101
  "puppeteer": "^10.4.0",
102
102
  "sinon": "^11.1.2",
103
103
  "supertest": "^6.1.6",
104
- "types.d.ts": "~0.6.3",
105
- "typescript": "^4.4.3",
104
+ "types.d.ts": "~0.6.4",
105
+ "typescript": "^4.4.4",
106
106
  "why-is-node-running": "^2.2.0"
107
107
  },
108
108
  "engines": {
@@ -1,15 +0,0 @@
1
- /**
2
- * @function
3
- * @template T extends {}
4
- * @param {T & {name?:string|null|undefined}} obj
5
- * @param {string} n
6
- * @return {obj is T}
7
- */
8
- function addName(obj, n) {
9
- obj.name = n;
10
- }
11
-
12
- let thing = {size: "medium"};
13
- addName(thing, "product");
14
- var other = thing;
15
- console.log(thing.name);