@researchdatabox/redbox-core 0.0.0-bootstrap.0 → 0.0.1-beta.9018

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 (185) hide show
  1. package/dist/IntegrationAuditParams.d.ts +11 -0
  2. package/dist/IntegrationAuditParams.js +14 -0
  3. package/dist/RecordAuditParams.d.ts +2 -0
  4. package/dist/RecordAuditParams.d.ts.map +1 -1
  5. package/dist/RecordAuditParams.js +3 -1
  6. package/dist/RecordsService.d.ts +14 -0
  7. package/dist/RecordsService.d.ts.map +1 -1
  8. package/dist/StorageService.d.ts +3 -0
  9. package/dist/StorageService.d.ts.map +1 -1
  10. package/dist/config/agendaQueue.config.d.ts.map +1 -1
  11. package/dist/config/agendaQueue.config.js +10 -1
  12. package/dist/config/auth.config.d.ts.map +1 -1
  13. package/dist/config/auth.config.js +2 -1
  14. package/dist/config/brandingConfigurationDefaults.config.d.ts +3 -0
  15. package/dist/config/brandingConfigurationDefaults.config.d.ts.map +1 -1
  16. package/dist/config/brandingConfigurationDefaults.config.js +154 -3
  17. package/dist/config/figshareDev.config.d.ts +12 -0
  18. package/dist/config/figshareDev.config.js +9 -0
  19. package/dist/config/index.d.ts +4 -16
  20. package/dist/config/index.d.ts.map +1 -1
  21. package/dist/config/index.js +4 -13
  22. package/dist/config/recordtype.config.d.ts.map +1 -1
  23. package/dist/config/recordtype.config.js +17 -1
  24. package/dist/config/routes.config.d.ts.map +1 -1
  25. package/dist/config/routes.config.js +47 -43
  26. package/dist/configmodels/AdminSidebarConfig.d.ts.map +1 -1
  27. package/dist/configmodels/AdminSidebarConfig.js +3 -2
  28. package/dist/configmodels/AuthorizedDomainsEmails.d.ts +48 -0
  29. package/dist/configmodels/AuthorizedDomainsEmails.d.ts.map +1 -1
  30. package/dist/configmodels/AuthorizedDomainsEmails.js +50 -2
  31. package/dist/configmodels/ConfigModels.d.ts +7 -1
  32. package/dist/configmodels/ConfigModels.d.ts.map +1 -1
  33. package/dist/configmodels/ConfigModels.js +25 -1
  34. package/dist/configmodels/DoiPublishing.d.ts +4711 -0
  35. package/dist/configmodels/DoiPublishing.js +639 -0
  36. package/dist/configmodels/FigsharePublishing.d.ts +1376 -0
  37. package/dist/configmodels/FigsharePublishing.js +630 -0
  38. package/dist/configmodels/SystemMessage.d.ts +32 -0
  39. package/dist/configmodels/SystemMessage.d.ts.map +1 -1
  40. package/dist/configmodels/SystemMessage.js +34 -2
  41. package/dist/controllers/AppConfigController.js +3 -3
  42. package/dist/controllers/FormVocabularyController.d.ts.map +1 -1
  43. package/dist/controllers/FormVocabularyController.js +4 -1
  44. package/dist/controllers/RecordAuditController.d.ts +29 -14
  45. package/dist/controllers/RecordAuditController.d.ts.map +1 -1
  46. package/dist/controllers/RecordAuditController.js +455 -57
  47. package/dist/controllers/RecordController.d.ts +1 -16
  48. package/dist/controllers/RecordController.d.ts.map +1 -1
  49. package/dist/controllers/RecordController.js +20 -39
  50. package/dist/controllers/index.d.ts.map +1 -1
  51. package/dist/controllers/index.js +4 -1
  52. package/dist/controllers/webservice/AppConfigController.js +3 -3
  53. package/dist/controllers/webservice/IntegrationAuditController.d.ts +10 -0
  54. package/dist/controllers/webservice/IntegrationAuditController.js +98 -0
  55. package/dist/form-config/default-1.0-draft.d.ts.map +1 -1
  56. package/dist/form-config/default-1.0-draft.js +26 -2
  57. package/dist/form-config/index.d.ts.map +1 -1
  58. package/dist/form-config/index.js +1 -1
  59. package/dist/index.d.ts +4 -0
  60. package/dist/index.d.ts.map +1 -1
  61. package/dist/index.js +12 -2
  62. package/dist/model/storage/IntegrationAuditModel.d.ts +47 -0
  63. package/dist/model/storage/IntegrationAuditModel.js +104 -0
  64. package/dist/model/storage/index.d.ts +1 -0
  65. package/dist/model/storage/index.d.ts.map +1 -1
  66. package/dist/model/storage/index.js +7 -2
  67. package/dist/services/AppConfigService.d.ts +20 -2
  68. package/dist/services/AppConfigService.d.ts.map +1 -1
  69. package/dist/services/AppConfigService.js +129 -15
  70. package/dist/services/DoiService.d.ts +19 -25
  71. package/dist/services/DoiService.d.ts.map +1 -1
  72. package/dist/services/DoiService.js +258 -408
  73. package/dist/services/FigshareService.d.ts +35 -65
  74. package/dist/services/FigshareService.d.ts.map +1 -1
  75. package/dist/services/FigshareService.js +477 -2056
  76. package/dist/services/FormRecordConsistencyService.d.ts.map +1 -1
  77. package/dist/services/FormRecordConsistencyService.js +4 -2
  78. package/dist/services/FormsService.d.ts.map +1 -1
  79. package/dist/services/FormsService.js +4 -2
  80. package/dist/services/IntegrationAuditService.d.ts +100 -0
  81. package/dist/services/IntegrationAuditService.d.ts.map +1 -1
  82. package/dist/services/IntegrationAuditService.js +561 -0
  83. package/dist/services/RecordsService.d.ts +16 -0
  84. package/dist/services/RecordsService.d.ts.map +1 -1
  85. package/dist/services/RecordsService.js +54 -2
  86. package/dist/services/SolrSearchService.d.ts +1 -0
  87. package/dist/services/SolrSearchService.d.ts.map +1 -1
  88. package/dist/services/SolrSearchService.js +14 -3
  89. package/dist/services/VocabularyService.d.ts +1 -0
  90. package/dist/services/VocabularyService.d.ts.map +1 -1
  91. package/dist/services/VocabularyService.js +4 -1
  92. package/dist/services/doi-v2/audit.d.ts +7 -0
  93. package/dist/services/doi-v2/audit.js +30 -0
  94. package/dist/services/doi-v2/bindings.d.ts +8 -0
  95. package/dist/services/doi-v2/bindings.js +85 -0
  96. package/dist/services/doi-v2/config.d.ts +7 -0
  97. package/dist/services/doi-v2/config.js +51 -0
  98. package/dist/services/doi-v2/context.d.ts +18 -0
  99. package/dist/services/doi-v2/context.js +41 -0
  100. package/dist/services/doi-v2/http.d.ts +21 -0
  101. package/dist/services/doi-v2/http.js +88 -0
  102. package/dist/services/doi-v2/payload.d.ts +4 -0
  103. package/dist/services/doi-v2/payload.js +291 -0
  104. package/dist/services/doi-v2/profiles.d.ts +5 -0
  105. package/dist/services/doi-v2/profiles.js +31 -0
  106. package/dist/services/doi-v2/runtime.d.ts +16 -0
  107. package/dist/services/doi-v2/runtime.js +173 -0
  108. package/dist/services/doi-v2/types.d.ts +49 -0
  109. package/dist/services/doi-v2/types.js +3 -0
  110. package/dist/services/figshare-v2/assets.d.ts +5 -0
  111. package/dist/services/figshare-v2/assets.js +297 -0
  112. package/dist/services/figshare-v2/bindings.d.ts +6 -0
  113. package/dist/services/figshare-v2/bindings.js +60 -0
  114. package/dist/services/figshare-v2/config.d.ts +13 -0
  115. package/dist/services/figshare-v2/config.js +81 -0
  116. package/dist/services/figshare-v2/context.d.ts +4 -0
  117. package/dist/services/figshare-v2/context.js +20 -0
  118. package/dist/services/figshare-v2/embargo.d.ts +5 -0
  119. package/dist/services/figshare-v2/embargo.js +36 -0
  120. package/dist/services/figshare-v2/http.d.ts +25 -0
  121. package/dist/services/figshare-v2/http.js +270 -0
  122. package/dist/services/figshare-v2/metadata.d.ts +6 -0
  123. package/dist/services/figshare-v2/metadata.js +221 -0
  124. package/dist/services/figshare-v2/observability.d.ts +7 -0
  125. package/dist/services/figshare-v2/observability.js +85 -0
  126. package/dist/services/figshare-v2/plan.d.ts +5 -0
  127. package/dist/services/figshare-v2/plan.js +51 -0
  128. package/dist/services/figshare-v2/publish.d.ts +5 -0
  129. package/dist/services/figshare-v2/publish.js +20 -0
  130. package/dist/services/figshare-v2/queue.d.ts +4 -0
  131. package/dist/services/figshare-v2/queue.js +11 -0
  132. package/dist/services/figshare-v2/runtime.d.ts +11 -0
  133. package/dist/services/figshare-v2/runtime.js +116 -0
  134. package/dist/services/figshare-v2/types.d.ts +194 -0
  135. package/dist/services/figshare-v2/types.js +37 -0
  136. package/dist/services/figshare-v2/workflow.d.ts +3 -0
  137. package/dist/services/figshare-v2/workflow.js +7 -0
  138. package/dist/services/figshare-v2/writeback.d.ts +5 -0
  139. package/dist/services/figshare-v2/writeback.js +45 -0
  140. package/dist/services/index.d.ts +3 -0
  141. package/dist/services/index.d.ts.map +1 -1
  142. package/dist/services/index.js +7 -2
  143. package/dist/visitor/client.visitor.d.ts +3 -0
  144. package/dist/visitor/client.visitor.d.ts.map +1 -1
  145. package/dist/visitor/client.visitor.js +8 -1
  146. package/dist/visitor/construct.visitor.d.ts +3 -0
  147. package/dist/visitor/construct.visitor.d.ts.map +1 -1
  148. package/dist/visitor/construct.visitor.js +95 -70
  149. package/dist/visitor/data-value.visitor.d.ts +3 -0
  150. package/dist/visitor/data-value.visitor.d.ts.map +1 -1
  151. package/dist/visitor/data-value.visitor.js +5 -1
  152. package/dist/visitor/json-type-def.visitor.d.ts +3 -0
  153. package/dist/visitor/json-type-def.visitor.d.ts.map +1 -1
  154. package/dist/visitor/json-type-def.visitor.js +5 -1
  155. package/dist/visitor/migrate-config-v4-v5.visitor.d.ts +3 -0
  156. package/dist/visitor/migrate-config-v4-v5.visitor.d.ts.map +1 -1
  157. package/dist/visitor/migrate-config-v4-v5.visitor.js +77 -64
  158. package/dist/visitor/template.visitor.d.ts +3 -0
  159. package/dist/visitor/template.visitor.d.ts.map +1 -1
  160. package/dist/visitor/template.visitor.js +5 -1
  161. package/dist/visitor/validator.visitor.d.ts +3 -1
  162. package/dist/visitor/validator.visitor.d.ts.map +1 -1
  163. package/dist/visitor/validator.visitor.js +6 -1
  164. package/dist/visitor/vocab-inline.visitor.d.ts +16 -1
  165. package/dist/visitor/vocab-inline.visitor.d.ts.map +1 -1
  166. package/dist/visitor/vocab-inline.visitor.js +109 -14
  167. package/package.json +26 -14
  168. package/dist/config/datacite.config.d.ts +0 -51
  169. package/dist/config/datacite.config.d.ts.map +0 -1
  170. package/dist/config/datacite.config.js +0 -44
  171. package/dist/config/figshareAPI.config.d.ts +0 -116
  172. package/dist/config/figshareAPI.config.d.ts.map +0 -1
  173. package/dist/config/figshareAPI.config.js +0 -857
  174. package/dist/config/figshareAPIEnv.config.d.ts +0 -11
  175. package/dist/config/figshareAPIEnv.config.d.ts.map +0 -1
  176. package/dist/config/figshareAPIEnv.config.js +0 -13
  177. package/dist/config/figshareRedboxFORMapping.config.d.ts +0 -15
  178. package/dist/config/figshareRedboxFORMapping.config.d.ts.map +0 -1
  179. package/dist/config/figshareRedboxFORMapping.config.js +0 -7458
  180. package/dist/config/relatedObjectsFormDefinition.config.d.ts.map +0 -1
  181. package/dist/form-config/dataPublication-1.0-draft.d.ts.map +0 -1
  182. package/dist/form-config/dataPublication-1.0-embargoed.d.ts.map +0 -1
  183. package/dist/form-config/dataPublication-1.0-published.d.ts.map +0 -1
  184. package/dist/form-config/dataPublication-1.0-queued.d.ts.map +0 -1
  185. package/dist/form-config/dataPublication-1.0-retired.d.ts.map +0 -1
@@ -1,8 +1,12 @@
1
1
  import { BrandingModel } from '../model/storage/BrandingModel';
2
2
  import { AppConfigAttributes } from '../waterline-models/AppConfig';
3
3
  import { Services as services } from '../CoreService';
4
+ import { type ConfigModelFormAdapter } from '../configmodels/ConfigModels';
4
5
  import type { BrandingConfigurationDefaultsConfig } from '../config/brandingConfigurationDefaults.config';
5
6
  import type { AuthorizedDomainsEmails } from '../configmodels/AuthorizedDomainsEmails';
7
+ export declare const APP_CONFIG_SECRET_MASK = "__REDACTED__";
8
+ export declare const APP_CONFIG_SECRET_CLEAR = "__CLEAR_SECRET__";
9
+ type AppConfigData = Record<string, unknown>;
6
10
  export declare namespace Services {
7
11
  /**
8
12
  * AppConfig related functions...
@@ -20,16 +24,27 @@ export declare namespace Services {
20
24
  private bootstrapAsync;
21
25
  initAllConfigFormSchemas(): Promise<void>;
22
26
  private refreshBrandingAppConfigMap;
27
+ private getSecretFields;
28
+ private isMaskedSecretPlaceholder;
29
+ private shouldMaskSecretValue;
30
+ private maskSecretFields;
31
+ private mergeSecretFields;
32
+ private prepareConfigModelForForm;
33
+ private prepareConfigModelForSave;
23
34
  getAppConfigurationForBrand(brandName: string): BrandingConfigurationDefaultsConfig & {
24
35
  authorizedDomainsEmails?: AuthorizedDomainsEmails;
25
36
  };
26
37
  getAllConfigurationForBrand: (brandId: string) => Promise<AppConfigAttributes[]>;
38
+ private getConfigRecordTimestamp;
39
+ private chooseLatestConfigRecord;
40
+ private reduceToLatestConfigRecords;
41
+ private findLatestConfigRecord;
27
42
  loadAppConfigurationModel(brandId: string): Promise<BrandingConfigurationDefaultsConfig & {
28
43
  authorizedDomainsEmails?: AuthorizedDomainsEmails;
29
44
  }>;
30
45
  getAppConfigByBrandAndKey(brandId: string, configKey: string): Promise<unknown>;
31
- createOrUpdateConfig(branding: BrandingModel, configKey: string, configData: string): Promise<unknown>;
32
- createConfig(brandName: string, configKey: string, configData: string): Promise<unknown>;
46
+ createOrUpdateConfig(branding: BrandingModel, configKey: string, configData: AppConfigData): Promise<unknown>;
47
+ createConfig(brandName: string, configKey: string, configData: AppConfigData): Promise<unknown>;
33
48
  getAppConfigForm(branding: BrandingModel, configForm: string): Promise<{
34
49
  model: object;
35
50
  schema: unknown;
@@ -50,10 +65,13 @@ export declare namespace Services {
50
65
  };
51
66
  schema?: unknown;
52
67
  tsGlob?: string | string[];
68
+ secretFields?: string[];
69
+ formAdapter?: ConfigModelFormAdapter;
53
70
  }): void;
54
71
  }
55
72
  }
56
73
  declare global {
57
74
  let AppConfigService: Services.AppConfigs;
58
75
  }
76
+ export {};
59
77
  //# sourceMappingURL=AppConfigService.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"AppConfigService.d.ts","sourceRoot":"","sources":["../../src/services/AppConfigService.ts"],"names":[],"mappings":"AAmBA,OAAO,EAAE,aAAa,EAAE,MAAM,gCAAgC,CAAC;AAC/D,OAAO,EAAE,mBAAmB,EAAE,MAAM,+BAA+B,CAAC;AACpE,OAAO,EAAE,QAAQ,IAAI,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAEtD,OAAO,KAAK,EAAE,mCAAmC,EAAE,MAAM,gDAAgD,CAAC;AAC1G,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,yCAAyC,CAAC;AAMvF,yBAAiB,QAAQ,CAAC;IACxB;;;;OAIG;IACH,MAAa,UAAW,SAAQ,QAAQ,CAAC,IAAI,CAAC,OAAO;QACnD,oBAAoB,EAAE,MAAM,CAAC,MAAM,EAAE,mCAAmC,GAAG;YAAE,uBAAuB,CAAC,EAAE,uBAAuB,CAAA;SAAE,CAAC,CAAM;QACvI,cAAc,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAM;QAC7C,OAAO,CAAC,YAAY,CAA0B;QAE9C,UAAmB,gBAAgB,EAAE,MAAM,EAAE,CAU3C;QAGK,SAAS,QAAO,OAAO,CAAC,IAAI,CAAC,CAGnC;gBAEa,cAAc;QAetB,wBAAwB,IAAI,OAAO,CAAC,IAAI,CAAC;gBAsBjC,2BAA2B;QAKlC,2BAA2B,CAAC,SAAS,EAAE,MAAM,GAAG,mCAAmC,GAAG;YAAE,uBAAuB,CAAC,EAAE,uBAAuB,CAAA;SAAE;QAI3I,2BAA2B,GAAI,SAAS,MAAM,KAAG,OAAO,CAAC,mBAAmB,EAAE,CAAC,CAErF;QAEY,yBAAyB,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,mCAAmC,GAAG;YAAE,uBAAuB,CAAC,EAAE,uBAAuB,CAAA;SAAE,CAAC;QAwBhJ,yBAAyB,CAAC,OAAO,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;QAoB/E,oBAAoB,CAAC,QAAQ,EAAE,aAAa,EAAE,SAAS,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;QAetG,YAAY,CAAC,SAAS,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;QAexF,gBAAgB,CAAC,QAAQ,EAAE,aAAa,EAAE,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC;YAAE,KAAK,EAAE,MAAM,CAAC;YAAC,MAAM,EAAE,OAAO,CAAC;YAAC,UAAU,EAAE,MAAM,EAAE,CAAA;SAAE,CAAC;QAgB7I,OAAO,CAAC,aAAa;QAuCrB;;;;WAIG;QACI,mBAAmB,CAAC,IAAI,EAAE;YAAE,GAAG,EAAE,MAAM,CAAC;YAAC,SAAS,EAAE,MAAM,CAAC;YAAC,KAAK,EAAE;gBAAE,KAAK,GAAG,IAAI,EAAE,KAAK,EAAE,GAAG,MAAM,CAAC;gBAAC,aAAa,CAAC,EAAE,MAAM,MAAM,EAAE,CAAA;aAAE,CAAC;YAAC,MAAM,CAAC,EAAE,OAAO,CAAC;YAAC,MAAM,CAAC,EAAE,MAAM,GAAG,MAAM,EAAE,CAAA;SAAE,GAAG,IAAI;KA6BpM;CAEF;AAED,OAAO,CAAC,MAAM,CAAC;IACb,IAAI,gBAAgB,EAAE,QAAQ,CAAC,UAAU,CAAC;CAC3C"}
1
+ {"version":3,"file":"AppConfigService.d.ts","sourceRoot":"","sources":["../../src/services/AppConfigService.ts"],"names":[],"mappings":"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"}
@@ -51,11 +51,13 @@ var __importStar = (this && this.__importStar) || (function () {
51
51
  };
52
52
  })();
53
53
  Object.defineProperty(exports, "__esModule", { value: true });
54
- exports.Services = void 0;
54
+ exports.Services = exports.APP_CONFIG_SECRET_CLEAR = exports.APP_CONFIG_SECRET_MASK = void 0;
55
55
  const CoreService_1 = require("../CoreService");
56
56
  const ConfigModels_1 = require("../configmodels/ConfigModels");
57
57
  const TJS = __importStar(require("typescript-json-schema"));
58
58
  const glob_1 = require("glob");
59
+ exports.APP_CONFIG_SECRET_MASK = '__REDACTED__';
60
+ exports.APP_CONFIG_SECRET_CLEAR = '__CLEAR_SECRET__';
59
61
  var Services;
60
62
  (function (Services) {
61
63
  /**
@@ -118,12 +120,116 @@ var Services;
118
120
  const appConfig = await this.loadAppConfigurationModel(branding.id);
119
121
  this.brandingAppConfigMap[branding.name] = appConfig;
120
122
  }
123
+ getSecretFields(configKey) {
124
+ return ConfigModels_1.ConfigModels.getModelInfo(configKey)?.secretFields ?? [];
125
+ }
126
+ isMaskedSecretPlaceholder(value) {
127
+ return typeof value === 'string' && value === exports.APP_CONFIG_SECRET_MASK;
128
+ }
129
+ shouldMaskSecretValue(value) {
130
+ if (typeof value === 'string') {
131
+ return value.trim() !== '';
132
+ }
133
+ return value != null;
134
+ }
135
+ maskSecretFields(configKey, configData) {
136
+ const secretFields = this.getSecretFields(configKey);
137
+ if (secretFields.length === 0 || configData == null) {
138
+ return configData;
139
+ }
140
+ const masked = _.cloneDeep(configData);
141
+ secretFields.forEach((fieldPath) => {
142
+ if (_.has(masked, fieldPath) && this.shouldMaskSecretValue(_.get(masked, fieldPath))) {
143
+ _.set(masked, fieldPath, exports.APP_CONFIG_SECRET_MASK);
144
+ }
145
+ });
146
+ return masked;
147
+ }
148
+ mergeSecretFields(configKey, incomingConfig, existingConfig) {
149
+ const secretFields = this.getSecretFields(configKey);
150
+ if (secretFields.length === 0 || incomingConfig == null) {
151
+ return incomingConfig;
152
+ }
153
+ const merged = _.cloneDeep(incomingConfig);
154
+ secretFields.forEach((fieldPath) => {
155
+ const incomingValue = _.get(merged, fieldPath);
156
+ if (this.isMaskedSecretPlaceholder(incomingValue)) {
157
+ if (existingConfig != null && _.has(existingConfig, fieldPath)) {
158
+ _.set(merged, fieldPath, _.get(existingConfig, fieldPath));
159
+ }
160
+ else {
161
+ _.unset(merged, fieldPath);
162
+ }
163
+ }
164
+ else if (incomingValue === exports.APP_CONFIG_SECRET_CLEAR) {
165
+ _.unset(merged, fieldPath);
166
+ }
167
+ });
168
+ return merged;
169
+ }
170
+ prepareConfigModelForForm(configKey, model) {
171
+ const formAdapter = ConfigModels_1.ConfigModels.getModelInfo(configKey)?.formAdapter?.toForm;
172
+ const transformed = typeof formAdapter === 'function'
173
+ ? formAdapter(_.cloneDeep(model))
174
+ : _.cloneDeep(model);
175
+ return transformed;
176
+ }
177
+ prepareConfigModelForSave(configKey, model) {
178
+ const formAdapter = ConfigModels_1.ConfigModels.getModelInfo(configKey)?.formAdapter?.fromForm;
179
+ const transformed = typeof formAdapter === 'function'
180
+ ? formAdapter(_.cloneDeep(model))
181
+ : _.cloneDeep(model);
182
+ return transformed;
183
+ }
121
184
  getAppConfigurationForBrand(brandName) {
122
185
  return _.get(this.brandingAppConfigMap, brandName, sails.config.brandingConfigurationDefaults == undefined ? {} : sails.config.brandingConfigurationDefaults);
123
186
  }
124
187
  getAllConfigurationForBrand = (brandId) => {
125
188
  return AppConfig.find({ branding: brandId });
126
189
  };
190
+ getConfigRecordTimestamp(record) {
191
+ const updatedAt = Date.parse(String(record?.updatedAt ?? ''));
192
+ if (!Number.isNaN(updatedAt)) {
193
+ return updatedAt;
194
+ }
195
+ const createdAt = Date.parse(String(record?.createdAt ?? ''));
196
+ if (!Number.isNaN(createdAt)) {
197
+ return createdAt;
198
+ }
199
+ return 0;
200
+ }
201
+ chooseLatestConfigRecord(records) {
202
+ return records.reduce((latest, current) => {
203
+ if (latest == null) {
204
+ return current;
205
+ }
206
+ return this.getConfigRecordTimestamp(current) >= this.getConfigRecordTimestamp(latest)
207
+ ? current
208
+ : latest;
209
+ }, undefined);
210
+ }
211
+ reduceToLatestConfigRecords(records) {
212
+ const latestByKey = new Map();
213
+ for (const record of records) {
214
+ const key = String(record.configKey ?? '');
215
+ const currentLatest = latestByKey.get(key);
216
+ if (currentLatest == null) {
217
+ latestByKey.set(key, record);
218
+ continue;
219
+ }
220
+ if (this.getConfigRecordTimestamp(record) >= this.getConfigRecordTimestamp(currentLatest)) {
221
+ latestByKey.set(key, record);
222
+ }
223
+ }
224
+ return Array.from(latestByKey.values());
225
+ }
226
+ async findLatestConfigRecord(brandId, configKey) {
227
+ const records = await AppConfig.find({ branding: brandId, configKey });
228
+ if (records.length > 1) {
229
+ sails.log.warn(`Multiple appconfig records found for branding '${brandId}' and key '${configKey}'. Using the most recently updated record.`);
230
+ }
231
+ return this.chooseLatestConfigRecord(records);
232
+ }
127
233
  async loadAppConfigurationModel(brandId) {
128
234
  const appConfiguration = {};
129
235
  const modelNames = ConfigModels_1.ConfigModels.getConfigKeys();
@@ -139,16 +245,20 @@ var Services;
139
245
  // grab any default branding configuration we're overriding in config
140
246
  _.merge(appConfiguration, sails.config.brandingConfigurationDefaults);
141
247
  const appConfigItems = await this.getAllConfigurationForBrand(brandId);
142
- for (const appConfigItem of appConfigItems) {
248
+ const latestAppConfigItems = this.reduceToLatestConfigRecords(appConfigItems);
249
+ if (latestAppConfigItems.length !== appConfigItems.length) {
250
+ sails.log.warn(`Duplicate appconfig records detected for branding '${brandId}'. Using the most recently updated record for each config key.`);
251
+ }
252
+ for (const appConfigItem of latestAppConfigItems) {
143
253
  _.set(appConfiguration, appConfigItem.configKey, appConfigItem.configData);
144
254
  }
145
255
  return appConfiguration;
146
256
  }
147
257
  async getAppConfigByBrandAndKey(brandId, configKey) {
148
- const dbConfig = await AppConfig.findOne({ branding: brandId, configKey });
258
+ const dbConfig = await this.findLatestConfigRecord(brandId, configKey);
149
259
  // If no config exists in the DB return the default settings
150
260
  if (dbConfig != null) {
151
- return dbConfig.configData;
261
+ return this.maskSecretFields(configKey, dbConfig.configData);
152
262
  }
153
263
  let config = _.get(sails.config.brandingConfigurationDefaults, configKey, {});
154
264
  if (_.isEmpty(config)) {
@@ -159,29 +269,32 @@ var Services;
159
269
  const modelClass = modelInfo.class;
160
270
  config = new modelClass();
161
271
  }
162
- return config;
272
+ return this.maskSecretFields(configKey, config);
163
273
  }
164
274
  async createOrUpdateConfig(branding, configKey, configData) {
165
- const dbConfig = await AppConfig.findOne({ branding: branding.id, configKey });
275
+ const dbConfig = await this.findLatestConfigRecord(String(branding.id), configKey);
276
+ const preparedConfigData = this.prepareConfigModelForSave(configKey, configData);
277
+ const mergedConfigData = this.mergeSecretFields(configKey, preparedConfigData, dbConfig?.configData);
166
278
  // Create if no config exists
167
279
  let record;
168
280
  if (dbConfig == null) {
169
- record = await AppConfig.create({ branding: branding.id, configKey: configKey, configData: configData });
281
+ record = await AppConfig.create({ branding: branding.id, configKey: configKey, configData: mergedConfigData });
170
282
  }
171
283
  else {
172
- record = await AppConfig.updateOne({ branding: branding.id, configKey }).set({ configData: configData });
284
+ record = await AppConfig.updateOne({ branding: branding.id, configKey }).set({ configData: mergedConfigData });
173
285
  }
174
286
  await this.refreshBrandingAppConfigMap(branding);
175
- return record.configData;
287
+ return this.maskSecretFields(configKey, record.configData);
176
288
  }
177
289
  async createConfig(brandName, configKey, configData) {
178
290
  const branding = BrandingService.getBrand(brandName);
179
- const dbConfig = await AppConfig.findOne({ branding: branding.id, configKey });
291
+ const dbConfig = await this.findLatestConfigRecord(String(branding.id), configKey);
292
+ const preparedConfigData = this.prepareConfigModelForSave(configKey, configData);
180
293
  // Create if no config exists
181
294
  if (dbConfig == null) {
182
- const createdRecord = await AppConfig.create({ branding: branding.id, configKey: configKey, configData: configData });
295
+ const createdRecord = await AppConfig.create({ branding: branding.id, configKey: configKey, configData: this.mergeSecretFields(configKey, preparedConfigData) });
183
296
  await this.refreshBrandingAppConfigMap(branding);
184
- return createdRecord.configData;
297
+ return this.maskSecretFields(configKey, createdRecord.configData);
185
298
  }
186
299
  throw Error(`Config with key ${configKey} for branding ${brandName} already exists`);
187
300
  }
@@ -195,7 +308,8 @@ var Services;
195
308
  const model = _.get(appConfig, configForm, new modelCtor());
196
309
  const jsonSchema = this.getJsonSchema(modelDefinition);
197
310
  const fieldOrder = typeof modelCtor.getFieldOrder === 'function' ? modelCtor.getFieldOrder() : [];
198
- const configData = { model: model, schema: jsonSchema, fieldOrder: fieldOrder };
311
+ const preparedModel = this.prepareConfigModelForForm(configForm, model);
312
+ const configData = { model: this.maskSecretFields(configForm, preparedModel), schema: jsonSchema, fieldOrder: fieldOrder };
199
313
  return configData;
200
314
  }
201
315
  getJsonSchema(modelDefinition) {
@@ -239,7 +353,7 @@ var Services;
239
353
  */
240
354
  registerConfigModel(info) {
241
355
  // persist in ConfigModels registry
242
- ConfigModels_1.ConfigModels.register(info.key, { modelName: info.modelName, class: info.class, schema: info.schema, tsGlob: info.tsGlob });
356
+ ConfigModels_1.ConfigModels.register(info.key, { modelName: info.modelName, class: info.class, schema: info.schema, tsGlob: info.tsGlob, secretFields: info.secretFields, formAdapter: info.formAdapter });
243
357
  // cache schema if provided
244
358
  if (info.schema) {
245
359
  this.modelSchemaMap[info.modelName] = info.schema;
@@ -270,4 +384,4 @@ var Services;
270
384
  }
271
385
  Services.AppConfigs = AppConfigs;
272
386
  })(Services || (exports.Services = Services = {}));
273
- //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"AppConfigService.js","sourceRoot":"","sources":["../../src/services/AppConfigService.ts"],"names":[],"mappings":";AAAA,0FAA0F;AAC1F,EAAE;AACF,6BAA6B;AAC7B,0BAA0B;AAC1B,EAAE;AACF,uEAAuE;AACvE,uEAAuE;AACvE,oEAAoE;AACpE,sCAAsC;AACtC,EAAE;AACF,kEAAkE;AAClE,iEAAiE;AACjE,gEAAgE;AAChE,+CAA+C;AAC/C,EAAE;AACF,0EAA0E;AAC1E,0EAA0E;AAC1E,8DAA8D;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAI9D,gDAAsD;AACtD,+DAAkF;AAGlF,4DAA8C;AAC9C,+BAAgC;AAIhC,IAAiB,QAAQ,CAoPxB;AApPD,WAAiB,QAAQ;IACvB;;;;OAIG;IACH,MAAa,UAAW,SAAQ,sBAAQ,CAAC,IAAI,CAAC,OAAO;QACnD,oBAAoB,GAAgH,EAAE,CAAC;QACvI,cAAc,GAA4B,EAAE,CAAC;QACrC,YAAY,GAAgB,IAAI,GAAG,EAAE,CAAC;QAE3B,gBAAgB,GAAa;YAC9C,WAAW;YACX,6BAA6B;YAC7B,2BAA2B;YAC3B,6BAA6B;YAC7B,sBAAsB;YACtB,kBAAkB;YAClB,2BAA2B;YAC3B,cAAc;YACd,qBAAqB;SACtB,CAAC;QAGK,SAAS,GAAG,GAAkB,EAAE;YACrC,IAAI,CAAC,oBAAoB,GAAG,EAAE,CAAA;YAC9B,OAAO,IAAI,CAAC,cAAc,EAAE,CAAC;QAC/B,CAAC,CAAA;QAEO,KAAK,CAAC,cAAc;YAC1B,+CAA+C;YAC/C,iDAAiD;YACjD,IAAI,CAAC,wBAAwB,EAAE,CAAC,IAAI,CAAC,GAAG,EAAE;gBACxC,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,4BAA4B,CAAC,CAAC;YAC/C,CAAC,CAAC,CAAA;YACF,MAAM,kBAAkB,GAAG,eAAe,CAAC,YAAY,EAAE,CAAC;YAC1D,KAAK,MAAM,iBAAiB,IAAI,kBAAkB,EAAE,CAAC;gBACnD,MAAM,QAAQ,GAAkB,eAAe,CAAC,QAAQ,CAAC,iBAAiB,CAAC,CAAC;gBAC5E,MAAM,eAAe,GAAG,MAAM,IAAI,CAAC,yBAAyB,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC;gBAC1E,IAAI,CAAC,oBAAoB,CAAC,iBAAiB,CAAC,GAAG,eAA8G,CAAC;YAChK,CAAC;QAEH,CAAC;QAED,KAAK,CAAC,wBAAwB;YAC5B,MAAM,UAAU,GAAa,2BAAY,CAAC,aAAa,EAAE,CAAC;YAE1D,iEAAiE;YACjE,KAAK,MAAM,SAAS,IAAI,UAAU,EAAE,CAAC;gBACnC,MAAM,eAAe,GAAgC,2BAAY,CAAC,YAAY,CAAC,SAAS,CAAC,CAAC;gBAC1F,IAAI,eAAe,EAAE,MAAM,EAAE,CAAC;oBAC5B,MAAM,KAAK,GAAG,KAAK,CAAC,OAAO,CAAC,eAAe,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,eAAe,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,eAAe,CAAC,MAAM,CAAC,CAAC;oBACxG,KAAK,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,OAAO,CAAC,CAAC,CAAS,EAAE,EAAE,CAAC,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;gBACzE,CAAC;YACH,CAAC;YAED,8DAA8D;YAC9D,KAAK,MAAM,SAAS,IAAI,UAAU,EAAE,CAAC;gBACnC,MAAM,eAAe,GAAgC,2BAAY,CAAC,YAAY,CAAC,SAAS,CAAC,CAAC;gBAC1F,sCAAsC;gBACtC,IAAI,eAAe,EAAE,CAAC;oBACpB,IAAI,CAAC,aAAa,CAAC,eAAe,CAAC,CAAC;gBACtC,CAAC;YACH,CAAC;QACH,CAAC;QAEO,KAAK,CAAC,2BAA2B,CAAC,QAAuB;YAC/D,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,yBAAyB,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAA;YACnE,IAAI,CAAC,oBAAoB,CAAC,QAAQ,CAAC,IAAI,CAAC,GAAG,SAAwG,CAAC;QACtJ,CAAC;QAEM,2BAA2B,CAAC,SAAiB;YAClD,OAAO,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,oBAAoB,EAAE,SAAS,EAAE,KAAK,CAAC,MAAM,CAAC,6BAA6B,IAAI,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,MAAM,CAAC,6BAA6B,CAAgG,CAAC;QAC/P,CAAC;QAEM,2BAA2B,GAAG,CAAC,OAAe,EAAkC,EAAE;YACvF,OAAO,SAAS,CAAC,IAAI,CAAC,EAAE,QAAQ,EAAE,OAAO,EAAE,CAA8C,CAAC;QAC5F,CAAC,CAAA;QAEM,KAAK,CAAC,yBAAyB,CAAC,OAAe;YACpD,MAAM,gBAAgB,GAA4B,EAAE,CAAC;YACrD,MAAM,UAAU,GAAG,2BAAY,CAAC,aAAa,EAAE,CAAC;YAChD,KAAK,MAAM,SAAS,IAAI,UAAU,EAAE,CAAC;gBACnC,MAAM,SAAS,GAAG,2BAAY,CAAC,YAAY,CAAC,SAAS,CAAC,CAAC;gBACvD,IAAI,CAAC,SAAS,EAAE,CAAC;oBACf,SAAS;gBACX,CAAC;gBACD,MAAM,UAAU,GAAG,SAAS,CAAC,KAAK,CAAC;gBACnC,MAAM,YAAY,GAAG,IAAI,UAAU,EAAE,CAAC;gBACtC,CAAC,CAAC,GAAG,CAAC,gBAAgB,EAAE,SAAS,EAAE,YAAY,CAAC,CAAC;YACnD,CAAC;YAED,qEAAqE;YACrE,CAAC,CAAC,KAAK,CAAC,gBAAgB,EAAE,KAAK,CAAC,MAAM,CAAC,6BAA6B,CAAC,CAAC;YAGtE,MAAM,cAAc,GAA0B,MAAM,IAAI,CAAC,2BAA2B,CAAC,OAAO,CAAC,CAAC;YAC9F,KAAK,MAAM,aAAa,IAAI,cAAc,EAAE,CAAC;gBAC3C,CAAC,CAAC,GAAG,CAAC,gBAAgB,EAAE,aAAa,CAAC,SAAS,EAAE,aAAa,CAAC,UAAU,CAAC,CAAC;YAC7E,CAAC;YACD,OAAO,gBAA0H,CAAC;QACpI,CAAC;QAEM,KAAK,CAAC,yBAAyB,CAAC,OAAe,EAAE,SAAiB;YACvE,MAAM,QAAQ,GAAG,MAAM,SAAS,CAAC,OAAO,CAAC,EAAE,QAAQ,EAAE,OAAO,EAAE,SAAS,EAAE,CAAC,CAAC;YAE3E,4DAA4D;YAC5D,IAAI,QAAQ,IAAI,IAAI,EAAE,CAAC;gBACrB,OAAO,QAAQ,CAAC,UAAU,CAAC;YAC7B,CAAC;YAED,IAAI,MAAM,GAAG,CAAC,CAAC,GAAG,CAAC,KAAK,CAAC,MAAM,CAAC,6BAA6B,EAAE,SAAS,EAAE,EAAE,CAAC,CAAC;YAC9E,IAAI,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC;gBACtB,MAAM,SAAS,GAAgC,2BAAY,CAAC,YAAY,CAAC,SAAS,CAAC,CAAC;gBACpF,IAAI,SAAS,IAAI,IAAI,EAAE,CAAC;oBACtB,MAAM,KAAK,CAAC,kCAAkC,SAAS,EAAE,CAAC,CAAC;gBAC7D,CAAC;gBACD,MAAM,UAAU,GAAG,SAAS,CAAC,KAAK,CAAC;gBACnC,MAAM,GAAG,IAAI,UAAU,EAAE,CAAC;YAC5B,CAAC;YACD,OAAO,MAAM,CAAC;QAChB,CAAC;QAEM,KAAK,CAAC,oBAAoB,CAAC,QAAuB,EAAE,SAAiB,EAAE,UAAkB;YAC9F,MAAM,QAAQ,GAAG,MAAM,SAAS,CAAC,OAAO,CAAC,EAAE,QAAQ,EAAE,QAAQ,CAAC,EAAE,EAAE,SAAS,EAAE,CAAC,CAAC;YAE/E,6BAA6B;YAC7B,IAAI,MAAM,CAAC;YACX,IAAI,QAAQ,IAAI,IAAI,EAAE,CAAC;gBACrB,MAAM,GAAG,MAAM,SAAS,CAAC,MAAM,CAAC,EAAE,QAAQ,EAAE,QAAQ,CAAC,EAAE,EAAE,SAAS,EAAE,SAAS,EAAE,UAAU,EAAE,UAAU,EAAE,CAAC,CAAC;YAC3G,CAAC;iBAAM,CAAC;gBACN,MAAM,GAAG,MAAM,SAAS,CAAC,SAAS,CAAC,EAAE,QAAQ,EAAE,QAAQ,CAAC,EAAE,EAAE,SAAS,EAAE,CAAC,CAAC,GAAG,CAAC,EAAE,UAAU,EAAE,UAAU,EAAE,CAAC,CAAC;YAC3G,CAAC;YAED,MAAM,IAAI,CAAC,2BAA2B,CAAC,QAAQ,CAAC,CAAC;YACjD,OAAQ,MAAyC,CAAC,UAAU,CAAC;QAC/D,CAAC;QAEM,KAAK,CAAC,YAAY,CAAC,SAAiB,EAAE,SAAiB,EAAE,UAAkB;YAChF,MAAM,QAAQ,GAAkB,eAAe,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC;YACpE,MAAM,QAAQ,GAAG,MAAM,SAAS,CAAC,OAAO,CAAC,EAAE,QAAQ,EAAE,QAAQ,CAAC,EAAE,EAAE,SAAS,EAAE,CAAC,CAAC;YAE/E,6BAA6B;YAC7B,IAAI,QAAQ,IAAI,IAAI,EAAE,CAAC;gBACrB,MAAM,aAAa,GAAG,MAAM,SAAS,CAAC,MAAM,CAAC,EAAE,QAAQ,EAAE,QAAQ,CAAC,EAAE,EAAE,SAAS,EAAE,SAAS,EAAE,UAAU,EAAE,UAAU,EAAE,CAAC,CAAC;gBAEtH,MAAM,IAAI,CAAC,2BAA2B,CAAC,QAAQ,CAAC,CAAC;gBACjD,OAAQ,aAAgD,CAAC,UAAU,CAAC;YACtE,CAAC;YAED,MAAM,KAAK,CAAC,mBAAmB,SAAS,iBAAiB,SAAS,iBAAiB,CAAC,CAAC;QACvF,CAAC;QAEM,KAAK,CAAC,gBAAgB,CAAC,QAAuB,EAAE,UAAkB;YAEvE,MAAM,SAAS,GAAG,IAAI,CAAC,2BAA2B,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;YAElE,MAAM,eAAe,GAAgC,2BAAY,CAAC,YAAY,CAAC,UAAU,CAAC,CAAC;YAC3F,IAAI,CAAC,eAAe,EAAE,CAAC;gBACrB,MAAM,IAAI,KAAK,CAAC,mCAAmC,UAAU,EAAE,CAAC,CAAC;YACnE,CAAC;YACD,MAAM,SAAS,GAAG,eAAe,CAAC,KAA2E,CAAC;YAC9G,MAAM,KAAK,GAAG,CAAC,CAAC,GAAG,CAAC,SAAS,EAAE,UAAU,EAAE,IAAI,SAAS,EAAE,CAAW,CAAC;YACtE,MAAM,UAAU,GAAG,IAAI,CAAC,aAAa,CAAC,eAAe,CAAC,CAAC;YACvD,MAAM,UAAU,GAAG,OAAO,SAAS,CAAC,aAAa,KAAK,UAAU,CAAC,CAAC,CAAC,SAAS,CAAC,aAAa,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;YAClG,MAAM,UAAU,GAAG,EAAE,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,UAAU,EAAE,UAAU,EAAE,UAAU,EAAE,CAAC;YAChF,OAAO,UAAU,CAAC;QACpB,CAAC;QAEO,aAAa,CAAC,eAAgC;YACpD,oCAAoC;YACpC,IAAI,IAAI,CAAC,cAAc,CAAC,eAAe,CAAC,SAAS,CAAC,IAAI,SAAS,EAAE,CAAC;gBAChE,OAAO,IAAI,CAAC,cAAc,CAAC,eAAe,CAAC,SAAS,CAAC,CAAC;YACxD,CAAC;YAED,IAAI,eAAe,CAAC,MAAM,EAAE,CAAC;gBAC3B,KAAK,CAAC,GAAG,CAAC,OAAO,CAAC,2GAA2G,EAAE,eAAe,CAAC,SAAS,CAAC,CAAC;gBAC1J,IAAI,CAAC,cAAc,CAAC,eAAe,CAAC,SAAS,CAAC,GAAG,eAAe,CAAC,MAAM,CAAC;gBACxE,OAAO,eAAe,CAAC,MAAM,CAAC;YAChC,CAAC;YAED,KAAK,CAAC,GAAG,CAAC,OAAO,CAAC,wFAAwF,EAAE,eAAe,CAAC,SAAS,CAAC,CAAC;YACvI,mFAAmF;YACnF,MAAM,UAAU,GAAG,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,YAAY,CAAC,MAAM,EAAE,CAAC,CAAC;YAC1D,MAAM,SAAS,GAAG,KAAK,CAAC,IAAI,CAAC,IAAI,GAAG,CAAC;gBACnC,6BAA6B;gBAC7B,GAAG,UAAU,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC,IAAA,eAAQ,EAAC,CAAC,CAAC,CAAC;aACxC,CAAC,CAAC,CAAC;YACJ,IAAI,SAAS,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;gBAC3B,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,yDAAyD,eAAe,CAAC,SAAS,EAAE,CAAC,CAAC;YACvG,CAAC;YACD,MAAM,QAAQ,GAAG,eAAe,CAAC,SAAS,CAAC;YAE3C,MAAM,OAAO,GAAG,GAAG,CAAC,mBAAmB,CAAC,SAAS,CAAC,CAAC;YACnD,MAAM,QAAQ,GAAoB;YAChC,yDAAyD;YACzD,8CAA8C;YAC9C,yEAAyE;YACzE,4FAA4F;YAC5F,gBAAgB;aACjB,CAAC;YAEF,mCAAmC;YACnC,MAAM,MAAM,GAAG,GAAG,CAAC,cAAc,CAAC,OAAO,EAAE,QAAQ,EAAE,QAAQ,CAAC,CAAC;YAC/D,IAAI,CAAC,cAAc,CAAC,eAAe,CAAC,SAAS,CAAC,GAAG,MAAM,CAAC;YACxD,OAAO,MAAM,CAAC;QAChB,CAAC;QAED;;;;WAIG;QACI,mBAAmB,CAAC,IAAiK;YAC1L,mCAAmC;YACnC,2BAAY,CAAC,QAAQ,CAAC,IAAI,CAAC,GAAG,EAAE,EAAE,SAAS,EAAE,IAAI,CAAC,SAAS,EAAE,KAAK,EAAE,IAAI,CAAC,KAAK,EAAE,MAAM,EAAE,IAAI,CAAC,MAAM,EAAE,MAAM,EAAE,IAAI,CAAC,MAAM,EAAE,CAAC,CAAC;YAC5H,2BAA2B;YAC3B,IAAI,IAAI,CAAC,MAAM,EAAE,CAAC;gBAChB,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,SAAS,CAAC,GAAG,IAAI,CAAC,MAAM,CAAC;YACpD,CAAC;YACD,6BAA6B;YAC7B,IAAI,IAAI,CAAC,MAAM,EAAE,CAAC;gBAChB,MAAM,KAAK,GAAG,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;gBACvE,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,IAAI,OAAO,CAAC,KAAK,QAAQ,IAAI,CAAC,CAAC,IAAI,EAAE,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;YAC9G,CAAC;YACD,6EAA6E;YAC7E,IAAI,IAAI,CAAC,oBAAoB,EAAE,CAAC;gBAC9B,IAAI,CAAC;oBACH,MAAM,eAAe,GAAG,IAAI,IAAI,CAAC,KAAK,EAAE,CAAC;oBACzC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,oBAAoB,CAAC,CAAC,OAAO,CAAC,SAAS,CAAC,EAAE;wBACzD,MAAM,WAAW,GAAG,IAAI,CAAC,oBAAoB,CAAC,SAAS,CAAC,IAAI,EAAE,CAAC;wBAC/D,IAAI,CAAC,CAAC,GAAG,CAAC,WAAW,EAAE,IAAI,CAAC,GAAG,CAAC,KAAK,SAAS,EAAE,CAAC;4BAC/C,CAAC,CAAC,GAAG,CAAC,WAAW,EAAE,IAAI,CAAC,GAAG,EAAE,eAAe,CAAC,CAAC;wBAChD,CAAC;wBACD,IAAI,CAAC,oBAAoB,CAAC,SAAS,CAAC,GAAG,WAAW,CAAC;oBACrD,CAAC,CAAC,CAAC;gBACL,CAAC;gBAAC,OAAO,CAAU,EAAE,CAAC;oBACpB,MAAM,GAAG,GAAG,CAAC,YAAY,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;oBACvD,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,0DAA0D,IAAI,CAAC,GAAG,KAAK,GAAG,EAAE,CAAC,CAAC;gBAC/F,CAAC;YACH,CAAC;QACH,CAAC;KACF;IA5OY,mBAAU,aA4OtB,CAAA;AAEH,CAAC,EApPgB,QAAQ,wBAAR,QAAQ,QAoPxB"}
387
+ //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"AppConfigService.js","sourceRoot":"","sources":["../../src/services/AppConfigService.ts"],"names":[],"mappings":"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"}
@@ -1,36 +1,30 @@
1
1
  import { Services as services } from '../CoreService';
2
- interface RecordWithMetadata extends Record<string, unknown> {
3
- metadata: Record<string, unknown>;
4
- }
2
+ import { BrandingModel } from '../model/storage/BrandingModel';
3
+ import type { DoiRecordModel } from './doi-v2/types';
4
+ import type { IntegrationAuditContext } from './IntegrationAuditService';
5
+ type DoiAction = 'create' | 'update';
6
+ type DoiAuditOptions = Record<string, unknown> & {
7
+ auditContext?: IntegrationAuditContext | null;
8
+ };
5
9
  export declare namespace Services {
6
- /**
7
- *
8
- *
9
- *
10
- * @author <a target='_' href='https://github.com/andrewbrazzatti'>Andrew Brazzatti</a>
11
- *
12
- */
13
10
  class Doi extends services.Core.Service {
14
11
  protected _exportedMethods: string[];
15
12
  private _msgPrefix;
16
13
  private msgPrefix;
17
- private makeCreateDoiCall;
18
- private makeUpdateDoiCall;
19
- deleteDoi(doi: string): Promise<boolean>;
20
- changeDoiState(doi: string, event: string): Promise<boolean>;
14
+ private resolveConfig;
15
+ private summarizeError;
16
+ private wrapHttpError;
21
17
  private doiResponseToRBValidationError;
22
- private processForCodes;
23
- publishDoi(oid: string, record: RecordWithMetadata, event?: string, action?: string): Promise<string | null>;
24
- getAuthenticationString(): string;
25
- publishDoiTrigger(oid: string, record: RecordWithMetadata, options: Record<string, unknown>): Promise<unknown>;
26
- publishDoiTriggerSync(oid: string, record: RecordWithMetadata, options: Record<string, unknown>): Promise<RecordWithMetadata>;
27
- updateDoiTriggerSync(oid: string, record: RecordWithMetadata, options: Record<string, unknown>): Promise<RecordWithMetadata>;
28
- addDoiDataToRecord(oid: string, record: RecordWithMetadata, doi: string): RecordWithMetadata;
29
- protected runTemplate(template: string, variables: Record<string, unknown>): string;
18
+ getAuthenticationString(record?: DoiRecordModel): string;
19
+ private publishV2Doi;
20
+ publishDoi(oid: string, record: DoiRecordModel, event?: string, action?: DoiAction, options?: DoiAuditOptions): Promise<string | null>;
21
+ deleteDoi(brand: BrandingModel, doi: string): Promise<boolean>;
22
+ changeDoiState(brand: BrandingModel, doi: string, event: string): Promise<boolean>;
23
+ publishDoiTrigger(oid: string, record: DoiRecordModel, options: Record<string, unknown>): Promise<unknown>;
24
+ publishDoiTriggerSync(oid: string, record: DoiRecordModel, options: Record<string, unknown>): Promise<DoiRecordModel>;
25
+ updateDoiTriggerSync(oid: string, record: DoiRecordModel, options: Record<string, unknown>): Promise<DoiRecordModel>;
26
+ addDoiDataToRecord(oid: string, record: DoiRecordModel, doi: string, options?: Record<string, unknown>): Promise<DoiRecordModel>;
30
27
  }
31
28
  }
32
- declare global {
33
- let DoiService: Services.Doi;
34
- }
35
29
  export {};
36
30
  //# sourceMappingURL=DoiService.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"DoiService.d.ts","sourceRoot":"","sources":["../../src/services/DoiService.ts"],"names":[],"mappings":"AAoBA,OAAO,EAAE,QAAQ,IAAI,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAOtD,UAAU,kBAAmB,SAAQ,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC;IAC1D,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;CACnC;AAqCD,yBAAiB,QAAQ,CAAC;IACxB;;;;;;OAMG;IACH,MAAa,GAAI,SAAQ,QAAQ,CAAC,IAAI,CAAC,OAAO;QAC5C,UAAmB,gBAAgB,EAAE,MAAM,EAAE,CAO3C;QAEF,OAAO,CAAC,UAAU,CAAU;QAC5B,OAAO,CAAC,SAAS;gBAOH,iBAAiB;gBAsBjB,iBAAiB;QAsBlB,SAAS,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;QA6BxC,cAAc,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;QAqCzE,OAAO,CAAC,8BAA8B;QAyBtC,OAAO,CAAC,eAAe;QAeV,UAAU,CAAC,GAAG,EAAE,MAAM,EAAE,MAAM,EAAE,kBAAkB,EAAE,KAAK,SAAY,EAAE,MAAM,SAAW;QAmQrG,uBAAuB;QAQV,iBAAiB,CAAC,GAAG,EAAE,MAAM,EAAE,MAAM,EAAE,kBAAkB,EAAE,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,OAAO,CAAC,OAAO,CAAC;QAe9G,qBAAqB,CAAC,GAAG,EAAE,MAAM,EAAE,MAAM,EAAE,kBAAkB,EAAE,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,OAAO,CAAC,kBAAkB,CAAC;QAa7H,oBAAoB,CAAC,GAAG,EAAE,MAAM,EAAE,MAAM,EAAE,kBAAkB,EAAE,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,OAAO,CAAC,kBAAkB,CAAC;QAQzI,kBAAkB,CAAC,GAAG,EAAE,MAAM,EAAE,MAAM,EAAE,kBAAkB,EAAE,GAAG,EAAE,MAAM;QA0BvE,SAAS,CAAC,WAAW,CAAC,QAAQ,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,MAAM;KAMpF;CACF;AAED,OAAO,CAAC,MAAM,CAAC;IACb,IAAI,UAAU,EAAE,QAAQ,CAAC,GAAG,CAAC;CAC9B"}
1
+ {"version":3,"file":"DoiService.d.ts","sourceRoot":"","sources":["../../src/services/DoiService.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,QAAQ,IAAI,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAEtD,OAAO,EAAE,aAAa,EAAE,MAAM,gCAAgC,CAAC;AAa/D,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAC;AAGrD,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,2BAA2B,CAAC;AAEzE,KAAK,SAAS,GAAG,QAAQ,GAAG,QAAQ,CAAC;AACrC,KAAK,eAAe,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG;IAC/C,YAAY,CAAC,EAAE,uBAAuB,GAAG,IAAI,CAAC;CAC/C,CAAC;AAEF,yBAAiB,QAAQ,CAAC;IACxB,MAAa,GAAI,SAAQ,QAAQ,CAAC,IAAI,CAAC,OAAO;QAC5C,UAAmB,gBAAgB,EAAE,MAAM,EAAE,CAU3C;QAEF,OAAO,CAAC,UAAU,CAAU;QAE5B,OAAO,CAAC,SAAS;gBAOH,aAAa;QAI3B,OAAO,CAAC,cAAc;QA4BtB,OAAO,CAAC,aAAa;QAYrB,OAAO,CAAC,8BAA8B;QA0B/B,uBAAuB,CAAC,MAAM,CAAC,EAAE,cAAc;gBAOxC,YAAY;QAsEb,UAAU,CACrB,GAAG,EAAE,MAAM,EACX,MAAM,EAAE,cAAc,EACtB,KAAK,SAAY,EACjB,MAAM,GAAE,SAAoB,EAC5B,OAAO,GAAE,eAAoB,GAC5B,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC;QASZ,SAAS,CAAC,KAAK,EAAE,aAAa,EAAE,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;QA8B9D,cAAc,CAAC,KAAK,EAAE,aAAa,EAAE,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;QA8BlF,iBAAiB,CAAC,GAAG,EAAE,MAAM,EAAE,MAAM,EAAE,cAAc,EAAE,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,OAAO,CAAC,OAAO,CAAC;QA8B1G,qBAAqB,CAAC,GAAG,EAAE,MAAM,EAAE,MAAM,EAAE,cAAc,EAAE,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,OAAO,CAAC,cAAc,CAAC;QAsBrH,oBAAoB,CAAC,GAAG,EAAE,MAAM,EAAE,MAAM,EAAE,cAAc,EAAE,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,OAAO,CAAC,cAAc,CAAC;QAmBpH,kBAAkB,CAC7B,GAAG,EAAE,MAAM,EACX,MAAM,EAAE,cAAc,EACtB,GAAG,EAAE,MAAM,EACX,OAAO,GAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAM,GACpC,OAAO,CAAC,cAAc,CAAC;KAiC3B;CACF"}