@oneuptime/common 12.0.13 → 12.0.14
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/Models/DatabaseModels/OnCallDutyPolicySchedule.ts +14 -0
- package/Models/DatabaseModels/UserCall.ts +94 -3
- package/Models/DatabaseModels/UserEmail.ts +94 -3
- package/Models/DatabaseModels/UserIncomingCallNumber.ts +94 -3
- package/Models/DatabaseModels/UserPush.ts +37 -0
- package/Models/DatabaseModels/UserSMS.ts +94 -3
- package/Models/DatabaseModels/UserWhatsApp.ts +93 -2
- package/Server/API/BaseAPI.ts +79 -14
- package/Server/API/UserCallAPI.ts +53 -45
- package/Server/API/UserEmailAPI.ts +53 -44
- package/Server/API/UserIncomingCallNumberAPI.ts +48 -38
- package/Server/API/UserNotificationMethodAdminAPI.ts +481 -0
- package/Server/API/UserPushAPI.ts +126 -2
- package/Server/API/UserSmsAPI.ts +53 -44
- package/Server/API/UserWhatsAppAPI.ts +53 -50
- package/Server/Infrastructure/Postgres/SchemaMigrations/1787142779538-MigrationName.ts +154 -0
- package/Server/Infrastructure/Postgres/SchemaMigrations/1787156982416-MigrationName.ts +17 -0
- package/Server/Infrastructure/Postgres/SchemaMigrations/1787700000000-FixTotpOtpUrlAlgorithm.ts +45 -0
- package/Server/Infrastructure/Postgres/SchemaMigrations/Index.ts +6 -0
- package/Server/Middleware/VerificationCodeRateLimit.ts +586 -0
- package/Server/Services/AnalyticsDatabaseService.ts +169 -0
- package/Server/Services/DatabaseService.ts +101 -0
- package/Server/Services/LogAggregationService.ts +5 -0
- package/Server/Services/PushNotificationService.ts +127 -12
- package/Server/Services/TeamMemberService.ts +53 -13
- package/Server/Services/UserCallService.ts +55 -24
- package/Server/Services/UserEmailService.ts +83 -17
- package/Server/Services/UserIncomingCallNumberService.ts +49 -85
- package/Server/Services/UserNotificationMethodAdminService.ts +1527 -0
- package/Server/Services/UserNotificationRuleService.ts +26 -0
- package/Server/Services/UserPushService.ts +89 -0
- package/Server/Services/UserSmsService.ts +50 -17
- package/Server/Services/UserWhatsAppService.ts +48 -15
- package/Server/Types/Database/QueryHelper.ts +30 -0
- package/Server/Utils/AnalyticsDatabase/QuerySettingsHelper.ts +59 -0
- package/Server/Utils/ChannelVerification.ts +510 -0
- package/Server/Utils/Monitor/Criteria/IncomingRequestCriteria.ts +13 -16
- package/Server/Utils/Monitor/MonitorAlert.ts +24 -21
- package/Server/Utils/Monitor/MonitorIncident.ts +21 -18
- package/Server/Utils/Monitor/MonitorResourceContext.ts +107 -0
- package/Server/Utils/Monitor/MonitorStepResourceIdentity.ts +442 -0
- package/Server/Utils/Monitor/SeriesResourceLabels.ts +3 -3
- package/Server/Utils/Monitor/SeriesResourceLinker.ts +96 -28
- package/Server/Utils/TotpAuth.ts +137 -9
- package/Server/Utils/UserRegistrationToken.ts +182 -0
- package/Server/Utils/VerificationCode.ts +134 -0
- package/Tests/App/Dashboard/AdminNotificationRulesPage.test.tsx +173 -94
- package/Tests/App/Dashboard/AdminUserNotificationMethodsPage.test.tsx +1151 -0
- package/Tests/App/Dashboard/AdminUserOnCallPages.test.tsx +905 -0
- package/Tests/App/Dashboard/DashboardCommandPalette.test.tsx +338 -0
- package/Tests/App/Dashboard/InvestigationPanel.test.tsx +1 -1
- package/Tests/App/Dashboard/MonitorTypePicker.test.tsx +28 -0
- package/Tests/Models/UserPushCriticalAlertColumn.test.ts +172 -0
- package/Tests/Server/API/BaseAPIGetListParallel.test.ts +519 -0
- package/Tests/Server/API/NotificationChannelVerificationAPI.test.ts +543 -0
- package/Tests/Server/API/UserIncomingCallNumberApi.test.ts +108 -18
- package/Tests/Server/API/UserNotificationMethodAdminAPI.test.ts +963 -0
- package/Tests/Server/API/UserPushCriticalAlertsApi.test.ts +114 -0
- package/Tests/Server/API/UserSmsApi.test.ts +107 -14
- package/Tests/Server/API/UserTotpAuthAPI.test.ts +427 -0
- package/Tests/Server/Infrastructure/Postgres/FixTotpOtpUrlAlgorithmMigration.test.ts +315 -0
- package/Tests/Server/Middleware/VerificationCodeRateLimit.test.ts +775 -0
- package/Tests/Server/Services/AddNetworkDeviceReachabilityColumnsMigration.test.ts +10 -62
- package/Tests/Server/Services/AnalyticsDatabasePaginationStability.test.ts +33 -13
- package/Tests/Server/Services/AnalyticsDatabaseSortKeyBoundary.test.ts +658 -0
- package/Tests/Server/Services/CriticalOnCallAlertDelivery.test.ts +458 -0
- package/Tests/Server/Services/CriticalPushAlertPayload.test.ts +301 -0
- package/Tests/Server/Services/DatabaseServiceAtomicIncrement.test.ts +143 -0
- package/Tests/Server/Services/DeliverNotificationForRuleExtraction.test.ts +1 -0
- package/Tests/Server/Services/LogAggregationScanMemory.test.ts +421 -0
- package/Tests/Server/Services/LogAggregationService.test.ts +2 -2
- package/Tests/Server/Services/NotificationChannelCodeIssuance.test.ts +401 -0
- package/Tests/Server/Services/PushNotificationDeliveryOptions.test.ts +204 -0
- package/Tests/Server/Services/TeamMemberAutoAcceptInvitation.test.ts +21 -1
- package/Tests/Server/Services/TeamMemberInviteRegistrationToken.test.ts +290 -0
- package/Tests/Server/Services/UserNotificationMethodAdminService.test.ts +948 -0
- package/Tests/Server/Services/UserNotificationRuleExecuteItem.test.ts +1 -0
- package/Tests/Server/Services/UserPushCriticalAlertToggle.test.ts +255 -0
- package/Tests/Server/Services/UserTotpAuthEnrolment.test.ts +218 -0
- package/Tests/Server/TestingUtils/AuthenticatorApp.ts +248 -0
- package/Tests/Server/Types/Database/Permissions/NotificationChannelVerificationColumns.test.ts +135 -0
- package/Tests/Server/Types/Database/Permissions/OnCallScheduleRelationSelect.test.ts +504 -0
- package/Tests/Server/Types/Database/QueryHelperFindWithSameTextAnyOf.test.ts +91 -0
- package/Tests/Server/Types/Workflow/Components/JsonToText.test.ts +384 -0
- package/Tests/Server/Types/Workflow/Components/MergeJson.test.ts +403 -0
- package/Tests/Server/Utils/Browser.test.ts +162 -0
- package/Tests/Server/Utils/ChannelVerification.test.ts +689 -0
- package/Tests/Server/Utils/Express.test.ts +371 -0
- package/Tests/Server/Utils/Monitor/Criteria/CustomCodeMonitorCriteria.test.ts +707 -0
- package/Tests/Server/Utils/Monitor/Criteria/DnsMonitorCriteria.test.ts +698 -0
- package/Tests/Server/Utils/Monitor/Criteria/IncomingEmailBodyCriteria.test.ts +243 -0
- package/Tests/Server/Utils/Monitor/Criteria/IncomingRequestBodyCriteria.test.ts +278 -0
- package/Tests/Server/Utils/Monitor/MonitorAlertResourceLinking.test.ts +160 -20
- package/Tests/Server/Utils/Monitor/MonitorDependencySuppressionCreatorSkip.test.ts +13 -8
- package/Tests/Server/Utils/Monitor/MonitorIncidentResourceLinking.test.ts +162 -18
- package/Tests/Server/Utils/Monitor/MonitorResourceContext.test.ts +349 -0
- package/Tests/Server/Utils/Monitor/MonitorStepResourceIdentity.test.ts +690 -0
- package/Tests/Server/Utils/Monitor/MonitorSummaryPersistence.test.ts +7 -2
- package/Tests/Server/Utils/Monitor/SeriesResourceLinker.test.ts +92 -18
- package/Tests/Server/Utils/PushNotificationUtilCreators.test.ts +267 -0
- package/Tests/Server/Utils/Telemetry/OneuptimeLabel.test.ts +439 -0
- package/Tests/Server/Utils/TotpAuth.test.ts +719 -0
- package/Tests/Server/Utils/UserRegistrationToken.test.ts +322 -0
- package/Tests/Server/Utils/VerificationCode.test.ts +296 -0
- package/Tests/Types/AutoRemediation/AutoRemediationSuggestionStatus.test.ts +192 -0
- package/Tests/Types/Call/CallRequest.test.ts +189 -0
- package/Tests/Types/Dashboard/DashboardSize.test.ts +226 -0
- package/Tests/Types/Incident/IncidentSlaStatus.test.ts +191 -0
- package/Tests/Types/Metrics/MetricDashboardMetricType.test.ts +278 -0
- package/Tests/Types/Metrics/MetricPipelineRuleType.test.ts +517 -0
- package/Tests/Types/Monitor/IncomingMonitorDefaultCriteria.test.ts +470 -0
- package/Tests/Types/Monitor/MonitorCriteriaInstance.test.ts +6 -4
- package/Tests/Types/Monitor/Recommendation/MonitorRecommendationCatalog.test.ts +262 -5
- package/Tests/Types/Monitor/Recommendation/MonitorRecommendationCoverage.test.ts +1 -1
- package/Tests/Types/Monitor/Recommendation/MonitorRecommendationNotificationMode.test.ts +1 -1
- package/Tests/Types/Monitor/ServiceAlertTemplates.test.ts +905 -0
- package/Tests/Types/Service/ServiceLanguage.test.ts +255 -0
- package/Tests/Types/TextRandomGeneration.test.ts +211 -0
- package/Tests/UI/Components/Button.test.tsx +175 -1
- package/Tests/UI/Components/CodeBlockLanguages.test.tsx +236 -0
- package/Tests/UI/Components/CommandPalette/CommandPalette.test.tsx +568 -0
- package/Tests/UI/Components/CommandPalette/CommandPaletteKeyboard.test.tsx +239 -0
- package/Tests/UI/Components/CommandPalette/CommandPaletteProviders.test.tsx +400 -0
- package/Tests/UI/Components/CommandPalette/PaletteFilter.test.ts +234 -0
- package/Tests/UI/Components/CommandPalette/RecentCommands.test.ts +97 -0
- package/Tests/UI/Components/CountModelSideMenuItemGuard.test.tsx +198 -0
- package/Tests/UI/Components/FeedItemSafeMode.test.tsx +1 -1
- package/Tests/UI/Components/Forms/Utils/FormFieldSchemaTypeUtil.test.ts +267 -0
- package/Tests/UI/Components/List.test.tsx +9 -2
- package/Tests/UI/Components/ListLoadingStates.test.tsx +173 -0
- package/Tests/UI/Components/MarkdownLazy.test.tsx +113 -0
- package/Tests/UI/Components/MarkdownMermaidRetry.test.tsx +110 -0
- package/Tests/UI/Components/ModelTable/useCustomFieldColumns.test.tsx +8 -0
- package/Tests/UI/Components/MonitorTemplateVariables/TemplateVariablesCatalog.test.ts +692 -0
- package/Tests/UI/Components/MoreMenuMotion.test.tsx +118 -0
- package/Tests/UI/Components/NavBarCommandKGating.test.tsx +178 -0
- package/Tests/UI/Components/OrderedStatesList.test.tsx +19 -2
- package/Tests/UI/Components/SideOverMotion.test.tsx +109 -0
- package/Tests/UI/Components/Skeleton.test.tsx +71 -0
- package/Tests/UI/Components/TableLoadingStates.test.tsx +279 -0
- package/Tests/UI/Components/Tabs.test.tsx +24 -0
- package/Tests/UI/Components/Toast.test.tsx +130 -7
- package/Tests/UI/Components/ToastStacking.test.tsx +198 -0
- package/Tests/UI/Utils/Dropdown.test.ts +423 -0
- package/Tests/UI/Utils/ModelAPITenantHeader.test.ts +122 -0
- package/Tests/UI/Utils/ModelListCache.test.ts +338 -0
- package/Tests/UI/Utils/ProjectListCacheInvalidation.test.ts +225 -0
- package/Tests/Utils/API.test.ts +16 -2
- package/Tests/Utils/Dashboard/Components/DashboardKubernetesResourceListShared.test.ts +347 -0
- package/Tests/Utils/Dashboard/Components/DashboardListSharedArgs.test.ts +259 -0
- package/Tests/Utils/Dashboard/Components/DashboardMonitorListComponent.test.ts +466 -0
- package/Tests/Utils/Rum/UrlScrubberSegments.test.ts +362 -0
- package/Types/Email/EmailTemplateType.ts +1 -0
- package/Types/Monitor/MonitorCriteriaInstance.ts +41 -20
- package/Types/Monitor/Recommendation/MonitorRecommendationCatalog.ts +131 -8
- package/Types/Monitor/Recommendation/MonitorRecommendationTypes.ts +48 -8
- package/Types/Monitor/ServiceAlertTemplates.ts +1352 -0
- package/Types/Permission.ts +35 -0
- package/Types/PushNotification/AndroidNotificationChannel.ts +26 -0
- package/Types/PushNotification/PushNotificationMessage.ts +15 -0
- package/Types/PushNotification/PushNotificationRequest.ts +8 -16
- package/Types/Service/ServiceLanguage.ts +144 -0
- package/Types/Text.ts +111 -19
- package/UI/Components/Button/Button.tsx +27 -14
- package/UI/Components/CodeBlock/CodeBlock.tsx +54 -7
- package/UI/Components/CodeBlock/LanguageRegistry.ts +103 -0
- package/UI/Components/CommandPalette/CommandPalette.tsx +790 -0
- package/UI/Components/CommandPalette/PaletteFilter.ts +196 -0
- package/UI/Components/CommandPalette/PaletteRow.tsx +173 -0
- package/UI/Components/CommandPalette/RecentCommands.ts +57 -0
- package/UI/Components/CommandPalette/Types.ts +49 -0
- package/UI/Components/CommandPalette/UseProviderSearch.ts +129 -0
- package/UI/Components/Dropdown/Dropdown.tsx +6 -1
- package/UI/Components/Feed/FeedItem.tsx +1 -1
- package/UI/Components/List/List.tsx +37 -5
- package/UI/Components/List/ListSkeleton.tsx +54 -0
- package/UI/Components/Markdown.tsx/LazyMarkdownViewer.tsx +6 -1
- package/UI/Components/Markdown.tsx/MarkdownViewer.tsx +71 -26
- package/UI/Components/Modal/Modal.tsx +2 -2
- package/UI/Components/ModelTable/BaseModelTable.tsx +1 -1
- package/UI/Components/ModelTable/useCustomFieldColumns.ts +11 -5
- package/UI/Components/MoreMenu/MoreMenu.tsx +39 -1
- package/UI/Components/Navbar/NavBar.tsx +14 -1
- package/UI/Components/OrderedStatesList/OrderedStatesList.tsx +50 -5
- package/UI/Components/SideMenu/CountModelSideMenuItem.tsx +40 -1
- package/UI/Components/SideOver/SideOver.tsx +37 -2
- package/UI/Components/Skeleton/Skeleton.tsx +53 -0
- package/UI/Components/Table/Table.tsx +74 -44
- package/UI/Components/Table/TableSkeletonRows.tsx +141 -0
- package/UI/Components/Tabs/Tab.tsx +1 -1
- package/UI/Components/Toast/Toast.tsx +118 -53
- package/UI/Components/Toast/ToastInit.tsx +82 -32
- package/UI/Styles/Theme.css +40 -0
- package/UI/Utils/ModelAPI/ModelAPI.ts +20 -10
- package/UI/Utils/ModelListCache.ts +188 -0
- package/UI/Utils/Project.ts +29 -0
- package/Utils/API.ts +6 -1
- package/build/dist/Models/DatabaseModels/OnCallDutyPolicySchedule.js +14 -0
- package/build/dist/Models/DatabaseModels/OnCallDutyPolicySchedule.js.map +1 -1
- package/build/dist/Models/DatabaseModels/UserCall.js +101 -3
- package/build/dist/Models/DatabaseModels/UserCall.js.map +1 -1
- package/build/dist/Models/DatabaseModels/UserEmail.js +101 -3
- package/build/dist/Models/DatabaseModels/UserEmail.js.map +1 -1
- package/build/dist/Models/DatabaseModels/UserIncomingCallNumber.js +101 -3
- package/build/dist/Models/DatabaseModels/UserIncomingCallNumber.js.map +1 -1
- package/build/dist/Models/DatabaseModels/UserPush.js +38 -0
- package/build/dist/Models/DatabaseModels/UserPush.js.map +1 -1
- package/build/dist/Models/DatabaseModels/UserSMS.js +101 -3
- package/build/dist/Models/DatabaseModels/UserSMS.js.map +1 -1
- package/build/dist/Models/DatabaseModels/UserWhatsApp.js +100 -2
- package/build/dist/Models/DatabaseModels/UserWhatsApp.js.map +1 -1
- package/build/dist/Server/API/BaseAPI.js +69 -13
- package/build/dist/Server/API/BaseAPI.js.map +1 -1
- package/build/dist/Server/API/UserCallAPI.js +42 -38
- package/build/dist/Server/API/UserCallAPI.js.map +1 -1
- package/build/dist/Server/API/UserEmailAPI.js +42 -38
- package/build/dist/Server/API/UserEmailAPI.js.map +1 -1
- package/build/dist/Server/API/UserIncomingCallNumberAPI.js +37 -32
- package/build/dist/Server/API/UserIncomingCallNumberAPI.js.map +1 -1
- package/build/dist/Server/API/UserNotificationMethodAdminAPI.js +341 -0
- package/build/dist/Server/API/UserNotificationMethodAdminAPI.js.map +1 -0
- package/build/dist/Server/API/UserPushAPI.js +95 -2
- package/build/dist/Server/API/UserPushAPI.js.map +1 -1
- package/build/dist/Server/API/UserSmsAPI.js +42 -38
- package/build/dist/Server/API/UserSmsAPI.js.map +1 -1
- package/build/dist/Server/API/UserWhatsAppAPI.js +42 -40
- package/build/dist/Server/API/UserWhatsAppAPI.js.map +1 -1
- package/build/dist/Server/Infrastructure/Postgres/SchemaMigrations/1787142779538-MigrationName.js +89 -0
- package/build/dist/Server/Infrastructure/Postgres/SchemaMigrations/1787142779538-MigrationName.js.map +1 -0
- package/build/dist/Server/Infrastructure/Postgres/SchemaMigrations/1787156982416-MigrationName.js +12 -0
- package/build/dist/Server/Infrastructure/Postgres/SchemaMigrations/1787156982416-MigrationName.js.map +1 -0
- package/build/dist/Server/Infrastructure/Postgres/SchemaMigrations/1787700000000-FixTotpOtpUrlAlgorithm.js +40 -0
- package/build/dist/Server/Infrastructure/Postgres/SchemaMigrations/1787700000000-FixTotpOtpUrlAlgorithm.js.map +1 -0
- package/build/dist/Server/Infrastructure/Postgres/SchemaMigrations/Index.js +6 -0
- package/build/dist/Server/Infrastructure/Postgres/SchemaMigrations/Index.js.map +1 -1
- package/build/dist/Server/Middleware/VerificationCodeRateLimit.js +393 -0
- package/build/dist/Server/Middleware/VerificationCodeRateLimit.js.map +1 -0
- package/build/dist/Server/Services/AnalyticsDatabaseService.js +136 -0
- package/build/dist/Server/Services/AnalyticsDatabaseService.js.map +1 -1
- package/build/dist/Server/Services/DatabaseService.js +74 -0
- package/build/dist/Server/Services/DatabaseService.js.map +1 -1
- package/build/dist/Server/Services/LogAggregationService.js +5 -0
- package/build/dist/Server/Services/LogAggregationService.js.map +1 -1
- package/build/dist/Server/Services/PushNotificationService.js +69 -30
- package/build/dist/Server/Services/PushNotificationService.js.map +1 -1
- package/build/dist/Server/Services/TeamMemberService.js +43 -7
- package/build/dist/Server/Services/TeamMemberService.js.map +1 -1
- package/build/dist/Server/Services/UserCallService.js +54 -22
- package/build/dist/Server/Services/UserCallService.js.map +1 -1
- package/build/dist/Server/Services/UserEmailService.js +78 -17
- package/build/dist/Server/Services/UserEmailService.js.map +1 -1
- package/build/dist/Server/Services/UserIncomingCallNumberService.js +45 -74
- package/build/dist/Server/Services/UserIncomingCallNumberService.js.map +1 -1
- package/build/dist/Server/Services/UserNotificationMethodAdminService.js +1117 -0
- package/build/dist/Server/Services/UserNotificationMethodAdminService.js.map +1 -0
- package/build/dist/Server/Services/UserNotificationRuleService.js +20 -0
- package/build/dist/Server/Services/UserNotificationRuleService.js.map +1 -1
- package/build/dist/Server/Services/UserPushService.js +77 -0
- package/build/dist/Server/Services/UserPushService.js.map +1 -1
- package/build/dist/Server/Services/UserSmsService.js +50 -17
- package/build/dist/Server/Services/UserSmsService.js.map +1 -1
- package/build/dist/Server/Services/UserWhatsAppService.js +48 -15
- package/build/dist/Server/Services/UserWhatsAppService.js.map +1 -1
- package/build/dist/Server/Types/Database/QueryHelper.js +27 -0
- package/build/dist/Server/Types/Database/QueryHelper.js.map +1 -1
- package/build/dist/Server/Utils/AnalyticsDatabase/QuerySettingsHelper.js +46 -0
- package/build/dist/Server/Utils/AnalyticsDatabase/QuerySettingsHelper.js.map +1 -1
- package/build/dist/Server/Utils/ChannelVerification.js +348 -0
- package/build/dist/Server/Utils/ChannelVerification.js.map +1 -0
- package/build/dist/Server/Utils/Monitor/Criteria/IncomingRequestCriteria.js +13 -12
- package/build/dist/Server/Utils/Monitor/Criteria/IncomingRequestCriteria.js.map +1 -1
- package/build/dist/Server/Utils/Monitor/MonitorAlert.js +20 -17
- package/build/dist/Server/Utils/Monitor/MonitorAlert.js.map +1 -1
- package/build/dist/Server/Utils/Monitor/MonitorIncident.js +17 -14
- package/build/dist/Server/Utils/Monitor/MonitorIncident.js.map +1 -1
- package/build/dist/Server/Utils/Monitor/MonitorResourceContext.js +95 -0
- package/build/dist/Server/Utils/Monitor/MonitorResourceContext.js.map +1 -0
- package/build/dist/Server/Utils/Monitor/MonitorStepResourceIdentity.js +313 -0
- package/build/dist/Server/Utils/Monitor/MonitorStepResourceIdentity.js.map +1 -0
- package/build/dist/Server/Utils/Monitor/SeriesResourceLabels.js +3 -3
- package/build/dist/Server/Utils/Monitor/SeriesResourceLinker.js +67 -26
- package/build/dist/Server/Utils/Monitor/SeriesResourceLinker.js.map +1 -1
- package/build/dist/Server/Utils/TotpAuth.js +127 -8
- package/build/dist/Server/Utils/TotpAuth.js.map +1 -1
- package/build/dist/Server/Utils/UserRegistrationToken.js +170 -0
- package/build/dist/Server/Utils/UserRegistrationToken.js.map +1 -0
- package/build/dist/Server/Utils/VerificationCode.js +120 -0
- package/build/dist/Server/Utils/VerificationCode.js.map +1 -0
- package/build/dist/Types/Email/EmailTemplateType.js +1 -0
- package/build/dist/Types/Email/EmailTemplateType.js.map +1 -1
- package/build/dist/Types/Monitor/MonitorCriteriaInstance.js +42 -21
- package/build/dist/Types/Monitor/MonitorCriteriaInstance.js.map +1 -1
- package/build/dist/Types/Monitor/Recommendation/MonitorRecommendationCatalog.js +77 -5
- package/build/dist/Types/Monitor/Recommendation/MonitorRecommendationCatalog.js.map +1 -1
- package/build/dist/Types/Monitor/Recommendation/MonitorRecommendationTypes.js +18 -6
- package/build/dist/Types/Monitor/Recommendation/MonitorRecommendationTypes.js.map +1 -1
- package/build/dist/Types/Monitor/ServiceAlertTemplates.js +1028 -0
- package/build/dist/Types/Monitor/ServiceAlertTemplates.js.map +1 -0
- package/build/dist/Types/Permission.js +33 -0
- package/build/dist/Types/Permission.js.map +1 -1
- package/build/dist/Types/PushNotification/AndroidNotificationChannel.js +27 -0
- package/build/dist/Types/PushNotification/AndroidNotificationChannel.js.map +1 -0
- package/build/dist/Types/Service/ServiceLanguage.js +96 -0
- package/build/dist/Types/Service/ServiceLanguage.js.map +1 -0
- package/build/dist/Types/Text.js +82 -17
- package/build/dist/Types/Text.js.map +1 -1
- package/build/dist/UI/Components/Button/Button.js +22 -14
- package/build/dist/UI/Components/Button/Button.js.map +1 -1
- package/build/dist/UI/Components/CodeBlock/CodeBlock.js +35 -3
- package/build/dist/UI/Components/CodeBlock/CodeBlock.js.map +1 -1
- package/build/dist/UI/Components/CodeBlock/LanguageRegistry.js +57 -0
- package/build/dist/UI/Components/CodeBlock/LanguageRegistry.js.map +1 -0
- package/build/dist/UI/Components/CommandPalette/CommandPalette.js +439 -0
- package/build/dist/UI/Components/CommandPalette/CommandPalette.js.map +1 -0
- package/build/dist/UI/Components/CommandPalette/PaletteFilter.js +135 -0
- package/build/dist/UI/Components/CommandPalette/PaletteFilter.js.map +1 -0
- package/build/dist/UI/Components/CommandPalette/PaletteRow.js +83 -0
- package/build/dist/UI/Components/CommandPalette/PaletteRow.js.map +1 -0
- package/build/dist/UI/Components/CommandPalette/RecentCommands.js +47 -0
- package/build/dist/UI/Components/CommandPalette/RecentCommands.js.map +1 -0
- package/build/dist/UI/Components/CommandPalette/Types.js +2 -0
- package/build/dist/UI/Components/CommandPalette/Types.js.map +1 -0
- package/build/dist/UI/Components/CommandPalette/UseProviderSearch.js +88 -0
- package/build/dist/UI/Components/CommandPalette/UseProviderSearch.js.map +1 -0
- package/build/dist/UI/Components/Dropdown/Dropdown.js +6 -1
- package/build/dist/UI/Components/Dropdown/Dropdown.js.map +1 -1
- package/build/dist/UI/Components/Feed/FeedItem.js +1 -1
- package/build/dist/UI/Components/Feed/FeedItem.js.map +1 -1
- package/build/dist/UI/Components/List/List.js +19 -5
- package/build/dist/UI/Components/List/List.js.map +1 -1
- package/build/dist/UI/Components/List/ListSkeleton.js +21 -0
- package/build/dist/UI/Components/List/ListSkeleton.js.map +1 -0
- package/build/dist/UI/Components/Markdown.tsx/LazyMarkdownViewer.js.map +1 -1
- package/build/dist/UI/Components/Markdown.tsx/MarkdownViewer.js +52 -25
- package/build/dist/UI/Components/Markdown.tsx/MarkdownViewer.js.map +1 -1
- package/build/dist/UI/Components/Modal/Modal.js +2 -2
- package/build/dist/UI/Components/ModelTable/BaseModelTable.js +1 -1
- package/build/dist/UI/Components/ModelTable/BaseModelTable.js.map +1 -1
- package/build/dist/UI/Components/ModelTable/useCustomFieldColumns.js +9 -2
- package/build/dist/UI/Components/ModelTable/useCustomFieldColumns.js.map +1 -1
- package/build/dist/UI/Components/MoreMenu/MoreMenu.js +32 -1
- package/build/dist/UI/Components/MoreMenu/MoreMenu.js.map +1 -1
- package/build/dist/UI/Components/Navbar/NavBar.js +5 -1
- package/build/dist/UI/Components/Navbar/NavBar.js.map +1 -1
- package/build/dist/UI/Components/OrderedStatesList/OrderedStatesList.js +29 -5
- package/build/dist/UI/Components/OrderedStatesList/OrderedStatesList.js.map +1 -1
- package/build/dist/UI/Components/SideMenu/CountModelSideMenuItem.js +23 -1
- package/build/dist/UI/Components/SideMenu/CountModelSideMenuItem.js.map +1 -1
- package/build/dist/UI/Components/SideOver/SideOver.js +23 -2
- package/build/dist/UI/Components/SideOver/SideOver.js.map +1 -1
- package/build/dist/UI/Components/Skeleton/Skeleton.js +23 -0
- package/build/dist/UI/Components/Skeleton/Skeleton.js.map +1 -0
- package/build/dist/UI/Components/Table/Table.js +35 -24
- package/build/dist/UI/Components/Table/Table.js.map +1 -1
- package/build/dist/UI/Components/Table/TableSkeletonRows.js +52 -0
- package/build/dist/UI/Components/Table/TableSkeletonRows.js.map +1 -0
- package/build/dist/UI/Components/Tabs/Tab.js +1 -1
- package/build/dist/UI/Components/Tabs/Tab.js.map +1 -1
- package/build/dist/UI/Components/Toast/Toast.js +77 -23
- package/build/dist/UI/Components/Toast/Toast.js.map +1 -1
- package/build/dist/UI/Components/Toast/ToastInit.js +37 -15
- package/build/dist/UI/Components/Toast/ToastInit.js.map +1 -1
- package/build/dist/UI/Utils/ModelAPI/ModelAPI.js +18 -9
- package/build/dist/UI/Utils/ModelAPI/ModelAPI.js.map +1 -1
- package/build/dist/UI/Utils/ModelListCache.js +126 -0
- package/build/dist/UI/Utils/ModelListCache.js.map +1 -0
- package/build/dist/UI/Utils/Project.js +24 -1
- package/build/dist/UI/Utils/Project.js.map +1 -1
- package/build/dist/Utils/API.js +6 -1
- package/build/dist/Utils/API.js.map +1 -1
- package/jest.config.json +1 -1
- package/package.json +2 -3
- package/Server/Utils/Monitor/MonitorClusterContext.ts +0 -182
- package/Tests/__mocks__/otpauth.js +0 -30
- package/build/dist/Server/Utils/Monitor/MonitorClusterContext.js +0 -141
- package/build/dist/Server/Utils/Monitor/MonitorClusterContext.js.map +0 -1
|
@@ -73,6 +73,9 @@ let UserSMS = class UserSMS extends BaseModel {
|
|
|
73
73
|
this.deletedByUserId = undefined;
|
|
74
74
|
this.isVerified = undefined;
|
|
75
75
|
this.verificationCode = undefined;
|
|
76
|
+
this.verificationCodeExpiresAt = undefined;
|
|
77
|
+
this.verificationFailedAttempts = undefined;
|
|
78
|
+
this.verificationCodeSentAt = undefined;
|
|
76
79
|
}
|
|
77
80
|
};
|
|
78
81
|
__decorate([
|
|
@@ -317,15 +320,26 @@ __decorate([
|
|
|
317
320
|
OwnerOnlyColumn(),
|
|
318
321
|
TableColumn({
|
|
319
322
|
title: "Verification Code",
|
|
320
|
-
description: "
|
|
323
|
+
description: "Keyed digest of the temporary verification code — never the code itself",
|
|
321
324
|
isDefaultValueColumn: true,
|
|
322
325
|
computed: true,
|
|
323
326
|
required: true,
|
|
324
327
|
type: TableColumnType.ShortText,
|
|
328
|
+
/*
|
|
329
|
+
* A row is born with NO usable code on it: a 64-character random
|
|
330
|
+
* placeholder that no six-digit code can ever hash to. The real code is
|
|
331
|
+
* generated, hashed and sent by this channel's service once the row
|
|
332
|
+
* exists — the row id is part of the hashed message, so the digest cannot
|
|
333
|
+
* be computed before the insert has assigned one.
|
|
334
|
+
*
|
|
335
|
+
* This stays a forced default rather than moving wholly into the service
|
|
336
|
+
* hook because the column is NOT NULL and must be satisfied on every
|
|
337
|
+
* create path, including those that pass props.ignoreHooks.
|
|
338
|
+
*/
|
|
325
339
|
forceGetDefaultValueOnCreate: () => {
|
|
326
|
-
return Text.
|
|
340
|
+
return Text.generateRandomText(64);
|
|
327
341
|
},
|
|
328
|
-
example: "
|
|
342
|
+
example: "9f2c1b4a7d3e6058c1f0a9b8d7e6f5c4b3a291807f6e5d4c3b2a19081726354",
|
|
329
343
|
}),
|
|
330
344
|
Column({
|
|
331
345
|
type: ColumnType.ShortText,
|
|
@@ -334,6 +348,90 @@ __decorate([
|
|
|
334
348
|
}),
|
|
335
349
|
__metadata("design:type", String)
|
|
336
350
|
], UserSMS.prototype, "verificationCode", void 0);
|
|
351
|
+
__decorate([
|
|
352
|
+
ColumnAccessControl({
|
|
353
|
+
create: [],
|
|
354
|
+
read: [],
|
|
355
|
+
update: [],
|
|
356
|
+
})
|
|
357
|
+
/*
|
|
358
|
+
* When the code currently on this row stops being accepted.
|
|
359
|
+
*
|
|
360
|
+
* NULL means there is no live code: none was ever issued, or the last one
|
|
361
|
+
* was used, or it was burned by the attempt limit — or the row predates
|
|
362
|
+
* this column, which is read the same conservative way. Without an expiry
|
|
363
|
+
* the six-digit code space stood open indefinitely, which is what made
|
|
364
|
+
* walking it worthwhile.
|
|
365
|
+
*/
|
|
366
|
+
,
|
|
367
|
+
TableColumn({
|
|
368
|
+
title: "Verification Code Expires At",
|
|
369
|
+
description: "When the verification code on this row stops being accepted",
|
|
370
|
+
computed: true,
|
|
371
|
+
type: TableColumnType.Date,
|
|
372
|
+
}),
|
|
373
|
+
Column({
|
|
374
|
+
type: ColumnType.Date,
|
|
375
|
+
nullable: true,
|
|
376
|
+
}),
|
|
377
|
+
__metadata("design:type", Date)
|
|
378
|
+
], UserSMS.prototype, "verificationCodeExpiresAt", void 0);
|
|
379
|
+
__decorate([
|
|
380
|
+
ColumnAccessControl({
|
|
381
|
+
create: [],
|
|
382
|
+
read: [],
|
|
383
|
+
update: [],
|
|
384
|
+
})
|
|
385
|
+
/*
|
|
386
|
+
* Wrong guesses made against the code currently on this row, reset to zero
|
|
387
|
+
* each time a code is issued.
|
|
388
|
+
*
|
|
389
|
+
* This is the counter that stops /verify being an unlimited oracle over a
|
|
390
|
+
* space small enough to walk in minutes. It is incremented with a single
|
|
391
|
+
* atomic UPDATE ... RETURNING rather than a read-modify-write, because
|
|
392
|
+
* requests racing each other are the normal shape of the attack.
|
|
393
|
+
*/
|
|
394
|
+
,
|
|
395
|
+
TableColumn({
|
|
396
|
+
title: "Verification Failed Attempts",
|
|
397
|
+
description: "Incorrect verification attempts made against the current verification code",
|
|
398
|
+
computed: true,
|
|
399
|
+
type: TableColumnType.Number,
|
|
400
|
+
}),
|
|
401
|
+
Column({
|
|
402
|
+
type: ColumnType.Number,
|
|
403
|
+
nullable: false,
|
|
404
|
+
default: 0,
|
|
405
|
+
}),
|
|
406
|
+
__metadata("design:type", Number)
|
|
407
|
+
], UserSMS.prototype, "verificationFailedAttempts", void 0);
|
|
408
|
+
__decorate([
|
|
409
|
+
ColumnAccessControl({
|
|
410
|
+
create: [],
|
|
411
|
+
read: [],
|
|
412
|
+
update: [],
|
|
413
|
+
})
|
|
414
|
+
/*
|
|
415
|
+
* When a verification code was last sent for this row.
|
|
416
|
+
*
|
|
417
|
+
* Drives the resend cooldown. Without it, "spend the five attempts, ask for
|
|
418
|
+
* a fresh code, repeat" costs an attacker nothing — and the resend control
|
|
419
|
+
* doubles as a way to send somebody unsolicited messages at whatever rate
|
|
420
|
+
* the network allows, at the project's expense.
|
|
421
|
+
*/
|
|
422
|
+
,
|
|
423
|
+
TableColumn({
|
|
424
|
+
title: "Verification Code Sent At",
|
|
425
|
+
description: "When a verification code was last sent for this row",
|
|
426
|
+
computed: true,
|
|
427
|
+
type: TableColumnType.Date,
|
|
428
|
+
}),
|
|
429
|
+
Column({
|
|
430
|
+
type: ColumnType.Date,
|
|
431
|
+
nullable: true,
|
|
432
|
+
}),
|
|
433
|
+
__metadata("design:type", Date)
|
|
434
|
+
], UserSMS.prototype, "verificationCodeSentAt", void 0);
|
|
337
435
|
UserSMS = __decorate([
|
|
338
436
|
TenantColumn("projectId"),
|
|
339
437
|
AllowAccessIfSubscriptionIsUnpaid(),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"UserSMS.js","sourceRoot":"","sources":["../../../../Models/DatabaseModels/UserSMS.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,OAAO,MAAM,WAAW,CAAC;AAChC,OAAO,IAAI,MAAM,QAAQ,CAAC;AAC1B,OAAO,SAAS,MAAM,uCAAuC,CAAC;AAC9D,OAAO,KAAK,MAAM,uBAAuB,CAAC;AAC1C,OAAO,iCAAiC,MAAM,sEAAsE,CAAC;AACrH,OAAO,mBAAmB,MAAM,wDAAwD,CAAC;AACzF,OAAO,eAAe,MAAM,oDAAoD,CAAC;AACjF,OAAO,kBAAkB,MAAM,uDAAuD,CAAC;AACvF,OAAO,YAAY,MAAM,mCAAmC,CAAC;AAC7D,OAAO,UAAU,MAAM,iCAAiC,CAAC;AACzD,OAAO,eAAe,MAAM,sCAAsC,CAAC;AACnE,OAAO,4BAA4B,MAAM,mDAAmD,CAAC;AAC7F,OAAO,WAAW,MAAM,kCAAkC,CAAC;AAC3D,OAAO,eAAe,MAAM,sCAAsC,CAAC;AACnE,OAAO,aAAa,MAAM,oCAAoC,CAAC;AAC/D,OAAO,YAAY,MAAM,mCAAmC,CAAC;AAC7D,OAAO,QAAQ,MAAM,2BAA2B,CAAC;AACjD,OAAO,QAAQ,MAAM,sBAAsB,CAAC;AAC5C,OAAO,UAAU,MAAM,wBAAwB,CAAC;AAChD,OAAO,KAAK,MAAM,mBAAmB,CAAC;AACtC,OAAO,IAAI,MAAM,kBAAkB,CAAC;AACpC,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,UAAU,EAAE,SAAS,EAAE,MAAM,SAAS,CAAC;AAEvE;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA6BG;AAqBH,IAAM,OAAO,GAAb,MAAM,OAAQ,SAAQ,SAAS;IAA/B;;QAyBS,YAAO,GAAa,SAAS,CAAC;QAqB9B,cAAS,GAAc,SAAS,CAAC;QA6BjC,UAAK,GAAW,SAAS,CAAC;QA0B1B,SAAI,GAAU,SAAS,CAAC;QAmBxB,WAAM,GAAc,SAAS,CAAC;QA2B9B,kBAAa,GAAU,SAAS,CAAC;QAmBjC,oBAAe,GAAc,SAAS,CAAC;QA4BvC,kBAAa,GAAU,SAAS,CAAC;QAmBjC,oBAAe,GAAc,SAAS,CAAC;QAmBvC,eAAU,GAAa,SAAS,CAAC;
|
|
1
|
+
{"version":3,"file":"UserSMS.js","sourceRoot":"","sources":["../../../../Models/DatabaseModels/UserSMS.ts"],"names":[],"mappings":"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"}
|
|
@@ -73,6 +73,9 @@ let UserWhatsApp = class UserWhatsApp extends BaseModel {
|
|
|
73
73
|
this.deletedByUserId = undefined;
|
|
74
74
|
this.isVerified = undefined;
|
|
75
75
|
this.verificationCode = undefined;
|
|
76
|
+
this.verificationCodeExpiresAt = undefined;
|
|
77
|
+
this.verificationFailedAttempts = undefined;
|
|
78
|
+
this.verificationCodeSentAt = undefined;
|
|
76
79
|
}
|
|
77
80
|
};
|
|
78
81
|
__decorate([
|
|
@@ -309,13 +312,24 @@ __decorate([
|
|
|
309
312
|
OwnerOnlyColumn(),
|
|
310
313
|
TableColumn({
|
|
311
314
|
title: "Verification Code",
|
|
312
|
-
description: "
|
|
315
|
+
description: "Keyed digest of the temporary verification code — never the code itself",
|
|
313
316
|
isDefaultValueColumn: true,
|
|
314
317
|
computed: true,
|
|
315
318
|
required: true,
|
|
316
319
|
type: TableColumnType.ShortText,
|
|
320
|
+
/*
|
|
321
|
+
* A row is born with NO usable code on it: a 64-character random
|
|
322
|
+
* placeholder that no six-digit code can ever hash to. The real code is
|
|
323
|
+
* generated, hashed and sent by this channel's service once the row
|
|
324
|
+
* exists — the row id is part of the hashed message, so the digest cannot
|
|
325
|
+
* be computed before the insert has assigned one.
|
|
326
|
+
*
|
|
327
|
+
* This stays a forced default rather than moving wholly into the service
|
|
328
|
+
* hook because the column is NOT NULL and must be satisfied on every
|
|
329
|
+
* create path, including those that pass props.ignoreHooks.
|
|
330
|
+
*/
|
|
317
331
|
forceGetDefaultValueOnCreate: () => {
|
|
318
|
-
return Text.
|
|
332
|
+
return Text.generateRandomText(64);
|
|
319
333
|
},
|
|
320
334
|
}),
|
|
321
335
|
Column({
|
|
@@ -325,6 +339,90 @@ __decorate([
|
|
|
325
339
|
}),
|
|
326
340
|
__metadata("design:type", String)
|
|
327
341
|
], UserWhatsApp.prototype, "verificationCode", void 0);
|
|
342
|
+
__decorate([
|
|
343
|
+
ColumnAccessControl({
|
|
344
|
+
create: [],
|
|
345
|
+
read: [],
|
|
346
|
+
update: [],
|
|
347
|
+
})
|
|
348
|
+
/*
|
|
349
|
+
* When the code currently on this row stops being accepted.
|
|
350
|
+
*
|
|
351
|
+
* NULL means there is no live code: none was ever issued, or the last one
|
|
352
|
+
* was used, or it was burned by the attempt limit — or the row predates
|
|
353
|
+
* this column, which is read the same conservative way. Without an expiry
|
|
354
|
+
* the six-digit code space stood open indefinitely, which is what made
|
|
355
|
+
* walking it worthwhile.
|
|
356
|
+
*/
|
|
357
|
+
,
|
|
358
|
+
TableColumn({
|
|
359
|
+
title: "Verification Code Expires At",
|
|
360
|
+
description: "When the verification code on this row stops being accepted",
|
|
361
|
+
computed: true,
|
|
362
|
+
type: TableColumnType.Date,
|
|
363
|
+
}),
|
|
364
|
+
Column({
|
|
365
|
+
type: ColumnType.Date,
|
|
366
|
+
nullable: true,
|
|
367
|
+
}),
|
|
368
|
+
__metadata("design:type", Date)
|
|
369
|
+
], UserWhatsApp.prototype, "verificationCodeExpiresAt", void 0);
|
|
370
|
+
__decorate([
|
|
371
|
+
ColumnAccessControl({
|
|
372
|
+
create: [],
|
|
373
|
+
read: [],
|
|
374
|
+
update: [],
|
|
375
|
+
})
|
|
376
|
+
/*
|
|
377
|
+
* Wrong guesses made against the code currently on this row, reset to zero
|
|
378
|
+
* each time a code is issued.
|
|
379
|
+
*
|
|
380
|
+
* This is the counter that stops /verify being an unlimited oracle over a
|
|
381
|
+
* space small enough to walk in minutes. It is incremented with a single
|
|
382
|
+
* atomic UPDATE ... RETURNING rather than a read-modify-write, because
|
|
383
|
+
* requests racing each other are the normal shape of the attack.
|
|
384
|
+
*/
|
|
385
|
+
,
|
|
386
|
+
TableColumn({
|
|
387
|
+
title: "Verification Failed Attempts",
|
|
388
|
+
description: "Incorrect verification attempts made against the current verification code",
|
|
389
|
+
computed: true,
|
|
390
|
+
type: TableColumnType.Number,
|
|
391
|
+
}),
|
|
392
|
+
Column({
|
|
393
|
+
type: ColumnType.Number,
|
|
394
|
+
nullable: false,
|
|
395
|
+
default: 0,
|
|
396
|
+
}),
|
|
397
|
+
__metadata("design:type", Number)
|
|
398
|
+
], UserWhatsApp.prototype, "verificationFailedAttempts", void 0);
|
|
399
|
+
__decorate([
|
|
400
|
+
ColumnAccessControl({
|
|
401
|
+
create: [],
|
|
402
|
+
read: [],
|
|
403
|
+
update: [],
|
|
404
|
+
})
|
|
405
|
+
/*
|
|
406
|
+
* When a verification code was last sent for this row.
|
|
407
|
+
*
|
|
408
|
+
* Drives the resend cooldown. Without it, "spend the five attempts, ask for
|
|
409
|
+
* a fresh code, repeat" costs an attacker nothing — and the resend control
|
|
410
|
+
* doubles as a way to send somebody unsolicited messages at whatever rate
|
|
411
|
+
* the network allows, at the project's expense.
|
|
412
|
+
*/
|
|
413
|
+
,
|
|
414
|
+
TableColumn({
|
|
415
|
+
title: "Verification Code Sent At",
|
|
416
|
+
description: "When a verification code was last sent for this row",
|
|
417
|
+
computed: true,
|
|
418
|
+
type: TableColumnType.Date,
|
|
419
|
+
}),
|
|
420
|
+
Column({
|
|
421
|
+
type: ColumnType.Date,
|
|
422
|
+
nullable: true,
|
|
423
|
+
}),
|
|
424
|
+
__metadata("design:type", Date)
|
|
425
|
+
], UserWhatsApp.prototype, "verificationCodeSentAt", void 0);
|
|
328
426
|
UserWhatsApp = __decorate([
|
|
329
427
|
TenantColumn("projectId"),
|
|
330
428
|
AllowAccessIfSubscriptionIsUnpaid(),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"UserWhatsApp.js","sourceRoot":"","sources":["../../../../Models/DatabaseModels/UserWhatsApp.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,OAAO,MAAM,WAAW,CAAC;AAChC,OAAO,IAAI,MAAM,QAAQ,CAAC;AAC1B,OAAO,SAAS,MAAM,uCAAuC,CAAC;AAC9D,OAAO,KAAK,MAAM,uBAAuB,CAAC;AAC1C,OAAO,iCAAiC,MAAM,sEAAsE,CAAC;AACrH,OAAO,mBAAmB,MAAM,wDAAwD,CAAC;AACzF,OAAO,eAAe,MAAM,oDAAoD,CAAC;AACjF,OAAO,kBAAkB,MAAM,uDAAuD,CAAC;AACvF,OAAO,YAAY,MAAM,mCAAmC,CAAC;AAC7D,OAAO,UAAU,MAAM,iCAAiC,CAAC;AACzD,OAAO,eAAe,MAAM,sCAAsC,CAAC;AACnE,OAAO,4BAA4B,MAAM,mDAAmD,CAAC;AAC7F,OAAO,WAAW,MAAM,kCAAkC,CAAC;AAC3D,OAAO,eAAe,MAAM,sCAAsC,CAAC;AACnE,OAAO,aAAa,MAAM,oCAAoC,CAAC;AAC/D,OAAO,YAAY,MAAM,mCAAmC,CAAC;AAC7D,OAAO,QAAQ,MAAM,2BAA2B,CAAC;AACjD,OAAO,QAAQ,MAAM,sBAAsB,CAAC;AAC5C,OAAO,UAAU,MAAM,wBAAwB,CAAC;AAChD,OAAO,KAAK,MAAM,mBAAmB,CAAC;AACtC,OAAO,IAAI,MAAM,kBAAkB,CAAC;AACpC,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,UAAU,EAAE,SAAS,EAAE,MAAM,SAAS,CAAC;AAEvE;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA6BG;AAqBH,IAAM,YAAY,GAAlB,MAAM,YAAa,SAAQ,SAAS;IAApC;;QAyBS,YAAO,GAAa,SAAS,CAAC;QAoB9B,cAAS,GAAc,SAAS,CAAC;QA0BjC,UAAK,GAAW,SAAS,CAAC;QA0B1B,SAAI,GAAU,SAAS,CAAC;QAkBxB,WAAM,GAAc,SAAS,CAAC;QA2B9B,kBAAa,GAAU,SAAS,CAAC;QAkBjC,oBAAe,GAAc,SAAS,CAAC;QA4BvC,kBAAa,GAAU,SAAS,CAAC;QAkBjC,oBAAe,GAAc,SAAS,CAAC;QAkBvC,eAAU,GAAa,SAAS,CAAC;
|
|
1
|
+
{"version":3,"file":"UserWhatsApp.js","sourceRoot":"","sources":["../../../../Models/DatabaseModels/UserWhatsApp.ts"],"names":[],"mappings":"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"}
|
|
@@ -8,6 +8,7 @@ var __metadata = (this && this.__metadata) || function (k, v) {
|
|
|
8
8
|
if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
|
|
9
9
|
};
|
|
10
10
|
import UserMiddleware from "../Middleware/UserAuthorization";
|
|
11
|
+
import DatabaseService from "../Services/DatabaseService";
|
|
11
12
|
import Express from "../Utils/Express";
|
|
12
13
|
import Response from "../Utils/Response";
|
|
13
14
|
import CaptureSpan from "../Utils/Telemetry/CaptureSpan";
|
|
@@ -192,19 +193,74 @@ export default class BaseAPI {
|
|
|
192
193
|
groupBy = JSONFunctions.deserialize(req.body["groupBy"]);
|
|
193
194
|
}
|
|
194
195
|
const databaseProps = await CommonAPI.getDatabaseCommonInteractionProps(req);
|
|
195
|
-
|
|
196
|
-
|
|
197
|
-
|
|
198
|
-
|
|
199
|
-
|
|
200
|
-
|
|
201
|
-
|
|
202
|
-
|
|
203
|
-
|
|
204
|
-
|
|
205
|
-
|
|
206
|
-
|
|
207
|
-
|
|
196
|
+
/*
|
|
197
|
+
* findBy and countBy are independent reads, so run them in parallel to
|
|
198
|
+
* cut list latency where the count is costly. The one thing that makes
|
|
199
|
+
* the sequential order load-bearing is a service-level onBeforeFind
|
|
200
|
+
* override that mutates the shared query/props objects in place (e.g.
|
|
201
|
+
* ProjectService elevates props.isRoot and pins query._id for users with
|
|
202
|
+
* no projects; the incident/alert privacy filters rewrite query keys):
|
|
203
|
+
* countBy historically ran after findBy and inherited those mutations.
|
|
204
|
+
* Services on the stock hook cannot mutate anything (and the permission
|
|
205
|
+
* pipeline copies the query before touching it, ReadPermission.ts:33),
|
|
206
|
+
* so only they run in parallel; hook-overriding services keep the
|
|
207
|
+
* sequential order and its exact semantics.
|
|
208
|
+
*/
|
|
209
|
+
const usesStockOnBeforeFindHook = this.service.onBeforeFind ===
|
|
210
|
+
DatabaseService.prototype
|
|
211
|
+
.onBeforeFind;
|
|
212
|
+
let list;
|
|
213
|
+
let count;
|
|
214
|
+
if (usesStockOnBeforeFindHook) {
|
|
215
|
+
const listPromise = this.service.findBy({
|
|
216
|
+
query,
|
|
217
|
+
select,
|
|
218
|
+
skip: skip,
|
|
219
|
+
limit: limit,
|
|
220
|
+
groupBy: groupBy,
|
|
221
|
+
sort: sort,
|
|
222
|
+
props: databaseProps,
|
|
223
|
+
});
|
|
224
|
+
/*
|
|
225
|
+
* Shallow copies so a countBy override that rewrites top-level query
|
|
226
|
+
* keys (the established privacy-filter pattern) can never race the
|
|
227
|
+
* concurrent findBy's reads of the shared objects.
|
|
228
|
+
*/
|
|
229
|
+
const countPromise = this.service.countBy({
|
|
230
|
+
query: Object.assign({}, query),
|
|
231
|
+
props: Object.assign({}, databaseProps),
|
|
232
|
+
});
|
|
233
|
+
/*
|
|
234
|
+
* allSettled instead of Promise.all: a findBy rejection must not leave
|
|
235
|
+
* countPromise as an unhandled rejection, and findBy's error keeps
|
|
236
|
+
* priority when both fail - the same failure the sequential code
|
|
237
|
+
* surfaced.
|
|
238
|
+
*/
|
|
239
|
+
const [listResult, countResult] = await Promise.allSettled([listPromise, countPromise]);
|
|
240
|
+
if (listResult.status === "rejected") {
|
|
241
|
+
throw listResult.reason;
|
|
242
|
+
}
|
|
243
|
+
if (countResult.status === "rejected") {
|
|
244
|
+
throw countResult.reason;
|
|
245
|
+
}
|
|
246
|
+
list = listResult.value;
|
|
247
|
+
count = countResult.value;
|
|
248
|
+
}
|
|
249
|
+
else {
|
|
250
|
+
list = await this.service.findBy({
|
|
251
|
+
query,
|
|
252
|
+
select,
|
|
253
|
+
skip: skip,
|
|
254
|
+
limit: limit,
|
|
255
|
+
groupBy: groupBy,
|
|
256
|
+
sort: sort,
|
|
257
|
+
props: databaseProps,
|
|
258
|
+
});
|
|
259
|
+
count = await this.service.countBy({
|
|
260
|
+
query,
|
|
261
|
+
props: databaseProps,
|
|
262
|
+
});
|
|
263
|
+
}
|
|
208
264
|
return Response.sendEntityArrayResponse(req, res, list, count, this.entityType);
|
|
209
265
|
}
|
|
210
266
|
async count(req, res) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"BaseAPI.js","sourceRoot":"","sources":["../../../../Server/API/BaseAPI.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"BaseAPI.js","sourceRoot":"","sources":["../../../../Server/API/BaseAPI.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,17 +1,35 @@
|
|
|
1
1
|
import UserMiddleware from "../Middleware/UserAuthorization";
|
|
2
|
+
import VerificationCodeRateLimit, { VerificationCodeRateLimitBucket, } from "../Middleware/VerificationCodeRateLimit";
|
|
2
3
|
import UserCallService from "../Services/UserCallService";
|
|
3
|
-
import
|
|
4
|
+
import ChannelVerification, { ChannelVerificationOutcome, } from "../Utils/ChannelVerification";
|
|
4
5
|
import Response from "../Utils/Response";
|
|
5
|
-
import logger, { getLogAttributesFromRequest } from "../Utils/Logger";
|
|
6
6
|
import BaseAPI from "./BaseAPI";
|
|
7
7
|
import BadDataException from "../../Types/Exception/BadDataException";
|
|
8
8
|
import ObjectID from "../../Types/ObjectID";
|
|
9
9
|
import UserCall from "../../Models/DatabaseModels/UserCall";
|
|
10
|
+
import UserNotificationRuleService from "../Services/UserNotificationRuleService";
|
|
11
|
+
import logger, { getLogAttributesFromRequest } from "../Utils/Logger";
|
|
12
|
+
/*
|
|
13
|
+
* The verify and resend routes for this notification channel.
|
|
14
|
+
*
|
|
15
|
+
* Neither the checking of a submitted code nor the issuing of a new one lives
|
|
16
|
+
* here, on purpose. The state machine is shared by all five channels
|
|
17
|
+
* (Common/Server/Utils/ChannelVerification.ts) so that a control added for one
|
|
18
|
+
* of them cannot quietly go missing on another — which is exactly what went
|
|
19
|
+
* wrong before: five hand-written copies of "compare the column, set
|
|
20
|
+
* isVerified", none of which expired the code, counted attempts, or refused a
|
|
21
|
+
* caller running the comparison a million times against somebody else's phone
|
|
22
|
+
* number.
|
|
23
|
+
*
|
|
24
|
+
* What is left here is the HTTP shape: reject malformed bodies, run the rate
|
|
25
|
+
* limiter before anything costs a database read, and turn the outcome into a
|
|
26
|
+
* response.
|
|
27
|
+
*/
|
|
10
28
|
export default class UserCallAPI extends BaseAPI {
|
|
11
29
|
constructor() {
|
|
12
30
|
super(UserCall, UserCallService);
|
|
13
|
-
this.router.post(`/user-call/verify`, UserMiddleware.getUserMiddleware, async (req, res, next) => {
|
|
14
|
-
var _a
|
|
31
|
+
this.router.post(`/user-call/verify`, UserMiddleware.getUserMiddleware, VerificationCodeRateLimit.getMiddleware(VerificationCodeRateLimitBucket.Verify), async (req, res, next) => {
|
|
32
|
+
var _a;
|
|
15
33
|
try {
|
|
16
34
|
req = req;
|
|
17
35
|
if (!req.body.itemId) {
|
|
@@ -20,45 +38,26 @@ export default class UserCallAPI extends BaseAPI {
|
|
|
20
38
|
if (!req.body.code) {
|
|
21
39
|
return Response.sendErrorResponse(req, res, new BadDataException("Invalid code"));
|
|
22
40
|
}
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
id: req.body["itemId"],
|
|
26
|
-
props: {
|
|
27
|
-
isRoot: true,
|
|
28
|
-
},
|
|
29
|
-
select: {
|
|
30
|
-
userId: true,
|
|
31
|
-
projectId: true,
|
|
32
|
-
verificationCode: true,
|
|
33
|
-
},
|
|
34
|
-
});
|
|
35
|
-
if (!item) {
|
|
36
|
-
return Response.sendErrorResponse(req, res, new BadDataException("Item not found"));
|
|
37
|
-
}
|
|
38
|
-
//check user id
|
|
39
|
-
if (((_a = item.userId) === null || _a === void 0 ? void 0 : _a.toString()) !==
|
|
40
|
-
((_c = (_b = req === null || req === void 0 ? void 0 : req.userAuthorization) === null || _b === void 0 ? void 0 : _b.userId) === null || _c === void 0 ? void 0 : _c.toString())) {
|
|
41
|
+
const userId = (_a = req === null || req === void 0 ? void 0 : req.userAuthorization) === null || _a === void 0 ? void 0 : _a.userId;
|
|
42
|
+
if (!userId) {
|
|
41
43
|
return Response.sendErrorResponse(req, res, new BadDataException("Invalid user ID"));
|
|
42
44
|
}
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
props: {
|
|
49
|
-
isRoot: true,
|
|
50
|
-
},
|
|
51
|
-
data: {
|
|
52
|
-
isVerified: true,
|
|
53
|
-
},
|
|
45
|
+
const result = await ChannelVerification.verifyCode({
|
|
46
|
+
service: this.service,
|
|
47
|
+
itemId: new ObjectID(req.body["itemId"].toString()),
|
|
48
|
+
userId: userId,
|
|
49
|
+
code: req.body["code"].toString(),
|
|
54
50
|
});
|
|
55
|
-
|
|
51
|
+
if (result.outcome !== ChannelVerificationOutcome.Verified) {
|
|
52
|
+
return Response.sendErrorResponse(req, res, ChannelVerification.getFailureException(result.outcome));
|
|
53
|
+
}
|
|
54
|
+
/* Create default notification rules for this verified call number */
|
|
56
55
|
try {
|
|
57
56
|
await UserNotificationRuleService.addDefaultNotificationRulesForVerifiedMethod({
|
|
58
|
-
projectId: new ObjectID(
|
|
59
|
-
userId: new ObjectID(
|
|
57
|
+
projectId: new ObjectID(result.projectId.toString()),
|
|
58
|
+
userId: new ObjectID(result.userId.toString()),
|
|
60
59
|
notificationMethod: {
|
|
61
|
-
userCallId:
|
|
60
|
+
userCallId: result.itemId,
|
|
62
61
|
},
|
|
63
62
|
});
|
|
64
63
|
}
|
|
@@ -71,7 +70,7 @@ export default class UserCallAPI extends BaseAPI {
|
|
|
71
70
|
return next(err);
|
|
72
71
|
}
|
|
73
72
|
});
|
|
74
|
-
this.router.post(`/user-call/resend-verification-code`, UserMiddleware.getUserMiddleware, async (req, res, next) => {
|
|
73
|
+
this.router.post(`/user-call/resend-verification-code`, UserMiddleware.getUserMiddleware, VerificationCodeRateLimit.getMiddleware(VerificationCodeRateLimitBucket.Resend), async (req, res, next) => {
|
|
75
74
|
var _a, _b, _c;
|
|
76
75
|
try {
|
|
77
76
|
req = req;
|
|
@@ -90,6 +89,11 @@ export default class UserCallAPI extends BaseAPI {
|
|
|
90
89
|
if (!item) {
|
|
91
90
|
return Response.sendErrorResponse(req, res, new BadDataException("Item not found"));
|
|
92
91
|
}
|
|
92
|
+
/*
|
|
93
|
+
* A caller may only ask for a code to be sent to a row they own.
|
|
94
|
+
* Without this the resend route is a way to make somebody else's
|
|
95
|
+
* device ring on demand.
|
|
96
|
+
*/
|
|
93
97
|
if (((_a = item.userId) === null || _a === void 0 ? void 0 : _a.toString()) !==
|
|
94
98
|
((_c = (_b = req === null || req === void 0 ? void 0 : req.userAuthorization) === null || _b === void 0 ? void 0 : _b.userId) === null || _c === void 0 ? void 0 : _c.toString())) {
|
|
95
99
|
return Response.sendErrorResponse(req, res, new BadDataException("Invalid user ID"));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"UserCallAPI.js","sourceRoot":"","sources":["../../../../Server/API/UserCallAPI.ts"],"names":[],"mappings":"AAAA,OAAO,cAAc,MAAM,iCAAiC,CAAC;AAC7D,OAAO,
|
|
1
|
+
{"version":3,"file":"UserCallAPI.js","sourceRoot":"","sources":["../../../../Server/API/UserCallAPI.ts"],"names":[],"mappings":"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"}
|