@researchdatabox/redbox-core 5.0.4-beta.12498 → 5.0.5

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 (616) hide show
  1. package/dist/CoreController.d.ts +3 -7
  2. package/dist/CoreController.d.ts.map +1 -1
  3. package/dist/CoreController.js +3 -85
  4. package/dist/DatastreamService.d.ts +2 -4
  5. package/dist/DatastreamService.d.ts.map +1 -1
  6. package/dist/HarvestRunService.d.ts +3 -4
  7. package/dist/HarvestRunService.d.ts.map +1 -1
  8. package/dist/HarvestRunService.js +1 -1
  9. package/dist/QueueService.d.ts +1 -1
  10. package/dist/QueueService.d.ts.map +1 -1
  11. package/dist/RecordWriteOptions.d.ts +21 -0
  12. package/dist/RecordWriteOptions.d.ts.map +1 -0
  13. package/dist/RecordWriteOptions.js +17 -0
  14. package/dist/RecordsService.d.ts +14 -105
  15. package/dist/RecordsService.d.ts.map +1 -1
  16. package/dist/RecordsService.js +1 -44
  17. package/dist/SearchService.d.ts +1 -2
  18. package/dist/SearchService.d.ts.map +1 -1
  19. package/dist/StorageService.d.ts +20 -48
  20. package/dist/StorageService.d.ts.map +1 -1
  21. package/dist/StorageService.js +1 -19
  22. package/dist/StorageServiceResponse.d.ts +1 -22
  23. package/dist/StorageServiceResponse.d.ts.map +1 -1
  24. package/dist/StorageServiceResponse.js +4 -22
  25. package/dist/api-routes/groups/branding.d.ts +0 -8
  26. package/dist/api-routes/groups/branding.d.ts.map +1 -1
  27. package/dist/api-routes/groups/branding.js +11 -86
  28. package/dist/api-routes/groups/dashboard-config.d.ts +9 -12
  29. package/dist/api-routes/groups/dashboard-config.d.ts.map +1 -1
  30. package/dist/api-routes/groups/dashboard-config.js +73 -136
  31. package/dist/api-routes/groups/forms.d.ts.map +1 -1
  32. package/dist/api-routes/groups/forms.js +2 -10
  33. package/dist/api-routes/groups/records.d.ts +0 -1
  34. package/dist/api-routes/groups/records.d.ts.map +1 -1
  35. package/dist/api-routes/groups/records.js +26 -141
  36. package/dist/api-routes/index.d.ts +0 -3
  37. package/dist/api-routes/index.d.ts.map +1 -1
  38. package/dist/api-routes/index.js +1 -4
  39. package/dist/api-routes/openapi.d.ts.map +1 -1
  40. package/dist/api-routes/openapi.js +5 -7
  41. package/dist/api-routes/request-extraction.d.ts.map +1 -1
  42. package/dist/api-routes/request-extraction.js +8 -10
  43. package/dist/api-routes/route-factory.d.ts.map +1 -1
  44. package/dist/api-routes/route-factory.js +1 -2
  45. package/dist/api-routes/route-registry.d.ts.map +1 -1
  46. package/dist/api-routes/route-registry.js +1 -3
  47. package/dist/api-routes/schemas/common.d.ts +0 -36
  48. package/dist/api-routes/schemas/common.d.ts.map +1 -1
  49. package/dist/api-routes/schemas/common.js +5 -95
  50. package/dist/api-routes/schemas/responses.d.ts +1 -1424
  51. package/dist/api-routes/schemas/responses.d.ts.map +1 -1
  52. package/dist/api-routes/schemas/responses.js +60 -382
  53. package/dist/api-routes/types.d.ts +0 -1
  54. package/dist/api-routes/types.d.ts.map +1 -1
  55. package/dist/api-routes/validation.d.ts +1 -5
  56. package/dist/api-routes/validation.d.ts.map +1 -1
  57. package/dist/api-routes/validation.js +15 -14
  58. package/dist/bootstrap.d.ts +1 -3
  59. package/dist/bootstrap.d.ts.map +1 -1
  60. package/dist/bootstrap.js +41 -58
  61. package/dist/config/agendaQueue.config.d.ts +0 -3
  62. package/dist/config/agendaQueue.config.d.ts.map +1 -1
  63. package/dist/config/agendaQueue.config.js +11 -29
  64. package/dist/config/branding.config.d.ts +0 -13
  65. package/dist/config/branding.config.d.ts.map +1 -1
  66. package/dist/config/branding.config.js +2 -34
  67. package/dist/config/brandingConfigurationDefaults.config.d.ts +0 -4
  68. package/dist/config/brandingConfigurationDefaults.config.d.ts.map +1 -1
  69. package/dist/config/brandingConfigurationDefaults.config.js +3 -42
  70. package/dist/config/datapubs.config.d.ts +72 -0
  71. package/dist/config/datapubs.config.d.ts.map +1 -0
  72. package/dist/config/datapubs.config.js +74 -0
  73. package/dist/config/i18n.config.d.ts +4 -0
  74. package/dist/config/i18n.config.d.ts.map +1 -1
  75. package/dist/config/i18n.config.js +1 -1
  76. package/dist/config/index.d.ts +4 -12
  77. package/dist/config/index.d.ts.map +1 -1
  78. package/dist/config/index.js +4 -7
  79. package/dist/config/policies.config.d.ts.map +1 -1
  80. package/dist/config/policies.config.js +23 -37
  81. package/dist/config/raid.config.d.ts +4 -7
  82. package/dist/config/raid.config.d.ts.map +1 -1
  83. package/dist/config/raid.config.js +35 -21
  84. package/dist/config/record.config.d.ts +0 -3
  85. package/dist/config/record.config.d.ts.map +1 -1
  86. package/dist/config/record.config.js +35 -37
  87. package/dist/config/recordtype.config.d.ts +9 -32
  88. package/dist/config/recordtype.config.d.ts.map +1 -1
  89. package/dist/config/recordtype.config.js +7 -4
  90. package/dist/config/routes.config.d.ts.map +1 -1
  91. package/dist/config/routes.config.js +53 -135
  92. package/dist/config/session.config.d.ts +2 -2
  93. package/dist/config/session.config.d.ts.map +1 -1
  94. package/dist/config/workflow.config.d.ts +0 -6
  95. package/dist/config/workflow.config.d.ts.map +1 -1
  96. package/dist/config/workflow.config.js +1 -1
  97. package/dist/configmodels/AdminSidebarConfig.d.ts.map +1 -1
  98. package/dist/configmodels/AdminSidebarConfig.js +2 -4
  99. package/dist/configmodels/ConfigModels.d.ts +1 -1
  100. package/dist/configmodels/ConfigModels.d.ts.map +1 -1
  101. package/dist/configmodels/ConfigModels.js +9 -26
  102. package/dist/configmodels/FigsharePublishing.d.ts +103 -0
  103. package/dist/configmodels/FigsharePublishing.d.ts.map +1 -1
  104. package/dist/configmodels/FigsharePublishing.js +36 -2
  105. package/dist/controllers/AppConfigController.d.ts.map +1 -1
  106. package/dist/controllers/AppConfigController.js +1 -4
  107. package/dist/controllers/BrandingAppController.d.ts +7 -29
  108. package/dist/controllers/BrandingAppController.d.ts.map +1 -1
  109. package/dist/controllers/BrandingAppController.js +69 -265
  110. package/dist/controllers/BrandingController.d.ts +1 -24
  111. package/dist/controllers/BrandingController.d.ts.map +1 -1
  112. package/dist/controllers/BrandingController.js +43 -173
  113. package/dist/controllers/DashboardConfigController.d.ts +2 -6
  114. package/dist/controllers/DashboardConfigController.d.ts.map +1 -1
  115. package/dist/controllers/DashboardConfigController.js +4 -18
  116. package/dist/controllers/DynamicAssetController.d.ts +5 -7
  117. package/dist/controllers/DynamicAssetController.d.ts.map +1 -1
  118. package/dist/controllers/DynamicAssetController.js +12 -21
  119. package/dist/controllers/RecordAuditController.d.ts.map +1 -1
  120. package/dist/controllers/RecordAuditController.js +24 -6
  121. package/dist/controllers/RecordController.d.ts +4 -45
  122. package/dist/controllers/RecordController.d.ts.map +1 -1
  123. package/dist/controllers/RecordController.js +345 -778
  124. package/dist/controllers/index.d.ts.map +1 -1
  125. package/dist/controllers/index.js +1 -4
  126. package/dist/controllers/webservice/AdminController.d.ts.map +1 -1
  127. package/dist/controllers/webservice/AdminController.js +3 -4
  128. package/dist/controllers/webservice/BrandingController.d.ts +1 -26
  129. package/dist/controllers/webservice/BrandingController.d.ts.map +1 -1
  130. package/dist/controllers/webservice/BrandingController.js +116 -292
  131. package/dist/controllers/webservice/DashboardConfigController.d.ts +17 -25
  132. package/dist/controllers/webservice/DashboardConfigController.d.ts.map +1 -1
  133. package/dist/controllers/webservice/DashboardConfigController.js +205 -90
  134. package/dist/controllers/webservice/FormManagementController.d.ts.map +1 -1
  135. package/dist/controllers/webservice/FormManagementController.js +3 -37
  136. package/dist/controllers/webservice/RecordController.d.ts +1 -15
  137. package/dist/controllers/webservice/RecordController.d.ts.map +1 -1
  138. package/dist/controllers/webservice/RecordController.js +267 -647
  139. package/dist/controllers/webservice/RecordTypeController.d.ts +1 -6
  140. package/dist/controllers/webservice/RecordTypeController.d.ts.map +1 -1
  141. package/dist/controllers/webservice/RecordTypeController.js +3 -21
  142. package/dist/controllers/webservice/SearchController.d.ts.map +1 -1
  143. package/dist/controllers/webservice/SearchController.js +3 -7
  144. package/dist/hooks/defineRedboxHook.d.ts +0 -3
  145. package/dist/hooks/defineRedboxHook.d.ts.map +1 -1
  146. package/dist/hooks/defineRedboxHook.js +1 -4
  147. package/dist/index.d.ts +25 -50
  148. package/dist/index.d.ts.map +1 -1
  149. package/dist/index.js +4 -90
  150. package/dist/loader/bootstrapShimRuntime.d.ts +1 -1
  151. package/dist/loader/bootstrapShimRuntime.d.ts.map +1 -1
  152. package/dist/loader/bootstrapShimRuntime.js +12 -20
  153. package/dist/loader/index.d.ts +0 -9
  154. package/dist/loader/index.d.ts.map +1 -1
  155. package/dist/loader/index.js +4 -93
  156. package/dist/middleware/redboxSession.d.ts.map +1 -1
  157. package/dist/middleware/redboxSession.js +15 -3
  158. package/dist/model/BuildResponse.d.ts +11 -25
  159. package/dist/model/BuildResponse.d.ts.map +1 -1
  160. package/dist/model/BuildResponse.js +3 -4
  161. package/dist/model/DashboardTypeResponseModel.d.ts +0 -6
  162. package/dist/model/DashboardTypeResponseModel.d.ts.map +1 -1
  163. package/dist/model/DashboardTypeResponseModel.js +1 -7
  164. package/dist/model/DashboardViewResponseModel.d.ts +1 -5
  165. package/dist/model/DashboardViewResponseModel.d.ts.map +1 -1
  166. package/dist/model/DashboardViewResponseModel.js +3 -6
  167. package/dist/model/RBValidationError.d.ts +0 -17
  168. package/dist/model/RBValidationError.d.ts.map +1 -1
  169. package/dist/model/RBValidationError.js +1 -37
  170. package/dist/model/RecordTypeResponseModel.d.ts +4 -12
  171. package/dist/model/RecordTypeResponseModel.d.ts.map +1 -1
  172. package/dist/model/RecordTypeResponseModel.js +2 -11
  173. package/dist/model/index.d.ts +1 -5
  174. package/dist/model/index.d.ts.map +1 -1
  175. package/dist/model/index.js +2 -5
  176. package/dist/model/storage/BrandingModel.d.ts +0 -7
  177. package/dist/model/storage/BrandingModel.d.ts.map +1 -1
  178. package/dist/model/storage/BrandingModel.js +1 -7
  179. package/dist/model/storage/DeletedRecordModel.d.ts +0 -35
  180. package/dist/model/storage/DeletedRecordModel.d.ts.map +1 -1
  181. package/dist/model/storage/DeletedRecordModel.js +1 -62
  182. package/dist/model/storage/FigshareSyncModel.d.ts +126 -0
  183. package/dist/model/storage/FigshareSyncModel.d.ts.map +1 -0
  184. package/dist/model/storage/FigshareSyncModel.js +3 -0
  185. package/dist/model/storage/IntegrationAuditModel.d.ts +2 -16
  186. package/dist/model/storage/IntegrationAuditModel.d.ts.map +1 -1
  187. package/dist/model/storage/IntegrationAuditModel.js +1 -15
  188. package/dist/model/storage/RecordAuditModel.d.ts +4 -11
  189. package/dist/model/storage/RecordAuditModel.d.ts.map +1 -1
  190. package/dist/model/storage/RecordAuditModel.js +30 -8
  191. package/dist/model/storage/RecordModel.d.ts +3 -6
  192. package/dist/model/storage/RecordModel.d.ts.map +1 -1
  193. package/dist/model/storage/RecordTypeModel.d.ts +0 -6
  194. package/dist/model/storage/RecordTypeModel.d.ts.map +1 -1
  195. package/dist/model/storage/RecordTypeModel.js +1 -4
  196. package/dist/model/storage/index.d.ts +10 -12
  197. package/dist/model/storage/index.d.ts.map +1 -1
  198. package/dist/model/storage/index.js +2 -24
  199. package/dist/policies/checkAuth.d.ts +6 -2
  200. package/dist/policies/checkAuth.d.ts.map +1 -1
  201. package/dist/policies/checkAuth.js +9 -32
  202. package/dist/policies/contentSecurityPolicy.d.ts.map +1 -1
  203. package/dist/policies/contentSecurityPolicy.js +2 -85
  204. package/dist/policies/index.d.ts +2 -3
  205. package/dist/policies/index.d.ts.map +1 -1
  206. package/dist/policies/index.js +2 -4
  207. package/dist/policies/validateApiContractRequest.d.ts.map +1 -1
  208. package/dist/policies/validateApiContractRequest.js +11 -49
  209. package/dist/services/AgendaQueueService.d.ts +1 -1
  210. package/dist/services/AgendaQueueService.d.ts.map +1 -1
  211. package/dist/services/AgendaQueueService.js +7 -4
  212. package/dist/services/AppConfigService.d.ts +0 -6
  213. package/dist/services/AppConfigService.d.ts.map +1 -1
  214. package/dist/services/AppConfigService.js +1 -23
  215. package/dist/services/AttachmentMetadataService.d.ts +0 -58
  216. package/dist/services/AttachmentMetadataService.d.ts.map +1 -1
  217. package/dist/services/AttachmentMetadataService.js +8 -643
  218. package/dist/services/BrandingLogoService.d.ts +1 -6
  219. package/dist/services/BrandingLogoService.d.ts.map +1 -1
  220. package/dist/services/BrandingLogoService.js +9 -77
  221. package/dist/services/BrandingService.d.ts +9 -171
  222. package/dist/services/BrandingService.d.ts.map +1 -1
  223. package/dist/services/BrandingService.js +68 -572
  224. package/dist/services/BrandingThemeCssService.d.ts +1 -17
  225. package/dist/services/BrandingThemeCssService.d.ts.map +1 -1
  226. package/dist/services/BrandingThemeCssService.js +12 -71
  227. package/dist/services/BrandingThemeTokens.d.ts.map +1 -1
  228. package/dist/services/BrandingThemeTokens.js +2 -1
  229. package/dist/services/DashboardConfigService.d.ts +54 -214
  230. package/dist/services/DashboardConfigService.d.ts.map +1 -1
  231. package/dist/services/DashboardConfigService.js +261 -829
  232. package/dist/services/DashboardTypesService.d.ts +4 -15
  233. package/dist/services/DashboardTypesService.d.ts.map +1 -1
  234. package/dist/services/DashboardTypesService.js +139 -72
  235. package/dist/services/DoiService.d.ts +1 -1
  236. package/dist/services/DoiService.d.ts.map +1 -1
  237. package/dist/services/DoiService.js +45 -71
  238. package/dist/services/FigshareService.d.ts +15 -10
  239. package/dist/services/FigshareService.d.ts.map +1 -1
  240. package/dist/services/FigshareService.js +82 -583
  241. package/dist/services/FormRecordConsistencyService.d.ts +23 -8
  242. package/dist/services/FormRecordConsistencyService.d.ts.map +1 -1
  243. package/dist/services/FormRecordConsistencyService.js +70 -54
  244. package/dist/services/FormsService.d.ts +2 -91
  245. package/dist/services/FormsService.d.ts.map +1 -1
  246. package/dist/services/FormsService.js +64 -324
  247. package/dist/services/HarvestRunService.d.ts +3 -6
  248. package/dist/services/HarvestRunService.d.ts.map +1 -1
  249. package/dist/services/HarvestRunService.js +97 -161
  250. package/dist/services/I18nEntriesService.d.ts +2 -1
  251. package/dist/services/I18nEntriesService.d.ts.map +1 -1
  252. package/dist/services/I18nEntriesService.js +45 -30
  253. package/dist/services/OniService.d.ts +62 -19
  254. package/dist/services/OniService.d.ts.map +1 -1
  255. package/dist/services/OniService.js +691 -223
  256. package/dist/services/RDMPService.d.ts +1 -1
  257. package/dist/services/RDMPService.d.ts.map +1 -1
  258. package/dist/services/RDMPService.js +5 -5
  259. package/dist/services/RaidService.d.ts +61 -19
  260. package/dist/services/RaidService.d.ts.map +1 -1
  261. package/dist/services/RaidService.js +530 -191
  262. package/dist/services/RecordTypesService.d.ts +0 -29
  263. package/dist/services/RecordTypesService.d.ts.map +1 -1
  264. package/dist/services/RecordTypesService.js +11 -106
  265. package/dist/services/RecordsService.d.ts +26 -313
  266. package/dist/services/RecordsService.d.ts.map +1 -1
  267. package/dist/services/RecordsService.js +763 -5089
  268. package/dist/services/SolrSearchService.d.ts +1 -1
  269. package/dist/services/SolrSearchService.d.ts.map +1 -1
  270. package/dist/services/SolrSearchService.js +12 -42
  271. package/dist/services/StandardDatastreamService.d.ts +5 -4
  272. package/dist/services/StandardDatastreamService.d.ts.map +1 -1
  273. package/dist/services/StandardDatastreamService.js +61 -106
  274. package/dist/services/TriggerService.d.ts.map +1 -1
  275. package/dist/services/TriggerService.js +30 -54
  276. package/dist/services/UsersService.d.ts +1 -2
  277. package/dist/services/UsersService.d.ts.map +1 -1
  278. package/dist/services/UsersService.js +283 -364
  279. package/dist/services/VocabularyService.d.ts +0 -2
  280. package/dist/services/VocabularyService.d.ts.map +1 -1
  281. package/dist/services/VocabularyService.js +2 -61
  282. package/dist/services/WorkflowStepsService.d.ts +0 -11
  283. package/dist/services/WorkflowStepsService.d.ts.map +1 -1
  284. package/dist/services/WorkflowStepsService.js +3 -32
  285. package/dist/services/WorkspaceService.d.ts +2 -2
  286. package/dist/services/WorkspaceService.d.ts.map +1 -1
  287. package/dist/services/WorkspaceService.js +5 -5
  288. package/dist/services/doi-v2/bindings.d.ts.map +1 -1
  289. package/dist/services/doi-v2/bindings.js +20 -3
  290. package/dist/services/doi-v2/config.d.ts +0 -1
  291. package/dist/services/doi-v2/config.d.ts.map +1 -1
  292. package/dist/services/doi-v2/config.js +5 -13
  293. package/dist/services/doi-v2/runtime.d.ts.map +1 -1
  294. package/dist/services/doi-v2/runtime.js +54 -14
  295. package/dist/services/figshare-v2/admin.d.ts +16 -0
  296. package/dist/services/figshare-v2/admin.d.ts.map +1 -0
  297. package/dist/services/figshare-v2/admin.js +283 -0
  298. package/dist/services/figshare-v2/assets.d.ts +20 -1
  299. package/dist/services/figshare-v2/assets.d.ts.map +1 -1
  300. package/dist/services/figshare-v2/assets.js +16 -1
  301. package/dist/services/figshare-v2/bindings.d.ts.map +1 -1
  302. package/dist/services/figshare-v2/bindings.js +20 -3
  303. package/dist/services/figshare-v2/config.d.ts +8 -2
  304. package/dist/services/figshare-v2/config.d.ts.map +1 -1
  305. package/dist/services/figshare-v2/config.js +31 -3
  306. package/dist/services/figshare-v2/execution.d.ts +25 -0
  307. package/dist/services/figshare-v2/execution.d.ts.map +1 -0
  308. package/dist/services/figshare-v2/execution.js +49 -0
  309. package/dist/services/figshare-v2/http.d.ts +6 -1
  310. package/dist/services/figshare-v2/http.d.ts.map +1 -1
  311. package/dist/services/figshare-v2/http.js +69 -12
  312. package/dist/services/figshare-v2/identity.d.ts +12 -0
  313. package/dist/services/figshare-v2/identity.d.ts.map +1 -0
  314. package/dist/services/figshare-v2/identity.js +78 -0
  315. package/dist/services/figshare-v2/managed-assets.d.ts +9 -0
  316. package/dist/services/figshare-v2/managed-assets.d.ts.map +1 -0
  317. package/dist/services/figshare-v2/managed-assets.js +229 -0
  318. package/dist/services/figshare-v2/plan.d.ts.map +1 -1
  319. package/dist/services/figshare-v2/plan.js +2 -9
  320. package/dist/services/figshare-v2/runtime.d.ts.map +1 -1
  321. package/dist/services/figshare-v2/runtime.js +58 -11
  322. package/dist/services/figshare-v2/source-intent.d.ts +9 -0
  323. package/dist/services/figshare-v2/source-intent.d.ts.map +1 -0
  324. package/dist/services/figshare-v2/source-intent.js +93 -0
  325. package/dist/services/figshare-v2/status.d.ts +4 -0
  326. package/dist/services/figshare-v2/status.d.ts.map +1 -0
  327. package/dist/services/figshare-v2/status.js +29 -0
  328. package/dist/services/figshare-v2/sync-store.d.ts +27 -0
  329. package/dist/services/figshare-v2/sync-store.d.ts.map +1 -0
  330. package/dist/services/figshare-v2/sync-store.js +139 -0
  331. package/dist/services/figshare-v2/types.d.ts +3 -0
  332. package/dist/services/figshare-v2/types.d.ts.map +1 -1
  333. package/dist/services/figshare-v2/types.js +1 -1
  334. package/dist/services/figshare-v2/worker.d.ts +16 -0
  335. package/dist/services/figshare-v2/worker.d.ts.map +1 -0
  336. package/dist/services/figshare-v2/worker.js +572 -0
  337. package/dist/services/index.d.ts +0 -9
  338. package/dist/services/index.d.ts.map +1 -1
  339. package/dist/services/index.js +3 -45
  340. package/dist/utilities/TranslationHtml.d.ts +3 -0
  341. package/dist/utilities/TranslationHtml.d.ts.map +1 -0
  342. package/dist/utilities/TranslationHtml.js +46 -0
  343. package/dist/visitor/client.visitor.d.ts +0 -6
  344. package/dist/visitor/client.visitor.d.ts.map +1 -1
  345. package/dist/visitor/client.visitor.js +14 -59
  346. package/dist/visitor/construct.visitor.d.ts +1 -27
  347. package/dist/visitor/construct.visitor.d.ts.map +1 -1
  348. package/dist/visitor/construct.visitor.js +177 -265
  349. package/dist/visitor/context-variables.visitor.d.ts +1 -3
  350. package/dist/visitor/context-variables.visitor.d.ts.map +1 -1
  351. package/dist/visitor/context-variables.visitor.js +1 -15
  352. package/dist/visitor/data-value.visitor.d.ts +0 -6
  353. package/dist/visitor/data-value.visitor.d.ts.map +1 -1
  354. package/dist/visitor/data-value.visitor.js +1 -10
  355. package/dist/visitor/json-type-def.visitor.d.ts +0 -6
  356. package/dist/visitor/json-type-def.visitor.d.ts.map +1 -1
  357. package/dist/visitor/json-type-def.visitor.js +1 -10
  358. package/dist/visitor/migrate-config-v4-v5.visitor.d.ts +0 -11
  359. package/dist/visitor/migrate-config-v4-v5.visitor.d.ts.map +1 -1
  360. package/dist/visitor/migrate-config-v4-v5.visitor.js +133 -228
  361. package/dist/visitor/template.visitor.d.ts +2 -17
  362. package/dist/visitor/template.visitor.d.ts.map +1 -1
  363. package/dist/visitor/template.visitor.js +22 -60
  364. package/dist/visitor/validator.visitor.d.ts +7 -49
  365. package/dist/visitor/validator.visitor.d.ts.map +1 -1
  366. package/dist/visitor/validator.visitor.js +178 -275
  367. package/dist/waterline-models/AttachmentMetadata.d.ts +0 -22
  368. package/dist/waterline-models/AttachmentMetadata.d.ts.map +1 -1
  369. package/dist/waterline-models/AttachmentMetadata.js +3 -147
  370. package/dist/waterline-models/BrandingConfig.d.ts +0 -7
  371. package/dist/waterline-models/BrandingConfig.d.ts.map +1 -1
  372. package/dist/waterline-models/BrandingConfig.js +1 -16
  373. package/dist/waterline-models/BrandingConfigHistory.d.ts +2 -11
  374. package/dist/waterline-models/BrandingConfigHistory.d.ts.map +1 -1
  375. package/dist/waterline-models/BrandingConfigHistory.js +1 -21
  376. package/dist/waterline-models/FigshareSync.d.ts +41 -0
  377. package/dist/waterline-models/FigshareSync.d.ts.map +1 -0
  378. package/dist/waterline-models/FigshareSync.js +168 -0
  379. package/dist/waterline-models/RecordType.d.ts +0 -9
  380. package/dist/waterline-models/RecordType.d.ts.map +1 -1
  381. package/dist/waterline-models/RecordType.js +1 -16
  382. package/dist/waterline-models/User.d.ts +2 -2
  383. package/dist/waterline-models/User.d.ts.map +1 -1
  384. package/dist/waterline-models/User.js +17 -12
  385. package/dist/waterline-models/index.d.ts +2 -2
  386. package/dist/waterline-models/index.d.ts.map +1 -1
  387. package/dist/waterline-models/index.js +4 -4
  388. package/package.json +46 -59
  389. package/dist/AttachmentStagingIdentity.d.ts +0 -3
  390. package/dist/AttachmentStagingIdentity.d.ts.map +0 -1
  391. package/dist/AttachmentStagingIdentity.js +0 -10
  392. package/dist/RecordConcurrencyObservability.d.ts +0 -51
  393. package/dist/RecordConcurrencyObservability.d.ts.map +0 -1
  394. package/dist/RecordConcurrencyObservability.js +0 -136
  395. package/dist/RecordEntityTag.d.ts +0 -31
  396. package/dist/RecordEntityTag.d.ts.map +0 -1
  397. package/dist/RecordEntityTag.js +0 -101
  398. package/dist/RecordFormFingerprint.d.ts +0 -7
  399. package/dist/RecordFormFingerprint.d.ts.map +0 -1
  400. package/dist/RecordFormFingerprint.js +0 -106
  401. package/dist/RecordHttpConcurrency.d.ts +0 -60
  402. package/dist/RecordHttpConcurrency.d.ts.map +0 -1
  403. package/dist/RecordHttpConcurrency.js +0 -181
  404. package/dist/RecordSaveResponse.d.ts +0 -219
  405. package/dist/RecordSaveResponse.d.ts.map +0 -1
  406. package/dist/RecordSaveResponse.js +0 -639
  407. package/dist/RecordStorageConcurrency.d.ts +0 -48
  408. package/dist/RecordStorageConcurrency.d.ts.map +0 -1
  409. package/dist/RecordStorageConcurrency.js +0 -103
  410. package/dist/RecordWriteClassification.d.ts +0 -12
  411. package/dist/RecordWriteClassification.d.ts.map +0 -1
  412. package/dist/RecordWriteClassification.js +0 -70
  413. package/dist/action-execution/audit.d.ts +0 -41
  414. package/dist/action-execution/audit.d.ts.map +0 -1
  415. package/dist/action-execution/audit.js +0 -122
  416. package/dist/action-execution/executor.d.ts +0 -24
  417. package/dist/action-execution/executor.d.ts.map +0 -1
  418. package/dist/action-execution/executor.js +0 -435
  419. package/dist/action-execution/failure.d.ts +0 -49
  420. package/dist/action-execution/failure.d.ts.map +0 -1
  421. package/dist/action-execution/failure.js +0 -129
  422. package/dist/action-execution/index.d.ts +0 -7
  423. package/dist/action-execution/index.d.ts.map +0 -1
  424. package/dist/action-execution/index.js +0 -23
  425. package/dist/action-execution/legacy-result.d.ts +0 -21
  426. package/dist/action-execution/legacy-result.d.ts.map +0 -1
  427. package/dist/action-execution/legacy-result.js +0 -70
  428. package/dist/action-execution/policy.d.ts +0 -12
  429. package/dist/action-execution/policy.d.ts.map +0 -1
  430. package/dist/action-execution/policy.js +0 -138
  431. package/dist/action-execution/types.d.ts +0 -121
  432. package/dist/action-execution/types.d.ts.map +0 -1
  433. package/dist/action-execution/types.js +0 -22
  434. package/dist/api-routes/groups/record-schemas.d.ts +0 -5
  435. package/dist/api-routes/groups/record-schemas.d.ts.map +0 -1
  436. package/dist/api-routes/groups/record-schemas.js +0 -181
  437. package/dist/api-routes/record-schema-openapi.d.ts +0 -26
  438. package/dist/api-routes/record-schema-openapi.d.ts.map +0 -1
  439. package/dist/api-routes/record-schema-openapi.js +0 -38
  440. package/dist/api-routes/record-schema-response.d.ts +0 -40
  441. package/dist/api-routes/record-schema-response.d.ts.map +0 -1
  442. package/dist/api-routes/record-schema-response.js +0 -89
  443. package/dist/config/recordSchema.config.d.ts +0 -68
  444. package/dist/config/recordSchema.config.d.ts.map +0 -1
  445. package/dist/config/recordSchema.config.js +0 -173
  446. package/dist/config/recordValidation.config.d.ts +0 -19
  447. package/dist/config/recordValidation.config.d.ts.map +0 -1
  448. package/dist/config/recordValidation.config.js +0 -10
  449. package/dist/configmodels/DashboardFieldCatalogue.d.ts +0 -67
  450. package/dist/configmodels/DashboardFieldCatalogue.d.ts.map +0 -1
  451. package/dist/configmodels/DashboardFieldCatalogue.js +0 -174
  452. package/dist/configmodels/DashboardSettings.d.ts +0 -191
  453. package/dist/configmodels/DashboardSettings.d.ts.map +0 -1
  454. package/dist/configmodels/DashboardSettings.js +0 -705
  455. package/dist/configmodels/OniPublishing.d.ts +0 -205
  456. package/dist/configmodels/OniPublishing.d.ts.map +0 -1
  457. package/dist/configmodels/OniPublishing.js +0 -335
  458. package/dist/configmodels/RaidPublishing.d.ts +0 -97
  459. package/dist/configmodels/RaidPublishing.d.ts.map +0 -1
  460. package/dist/configmodels/RaidPublishing.js +0 -35
  461. package/dist/configmodels/WebAnalytics.d.ts +0 -55
  462. package/dist/configmodels/WebAnalytics.d.ts.map +0 -1
  463. package/dist/configmodels/WebAnalytics.js +0 -61
  464. package/dist/controllers/BrandingControllerSupport.d.ts +0 -20
  465. package/dist/controllers/BrandingControllerSupport.d.ts.map +0 -1
  466. package/dist/controllers/BrandingControllerSupport.js +0 -80
  467. package/dist/controllers/webservice/RecordSchemaController.d.ts +0 -32
  468. package/dist/controllers/webservice/RecordSchemaController.d.ts.map +0 -1
  469. package/dist/controllers/webservice/RecordSchemaController.js +0 -356
  470. package/dist/model/BrandingTypeface.d.ts +0 -70
  471. package/dist/model/BrandingTypeface.d.ts.map +0 -1
  472. package/dist/model/BrandingTypeface.js +0 -116
  473. package/dist/model/record-contract.d.ts +0 -42
  474. package/dist/model/record-contract.d.ts.map +0 -1
  475. package/dist/model/record-contract.js +0 -3
  476. package/dist/model/storage/record-schema.d.ts +0 -115
  477. package/dist/model/storage/record-schema.d.ts.map +0 -1
  478. package/dist/model/storage/record-schema.js +0 -3
  479. package/dist/record-contract/ajv-error-mapper.d.ts +0 -34
  480. package/dist/record-contract/ajv-error-mapper.d.ts.map +0 -1
  481. package/dist/record-contract/ajv-error-mapper.js +0 -153
  482. package/dist/record-contract/canonical-json.d.ts +0 -20
  483. package/dist/record-contract/canonical-json.d.ts.map +0 -1
  484. package/dist/record-contract/canonical-json.js +0 -126
  485. package/dist/record-contract/codes.d.ts +0 -36
  486. package/dist/record-contract/codes.d.ts.map +0 -1
  487. package/dist/record-contract/codes.js +0 -38
  488. package/dist/record-contract/contributor-registry.d.ts +0 -76
  489. package/dist/record-contract/contributor-registry.d.ts.map +0 -1
  490. package/dist/record-contract/contributor-registry.js +0 -126
  491. package/dist/record-contract/core-contributors.d.ts +0 -44
  492. package/dist/record-contract/core-contributors.d.ts.map +0 -1
  493. package/dist/record-contract/core-contributors.js +0 -395
  494. package/dist/record-contract/deep-freeze.d.ts +0 -3
  495. package/dist/record-contract/deep-freeze.d.ts.map +0 -1
  496. package/dist/record-contract/deep-freeze.js +0 -23
  497. package/dist/record-contract/index.d.ts +0 -13
  498. package/dist/record-contract/index.d.ts.map +0 -1
  499. package/dist/record-contract/index.js +0 -29
  500. package/dist/record-contract/json-pointer.d.ts +0 -20
  501. package/dist/record-contract/json-pointer.d.ts.map +0 -1
  502. package/dist/record-contract/json-pointer.js +0 -70
  503. package/dist/record-contract/json-schema-renderer.d.ts +0 -51
  504. package/dist/record-contract/json-schema-renderer.d.ts.map +0 -1
  505. package/dist/record-contract/json-schema-renderer.js +0 -450
  506. package/dist/record-contract/record-contract-compiler.d.ts +0 -42
  507. package/dist/record-contract/record-contract-compiler.d.ts.map +0 -1
  508. package/dist/record-contract/record-contract-compiler.js +0 -775
  509. package/dist/record-contract/record-contract-context.d.ts +0 -91
  510. package/dist/record-contract/record-contract-context.d.ts.map +0 -1
  511. package/dist/record-contract/record-contract-context.js +0 -39
  512. package/dist/record-contract/record-json-schema-artifact.d.ts +0 -74
  513. package/dist/record-contract/record-json-schema-artifact.d.ts.map +0 -1
  514. package/dist/record-contract/record-json-schema-artifact.js +0 -309
  515. package/dist/record-contract/record-json-schema-etag.d.ts +0 -15
  516. package/dist/record-contract/record-json-schema-etag.d.ts.map +0 -1
  517. package/dist/record-contract/record-json-schema-etag.js +0 -41
  518. package/dist/record-contract/types.d.ts +0 -151
  519. package/dist/record-contract/types.d.ts.map +0 -1
  520. package/dist/record-contract/types.js +0 -6
  521. package/dist/services/BrandingTypefaceService.d.ts +0 -74
  522. package/dist/services/BrandingTypefaceService.d.ts.map +0 -1
  523. package/dist/services/BrandingTypefaceService.js +0 -359
  524. package/dist/services/BrandingWoff2Inspector.d.ts +0 -17
  525. package/dist/services/BrandingWoff2Inspector.d.ts.map +0 -1
  526. package/dist/services/BrandingWoff2Inspector.js +0 -402
  527. package/dist/services/DashboardLegacyConversion.d.ts +0 -82
  528. package/dist/services/DashboardLegacyConversion.d.ts.map +0 -1
  529. package/dist/services/DashboardLegacyConversion.js +0 -427
  530. package/dist/services/RecordSchemaService.d.ts +0 -440
  531. package/dist/services/RecordSchemaService.d.ts.map +0 -1
  532. package/dist/services/RecordSchemaService.js +0 -3061
  533. package/dist/services/RecordValidationService.d.ts +0 -340
  534. package/dist/services/RecordValidationService.d.ts.map +0 -1
  535. package/dist/services/RecordValidationService.js +0 -1898
  536. package/dist/services/form-record-access-user.d.ts +0 -3
  537. package/dist/services/form-record-access-user.d.ts.map +0 -1
  538. package/dist/services/form-record-access-user.js +0 -23
  539. package/dist/services/integration-v2/bindings.d.ts +0 -3
  540. package/dist/services/integration-v2/bindings.d.ts.map +0 -1
  541. package/dist/services/integration-v2/bindings.js +0 -91
  542. package/dist/services/integration-v2/runtime.d.ts +0 -3
  543. package/dist/services/integration-v2/runtime.d.ts.map +0 -1
  544. package/dist/services/integration-v2/runtime.js +0 -50
  545. package/dist/services/internal-record-schema-authorization.d.ts +0 -8
  546. package/dist/services/internal-record-schema-authorization.d.ts.map +0 -1
  547. package/dist/services/internal-record-schema-authorization.js +0 -16
  548. package/dist/services/oni-v2/audit.d.ts +0 -19
  549. package/dist/services/oni-v2/audit.d.ts.map +0 -1
  550. package/dist/services/oni-v2/audit.js +0 -50
  551. package/dist/services/oni-v2/bindings.d.ts +0 -7
  552. package/dist/services/oni-v2/bindings.d.ts.map +0 -1
  553. package/dist/services/oni-v2/bindings.js +0 -31
  554. package/dist/services/oni-v2/config.d.ts +0 -12
  555. package/dist/services/oni-v2/config.d.ts.map +0 -1
  556. package/dist/services/oni-v2/config.js +0 -134
  557. package/dist/services/oni-v2/context.d.ts +0 -3
  558. package/dist/services/oni-v2/context.d.ts.map +0 -1
  559. package/dist/services/oni-v2/context.js +0 -17
  560. package/dist/services/oni-v2/crate.d.ts +0 -17
  561. package/dist/services/oni-v2/crate.d.ts.map +0 -1
  562. package/dist/services/oni-v2/crate.js +0 -504
  563. package/dist/services/oni-v2/flydriveOcflStore.d.ts +0 -69
  564. package/dist/services/oni-v2/flydriveOcflStore.d.ts.map +0 -1
  565. package/dist/services/oni-v2/flydriveOcflStore.js +0 -325
  566. package/dist/services/oni-v2/ingestion.d.ts +0 -37
  567. package/dist/services/oni-v2/ingestion.d.ts.map +0 -1
  568. package/dist/services/oni-v2/ingestion.js +0 -91
  569. package/dist/services/oni-v2/mapping.d.ts +0 -17
  570. package/dist/services/oni-v2/mapping.d.ts.map +0 -1
  571. package/dist/services/oni-v2/mapping.js +0 -137
  572. package/dist/services/oni-v2/repository.d.ts +0 -9
  573. package/dist/services/oni-v2/repository.d.ts.map +0 -1
  574. package/dist/services/oni-v2/repository.js +0 -180
  575. package/dist/services/oni-v2/runtime.d.ts +0 -23
  576. package/dist/services/oni-v2/runtime.d.ts.map +0 -1
  577. package/dist/services/oni-v2/runtime.js +0 -121
  578. package/dist/services/oni-v2/templating.d.ts +0 -11
  579. package/dist/services/oni-v2/templating.d.ts.map +0 -1
  580. package/dist/services/oni-v2/templating.js +0 -27
  581. package/dist/services/oni-v2/types.d.ts +0 -100
  582. package/dist/services/oni-v2/types.d.ts.map +0 -1
  583. package/dist/services/oni-v2/types.js +0 -3
  584. package/dist/services/raid-v2/audit.d.ts +0 -10
  585. package/dist/services/raid-v2/audit.d.ts.map +0 -1
  586. package/dist/services/raid-v2/audit.js +0 -29
  587. package/dist/services/raid-v2/errors.d.ts +0 -85
  588. package/dist/services/raid-v2/errors.d.ts.map +0 -1
  589. package/dist/services/raid-v2/errors.js +0 -36
  590. package/dist/services/raid-v2/http.d.ts +0 -4
  591. package/dist/services/raid-v2/http.d.ts.map +0 -1
  592. package/dist/services/raid-v2/http.js +0 -84
  593. package/dist/services/raid-v2/logger.d.ts +0 -8
  594. package/dist/services/raid-v2/logger.d.ts.map +0 -1
  595. package/dist/services/raid-v2/logger.js +0 -30
  596. package/dist/services/raid-v2/mapping.d.ts +0 -9
  597. package/dist/services/raid-v2/mapping.d.ts.map +0 -1
  598. package/dist/services/raid-v2/mapping.js +0 -168
  599. package/dist/services/raid-v2/runtime.d.ts +0 -5
  600. package/dist/services/raid-v2/runtime.d.ts.map +0 -1
  601. package/dist/services/raid-v2/runtime.js +0 -135
  602. package/dist/services/raid-v2/tags.d.ts +0 -11
  603. package/dist/services/raid-v2/tags.d.ts.map +0 -1
  604. package/dist/services/raid-v2/tags.js +0 -12
  605. package/dist/services/raid-v2/types.d.ts +0 -66
  606. package/dist/services/raid-v2/types.d.ts.map +0 -1
  607. package/dist/services/raid-v2/types.js +0 -3
  608. package/dist/services/record-hooks/coordinator.d.ts +0 -64
  609. package/dist/services/record-hooks/coordinator.d.ts.map +0 -1
  610. package/dist/services/record-hooks/coordinator.js +0 -276
  611. package/dist/visitor/related-object-data-inline.visitor.d.ts +0 -31
  612. package/dist/visitor/related-object-data-inline.visitor.d.ts.map +0 -1
  613. package/dist/visitor/related-object-data-inline.visitor.js +0 -96
  614. package/dist/waterline-models/DashboardConfiguration.d.ts +0 -29
  615. package/dist/waterline-models/DashboardConfiguration.d.ts.map +0 -1
  616. package/dist/waterline-models/DashboardConfiguration.js +0 -52
@@ -56,9 +56,6 @@ const rxjs_1 = require("rxjs");
56
56
  const operators_1 = require("rxjs/operators");
57
57
  const CoreService_1 = require("../CoreService");
58
58
  const crypto = __importStar(require("crypto"));
59
- const branding_config_1 = require("../config/branding.config");
60
- const BrandingTypeface_1 = require("../model/BrandingTypeface");
61
- const TransactionUtils_1 = require("../utilities/TransactionUtils");
62
59
  var Services;
63
60
  (function (Services) {
64
61
  /**
@@ -74,7 +71,6 @@ var Services;
74
71
  'getBrand',
75
72
  'getAvailable',
76
73
  'getBrandAndPortalPath',
77
- 'getFaviconUrl',
78
74
  'getBrandNameFromReq',
79
75
  'getBrandFromReq',
80
76
  'getPortalFromReq',
@@ -82,69 +78,55 @@ var Services;
82
78
  'getRootContext',
83
79
  'getBrandById',
84
80
  'getBrandingFromDB',
85
- 'getActiveTypefaceFontInfo',
86
- 'hasActiveCustomTypeface',
87
- 'getAdminState',
88
- 'listVersions',
89
81
  'saveDraft',
90
- 'uploadTypefaceFace',
91
- 'removeTypefaceFace',
92
- 'useDefaultTypography',
93
- 'revertTypefaceDraft',
94
82
  'preview',
95
- 'previewVersion',
96
83
  'fetchPreview',
97
84
  'publish',
98
- 'restore',
99
85
  'rollback',
100
- 'refreshBrandingCache',
86
+ 'refreshBrandingCache'
101
87
  ];
102
88
  availableBrandings = [];
103
89
  brandings = [];
104
90
  dBrand = { name: 'default' };
105
91
  bootstrap = () => {
106
- return super.getObservable(BrandingConfig.findOne(this.dBrand)).pipe((0, operators_1.mergeMap)(defaultBrand => {
92
+ return super.getObservable(BrandingConfig.findOne(this.dBrand))
93
+ .pipe((0, operators_1.mergeMap)(defaultBrand => {
107
94
  if (_.isEmpty(defaultBrand)) {
108
95
  // create default brand
109
96
  sails.log.verbose("Default brand doesn't exist, creating...");
110
97
  return super.getObservable(BrandingConfig.create(this.dBrand));
111
98
  }
112
- sails.log.verbose('Default brand already exists...');
99
+ sails.log.verbose("Default brand already exists...");
113
100
  return (0, rxjs_1.of)(defaultBrand);
114
101
  }), (0, operators_1.mergeMap)(this.loadAvailableBrands));
115
102
  };
116
103
  loadAvailableBrands = (_defBrand) => {
117
- sails.log.verbose('Loading available brands......');
104
+ sails.log.verbose("Loading available brands......");
118
105
  // Find all the BrandingConfig we have and add them to the availableBrandings array.
119
106
  // A policy is configured to reject any branding values not present in this array.
120
- return super.getObservable(BrandingConfig.find({}).populate('roles')).pipe((0, operators_1.mergeMap)(brands => {
107
+ return super.getObservable(BrandingConfig.find({}).populate('roles'))
108
+ .pipe((0, operators_1.mergeMap)(brands => {
121
109
  this.brandings = brands;
122
110
  this.availableBrandings = _.map(this.brandings, 'name');
123
111
  const defBrandEntry = this.getDefault();
124
112
  if (defBrandEntry == null) {
125
- sails.log.error('Failed to load default brand!');
126
- return (0, rxjs_1.throwError)(new Error('Failed to load default brand!'));
113
+ sails.log.error("Failed to load default brand!");
114
+ return (0, rxjs_1.throwError)(new Error("Failed to load default brand!"));
127
115
  }
128
116
  return (0, rxjs_1.of)(defBrandEntry);
129
117
  }));
130
118
  };
131
119
  getDefault = () => {
132
- return _.find(this.brandings, (o) => {
133
- return o.name == this.dBrand.name;
134
- });
120
+ return _.find(this.brandings, (o) => { return o.name == this.dBrand.name; });
135
121
  };
136
122
  getBrand = (name) => {
137
- return _.find(this.brandings, (o) => {
138
- return o.name == name;
139
- });
123
+ return _.find(this.brandings, (o) => { return o.name == name; });
140
124
  };
141
125
  getBrandById = (id) => {
142
- return _.find(this.brandings, (o) => {
143
- return o.id == id;
144
- });
126
+ return _.find(this.brandings, (o) => { return o.id == id; });
145
127
  };
146
128
  async getBrandingFromDB(name) {
147
- return (await BrandingConfig.findOne({ name: name }));
129
+ return BrandingConfig.findOne({ name: name });
148
130
  }
149
131
  getAvailable = () => {
150
132
  return this.availableBrandings;
@@ -160,9 +142,6 @@ var Services;
160
142
  return `${rootContext}/${branding}/${portal}`;
161
143
  }
162
144
  }
163
- getFaviconUrl(req) {
164
- return `${this.getBrandAndPortalPath(req)}/images/favicon`;
165
- }
166
145
  getRootContext() {
167
146
  const rootContext = sails.config.http.rootContext;
168
147
  if (_.isEmpty(rootContext)) {
@@ -224,314 +203,28 @@ var Services;
224
203
  }
225
204
  return portal;
226
205
  }
227
- // ------------------------------------------------------------------
228
- // Revisioned draft and version lifecycle (design.md sections 3.3, 5, 7).
229
- // Every colour/typeface draft mutation requires `expectedDraftRevision`
230
- // and applies exactly one logical mutation with one revision increment via
231
- // a conditional update. Publish/restore require both expected counters,
232
- // re-verify stored bytes, and move active state in a single row update.
233
- // ------------------------------------------------------------------
234
- readHistoryMaxVersions() {
235
- return (0, branding_config_1.getBrandingPositiveInt)('historyMaxVersions', BrandingTypeface_1.BRANDING_HISTORY_MAX_VERSIONS);
236
- }
237
- snapshotKey(value) {
238
- return JSON.stringify(value === undefined ? null : value);
239
- }
240
- brandCounters(brand) {
241
- return {
242
- version: typeof brand.version === 'number' ? brand.version : 0,
243
- draftRevision: typeof brand.draftRevision === 'number' ? brand.draftRevision : 0,
244
- };
245
- }
246
- conflictError(brand) {
247
- const current = this.brandCounters(brand);
248
- const error = new Error(`branding-conflict: expected version ${current.version} and draft revision ${current.draftRevision}`);
249
- error.code = 'branding-conflict';
250
- error.current = current;
251
- return error;
252
- }
253
- codedError(code, message) {
254
- const error = new Error(`${code}: ${message}`);
255
- error.code = code;
256
- return error;
257
- }
258
- isUniqueViolation(error) {
259
- const code = typeof error?.code === 'string' ? String(error.code) : '';
260
- const message = error instanceof Error ? error.message : String(error ?? '');
261
- return code === 'E_UNIQUE' || /E_UNIQUE|unique|duplicate key/i.test(`${code} ${message}`);
262
- }
263
- extractActor(actor) {
264
- if (!actor || typeof actor !== 'object') {
265
- return {};
266
- }
267
- const record = actor;
268
- const actorId = typeof record.id === 'string' || typeof record.id === 'number'
269
- ? String(record.id)
270
- : typeof record.username === 'string'
271
- ? record.username
272
- : undefined;
273
- const actorDisplayName = typeof record.displayName === 'string'
274
- ? record.displayName
275
- : typeof record.name === 'string'
276
- ? record.name
277
- : typeof record.username === 'string'
278
- ? record.username
279
- : actorId;
280
- return { actorId, actorDisplayName };
281
- }
282
- async loadBrandOrThrow(branding) {
283
- const brand = await BrandingConfig.findOne({ name: branding });
284
- if (!brand) {
285
- throw this.codedError('branding-not-found', `Brand not found: ${branding}`);
286
- }
287
- return brand;
288
- }
289
- draftTypefaceOf(brand) {
290
- return (0, BrandingTypeface_1.normalizeTypefaceState)(brand.draftTypeface);
291
- }
292
- async listHistoriesAsc(brandingId) {
293
- return (await BrandingConfigHistory.find({ branding: brandingId }).sort('version ASC'));
294
- }
295
- activeHistoryRow(histories, activeVersion) {
296
- return histories.find(history => history.version === activeVersion);
297
- }
298
- async maxHistoryVersion(brandingId) {
299
- const histories = await this.listHistoriesAsc(brandingId);
300
- return histories.reduce((max, history) => Math.max(max, history.version), 0);
301
- }
302
- publicationIdentity(hash, typeface) {
303
- return this.snapshotKey({
304
- hash: String(hash ?? ''),
305
- faces: (0, BrandingTypeface_1.orderedTypefaceFaces)((0, BrandingTypeface_1.normalizeTypefaceState)(typeface)).map(face => [face.slot, face.sha256]),
306
- });
307
- }
308
- /** Newest-first version entries shared by getAdminState and listVersions. */
309
- buildVersionEntries(brand, histories) {
310
- return [...histories]
311
- .sort((left, right) => right.version - left.version)
312
- .map(history => ({
313
- id: String(history.id),
314
- branding: String(brand.id),
315
- version: history.version,
316
- hash: history.hash,
317
- dateCreated: history.dateCreated ?? '',
318
- actorId: history.actorId,
319
- actorDisplayName: history.actorDisplayName,
320
- restoredFromVersion: history.restoredFromVersion,
321
- variables: history.variables ?? {},
322
- typeface: (0, BrandingTypeface_1.normalizeTypefaceState)(history.typeface),
323
- }));
324
- }
325
- /**
326
- * Canonical Admin-state response builder (design.md section 5.3).
327
- *
328
- * Every response includes advisory active-face health, including mutations,
329
- * because the Admin UI replaces its canonical state with each response.
330
- */
331
- async getAdminState(branding) {
332
- const brand = await this.loadBrandOrThrow(branding);
333
- const { version: activeVersion, draftRevision } = this.brandCounters(brand);
334
- const histories = await this.listHistoriesAsc(String(brand.id));
335
- const activeRow = this.activeHistoryRow(histories, activeVersion);
336
- const activeVariables = activeRow?.variables ?? {};
337
- const activeTypeface = (0, BrandingTypeface_1.normalizeTypefaceState)(brand.typeface ?? activeRow?.typeface ?? null);
338
- const draftVariables = brand.variables ?? {};
339
- const draftTypeface = this.draftTypefaceOf(brand);
340
- const versions = this.buildVersionEntries(brand, histories);
341
- const healthWarnings = await this.activeHealthWarnings(String(brand.id), activeTypeface);
342
- return {
343
- branding: { id: String(brand.id), name: String(brand.name) },
344
- active: {
345
- version: activeVersion,
346
- hash: String(brand.hash ?? ''),
347
- variables: activeVariables,
348
- typeface: activeTypeface,
349
- },
350
- draft: {
351
- revision: draftRevision,
352
- variables: draftVariables,
353
- typeface: draftTypeface,
354
- dirty: {
355
- colours: this.snapshotKey(draftVariables) !== this.snapshotKey(activeVariables),
356
- typeface: this.snapshotKey(draftTypeface) !== this.snapshotKey(activeTypeface),
357
- },
358
- },
359
- versions,
360
- limits: {
361
- faceMaxBytes: (0, branding_config_1.getBrandingPositiveInt)('typefaceFaceMaxBytes', BrandingTypeface_1.BRANDING_TYPEFACE_FACE_MAX_BYTES),
362
- familyMaxBytes: (0, branding_config_1.getBrandingPositiveInt)('typefaceFamilyMaxBytes', BrandingTypeface_1.BRANDING_TYPEFACE_FAMILY_MAX_BYTES),
363
- historyMaxVersions: this.readHistoryMaxVersions(),
364
- },
365
- healthWarnings,
366
- };
367
- }
368
- /** Retained versions newest-first (no storage health reads). */
369
- async listVersions(branding) {
370
- const brand = await this.loadBrandOrThrow(branding);
371
- const histories = await this.listHistoriesAsc(String(brand.id));
372
- return this.buildVersionEntries(brand, histories);
373
- }
374
- /**
375
- * Advisory active-asset health; config retrieval never fails on storage errors.
376
- * Missing objects are reported via a cheap existence probe; only faces that
377
- * exist pay for a full read plus hash verification (corruption check).
378
- */
379
- async activeHealthWarnings(brandingId, activeTypeface) {
380
- const warnings = [];
381
- for (const face of (0, BrandingTypeface_1.orderedTypefaceFaces)(activeTypeface)) {
382
- if (!(await BrandingTypefaceService.faceExists(brandingId, face.sha256))) {
383
- sails.log.warn(`BrandingService active typeface health: brand ${brandingId} slot ${face.slot} face-unavailable`);
384
- warnings.push({ code: 'face-unavailable', slot: face.slot, sha256: face.sha256 });
385
- continue;
386
- }
387
- try {
388
- await BrandingTypefaceService.readFace(brandingId, face.sha256);
389
- }
390
- catch (error) {
391
- const code = error?.code === 'typeface-corrupt' ? 'face-corrupt' : 'face-unavailable';
392
- sails.log.warn(`BrandingService active typeface health: brand ${brandingId} slot ${face.slot} ${code}`);
393
- warnings.push({ code, slot: face.slot, sha256: face.sha256 });
394
- }
395
- }
396
- return warnings;
397
- }
398
- requireDraftRevision(brand, expectedDraftRevision) {
399
- const current = typeof brand.draftRevision === 'number' ? brand.draftRevision : 0;
400
- if (expectedDraftRevision === undefined || expectedDraftRevision !== current) {
401
- throw this.conflictError(brand);
402
- }
403
- return current;
404
- }
405
- requireCounters(brand, expectedVersion, expectedDraftRevision) {
406
- const current = this.brandCounters(brand);
407
- if (expectedVersion === undefined ||
408
- expectedVersion !== current.version ||
409
- expectedDraftRevision === undefined ||
410
- expectedDraftRevision !== current.draftRevision) {
411
- throw this.conflictError(brand);
412
- }
413
- }
414
- async conditionalDraftUpdate(brand, patch) {
415
- const current = typeof brand.draftRevision === 'number' ? brand.draftRevision : 0;
416
- const updated = await BrandingConfig.updateOne({ id: brand.id, draftRevision: current }).set({
417
- ...patch,
418
- draftRevision: current + 1,
419
- });
420
- if (!updated) {
421
- const reread = await this.loadBrandOrThrow(String(brand.name));
422
- throw this.conflictError(reread);
423
- }
424
- return updated;
425
- }
426
- /** Save colour draft; typeface draft is preserved untouched. */
206
+ /** Save draft variables after whitelist + contrast validation */
427
207
  async saveDraft(input) {
428
- const brand = await this.loadBrandOrThrow(input.branding);
429
- this.requireDraftRevision(brand, input.expectedDraftRevision);
430
208
  const normalized = BrandingThemeCssService.validateVariables(input.variables || {});
431
- await this.conditionalDraftUpdate(brand, { variables: normalized });
432
- return this.getAdminState(input.branding);
433
- }
434
- /** Stage one uploaded face and apply a single-slot draft mutation. */
435
- async uploadTypefaceFace(input) {
436
- if (!(0, BrandingTypeface_1.isBrandingTypefaceSlot)(input.slot)) {
437
- throw this.codedError('branding-invalid', `Invalid typeface slot: ${String(input.slot)}`);
438
- }
439
- const brand = await this.loadBrandOrThrow(input.branding);
440
- this.requireDraftRevision(brand, input.expectedDraftRevision);
441
- const draft = this.draftTypefaceOf(brand);
442
- const base = { ...(draft.faces ?? {}) };
443
- const face = await BrandingTypefaceService.inspectAndStoreFace({
444
- brandingId: String(brand.id),
445
- slot: input.slot,
446
- bytes: input.bytes,
447
- originalFilename: input.originalFilename,
448
- existingFaces: (0, BrandingTypeface_1.orderedTypefaceFaces)({ mode: 'custom', faces: base }),
449
- });
450
- base[input.slot] = face;
451
- await this.conditionalDraftUpdate(brand, { draftTypeface: { mode: 'custom', faces: base } });
452
- return this.getAdminState(input.branding);
453
- }
454
- /** Remove one draft face; the active typeface is untouched. */
455
- async removeTypefaceFace(input) {
456
- if (!(0, BrandingTypeface_1.isBrandingTypefaceSlot)(input.slot)) {
457
- throw this.codedError('branding-invalid', `Invalid typeface slot: ${String(input.slot)}`);
458
- }
459
- const brand = await this.loadBrandOrThrow(input.branding);
460
- this.requireDraftRevision(brand, input.expectedDraftRevision);
461
- const draft = this.draftTypefaceOf(brand);
462
- if (draft.mode !== 'custom' || !draft.faces?.[input.slot]) {
463
- throw this.codedError('branding-face-not-found', `No draft face in slot: ${String(input.slot)}`);
464
- }
465
- const faces = { ...(draft.faces ?? {}) };
466
- delete faces[input.slot];
467
- const next = Object.keys(faces).length === 0 ? { mode: 'default', faces: {} } : { mode: 'custom', faces };
468
- await this.conditionalDraftUpdate(brand, { draftTypeface: next });
469
- return this.getAdminState(input.branding);
470
- }
471
- /** Set the draft typeface to Default Typography; draft colours are preserved. */
472
- async useDefaultTypography(input) {
473
- const brand = await this.loadBrandOrThrow(input.branding);
474
- this.requireDraftRevision(brand, input.expectedDraftRevision);
475
- await this.conditionalDraftUpdate(brand, { draftTypeface: { mode: 'default', faces: {} } });
476
- return this.getAdminState(input.branding);
477
- }
478
- /** Copy only the active typeface into the draft; draft colours are preserved. */
479
- async revertTypefaceDraft(input) {
480
- const brand = await this.loadBrandOrThrow(input.branding);
481
- this.requireDraftRevision(brand, input.expectedDraftRevision);
482
- const histories = await this.listHistoriesAsc(String(brand.id));
483
- const { version: activeVersion } = this.brandCounters(brand);
484
- const activeRow = this.activeHistoryRow(histories, activeVersion);
485
- const activeTypeface = (0, BrandingTypeface_1.normalizeTypefaceState)(brand.typeface ?? activeRow?.typeface ?? null);
486
- await this.conditionalDraftUpdate(brand, { draftTypeface: activeTypeface });
487
- return this.getAdminState(input.branding);
488
- }
489
- previewUrl(branding, portal, token) {
490
- return `/${branding}/${portal}/preview/${token}.css`;
209
+ const brand = await BrandingConfig.findOne({ name: input.branding });
210
+ if (!brand)
211
+ throw new Error('branding-not-found');
212
+ await BrandingConfig.update({ id: brand.id }, { variables: normalized });
213
+ const updated = await this.refreshBrandingCache(brand.id);
214
+ return updated;
491
215
  }
492
- /** Generate preview CSS for an exact draft revision (non-mutating). */
493
- async preview(branding, portal, expectedDraftRevision) {
494
- const brand = await this.loadBrandOrThrow(branding);
495
- const current = typeof brand.draftRevision === 'number' ? brand.draftRevision : 0;
496
- if (expectedDraftRevision === undefined || expectedDraftRevision !== current) {
497
- throw this.conflictError(brand);
498
- }
499
- const draftVariables = brand.variables ?? {};
500
- const draftTypeface = this.draftTypefaceOf(brand);
501
- if (!(0, BrandingTypeface_1.isPublishableTypefaceState)(draftTypeface)) {
502
- throw this.codedError('branding-invalid', 'A custom typeface cannot be previewed without a Regular face');
503
- }
504
- const { css, hash } = BrandingThemeCssService.generate(draftVariables, {
505
- typeface: draftTypeface,
506
- brandName: String(brand.name),
507
- });
216
+ /** Generate preview token storing compiled CSS in CacheEntry */
217
+ async preview(branding, portal) {
218
+ const brand = await BrandingConfig.findOne({ name: branding });
219
+ if (!brand)
220
+ throw new Error('branding-not-found');
221
+ const { css, hash } = BrandingThemeCssService.generate(brand.variables || {});
508
222
  const token = crypto.randomBytes(16).toString('hex');
509
223
  const name = `branding-preview:${token}`;
510
224
  const ts = Math.floor(Date.now() / 1000);
511
- await CacheEntry.create({ name, data: { css, branding, portal, hash, revision: current }, ts_added: ts });
512
- return { token, url: this.previewUrl(branding, portal, token), hash, revision: current };
513
- }
514
- /** Preview a retained version without mutating the draft. */
515
- async previewVersion(input) {
516
- const brand = await this.loadBrandOrThrow(input.branding);
517
- // Brand-scoped lookup: rows from another brand never match, so cross-brand
518
- // restores/previews are rejected as not-found.
519
- const histories = await this.listHistoriesAsc(String(brand.id));
520
- const row = histories.find(history => String(history.id) === String(input.versionId));
521
- if (!row) {
522
- throw this.codedError('history-not-found', `Version not found: ${input.versionId}`);
523
- }
524
- const variables = row.variables ?? {};
525
- const typeface = (0, BrandingTypeface_1.normalizeTypefaceState)(row.typeface);
526
- const { css, hash } = BrandingThemeCssService.generate(variables, { typeface, brandName: String(brand.name) });
527
- const token = crypto.randomBytes(16).toString('hex');
528
- const ts = Math.floor(Date.now() / 1000);
529
- await CacheEntry.create({
530
- name: `branding-preview:${token}`,
531
- data: { css, branding: input.branding, portal: input.portal, hash, versionId: String(row.id) },
532
- ts_added: ts,
533
- });
534
- return { token, url: this.previewUrl(input.branding, input.portal, token), hash };
225
+ await CacheEntry.create({ name, data: { css, branding, portal, hash }, ts_added: ts });
226
+ const url = `/${branding}/${portal}/preview/${token}.css`;
227
+ return { token, url, hash };
535
228
  }
536
229
  /** Fetch preview CSS (helper for tests); enforces TTL */
537
230
  async fetchPreview(token) {
@@ -549,247 +242,50 @@ var Services;
549
242
  await CacheEntry.destroy({ id: entry.id });
550
243
  return entry.data;
551
244
  }
552
- async buildPublishSnapshot(brand) {
553
- const variables = BrandingThemeCssService.validateVariables(brand.variables ?? {});
554
- const typeface = this.draftTypefaceOf(brand);
555
- if (!(0, BrandingTypeface_1.isPublishableTypefaceState)(typeface)) {
556
- throw this.codedError('branding-invalid', 'A custom typeface cannot be published without a Regular face');
557
- }
558
- await BrandingTypefaceService.assertTypefaceAvailable(String(brand.id), typeface);
559
- const { css, hash } = BrandingThemeCssService.generate(variables, { typeface, brandName: String(brand.name) });
560
- return { variables, typeface, css, hash };
561
- }
562
- async persistPublication(brand, historyValues, snapshot, nextVersion) {
563
- const { version: activeVersion, draftRevision } = this.brandCounters(brand);
564
- const datastore = typeof BrandingConfig.getDatastore === 'function' ? BrandingConfig.getDatastore() : undefined;
565
- await (0, TransactionUtils_1.runWithOptionalTransaction)(datastore, async (connection) => {
566
- const createQuery = BrandingConfigHistory.create(historyValues);
567
- let created = null;
568
- try {
569
- created = await (connection && typeof createQuery.usingConnection === 'function'
570
- ? createQuery.usingConnection(connection)
571
- : createQuery);
572
- }
573
- catch (error) {
574
- if (!this.isUniqueViolation(error)) {
575
- throw error;
576
- }
577
- const reread = await this.loadBrandOrThrow(String(brand.name));
578
- throw this.conflictError(reread);
579
- }
580
- let updated;
581
- try {
582
- const updateQuery = BrandingConfig.updateOne({
583
- id: brand.id,
584
- version: activeVersion,
585
- draftRevision,
586
- }).set({
587
- variables: snapshot.variables,
588
- css: snapshot.css,
589
- hash: snapshot.hash,
590
- version: nextVersion,
591
- typeface: snapshot.typeface,
592
- draftTypeface: snapshot.typeface,
593
- draftRevision: draftRevision + 1,
594
- });
595
- updated = await (connection && typeof updateQuery.usingConnection === 'function'
596
- ? updateQuery.usingConnection(connection)
597
- : updateQuery);
598
- }
599
- catch (error) {
600
- // Only adapter/Waterline validation failures certify non-application.
601
- // A transport timeout may occur after commit: retain its history.
602
- const code = error.code;
603
- if (!connection &&
604
- created?.id !== undefined &&
605
- ['E_INVALID_NEW_RECORD', 'E_INVALID_VALUES_TO_SET', 'E_USAGE', 'E_UNIQUE'].includes(code ?? '')) {
606
- await BrandingConfigHistory.destroy({ id: created.id });
607
- }
608
- throw error;
609
- }
610
- if (!updated) {
611
- if (!connection && created && created.id !== undefined) {
612
- await BrandingConfigHistory.destroy({ id: created.id }).catch(() => undefined);
613
- }
614
- const reread = await this.loadBrandOrThrow(String(brand.name));
615
- throw this.conflictError(reread);
616
- }
617
- }, { logger: sails.log });
618
- }
619
- /** Publish the draft atomically; unchanged publishes are idempotent. */
620
- async publish(branding, portal, actor, opts) {
621
- const brand = await this.loadBrandOrThrow(branding);
622
- this.requireCounters(brand, opts?.expectedVersion, opts?.expectedDraftRevision);
623
- const snapshot = await this.buildPublishSnapshot(brand);
624
- const { version: activeVersion } = this.brandCounters(brand);
625
- const histories = await this.listHistoriesAsc(String(brand.id));
626
- const activeRow = this.activeHistoryRow(histories, activeVersion);
627
- const activeVariables = activeRow?.variables ?? {};
628
- const activeTypeface = (0, BrandingTypeface_1.normalizeTypefaceState)(brand.typeface ?? activeRow?.typeface ?? null);
629
- if (String(brand.hash ?? '') === snapshot.hash &&
630
- this.snapshotKey((0, BrandingTypeface_1.orderedTypefaceFaces)(snapshot.typeface).map(face => [face.slot, face.sha256])) ===
631
- this.snapshotKey((0, BrandingTypeface_1.orderedTypefaceFaces)(activeTypeface).map(face => [face.slot, face.sha256]))) {
632
- if (this.snapshotKey(snapshot.typeface) !== this.snapshotKey(activeTypeface) ||
633
- this.snapshotKey(snapshot.variables) !== this.snapshotKey(activeVariables)) {
634
- await this.conditionalDraftUpdate(brand, { variables: activeVariables, draftTypeface: activeTypeface });
635
- }
636
- // A previous write may have committed but lost its response before cache refresh.
637
- await this.pruneHistories(String(brand.id));
638
- await this.refreshBrandingCache(String(brand.id));
639
- const state = await this.getAdminState(branding);
640
- return { state, version: activeVersion, hash: String(brand.hash ?? ''), idempotent: true };
641
- }
642
- const maxVersion = histories.reduce((max, history) => Math.max(max, history.version), activeVersion);
643
- const nextVersion = maxVersion + 1;
644
- const attribution = this.extractActor(actor);
645
- const historyValues = {
646
- branding: brand.id,
647
- version: nextVersion,
648
- hash: snapshot.hash,
649
- css: snapshot.css,
650
- variables: snapshot.variables,
651
- typeface: snapshot.typeface,
652
- ...(attribution.actorId ? { actorId: attribution.actorId } : {}),
653
- ...(attribution.actorDisplayName ? { actorDisplayName: attribution.actorDisplayName } : {}),
654
- };
655
- await this.persistPublication(brand, historyValues, snapshot, nextVersion);
656
- await this.pruneSupersededAmbiguousHistories(String(brand.id), activeVersion, nextVersion, snapshot);
657
- await this.pruneHistories(String(brand.id));
658
- await this.refreshBrandingCache(String(brand.id));
659
- const state = await this.getAdminState(branding);
660
- return { state, version: nextVersion, hash: snapshot.hash };
661
- }
662
- /** Restore a retained version as a new monotonically increasing version. */
663
- async restore(input) {
664
- const brand = await this.loadBrandOrThrow(input.branding);
665
- this.requireCounters(brand, input.expectedVersion, input.expectedDraftRevision);
666
- const histories = await this.listHistoriesAsc(String(brand.id));
667
- const row = histories.find(history => String(history.id) === String(input.versionId));
668
- if (!row) {
669
- throw this.codedError('history-not-found', `Version not found: ${input.versionId}`);
670
- }
671
- const { version: activeVersion } = this.brandCounters(brand);
672
- const variables = BrandingThemeCssService.validateVariables(row.variables ?? {});
673
- const typeface = (0, BrandingTypeface_1.normalizeTypefaceState)(row.typeface);
674
- // Re-read and hash-check every face before any active mutation.
675
- await BrandingTypefaceService.assertTypefaceAvailable(String(brand.id), typeface);
676
- // Regenerate CSS from the historical snapshot rather than trusting stored CSS.
677
- const { css, hash } = BrandingThemeCssService.generate(variables, { typeface, brandName: String(brand.name) });
678
- const maxVersion = histories.reduce((max, history) => Math.max(max, history.version), activeVersion);
679
- const nextVersion = maxVersion + 1;
680
- const attribution = this.extractActor(input.actor);
681
- const historyValues = {
682
- branding: brand.id,
683
- version: nextVersion,
684
- hash,
685
- css,
686
- variables,
687
- typeface,
688
- restoredFromVersion: row.version,
689
- ...(attribution.actorId ? { actorId: attribution.actorId } : {}),
690
- ...(attribution.actorDisplayName ? { actorDisplayName: attribution.actorDisplayName } : {}),
691
- };
692
- await this.persistPublication(brand, historyValues, { css, hash, variables, typeface }, nextVersion);
693
- await this.pruneSupersededAmbiguousHistories(String(brand.id), activeVersion, nextVersion, {
694
- hash,
695
- typeface,
696
- });
697
- await this.pruneHistories(String(brand.id));
698
- await this.refreshBrandingCache(String(brand.id));
699
- const state = await this.getAdminState(input.branding);
700
- return { state, version: nextVersion, hash };
701
- }
702
- /**
703
- * Deprecated one-major-release alias with restore semantics.
704
- * Kept only for the compatibility route; new code must call restore.
705
- */
706
- async rollback(versionId, actor, opts) {
707
- let branding = opts?.branding;
708
- if (!branding) {
709
- const row = await BrandingConfigHistory.findOne({
710
- id: versionId,
711
- });
712
- if (!row) {
713
- throw this.codedError('history-not-found', `Version not found: ${versionId}`);
714
- }
715
- const populated = row.branding;
716
- if (typeof populated === 'object' && populated !== null && populated.id !== undefined) {
717
- const brand = await BrandingConfig.findOne({ id: populated.id });
718
- if (!brand) {
719
- throw this.codedError('branding-not-found', `Brand not found for version: ${versionId}`);
720
- }
721
- branding = String(brand.name);
722
- }
723
- else {
724
- const brand = await BrandingConfig.findOne({ id: String(populated) });
725
- if (!brand) {
726
- throw this.codedError('branding-not-found', `Brand not found for version: ${versionId}`);
727
- }
728
- branding = String(brand.name);
729
- }
730
- }
731
- return this.restore({
732
- branding,
733
- versionId,
734
- expectedVersion: opts?.expectedVersion,
735
- expectedDraftRevision: opts?.expectedDraftRevision,
736
- actor,
245
+ /** Publish current draft (variables) -> CSS, bump version, persist hash, history */
246
+ async publish(branding, portal, _actor, opts) {
247
+ const brand = await BrandingConfig.findOne({ name: branding });
248
+ if (!brand)
249
+ throw new Error('branding-not-found');
250
+ if (opts?.expectedVersion != null && brand.version != null && opts.expectedVersion !== brand.version) {
251
+ throw new Error('publish-conflict');
252
+ }
253
+ const { css, hash } = BrandingThemeCssService.generate(brand.variables || {});
254
+ // Idempotency: if hash unchanged from last published, do not create new history/version
255
+ if (brand.hash && brand.hash === hash) {
256
+ return { version: brand.version || 0, hash: brand.hash, idempotent: true };
257
+ }
258
+ const newVersion = (brand.version || 0) + 1;
259
+ await BrandingConfig.update({ id: brand.id }, { css, hash, version: newVersion });
260
+ await BrandingConfigHistory.create({ branding: brand.id, version: newVersion, hash, css, variables: brand.variables });
261
+ await this.refreshBrandingCache(brand.id);
262
+ return { version: newVersion, hash };
263
+ }
264
+ /** Rollback to a previous published version via history id */
265
+ async rollback(historyId, _actor) {
266
+ const historyEntry = await BrandingConfigHistory.findOne({ id: historyId }).populate('branding');
267
+ if (!historyEntry)
268
+ throw new Error('history-not-found');
269
+ const branding = historyEntry.branding;
270
+ if (!branding)
271
+ throw new Error('branding-not-found');
272
+ // Restore variables, CSS, hash from history
273
+ await BrandingConfig.update({ id: branding.id }, {
274
+ variables: historyEntry.variables,
275
+ css: historyEntry.css,
276
+ hash: historyEntry.hash,
277
+ version: historyEntry.version
737
278
  });
738
- }
739
- /** Retain only the newest configured history rows after a durable transition. */
740
- async pruneHistories(brandingId) {
741
- const retain = this.readHistoryMaxVersions();
742
- const histories = (await BrandingConfigHistory.find({ branding: brandingId }).sort('version DESC'));
743
- for (const history of histories.slice(retain)) {
744
- await BrandingConfigHistory.destroy({ id: history.id });
745
- sails.log.verbose(`BrandingService pruned branding ${brandingId} version ${history.version}`);
746
- }
747
- }
748
- /**
749
- * Remove an ambiguous non-transactional attempt once a later publication
750
- * has committed the same snapshot. Such rows can sit above the active
751
- * version when an update response is lost and must not consume retention.
752
- */
753
- async pruneSupersededAmbiguousHistories(brandingId, activeVersion, successfulVersion, snapshot) {
754
- const successfulIdentity = this.publicationIdentity(snapshot.hash, snapshot.typeface);
755
- const histories = await this.listHistoriesAsc(brandingId);
756
- for (const history of histories) {
757
- if (history.version <= activeVersion ||
758
- history.version >= successfulVersion ||
759
- history.id === undefined ||
760
- history.id === null ||
761
- this.publicationIdentity(history.hash, history.typeface) !== successfulIdentity) {
762
- continue;
763
- }
764
- await BrandingConfigHistory.destroy({ id: history.id });
765
- sails.log.verbose(`BrandingService removed superseded ambiguous publication for brand ${brandingId} version ${history.version}`);
766
- }
767
- }
768
- // ------------------------------------------------------------------
769
- // Page-rendering helpers for layouts (design.md sections 3.4, 9.1).
770
- // Synchronous reads of the in-memory brand cache so EJS layouts can
771
- // decide font inclusion without storage I/O. A missing or corrupt active
772
- // face never re-enables Google fonts here; the browser falls back via CSS
773
- // while the Admin state carries the health warning.
774
- // ------------------------------------------------------------------
775
- /** Regular-face public URL for an active custom typeface, else null. */
776
- getActiveTypefaceFontInfo(brandingName) {
777
- const brand = this.getBrand(brandingName);
778
- const typeface = (0, BrandingTypeface_1.normalizeTypefaceState)(brand?.typeface);
779
- if (typeface.mode !== 'custom' || !typeface.faces?.regular) {
780
- return null;
781
- }
279
+ const refreshed = await this.refreshBrandingCache(branding.id);
782
280
  return {
783
- regularUrl: BrandingTypefaceService.publicUrl(String(brand?.name), typeface.faces.regular.sha256),
281
+ version: historyEntry.version,
282
+ hash: historyEntry.hash,
283
+ branding: refreshed
784
284
  };
785
285
  }
786
- /** True when the resolved brand has an active custom typeface with a Regular face. */
787
- hasActiveCustomTypeface(brandingName) {
788
- return this.getActiveTypefaceFontInfo(brandingName) !== null;
789
- }
790
286
  /** Refresh a single branding record in the in-memory cache (this.brandings & availableBrandings) */
791
287
  async refreshBrandingCache(id) {
792
- const updated = (await BrandingConfig.findOne({ id }).populate('roles'));
288
+ const updated = await BrandingConfig.findOne({ id }).populate('roles');
793
289
  if (updated) {
794
290
  const idx = this.brandings.findIndex((b) => b.id === id);
795
291
  if (idx >= 0) {
@@ -805,4 +301,4 @@ var Services;
805
301
  }
806
302
  Services.Branding = Branding;
807
303
  })(Services || (exports.Services = Services = {}));
808
- //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"BrandingService.js","sourceRoot":"","sources":["../../src/services/BrandingService.ts"],"names":[],"mappings":"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"}
304
+ //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"BrandingService.js","sourceRoot":"","sources":["../../src/services/BrandingService.ts"],"names":[],"mappings":"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"}