@serve.zone/dcrouter 13.30.0 → 13.32.0

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.
Files changed (88) hide show
  1. package/dist_serve/bundle.js +1042 -1014
  2. package/dist_ts/00_commitinfo_data.js +1 -1
  3. package/dist_ts/classes.dcrouter.d.ts +1 -1
  4. package/dist_ts/opsserver/classes.opsserver.d.ts +4 -2
  5. package/dist_ts/opsserver/classes.opsserver.js +2 -11
  6. package/dist_ts/opsserver/handlers/acme-config.handler.js +7 -24
  7. package/dist_ts/opsserver/handlers/admin.handler.d.ts +12 -0
  8. package/dist_ts/opsserver/handlers/admin.handler.js +129 -95
  9. package/dist_ts/opsserver/handlers/api-token.handler.js +28 -2
  10. package/dist_ts/opsserver/handlers/certificate.handler.js +7 -24
  11. package/dist_ts/opsserver/handlers/config.handler.js +3 -1
  12. package/dist_ts/opsserver/handlers/dns-provider.handler.js +7 -24
  13. package/dist_ts/opsserver/handlers/dns-record.handler.js +7 -24
  14. package/dist_ts/opsserver/handlers/domain.handler.js +7 -24
  15. package/dist_ts/opsserver/handlers/email-domain.handler.js +7 -24
  16. package/dist_ts/opsserver/handlers/email-ops.handler.js +8 -1
  17. package/dist_ts/opsserver/handlers/logs.handler.js +4 -1
  18. package/dist_ts/opsserver/handlers/network-target.handler.js +7 -24
  19. package/dist_ts/opsserver/handlers/radius.handler.js +32 -1
  20. package/dist_ts/opsserver/handlers/remoteingress.handler.js +24 -1
  21. package/dist_ts/opsserver/handlers/route-management.handler.js +7 -26
  22. package/dist_ts/opsserver/handlers/security.handler.js +32 -7
  23. package/dist_ts/opsserver/handlers/source-profile.handler.js +7 -24
  24. package/dist_ts/opsserver/handlers/stats.handler.js +8 -1
  25. package/dist_ts/opsserver/handlers/target-profile.handler.js +7 -24
  26. package/dist_ts/opsserver/handlers/users.handler.d.ts +1 -1
  27. package/dist_ts/opsserver/handlers/users.handler.js +35 -4
  28. package/dist_ts/opsserver/handlers/vpn.handler.js +34 -1
  29. package/dist_ts/opsserver/handlers/workhoster.handler.js +16 -35
  30. package/dist_ts/opsserver/helpers/auth.d.ts +21 -0
  31. package/dist_ts/opsserver/helpers/auth.js +63 -0
  32. package/dist_ts_interfaces/data/route-management.d.ts +2 -1
  33. package/dist_ts_interfaces/data/route-management.js +48 -2
  34. package/dist_ts_interfaces/requests/api-tokens.d.ts +10 -5
  35. package/dist_ts_interfaces/requests/combined.stats.d.ts +2 -1
  36. package/dist_ts_interfaces/requests/config.d.ts +2 -1
  37. package/dist_ts_interfaces/requests/email-ops.d.ts +6 -3
  38. package/dist_ts_interfaces/requests/logs.d.ts +4 -2
  39. package/dist_ts_interfaces/requests/radius.d.ts +24 -12
  40. package/dist_ts_interfaces/requests/remoteingress.d.ts +14 -7
  41. package/dist_ts_interfaces/requests/security-policy.d.ts +16 -8
  42. package/dist_ts_interfaces/requests/stats.d.ts +18 -9
  43. package/dist_ts_interfaces/requests/users.d.ts +39 -2
  44. package/dist_ts_interfaces/requests/vpn.d.ts +22 -11
  45. package/dist_ts_interfaces/requests/workhoster.d.ts +10 -5
  46. package/dist_ts_migrations/index.js +3 -1
  47. package/dist_ts_web/00_commitinfo_data.js +1 -1
  48. package/dist_ts_web/appstate.d.ts +8 -0
  49. package/dist_ts_web/appstate.js +52 -2
  50. package/dist_ts_web/elements/access/ops-view-apitokens.js +2 -21
  51. package/dist_ts_web/elements/access/ops-view-users.d.ts +2 -0
  52. package/dist_ts_web/elements/access/ops-view-users.js +133 -2
  53. package/dist_ts_web/elements/network/ops-view-routes.js +11 -1
  54. package/dist_ts_web/elements/ops-dashboard.js +2 -4
  55. package/package.json +3 -3
  56. package/readme.md +1 -1
  57. package/ts/00_commitinfo_data.ts +1 -1
  58. package/ts/classes.dcrouter.ts +1 -1
  59. package/ts/opsserver/classes.opsserver.ts +3 -14
  60. package/ts/opsserver/handlers/acme-config.handler.ts +6 -23
  61. package/ts/opsserver/handlers/admin.handler.ts +155 -111
  62. package/ts/opsserver/handlers/api-token.handler.ts +27 -1
  63. package/ts/opsserver/handlers/certificate.handler.ts +6 -23
  64. package/ts/opsserver/handlers/config.handler.ts +2 -0
  65. package/ts/opsserver/handlers/dns-provider.handler.ts +6 -23
  66. package/ts/opsserver/handlers/dns-record.handler.ts +6 -23
  67. package/ts/opsserver/handlers/domain.handler.ts +6 -23
  68. package/ts/opsserver/handlers/email-domain.handler.ts +6 -23
  69. package/ts/opsserver/handlers/email-ops.handler.ts +7 -0
  70. package/ts/opsserver/handlers/logs.handler.ts +3 -0
  71. package/ts/opsserver/handlers/network-target.handler.ts +6 -23
  72. package/ts/opsserver/handlers/radius.handler.ts +31 -0
  73. package/ts/opsserver/handlers/remoteingress.handler.ts +23 -0
  74. package/ts/opsserver/handlers/route-management.handler.ts +6 -25
  75. package/ts/opsserver/handlers/security.handler.ts +31 -6
  76. package/ts/opsserver/handlers/source-profile.handler.ts +6 -23
  77. package/ts/opsserver/handlers/stats.handler.ts +7 -0
  78. package/ts/opsserver/handlers/target-profile.handler.ts +6 -23
  79. package/ts/opsserver/handlers/users.handler.ts +46 -3
  80. package/ts/opsserver/handlers/vpn.handler.ts +33 -0
  81. package/ts/opsserver/handlers/workhoster.handler.ts +18 -33
  82. package/ts/opsserver/helpers/auth.ts +91 -0
  83. package/ts_web/00_commitinfo_data.ts +1 -1
  84. package/ts_web/appstate.ts +69 -1
  85. package/ts_web/elements/access/ops-view-apitokens.ts +1 -20
  86. package/ts_web/elements/access/ops-view-users.ts +139 -1
  87. package/ts_web/elements/network/ops-view-routes.ts +9 -0
  88. package/ts_web/elements/ops-dashboard.ts +1 -3
@@ -444,9 +444,7 @@ let OpsDashboard = (() => {
444
444
  <dees-input-checkbox
445
445
  .key=${'enableIdpGlobalAuth'}
446
446
  .label=${'Allow idp.global login for this email'}
447
- .description=${statusArg.idpGlobalConfigured
448
- ? 'The local account remains authoritative; idp.global only verifies identity.'
449
- : 'Requires DCROUTER_IDP_GLOBAL_URL before idp.global logins can work.'}
447
+ .description=${'Uses https://idp.global by default; the local dcrouter account and role remain authoritative.'}
450
448
  ></dees-input-checkbox>
451
449
  </dees-form>
452
450
  </div>
@@ -501,4 +499,4 @@ let OpsDashboard = (() => {
501
499
  return OpsDashboard = _classThis;
502
500
  })();
503
501
  export { OpsDashboard };
504
- //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"ops-dashboard.js","sourceRoot":"","sources":["../../../ts_web/elements/ops-dashboard.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,OAAO,KAAK,OAAO,MAAM,eAAe,CAAC;AACzC,OAAO,KAAK,QAAQ,MAAM,gBAAgB,CAAC;AAC3C,OAAO,KAAK,UAAU,MAAM,mCAAmC,CAAC;AAChE,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AACzC,OAAO,EACL,WAAW,EACX,GAAG,EACH,UAAU,EACV,aAAa,EACb,IAAI,EACJ,KAAK,EAEN,MAAM,6BAA6B,CAAC;AAGrC,yBAAyB;AACzB,OAAO,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AAEjD,iBAAiB;AACjB,OAAO,EAAE,eAAe,EAAE,MAAM,iCAAiC,CAAC;AAClE,OAAO,EAAE,aAAa,EAAE,MAAM,+BAA+B,CAAC;AAE9D,gBAAgB;AAChB,OAAO,EAAE,sBAAsB,EAAE,MAAM,wCAAwC,CAAC;AAChF,OAAO,EAAE,aAAa,EAAE,MAAM,8BAA8B,CAAC;AAC7D,OAAO,EAAE,qBAAqB,EAAE,MAAM,sCAAsC,CAAC;AAC7E,OAAO,EAAE,qBAAqB,EAAE,MAAM,sCAAsC,CAAC;AAC7E,OAAO,EAAE,qBAAqB,EAAE,MAAM,sCAAsC,CAAC;AAC7E,OAAO,EAAE,oBAAoB,EAAE,MAAM,qCAAqC,CAAC;AAC3E,OAAO,EAAE,UAAU,EAAE,MAAM,2BAA2B,CAAC;AAEvD,cAAc;AACd,OAAO,EAAE,aAAa,EAAE,MAAM,4BAA4B,CAAC;AAC3D,OAAO,EAAE,oBAAoB,EAAE,MAAM,oCAAoC,CAAC;AAC1E,OAAO,EAAE,mBAAmB,EAAE,MAAM,mCAAmC,CAAC;AAExE,eAAe;AACf,OAAO,EAAE,qBAAqB,EAAE,MAAM,qCAAqC,CAAC;AAC5E,OAAO,EAAE,gBAAgB,EAAE,MAAM,gCAAgC,CAAC;AAClE,OAAO,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAC;AAE1D,iBAAiB;AACjB,OAAO,EAAE,uBAAuB,EAAE,MAAM,0CAA0C,CAAC;AACnF,OAAO,EAAE,sBAAsB,EAAE,MAAM,yCAAyC,CAAC;AACjF,OAAO,EAAE,6BAA6B,EAAE,MAAM,gDAAgD,CAAC;AAE/F,gBAAgB;AAChB,OAAO,EAAE,gBAAgB,EAAE,MAAM,iCAAiC,CAAC;AACnE,OAAO,EAAE,cAAc,EAAE,MAAM,+BAA+B,CAAC;AAC/D,OAAO,EAAE,UAAU,EAAE,MAAM,2BAA2B,CAAC;AACvD,OAAO,EAAE,mBAAmB,EAAE,MAAM,oCAAoC,CAAC;IAY5D,YAAY;4BADxB,aAAa,CAAC,eAAe,CAAC;;;;sBACG,WAAW;;;;;;;;;;4BAAnB,SAAQ,WAAW;;;;sCAC1C,KAAK,EAAE;mCAQP,KAAK,EAAE;uCASP,KAAK,EAAE;YAjBC,mLAAS,UAAU,6BAAV,UAAU,+FAG1B;YAKO,0KAAS,OAAO,6BAAP,OAAO,yFAOvB;YAEO,sLAAS,WAAW,6BAAX,WAAW,iGAI3B;YAtBJ,6KAgaC;;;;QA/ZU,iFAA4C;YACnD,QAAQ,EAAE,IAAI;YACd,UAAU,EAAE,KAAK;SAClB,EAAC;QAHO,IAAS,UAAU,gDAG1B;QAHO,IAAS,UAAU,sDAG1B;QAEM,gBAAgB,0DAAO;QACvB,qBAAqB,CAAiB;QAErC,2EAAsC;YAC7C,UAAU,EAAE,UAAU;YACtB,aAAa,EAAE,IAAI;YACnB,gBAAgB,EAAE,KAAK;YACvB,WAAW,EAAE,IAAI;YACjB,eAAe,EAAE,IAAI;YACrB,KAAK,EAAE,OAAO;SACf,EAAC;QAPO,IAAS,OAAO,6CAOvB;QAPO,IAAS,OAAO,mDAOvB;QAEO,yIAA8C;YACrD,MAAM,EAAE,IAAI;YACZ,SAAS,EAAE,KAAK;YAChB,KAAK,EAAE,IAAI;SACZ,GAAC;QAJO,IAAS,WAAW,iDAI3B;QAJO,IAAS,WAAW,uDAI3B;QAEF,kGAAkG;QAC1F,QAAQ,6DAAkB;YAChC;gBACE,IAAI,EAAE,UAAU;gBAChB,QAAQ,EAAE,wBAAwB;gBAClC,QAAQ,EAAE;oBACR,EAAE,IAAI,EAAE,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,QAAQ,EAAE,iBAAiB,EAAE,OAAO,EAAE,eAAe,EAAE;oBACvF,EAAE,IAAI,EAAE,eAAe,EAAE,IAAI,EAAE,eAAe,EAAE,QAAQ,EAAE,iBAAiB,EAAE,OAAO,EAAE,aAAa,EAAE;iBACtG;aACF;YACD;gBACE,IAAI,EAAE,SAAS;gBACf,QAAQ,EAAE,gBAAgB;gBAC1B,QAAQ,EAAE;oBACR,EAAE,IAAI,EAAE,UAAU,EAAE,IAAI,EAAE,kBAAkB,EAAE,QAAQ,EAAE,iBAAiB,EAAE,OAAO,EAAE,sBAAsB,EAAE;oBAC5G,EAAE,IAAI,EAAE,QAAQ,EAAE,IAAI,EAAE,QAAQ,EAAE,QAAQ,EAAE,cAAc,EAAE,OAAO,EAAE,aAAa,EAAE;oBACpF,EAAE,IAAI,EAAE,gBAAgB,EAAE,IAAI,EAAE,iBAAiB,EAAE,QAAQ,EAAE,oBAAoB,EAAE,OAAO,EAAE,qBAAqB,EAAE;oBACnH,EAAE,IAAI,EAAE,gBAAgB,EAAE,IAAI,EAAE,iBAAiB,EAAE,QAAQ,EAAE,eAAe,EAAE,OAAO,EAAE,qBAAqB,EAAE;oBAC9G,EAAE,IAAI,EAAE,gBAAgB,EAAE,IAAI,EAAE,iBAAiB,EAAE,QAAQ,EAAE,eAAe,EAAE,OAAO,EAAE,qBAAqB,EAAE;oBAC9G,EAAE,IAAI,EAAE,eAAe,EAAE,IAAI,EAAE,gBAAgB,EAAE,QAAQ,EAAE,cAAc,EAAE,OAAO,EAAE,oBAAoB,EAAE;oBAC1G,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,KAAK,EAAE,QAAQ,EAAE,eAAe,EAAE,OAAO,EAAE,UAAU,EAAE;iBAC7E;aACF;YACD;gBACE,IAAI,EAAE,OAAO;gBACb,QAAQ,EAAE,aAAa;gBACvB,QAAQ,EAAE;oBACR,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,WAAW,EAAE,QAAQ,EAAE,mBAAmB,EAAE,OAAO,EAAE,aAAa,EAAE;oBACzF,EAAE,IAAI,EAAE,UAAU,EAAE,IAAI,EAAE,gBAAgB,EAAE,QAAQ,EAAE,oBAAoB,EAAE,OAAO,EAAE,oBAAoB,EAAE;oBAC3G,EAAE,IAAI,EAAE,SAAS,EAAE,IAAI,EAAE,eAAe,EAAE,QAAQ,EAAE,cAAc,EAAE,OAAO,EAAE,mBAAmB,EAAE;iBACnG;aACF;YACD;gBACE,IAAI,EAAE,MAAM;gBACZ,QAAQ,EAAE,mBAAmB;gBAC7B,OAAO,EAAE,WAAW;aACrB;YACD;gBACE,IAAI,EAAE,QAAQ;gBACd,QAAQ,EAAE,iBAAiB;gBAC3B,QAAQ,EAAE;oBACR,EAAE,IAAI,EAAE,gBAAgB,EAAE,IAAI,EAAE,iBAAiB,EAAE,QAAQ,EAAE,gBAAgB,EAAE,OAAO,EAAE,qBAAqB,EAAE;oBAC/G,EAAE,IAAI,EAAE,WAAW,EAAE,IAAI,EAAE,YAAY,EAAE,QAAQ,EAAE,YAAY,EAAE,OAAO,EAAE,gBAAgB,EAAE;oBAC5F,EAAE,IAAI,EAAE,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,QAAQ,EAAE,cAAc,EAAE,OAAO,EAAE,YAAY,EAAE;iBAClF;aACF;YACD;gBACE,IAAI,EAAE,UAAU;gBAChB,QAAQ,EAAE,eAAe;gBACzB,QAAQ,EAAE;oBACR,EAAE,IAAI,EAAE,UAAU,EAAE,IAAI,EAAE,UAAU,EAAE,QAAQ,EAAE,YAAY,EAAE,OAAO,EAAE,uBAAuB,EAAE;oBAChG,EAAE,IAAI,EAAE,SAAS,EAAE,IAAI,EAAE,aAAa,EAAE,QAAQ,EAAE,kBAAkB,EAAE,OAAO,EAAE,sBAAsB,EAAE;oBACvG,EAAE,IAAI,EAAE,gBAAgB,EAAE,IAAI,EAAE,gBAAgB,EAAE,QAAQ,EAAE,aAAa,EAAE,OAAO,EAAE,6BAA6B,EAAE;iBACpH;aACF;YACD;gBACE,IAAI,EAAE,SAAS;gBACf,QAAQ,EAAE,cAAc;gBACxB,QAAQ,EAAE;oBACR,EAAE,IAAI,EAAE,WAAW,EAAE,IAAI,EAAE,WAAW,EAAE,QAAQ,EAAE,aAAa,EAAE,OAAO,EAAE,gBAAgB,EAAE;oBAC5F,EAAE,IAAI,EAAE,SAAS,EAAE,IAAI,EAAE,SAAS,EAAE,QAAQ,EAAE,cAAc,EAAE,OAAO,EAAE,cAAc,EAAE;oBACvF,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,KAAK,EAAE,QAAQ,EAAE,aAAa,EAAE,OAAO,EAAE,UAAU,EAAE;oBAC1E,EAAE,IAAI,EAAE,cAAc,EAAE,IAAI,EAAE,cAAc,EAAE,QAAQ,EAAE,mBAAmB,EAAE,OAAO,EAAE,mBAAmB,EAAE;iBAC5G;aACF;SACF,EAAC;QAEF,4FAA4F;QACpF,OAAO,CAAC,IAAiB;YAC/B,OAAO,IAAI,CAAC,IAAI,IAAI,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,CAAC,OAAO,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC;QAClE,CAAC;QAED,4EAA4E;QACpE,UAAU,CAAC,IAAiB;YAClC,OAAO,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,QAAQ,EAAE,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC;QAC/D,CAAC;QAED,wDAAwD;QAChD,cAAc,CAAC,QAAgB,EAAE,OAAsB;YAC7D,MAAM,GAAG,GAAG,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,KAAK,QAAQ,CAAC,CAAC;YACpE,IAAI,CAAC,GAAG;gBAAE,OAAO,SAAS,CAAC;YAC3B,IAAI,OAAO,IAAI,GAAG,CAAC,QAAQ,EAAE,CAAC;gBAC5B,OAAO,GAAG,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC,KAAK,OAAO,CAAC,IAAI,GAAG,CAAC;YACxE,CAAC;YACD,OAAO,GAAG,CAAC;QACb,CAAC;QAED,IAAY,cAAc;YACxB,MAAM,QAAQ,GAAgF,EAAE,CAAC;YACjG,MAAM,MAAM,GAAG,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC;YACvC,IAAI,MAAM,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,OAAO,EAAE,CAAC;gBACpC,QAAQ,CAAC,IAAI,CAAC;oBACZ,EAAE,EAAE,aAAa;oBACjB,IAAI,EAAE,SAAS;oBACf,OAAO,EAAE,wGAAwG;oBACjH,WAAW,EAAE,KAAK;iBACnB,CAAC,CAAC;YACL,CAAC;YACD,OAAO,QAAQ,CAAC;QAClB,CAAC;QAED;;;WAGG;QACH,IAAY,cAAc;YACxB,OAAO,CACL,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,OAAO,CAAC,UAAU,EAAE,IAAI,CAAC,OAAO,CAAC,aAAa,CAAC,IAAI,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,CAC7F,CAAC;QACJ,CAAC;QAED;YACE,KAAK,EAAE,CAAC;YACR,QAAQ,CAAC,KAAK,GAAG,oBAAoB,CAAC;YAEtC,2BAA2B;YAC3B,MAAM,iBAAiB,GAAG,QAAQ,CAAC,cAAc;iBAC9C,MAAM,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,QAAQ,CAAC;iBAC9B,SAAS,CAAC,CAAC,UAAU,EAAE,EAAE;gBACxB,IAAI,CAAC,UAAU,GAAG,UAAU,CAAC;gBAC7B,oCAAoC;gBACpC,IAAI,UAAU,CAAC,UAAU,EAAE,CAAC;oBAC1B,QAAQ,CAAC,cAAc,CAAC,cAAc,CAAC,QAAQ,CAAC,mBAAmB,EAAE,IAAI,CAAC,CAAC;oBAC3E,QAAQ,CAAC,eAAe,CAAC,cAAc,CAAC,QAAQ,CAAC,wBAAwB,EAAE,IAAI,CAAC,CAAC;gBACnF,CAAC;YACH,CAAC,CAAC,CAAC;YACL,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC,iBAAiB,CAAC,CAAC;YAE7C,kDAAkD;YAClD,MAAM,kBAAkB,GAAG,QAAQ,CAAC,eAAe;iBAChD,MAAM,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,QAAQ,CAAC;iBAC9B,SAAS,CAAC,CAAC,WAAW,EAAE,EAAE;gBACzB,IAAI,CAAC,WAAW,GAAG,WAAW,CAAC;YACjC,CAAC,CAAC,CAAC;YACL,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC,kBAAkB,CAAC,CAAC;YAE9C,wBAAwB;YACxB,MAAM,cAAc,GAAG,QAAQ,CAAC,WAAW;iBACxC,MAAM,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,QAAQ,CAAC;iBAC9B,SAAS,CAAC,CAAC,OAAO,EAAE,EAAE;gBACrB,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;gBACvB,mEAAmE;gBACnE,IAAI,CAAC,eAAe,CAAC,OAAO,CAAC,UAAU,EAAE,OAAO,CAAC,aAAa,CAAC,CAAC;YAClE,CAAC,CAAC,CAAC;YACL,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC;QAC5C,CAAC;QAED;;;WAGG;QACK,eAAe,CAAC,QAAgB,EAAE,WAA0B;YAClE,MAAM,OAAO,GAAG,IAAI,CAAC,UAAU,EAAE,aAAa,CAAC,qBAAqB,CAAQ,CAAC;YAC7E,IAAI,CAAC,OAAO;gBAAE,OAAO;YAErB,MAAM,UAAU,GAAG,IAAI,CAAC,cAAc,CAAC,QAAQ,EAAE,WAAW,CAAC,CAAC;YAC9D,IAAI,CAAC,UAAU;gBAAE,OAAO;YAExB,IAAI,OAAO,CAAC,YAAY,KAAK,UAAU;gBAAE,OAAO;YAEhD,oEAAoE;YACpE,8EAA8E;YAC9E,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC;QAC/B,CAAC;QAEM,MAAM,CAAC,MAAM,GAAG;YACrB,UAAU,CAAC,aAAa;YACxB,GAAG,CAAA;;;;;;;;;;;;;KAaF;SACF,CAAC;QAEK,MAAM;YACX,OAAO,IAAI,CAAA;;;;;;;wBAOS,IAAI,CAAC,QAAQ;4BACT,IAAI,CAAC,cAAc;8BACjB,IAAI,CAAC,cAAc;;;;;KAK5C,CAAC;QACJ,CAAC;QAEM,KAAK,CAAC,YAAY;YACvB,MAAM,WAAW,GAAG,IAAI,CAAC,UAAW,CAAC,aAAa,CAAC,mBAAmB,CAAQ,CAAC;YAC/E,WAAW,CAAC,gBAAgB,CAAC,OAAO,EAAE,CAAC,CAAQ,EAAE,EAAE;gBACjD,qBAAqB;gBACrB,MAAM,MAAM,GAAI,CAAiB,CAAC,MAAM,CAAC;gBACzC,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,QAAQ,EAAE,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;YACzD,CAAC,CAAC,CAAC;YAEH,sBAAsB;YACtB,MAAM,OAAO,GAAG,IAAI,CAAC,UAAW,CAAC,aAAa,CAAC,qBAAqB,CAAC,CAAC;YACtE,IAAI,OAAO,EAAE,CAAC;gBACZ,OAAO,CAAC,gBAAgB,CAAC,aAAa,EAAE,CAAC,CAAQ,EAAE,EAAE;oBACnD,MAAM,IAAI,GAAI,CAAiB,CAAC,MAAM,CAAC,IAAmB,CAAC;oBAC3D,MAAM,MAAM,GAAG,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC;oBACrC,MAAM,YAAY,GAAG,QAAQ,CAAC,WAAW,CAAC,QAAQ,EAAE,CAAC;oBACrD,IAAI,MAAM,EAAE,CAAC;wBACX,MAAM,UAAU,GAAG,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;wBACxC,MAAM,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;wBACnC,yEAAyE;wBACzE,IAAI,YAAY,EAAE,UAAU,KAAK,UAAU,IAAI,YAAY,EAAE,aAAa,KAAK,OAAO,EAAE,CAAC;4BACvF,OAAO;wBACT,CAAC;wBACD,SAAS,CAAC,cAAc,CAAC,UAAU,EAAE,OAAO,CAAC,CAAC;oBAChD,CAAC;yBAAM,CAAC;wBACN,MAAM,IAAI,GAAG,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;wBAChC,IAAI,YAAY,EAAE,UAAU,KAAK,IAAI,IAAI,CAAC,YAAY,EAAE,aAAa,EAAE,CAAC;4BACtE,OAAO;wBACT,CAAC;wBACD,SAAS,CAAC,cAAc,CAAC,IAAI,CAAC,CAAC;oBACjC,CAAC;gBACH,CAAC,CAAC,CAAC;gBAEH,sBAAsB;gBACtB,OAAO,CAAC,gBAAgB,CAAC,QAAQ,EAAE,KAAK,IAAI,EAAE;oBAC5C,MAAM,QAAQ,CAAC,cAAc,CAAC,cAAc,CAAC,QAAQ,CAAC,YAAY,EAAE,IAAI,CAAC,CAAC;gBAC5E,CAAC,CAAC,CAAC;YACL,CAAC;YAED,8EAA8E;YAC9E,MAAM,UAAU,GAAG,QAAQ,CAAC,cAAc,CAAC,QAAQ,EAAG,CAAC;YACvD,IAAI,UAAU,CAAC,QAAQ,EAAE,GAAG,EAAE,CAAC;gBAC7B,IAAI,UAAU,CAAC,QAAQ,CAAC,SAAS,GAAG,IAAI,CAAC,GAAG,EAAE,EAAE,CAAC;oBAC/C,iFAAiF;oBACjF,IAAI,CAAC;wBACH,MAAM,aAAa,GAAG,IAAI,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAC,YAAY,CAAC,YAAY,CAE1E,eAAe,EAAE,gBAAgB,CAAC,CAAC;wBACrC,MAAM,QAAQ,GAAG,MAAM,aAAa,CAAC,IAAI,CAAC,EAAE,QAAQ,EAAE,UAAU,CAAC,QAAQ,EAAE,CAAC,CAAC;wBAC7E,IAAI,QAAQ,CAAC,KAAK,EAAE,CAAC;4BACnB,gCAAgC;4BAChC,IAAI,CAAC,UAAU,GAAG,UAAU,CAAC;4BAC7B,MAAO,WAAmB,CAAC,sBAAsB,EAAE,CAAC;4BACpD,MAAM,QAAQ,CAAC,cAAc,CAAC,cAAc,CAAC,QAAQ,CAAC,mBAAmB,EAAE,IAAI,CAAC,CAAC;4BACjF,MAAM,QAAQ,CAAC,eAAe,CAAC,cAAc,CAAC,QAAQ,CAAC,wBAAwB,EAAE,IAAI,CAAC,CAAC;4BACvF,MAAM,IAAI,CAAC,oBAAoB,EAAE,CAAC;wBACpC,CAAC;6BAAM,CAAC;4BACN,oDAAoD;4BACpD,MAAM,QAAQ,CAAC,cAAc,CAAC,cAAc,CAAC,QAAQ,CAAC,YAAY,EAAE,IAAI,CAAC,CAAC;wBAC5E,CAAC;oBACH,CAAC;oBAAC,MAAM,CAAC;wBACP,wDAAwD;wBACxD,MAAM,QAAQ,CAAC,cAAc,CAAC,cAAc,CAAC,QAAQ,CAAC,YAAY,EAAE,IAAI,CAAC,CAAC;oBAC5E,CAAC;gBACH,CAAC;qBAAM,CAAC;oBACN,sCAAsC;oBACtC,MAAM,QAAQ,CAAC,cAAc,CAAC,cAAc,CAAC,QAAQ,CAAC,YAAY,EAAE,IAAI,CAAC,CAAC;gBAC5E,CAAC;YACH,CAAC;QACH,CAAC;QAEO,KAAK,CAAC,KAAK,CAAC,QAAgB,EAAE,QAAgB;YACpD,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,eAAe,CAAC;YAC5C,OAAO,CAAC,GAAG,CAAC,wBAAwB,CAAC,CAAC;YACtC,MAAM,WAAW,GAAG,IAAI,CAAC,UAAW,CAAC,aAAa,CAAC,mBAAmB,CAAQ,CAAC;YAC/E,MAAM,IAAI,GAAG,WAAW,CAAC,UAAW,CAAC,aAAa,CAAC,WAAW,CAAQ,CAAC;YACvE,IAAI,CAAC,SAAS,CAAC,SAAS,EAAE,eAAe,CAAC,CAAC;YAE3C,MAAM,KAAK,GAAG,MAAM,QAAQ,CAAC,cAAc,CAAC,cAAc,CAAC,QAAQ,CAAC,WAAW,EAAE;gBAC/E,QAAQ;gBACR,QAAQ;aACT,CAAC,CAAC;YAEH,IAAI,KAAK,CAAC,QAAQ,EAAE,CAAC;gBACnB,OAAO,CAAC,GAAG,CAAC,kBAAkB,CAAC,CAAC;gBAChC,IAAI,CAAC,UAAU,GAAG,KAAK,CAAC;gBACxB,IAAK,CAAC,SAAS,CAAC,SAAS,EAAE,YAAY,CAAC,CAAC;gBACzC,MAAM,WAAY,CAAC,sBAAsB,EAAE,CAAC;gBAC5C,MAAM,QAAQ,CAAC,cAAc,CAAC,cAAc,CAAC,QAAQ,CAAC,mBAAmB,EAAE,IAAI,CAAC,CAAC;gBACjF,MAAM,QAAQ,CAAC,eAAe,CAAC,cAAc,CAAC,QAAQ,CAAC,wBAAwB,EAAE,IAAI,CAAC,CAAC;gBACvF,MAAM,IAAI,CAAC,oBAAoB,EAAE,CAAC;YACpC,CAAC;iBAAM,CAAC;gBACN,IAAK,CAAC,SAAS,CAAC,OAAO,EAAE,eAAe,CAAC,CAAC;gBAC1C,MAAM,QAAQ,CAAC,WAAW,CAAC,UAAU,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;gBACrD,IAAK,CAAC,KAAK,EAAE,CAAC;YAChB,CAAC;QACH,CAAC;QAEO,KAAK,CAAC,oBAAoB;YAChC,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,QAAQ,IAAI,IAAI,CAAC,gBAAgB,EAAE,WAAW,EAAE,CAAC;gBACpE,OAAO;YACT,CAAC;YACD,IAAI,IAAI,CAAC,qBAAqB,EAAE,CAAC;gBAC/B,OAAO,IAAI,CAAC,qBAAqB,CAAC;YACpC,CAAC;YAED,IAAI,CAAC,qBAAqB,GAAG,CAAC,KAAK,IAAI,EAAE;gBACvC,IAAI,CAAC;oBACH,MAAM,MAAM,GAAG,MAAM,QAAQ,CAAC,uBAAuB,EAAE,CAAC;oBACxD,IAAI,MAAM,CAAC,cAAc,EAAE,CAAC;wBAC1B,MAAM,IAAI,CAAC,yBAAyB,CAAC,MAAM,CAAC,CAAC;oBAC/C,CAAC;gBACH,CAAC;gBAAC,OAAO,KAAK,EAAE,CAAC;oBACf,OAAO,CAAC,KAAK,CAAC,sCAAsC,EAAE,KAAK,CAAC,CAAC;gBAC/D,CAAC;wBAAS,CAAC;oBACT,IAAI,CAAC,qBAAqB,GAAG,SAAS,CAAC;gBACzC,CAAC;YACH,CAAC,CAAC,EAAE,CAAC;YAEL,OAAO,IAAI,CAAC,qBAAqB,CAAC;QACpC,CAAC;QAEO,KAAK,CAAC,yBAAyB,CAAC,SAAyC;YAC/E,MAAM,EAAE,WAAW,EAAE,GAAG,MAAM,MAAM,CAAC,6BAA6B,CAAC,CAAC;YACpE,IAAI,CAAC,gBAAgB,GAAG,MAAM,WAAW,CAAC,aAAa,CAAC;gBACtD,UAAU,EAAE,KAAK;gBACjB,KAAK,EAAE;oBACL;wBACE,KAAK,EAAE,wBAAwB;wBAC/B,OAAO,EAAE,IAAI,CAAA;;;;;;wCAMiB,OAAO,WAAW,aAAa,cAAc,IAAI;wCACjD,MAAM,WAAW,cAAc;wCAC/B,UAAU,WAAW,UAAU,cAAc,IAAI,oBAAoB,IAAI;wCACzE,iBAAiB,WAAW,kBAAkB,cAAc,IAAI,oBAAoB,IAAI;;yBAEvG,qBAAqB;2BACnB,uCAAuC;iCACjC,SAAS,CAAC,mBAAmB;4BAC1C,CAAC,CAAC,6EAA6E;4BAC/E,CAAC,CAAC,qEAAqE;;;;WAIhF;wBACD,WAAW,EAAE;4BACX;gCACE,IAAI,EAAE,cAAc;gCACpB,MAAM,EAAE,KAAK,EAAE,UAAe,EAAE,EAAE;oCAChC,MAAM,IAAI,GAAG,UAAU,CAAC,UAAU,EAAE,aAAa,CAAC,qBAAqB,CAAQ,CAAC;oCAChF,IAAI,CAAC,IAAI;wCAAE,OAAO;oCAClB,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,eAAe,EAAE,CAAC;oCAC9C,MAAM,KAAK,GAAG,MAAM,CAAC,QAAQ,CAAC,KAAK,IAAI,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC;oCAClD,MAAM,IAAI,GAAG,MAAM,CAAC,QAAQ,CAAC,IAAI,IAAI,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC;oCAChD,MAAM,QAAQ,GAAG,MAAM,CAAC,QAAQ,CAAC,QAAQ,IAAI,EAAE,CAAC,CAAC;oCACjD,MAAM,eAAe,GAAG,MAAM,CAAC,QAAQ,CAAC,eAAe,IAAI,EAAE,CAAC,CAAC;oCAE/D,IAAI,CAAC,KAAK,IAAI,CAAC,QAAQ,EAAE,CAAC;wCACxB,IAAI,CAAC,SAAS,EAAE,CAAC,OAAO,EAAE,kCAAkC,CAAC,CAAC;wCAC9D,OAAO;oCACT,CAAC;oCACD,IAAI,QAAQ,KAAK,eAAe,EAAE,CAAC;wCACjC,IAAI,CAAC,SAAS,EAAE,CAAC,OAAO,EAAE,yBAAyB,CAAC,CAAC;wCACrD,OAAO;oCACT,CAAC;oCAED,IAAI,CAAC;wCACH,IAAI,CAAC,SAAS,EAAE,CAAC,SAAS,EAAE,6BAA6B,CAAC,CAAC;wCAC3D,MAAM,QAAQ,CAAC,sBAAsB,CAAC;4CACpC,KAAK;4CACL,IAAI;4CACJ,QAAQ;4CACR,mBAAmB,EAAE,OAAO,CAAC,QAAQ,CAAC,mBAAmB,CAAC;yCAC3D,CAAC,CAAC;wCACH,IAAI,CAAC,SAAS,EAAE,CAAC,SAAS,EAAE,0BAA0B,CAAC,CAAC;wCACxD,MAAM,UAAU,CAAC,OAAO,EAAE,CAAC;wCAC3B,IAAI,CAAC,gBAAgB,GAAG,SAAS,CAAC;wCAClC,MAAM,QAAQ,CAAC,cAAc,CAAC,cAAc,CAAC,QAAQ,CAAC,gBAAgB,EAAE,IAAI,CAAC,CAAC;oCAChF,CAAC;oCAAC,OAAO,KAAK,EAAE,CAAC;wCACf,IAAI,CAAC,SAAS,EAAE,CAAC,OAAO,EAAE,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,yBAAyB,CAAC,CAAC;oCAChG,CAAC;gCACH,CAAC;6BACF;yBACF;qBACF;iBACF;aACF,CAAC,CAAC;QACL,CAAC;;YA/ZU,uDAAY;;;;;SAAZ,YAAY"}
502
+ //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"ops-dashboard.js","sourceRoot":"","sources":["../../../ts_web/elements/ops-dashboard.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,7 +1,7 @@
1
1
  {
2
2
  "name": "@serve.zone/dcrouter",
3
3
  "private": false,
4
- "version": "13.30.0",
4
+ "version": "13.32.0",
5
5
  "description": "A multifaceted routing service handling mail and SMS delivery functions.",
6
6
  "type": "module",
7
7
  "exports": {
@@ -28,7 +28,7 @@
28
28
  "@apiclient.xyz/cloudflare": "^7.1.0",
29
29
  "@design.estate/dees-catalog": "^3.81.0",
30
30
  "@design.estate/dees-element": "^2.2.4",
31
- "@idp.global/sdk": "^1.3.0",
31
+ "@idp.global/sdk": "^1.3.1",
32
32
  "@push.rocks/lik": "^6.4.1",
33
33
  "@push.rocks/projectinfo": "^5.1.0",
34
34
  "@push.rocks/qenv": "^6.1.4",
@@ -41,7 +41,7 @@
41
41
  "@push.rocks/smartjwt": "^2.2.2",
42
42
  "@push.rocks/smartlog": "^3.2.2",
43
43
  "@push.rocks/smartmetrics": "^3.0.3",
44
- "@push.rocks/smartmigration": "1.3.1",
44
+ "@push.rocks/smartmigration": "1.4.1",
45
45
  "@push.rocks/smartmta": "^5.3.3",
46
46
  "@push.rocks/smartnetwork": "^4.7.1",
47
47
  "@push.rocks/smartpath": "^6.0.0",
package/readme.md CHANGED
@@ -86,7 +86,7 @@ Bootstrap behavior:
86
86
  - `getAdminBootstrapStatus` reports whether persistence is ready and whether a first admin is required.
87
87
  - The temporary env/config admin identity is only used to authorize bootstrap access while no persisted admin exists.
88
88
  - `createInitialAdminUser` creates the first persisted admin with normalized email and local password authentication.
89
- - Optional `idp.global` authentication can be enabled for that local account; the local dcrouter role remains authoritative and the IdP email must match the local account email.
89
+ - Optional `idp.global` authentication can be enabled for that local account. The hosted `https://idp.global` endpoint is used by default, `adminAuth.idpGlobalUrl` or `DCROUTER_IDP_GLOBAL_URL` only override it, and the local dcrouter role remains authoritative.
90
90
  - After a persisted admin exists, temporary bootstrap admin login is rejected and normal persisted-account authentication is used.
91
91
 
92
92
  ## Configuration Model
@@ -3,6 +3,6 @@
3
3
  */
4
4
  export const commitinfo = {
5
5
  name: '@serve.zone/dcrouter',
6
- version: '13.30.0',
6
+ version: '13.32.0',
7
7
  description: 'A multifaceted routing service handling mail and SMS delivery functions.'
8
8
  }
@@ -169,7 +169,7 @@ export interface IDcRouterOptions {
169
169
 
170
170
  /** Optional OpsServer account authentication settings. */
171
171
  adminAuth?: {
172
- /** Base URL for idp.global password authentication. Can also be set through DCROUTER_IDP_GLOBAL_URL. */
172
+ /** Optional idp.global password-authentication URL override. Defaults to the SDK's hosted https://idp.global endpoint. Can also be set through DCROUTER_IDP_GLOBAL_URL. */
173
173
  idpGlobalUrl?: string;
174
174
  /** Test/integration hook for injecting an idp.global-compatible password client. */
175
175
  idpClient?: Pick<plugins.idpSdkServer.IdpGlobalServerClient, 'loginWithEmailAndPassword' | 'stop'>;
@@ -3,7 +3,6 @@ import * as plugins from '../plugins.js';
3
3
  import * as paths from '../paths.js';
4
4
  import * as handlers from './handlers/index.js';
5
5
  import * as interfaces from '../../ts_interfaces/index.js';
6
- import { requireValidIdentity, requireAdminIdentity } from './helpers/guards.js';
7
6
 
8
7
  export class OpsServer {
9
8
  public dcRouterRef: DcRouter;
@@ -12,9 +11,9 @@ export class OpsServer {
12
11
  // Main TypedRouter — unauthenticated endpoints (login/logout/verify) and own-auth handlers
13
12
  public typedrouter = new plugins.typedrequest.TypedRouter();
14
13
 
15
- // Auth-enforced routers middleware validates identity before any handler runs
16
- public viewRouter = new plugins.typedrequest.TypedRouter<{ request: { identity: interfaces.data.IIdentity } }>();
17
- public adminRouter = new plugins.typedrequest.TypedRouter<{ request: { identity: interfaces.data.IIdentity } }>();
14
+ // Grouped routers. Handlers enforce auth explicitly with per-endpoint scopes.
15
+ public viewRouter = new plugins.typedrequest.TypedRouter<{ request: { identity?: interfaces.data.IIdentity; apiToken?: string } }>();
16
+ public adminRouter = new plugins.typedrequest.TypedRouter<{ request: { identity?: interfaces.data.IIdentity; apiToken?: string } }>();
18
17
 
19
18
  // Handler instances
20
19
  public adminHandler!: handlers.AdminHandler;
@@ -72,16 +71,6 @@ export class OpsServer {
72
71
  this.adminHandler = new handlers.AdminHandler(this);
73
72
  await this.adminHandler.initialize();
74
73
 
75
- // viewRouter middleware: requires valid identity (any logged-in user)
76
- this.viewRouter.addMiddleware(async (typedRequest) => {
77
- await requireValidIdentity(this.adminHandler, typedRequest.request);
78
- });
79
-
80
- // adminRouter middleware: requires admin identity
81
- this.adminRouter.addMiddleware(async (typedRequest) => {
82
- await requireAdminIdentity(this.adminHandler, typedRequest.request);
83
- });
84
-
85
74
  // Connect auth routers to the main typedrouter
86
75
  this.typedrouter.addTypedRouter(this.viewRouter);
87
76
  this.typedrouter.addTypedRouter(this.adminRouter);
@@ -1,6 +1,7 @@
1
1
  import * as plugins from '../../plugins.js';
2
2
  import type { OpsServer } from '../classes.opsserver.js';
3
3
  import * as interfaces from '../../../ts_interfaces/index.js';
4
+ import { requireOpsAuth } from '../helpers/auth.js';
4
5
 
5
6
  /**
6
7
  * CRUD handler for the singleton `AcmeConfigDoc`.
@@ -20,29 +21,11 @@ export class AcmeConfigHandler {
20
21
  request: { identity?: interfaces.data.IIdentity; apiToken?: string },
21
22
  requiredScope?: interfaces.data.TApiTokenScope,
22
23
  ): Promise<string> {
23
- if (request.identity?.jwt) {
24
- try {
25
- const isAdmin = await this.opsServerRef.adminHandler.adminIdentityGuard.exec({
26
- identity: request.identity,
27
- });
28
- if (isAdmin) return request.identity.userId;
29
- } catch { /* fall through */ }
30
- }
31
-
32
- if (request.apiToken) {
33
- const tokenManager = this.opsServerRef.dcRouterRef.apiTokenManager;
34
- if (tokenManager) {
35
- const token = await tokenManager.validateToken(request.apiToken);
36
- if (token) {
37
- if (!requiredScope || tokenManager.hasScope(token, requiredScope)) {
38
- return token.createdBy;
39
- }
40
- throw new plugins.typedrequest.TypedResponseError('insufficient scope');
41
- }
42
- }
43
- }
44
-
45
- throw new plugins.typedrequest.TypedResponseError('unauthorized');
24
+ const auth = await requireOpsAuth(this.opsServerRef, request, {
25
+ scope: requiredScope,
26
+ requireAdminIdentity: requiredScope?.endsWith(':write'),
27
+ });
28
+ return auth.userId;
46
29
  }
47
30
 
48
31
  private registerHandlers(): void {
@@ -159,6 +159,93 @@ export class AdminHandler {
159
159
  throw new plugins.typedrequest.TypedResponseError((error as Error).message || 'failed to create initial admin');
160
160
  }
161
161
  }
162
+
163
+ public async createUser(optionsArg: {
164
+ email: string;
165
+ name?: string;
166
+ role: interfaces.requests.TUserManagementRole;
167
+ password: string;
168
+ enableIdpGlobalAuth?: boolean;
169
+ }): Promise<interfaces.requests.IReq_CreateUser['response']> {
170
+ const store = this.getAccountStore();
171
+ if (!store) {
172
+ return { success: false, message: 'database is not ready' };
173
+ }
174
+ if (!(await store.hasActiveAdminAccount())) {
175
+ return { success: false, message: 'initial admin bootstrap is required before creating users' };
176
+ }
177
+
178
+ const role = optionsArg.role;
179
+ if (role !== 'admin' && role !== 'user') {
180
+ return { success: false, message: 'role must be admin or user' };
181
+ }
182
+
183
+ const password = String(optionsArg.password || '');
184
+ if (!password) {
185
+ return { success: false, message: 'password is required' };
186
+ }
187
+
188
+ const authSources: Array<'local' | 'idp.global'> = ['local'];
189
+ if (optionsArg.enableIdpGlobalAuth) {
190
+ authSources.push('idp.global');
191
+ }
192
+
193
+ try {
194
+ const email = String(optionsArg.email || '').trim();
195
+ const account = await store.createAccount({
196
+ email,
197
+ name: String(optionsArg.name || '').trim() || email,
198
+ role,
199
+ authSources,
200
+ password,
201
+ });
202
+ return { success: true, user: this.accountToUser(account) };
203
+ } catch (error) {
204
+ return { success: false, message: (error as Error).message || 'failed to create user' };
205
+ }
206
+ }
207
+
208
+ public async deleteUser(optionsArg: {
209
+ id: string;
210
+ requestingUserId: string;
211
+ }): Promise<interfaces.requests.IReq_DeleteUser['response']> {
212
+ const store = this.getAccountStore();
213
+ if (!store) {
214
+ return { success: false, message: 'database is not ready' };
215
+ }
216
+ if (!(await store.hasActiveAdminAccount())) {
217
+ return { success: false, message: 'initial admin bootstrap is required before deleting users' };
218
+ }
219
+
220
+ const id = String(optionsArg.id || '').trim();
221
+ if (!id) {
222
+ return { success: false, message: 'user id is required' };
223
+ }
224
+ if (id === optionsArg.requestingUserId) {
225
+ return { success: false, message: 'cannot delete the current user' };
226
+ }
227
+
228
+ const account = await store.getAccountById(id);
229
+ if (!account) {
230
+ return { success: false, message: 'user not found' };
231
+ }
232
+
233
+ if (account.role === 'admin' && account.status === 'active') {
234
+ const activeAdmins = (await store.listAccounts()).filter(
235
+ (accountArg) => accountArg.role === 'admin' && accountArg.status === 'active',
236
+ );
237
+ if (activeAdmins.length <= 1) {
238
+ return { success: false, message: 'cannot delete the last active admin' };
239
+ }
240
+ }
241
+
242
+ const doc = await plugins.idpSdkServer.IdpSdkAccountDoc.findById(id);
243
+ if (!doc) {
244
+ return { success: false, message: 'user not found' };
245
+ }
246
+ await doc.delete();
247
+ return { success: true };
248
+ }
162
249
 
163
250
  private registerHandlers(): void {
164
251
  this.typedrouter.addTypedHandler(
@@ -171,12 +258,18 @@ export class AdminHandler {
171
258
  this.opsServerRef.adminRouter.addTypedHandler(
172
259
  new plugins.typedrequest.TypedHandler<interfaces.requests.IReq_CreateInitialAdminUser>(
173
260
  'createInitialAdminUser',
174
- async (dataArg) => this.createInitialAdminUser({
175
- email: dataArg.email,
176
- name: dataArg.name,
177
- password: dataArg.password,
178
- enableIdpGlobalAuth: dataArg.enableIdpGlobalAuth,
179
- })
261
+ async (dataArg) => {
262
+ const isAdmin = await this.adminIdentityGuard.exec({ identity: dataArg.identity });
263
+ if (!isAdmin) {
264
+ throw new plugins.typedrequest.TypedResponseError('admin identity required');
265
+ }
266
+ return this.createInitialAdminUser({
267
+ email: dataArg.email,
268
+ name: dataArg.name,
269
+ password: dataArg.password,
270
+ enableIdpGlobalAuth: dataArg.enableIdpGlobalAuth,
271
+ });
272
+ }
180
273
  )
181
274
  );
182
275
 
@@ -213,8 +306,10 @@ export class AdminHandler {
213
306
  new plugins.typedrequest.TypedHandler<interfaces.requests.IReq_AdminLogout>(
214
307
  'adminLogout',
215
308
  async (dataArg) => {
216
- // In a real implementation, you might want to blacklist the JWT
217
- // For now, just return success
309
+ const identity = await this.validateIdentity(dataArg.identity);
310
+ if (!identity) {
311
+ throw new plugins.typedrequest.TypedResponseError('identity is not valid');
312
+ }
218
313
  return {
219
314
  success: true,
220
315
  };
@@ -227,52 +322,8 @@ export class AdminHandler {
227
322
  new plugins.typedrequest.TypedHandler<interfaces.requests.IReq_VerifyIdentity>(
228
323
  'verifyIdentity',
229
324
  async (dataArg) => {
230
- if (!dataArg.identity?.jwt) {
231
- return {
232
- valid: false,
233
- };
234
- }
235
-
236
- try {
237
- const jwtData = await this.smartjwtInstance.verifyJWTAndGetData(dataArg.identity.jwt);
238
-
239
- // Check if expired
240
- if (jwtData.expiresAt < Date.now()) {
241
- return {
242
- valid: false,
243
- };
244
- }
245
-
246
- // Check if logged in
247
- if (jwtData.status !== 'loggedIn') {
248
- return {
249
- valid: false,
250
- };
251
- }
252
-
253
- const user = await this.resolveUser(jwtData.userId);
254
- if (!user) {
255
- return {
256
- valid: false,
257
- };
258
- }
259
-
260
- return {
261
- valid: true,
262
- identity: {
263
- jwt: dataArg.identity.jwt,
264
- userId: user.id,
265
- name: user.name || user.username,
266
- expiresAt: jwtData.expiresAt,
267
- role: user.role,
268
- type: 'user',
269
- },
270
- };
271
- } catch (error) {
272
- return {
273
- valid: false,
274
- };
275
- }
325
+ const identity = await this.validateIdentity(dataArg.identity);
326
+ return identity ? { valid: true, identity } : { valid: false };
276
327
  }
277
328
  )
278
329
  );
@@ -285,45 +336,7 @@ export class AdminHandler {
285
336
  identity: interfaces.data.IIdentity;
286
337
  }>(
287
338
  async (dataArg) => {
288
- if (!dataArg.identity?.jwt) {
289
- return false;
290
- }
291
-
292
- try {
293
- const jwtData = await this.smartjwtInstance.verifyJWTAndGetData(dataArg.identity.jwt);
294
-
295
- // Check expiration
296
- if (jwtData.expiresAt < Date.now()) {
297
- return false;
298
- }
299
-
300
- // Check status
301
- if (jwtData.status !== 'loggedIn') {
302
- return false;
303
- }
304
-
305
- // Verify data hasn't been tampered with
306
- if (dataArg.identity.expiresAt !== jwtData.expiresAt) {
307
- return false;
308
- }
309
-
310
- if (dataArg.identity.userId !== jwtData.userId) {
311
- return false;
312
- }
313
-
314
- const user = await this.resolveUser(jwtData.userId);
315
- if (!user) {
316
- return false;
317
- }
318
-
319
- if (dataArg.identity.role && dataArg.identity.role !== user.role) {
320
- return false;
321
- }
322
-
323
- return true;
324
- } catch (error) {
325
- return false;
326
- }
339
+ return Boolean(await this.validateIdentity(dataArg.identity));
327
340
  },
328
341
  {
329
342
  failedHint: 'identity is not valid',
@@ -338,14 +351,8 @@ export class AdminHandler {
338
351
  identity: interfaces.data.IIdentity;
339
352
  }>(
340
353
  async (dataArg) => {
341
- // First check if identity is valid
342
- const isValid = await this.validIdentityGuard.exec(dataArg);
343
- if (!isValid) {
344
- return false;
345
- }
346
-
347
- // Check if user has admin role
348
- return dataArg.identity.role === 'admin';
354
+ const identity = await this.validateIdentity(dataArg.identity);
355
+ return identity?.role === 'admin';
349
356
  },
350
357
  {
351
358
  failedHint: 'user is not admin',
@@ -353,6 +360,49 @@ export class AdminHandler {
353
360
  }
354
361
  );
355
362
 
363
+ public async validateIdentity(
364
+ identityArg?: interfaces.data.IIdentity,
365
+ ): Promise<interfaces.data.IIdentity | null> {
366
+ if (!identityArg?.jwt) {
367
+ return null;
368
+ }
369
+
370
+ try {
371
+ const jwtData = await this.smartjwtInstance.verifyJWTAndGetData(identityArg.jwt);
372
+ if (jwtData.expiresAt < Date.now()) {
373
+ return null;
374
+ }
375
+ if (jwtData.status !== 'loggedIn') {
376
+ return null;
377
+ }
378
+ if (identityArg.expiresAt !== jwtData.expiresAt) {
379
+ return null;
380
+ }
381
+ if (identityArg.userId !== jwtData.userId) {
382
+ return null;
383
+ }
384
+
385
+ const user = await this.resolveUser(jwtData.userId);
386
+ if (!user) {
387
+ return null;
388
+ }
389
+ if (identityArg.role && identityArg.role !== user.role) {
390
+ return null;
391
+ }
392
+
393
+ return {
394
+ jwt: identityArg.jwt,
395
+ userId: user.id,
396
+ name: user.name || user.username,
397
+ expiresAt: jwtData.expiresAt,
398
+ role: user.role,
399
+ type: 'user',
400
+ };
401
+ } catch {
402
+ return null;
403
+ }
404
+ }
405
+
356
406
  private async authenticateUser(optionsArg: {
357
407
  username: string;
358
408
  password: string;
@@ -420,23 +470,17 @@ export class AdminHandler {
420
470
  }
421
471
 
422
472
  const baseUrl = this.opsServerRef.dcRouterRef.options.adminAuth?.idpGlobalUrl || process.env.DCROUTER_IDP_GLOBAL_URL;
423
- if (!baseUrl) {
424
- return undefined;
425
- }
426
-
427
473
  if (!this.idpClient) {
428
- this.idpClient = new plugins.idpSdkServer.IdpGlobalServerClient({ baseUrl });
474
+ this.idpClient = baseUrl
475
+ ? new plugins.idpSdkServer.IdpGlobalServerClient({ baseUrl })
476
+ : new plugins.idpSdkServer.IdpGlobalServerClient({} as plugins.idpSdkServer.IIdpGlobalServerClientOptions);
429
477
  this.ownsIdpClient = true;
430
478
  }
431
479
  return this.idpClient;
432
480
  }
433
481
 
434
482
  private isIdpGlobalConfigured(): boolean {
435
- return !!(
436
- this.opsServerRef.dcRouterRef.options.adminAuth?.idpClient ||
437
- this.opsServerRef.dcRouterRef.options.adminAuth?.idpGlobalUrl ||
438
- process.env.DCROUTER_IDP_GLOBAL_URL
439
- );
483
+ return true;
440
484
  }
441
485
 
442
486
  private accountToUser(accountArg: plugins.idpSdkServer.IIdpSdkAccount): TAdminUser {
@@ -1,6 +1,7 @@
1
1
  import * as plugins from '../../plugins.js';
2
2
  import type { OpsServer } from '../classes.opsserver.js';
3
3
  import * as interfaces from '../../../ts_interfaces/index.js';
4
+ import { requireOpsAuth } from '../helpers/auth.js';
4
5
 
5
6
  export class ApiTokenHandler {
6
7
  constructor(private opsServerRef: OpsServer) {
@@ -17,6 +18,11 @@ export class ApiTokenHandler {
17
18
  new plugins.typedrequest.TypedHandler<interfaces.requests.IReq_CreateApiToken>(
18
19
  'createApiToken',
19
20
  async (dataArg) => {
21
+ const auth = await requireOpsAuth(this.opsServerRef, dataArg, {
22
+ scope: 'tokens:manage',
23
+ requireAdminIdentity: true,
24
+ requireAdminToken: true,
25
+ });
20
26
  const manager = this.opsServerRef.dcRouterRef.apiTokenManager;
21
27
  if (!manager) {
22
28
  return { success: false, message: 'Token management not initialized' };
@@ -25,7 +31,7 @@ export class ApiTokenHandler {
25
31
  dataArg.name,
26
32
  dataArg.scopes,
27
33
  dataArg.expiresInDays ?? null,
28
- dataArg.identity.userId,
34
+ auth.userId,
29
35
  dataArg.policy,
30
36
  );
31
37
  return { success: true, tokenId: result.id, tokenValue: result.rawToken };
@@ -38,6 +44,11 @@ export class ApiTokenHandler {
38
44
  new plugins.typedrequest.TypedHandler<interfaces.requests.IReq_ListApiTokens>(
39
45
  'listApiTokens',
40
46
  async (dataArg) => {
47
+ await requireOpsAuth(this.opsServerRef, dataArg, {
48
+ scope: 'tokens:read',
49
+ requireAdminIdentity: true,
50
+ requireAdminToken: true,
51
+ });
41
52
  const manager = this.opsServerRef.dcRouterRef.apiTokenManager;
42
53
  if (!manager) {
43
54
  return { tokens: [] };
@@ -52,6 +63,11 @@ export class ApiTokenHandler {
52
63
  new plugins.typedrequest.TypedHandler<interfaces.requests.IReq_RevokeApiToken>(
53
64
  'revokeApiToken',
54
65
  async (dataArg) => {
66
+ await requireOpsAuth(this.opsServerRef, dataArg, {
67
+ scope: 'tokens:manage',
68
+ requireAdminIdentity: true,
69
+ requireAdminToken: true,
70
+ });
55
71
  const manager = this.opsServerRef.dcRouterRef.apiTokenManager;
56
72
  if (!manager) {
57
73
  return { success: false, message: 'Token management not initialized' };
@@ -67,6 +83,11 @@ export class ApiTokenHandler {
67
83
  new plugins.typedrequest.TypedHandler<interfaces.requests.IReq_RollApiToken>(
68
84
  'rollApiToken',
69
85
  async (dataArg) => {
86
+ await requireOpsAuth(this.opsServerRef, dataArg, {
87
+ scope: 'tokens:manage',
88
+ requireAdminIdentity: true,
89
+ requireAdminToken: true,
90
+ });
70
91
  const manager = this.opsServerRef.dcRouterRef.apiTokenManager;
71
92
  if (!manager) {
72
93
  return { success: false, message: 'Token management not initialized' };
@@ -85,6 +106,11 @@ export class ApiTokenHandler {
85
106
  new plugins.typedrequest.TypedHandler<interfaces.requests.IReq_ToggleApiToken>(
86
107
  'toggleApiToken',
87
108
  async (dataArg) => {
109
+ await requireOpsAuth(this.opsServerRef, dataArg, {
110
+ scope: 'tokens:manage',
111
+ requireAdminIdentity: true,
112
+ requireAdminToken: true,
113
+ });
88
114
  const manager = this.opsServerRef.dcRouterRef.apiTokenManager;
89
115
  if (!manager) {
90
116
  return { success: false, message: 'Token management not initialized' };