@webda/core 3.16.4 → 4.0.0-beta.2
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/lib/application.d.ts +29 -8
- package/lib/application.d.ts.map +1 -0
- package/lib/application.js +65 -38
- package/lib/application.js.map +1 -1
- package/lib/application.spec.d.ts +1 -0
- package/lib/application.spec.d.ts.map +1 -0
- package/lib/application.spec.js +57 -43
- package/lib/application.spec.js.map +1 -1
- package/lib/core.d.ts +16 -12
- package/lib/core.d.ts.map +1 -0
- package/lib/core.js +105 -80
- package/lib/core.js.map +1 -1
- package/lib/core.spec.d.ts +1 -0
- package/lib/core.spec.d.ts.map +1 -0
- package/lib/core.spec.js +96 -67
- package/lib/core.spec.js.map +1 -1
- package/lib/errors.d.ts +59 -60
- package/lib/errors.d.ts.map +1 -0
- package/lib/errors.js +92 -108
- package/lib/errors.js.map +1 -1
- package/lib/errors.spec.d.ts +1 -0
- package/lib/errors.spec.d.ts.map +1 -0
- package/lib/errors.spec.js +1 -1
- package/lib/errors.spec.js.map +1 -1
- package/lib/index.d.ts +6 -3
- package/lib/index.d.ts.map +1 -0
- package/lib/index.js +6 -3
- package/lib/index.js.map +1 -1
- package/lib/models/aclmodel.d.ts +2 -2
- package/lib/models/aclmodel.d.ts.map +1 -0
- package/lib/models/aclmodel.js +8 -9
- package/lib/models/aclmodel.js.map +1 -1
- package/lib/models/aclmodel.spec.d.ts +1 -0
- package/lib/models/aclmodel.spec.d.ts.map +1 -0
- package/lib/models/aclmodel.spec.js +3 -3
- package/lib/models/aclmodel.spec.js.map +1 -1
- package/lib/models/coremodel.d.ts +15 -0
- package/lib/models/coremodel.d.ts.map +1 -0
- package/lib/models/coremodel.js +35 -28
- package/lib/models/coremodel.js.map +1 -1
- package/lib/models/coremodel.spec.d.ts +1 -0
- package/lib/models/coremodel.spec.d.ts.map +1 -0
- package/lib/models/coremodel.spec.js +33 -31
- package/lib/models/coremodel.spec.js.map +1 -1
- package/lib/models/deployment.d.ts +1 -0
- package/lib/models/deployment.d.ts.map +1 -0
- package/lib/models/ident.d.ts +17 -2
- package/lib/models/ident.d.ts.map +1 -0
- package/lib/models/ident.js +0 -14
- package/lib/models/ident.js.map +1 -1
- package/lib/models/ident.spec.d.ts +1 -0
- package/lib/models/ident.spec.d.ts.map +1 -0
- package/lib/models/ident.spec.js +1 -20
- package/lib/models/ident.spec.js.map +1 -1
- package/lib/models/ownermodel.d.ts +1 -0
- package/lib/models/ownermodel.d.ts.map +1 -0
- package/lib/models/ownermodel.spec.d.ts +1 -0
- package/lib/models/ownermodel.spec.d.ts.map +1 -0
- package/lib/models/ownermodel.spec.js +57 -33
- package/lib/models/ownermodel.spec.js.map +1 -1
- package/lib/models/relations.d.ts +1 -0
- package/lib/models/relations.d.ts.map +1 -0
- package/lib/models/relations.js +3 -3
- package/lib/models/relations.js.map +1 -1
- package/lib/models/relations.spec.d.ts +2 -0
- package/lib/models/relations.spec.d.ts.map +1 -0
- package/lib/models/relations.spec.js +10 -17
- package/lib/models/relations.spec.js.map +1 -1
- package/lib/models/rolemodel.d.ts +1 -0
- package/lib/models/rolemodel.d.ts.map +1 -0
- package/lib/models/rolemodel.js +2 -2
- package/lib/models/rolemodel.js.map +1 -1
- package/lib/models/rolemodel.spec.d.ts +1 -0
- package/lib/models/rolemodel.spec.d.ts.map +1 -0
- package/lib/models/rolemodel.spec.js +5 -1
- package/lib/models/rolemodel.spec.js.map +1 -1
- package/lib/models/simpleuser.d.ts +47 -0
- package/lib/models/simpleuser.d.ts.map +1 -0
- package/lib/models/simpleuser.js +84 -0
- package/lib/models/simpleuser.js.map +1 -0
- package/lib/models/test.d.ts +11 -0
- package/lib/models/test.d.ts.map +1 -0
- package/lib/models/test.js +7 -0
- package/lib/models/test.js.map +1 -0
- package/lib/models/user.d.ts +2 -35
- package/lib/models/user.d.ts.map +1 -0
- package/lib/models/user.js +3 -74
- package/lib/models/user.js.map +1 -1
- package/lib/models/user.spec.d.ts +1 -0
- package/lib/models/user.spec.d.ts.map +1 -0
- package/lib/models/user.spec.js +7 -6
- package/lib/models/user.spec.js.map +1 -1
- package/lib/queues/filequeue.d.ts +1 -0
- package/lib/queues/filequeue.d.ts.map +1 -0
- package/lib/queues/filequeue.js +5 -5
- package/lib/queues/filequeue.js.map +1 -1
- package/lib/queues/filequeue.spec.d.ts +1 -0
- package/lib/queues/filequeue.spec.d.ts.map +1 -0
- package/lib/queues/filequeue.spec.js +11 -5
- package/lib/queues/filequeue.spec.js.map +1 -1
- package/lib/queues/memoryqueue.d.ts +14 -0
- package/lib/queues/memoryqueue.d.ts.map +1 -0
- package/lib/queues/memoryqueue.js +38 -7
- package/lib/queues/memoryqueue.js.map +1 -1
- package/lib/queues/memoryqueue.spec.d.ts +1 -0
- package/lib/queues/memoryqueue.spec.d.ts.map +1 -0
- package/lib/queues/memoryqueue.spec.js +18 -7
- package/lib/queues/memoryqueue.spec.js.map +1 -1
- package/lib/queues/pubsubservice.d.ts +1 -0
- package/lib/queues/pubsubservice.d.ts.map +1 -0
- package/lib/queues/queue.spec.d.ts +3 -2
- package/lib/queues/queue.spec.d.ts.map +1 -0
- package/lib/queues/queue.spec.js +5 -3
- package/lib/queues/queue.spec.js.map +1 -1
- package/lib/queues/queueservice.d.ts +1 -0
- package/lib/queues/queueservice.d.ts.map +1 -0
- package/lib/queues/queueservice.js +7 -7
- package/lib/queues/queueservice.js.map +1 -1
- package/lib/rest/restdomainservice.d.ts +63 -0
- package/lib/rest/restdomainservice.d.ts.map +1 -0
- package/lib/rest/restdomainservice.js +687 -0
- package/lib/rest/restdomainservice.js.map +1 -0
- package/lib/rest/restdomainservice.spec.d.ts +2 -0
- package/lib/rest/restdomainservice.spec.d.ts.map +1 -0
- package/lib/rest/restdomainservice.spec.js +124 -0
- package/lib/rest/restdomainservice.spec.js.map +1 -0
- package/lib/{router.d.ts → rest/router.d.ts} +6 -4
- package/lib/rest/router.d.ts.map +1 -0
- package/lib/{router.js → rest/router.js} +33 -23
- package/lib/rest/router.js.map +1 -0
- package/lib/rest/router.spec.d.ts +2 -0
- package/lib/rest/router.spec.d.ts.map +1 -0
- package/lib/{router.spec.js → rest/router.spec.js} +54 -28
- package/lib/rest/router.spec.js.map +1 -0
- package/lib/services/asyncevents.d.ts +1 -0
- package/lib/services/asyncevents.d.ts.map +1 -0
- package/lib/services/asyncevents.js +4 -4
- package/lib/services/asyncevents.js.map +1 -1
- package/lib/services/asyncevents.spec.d.ts +1 -0
- package/lib/services/asyncevents.spec.d.ts.map +1 -0
- package/lib/services/asyncevents.spec.js +10 -10
- package/lib/services/asyncevents.spec.js.map +1 -1
- package/lib/services/authentication.d.ts +2 -1
- package/lib/services/authentication.d.ts.map +1 -0
- package/lib/services/authentication.js +26 -25
- package/lib/services/authentication.js.map +1 -1
- package/lib/services/authentication.spec.d.ts +1 -0
- package/lib/services/authentication.spec.d.ts.map +1 -0
- package/lib/services/authentication.spec.js +24 -24
- package/lib/services/authentication.spec.js.map +1 -1
- package/lib/services/binary.d.ts +13 -87
- package/lib/services/binary.d.ts.map +1 -0
- package/lib/services/binary.js +39 -421
- package/lib/services/binary.js.map +1 -1
- package/lib/services/binary.spec.d.ts +19 -22
- package/lib/services/binary.spec.d.ts.map +1 -0
- package/lib/services/binary.spec.js +87 -374
- package/lib/services/binary.spec.js.map +1 -1
- package/lib/services/cloudbinary.d.ts +3 -2
- package/lib/services/cloudbinary.d.ts.map +1 -0
- package/lib/services/cloudbinary.js +1 -1
- package/lib/services/cloudbinary.js.map +1 -1
- package/lib/services/cloudbinary.spec.d.ts +1 -8
- package/lib/services/cloudbinary.spec.d.ts.map +1 -0
- package/lib/services/cloudbinary.spec.js +4 -130
- package/lib/services/cloudbinary.spec.js.map +1 -1
- package/lib/services/configuration.d.ts +10 -1
- package/lib/services/configuration.d.ts.map +1 -0
- package/lib/services/configuration.js +22 -7
- package/lib/services/configuration.js.map +1 -1
- package/lib/services/configuration.spec.d.ts +1 -0
- package/lib/services/configuration.spec.d.ts.map +1 -0
- package/lib/services/configuration.spec.js +60 -17
- package/lib/services/configuration.spec.js.map +1 -1
- package/lib/services/cron.d.ts +2 -1
- package/lib/services/cron.d.ts.map +1 -0
- package/lib/services/cron.js +10 -10
- package/lib/services/cron.js.map +1 -1
- package/lib/services/cron.spec.d.ts +1 -0
- package/lib/services/cron.spec.d.ts.map +1 -0
- package/lib/services/cron.spec.js +2 -2
- package/lib/services/cron.spec.js.map +1 -1
- package/lib/services/cryptoservice.d.ts +3 -2
- package/lib/services/cryptoservice.d.ts.map +1 -0
- package/lib/services/cryptoservice.js +29 -30
- package/lib/services/cryptoservice.js.map +1 -1
- package/lib/services/cryptoservice.spec.d.ts +1 -0
- package/lib/services/cryptoservice.spec.d.ts.map +1 -0
- package/lib/services/cryptoservice.spec.js +17 -17
- package/lib/services/cryptoservice.spec.js.map +1 -1
- package/lib/services/debugmailer.d.ts +2 -2
- package/lib/services/debugmailer.d.ts.map +1 -0
- package/lib/services/debugmailer.js +1 -2
- package/lib/services/debugmailer.js.map +1 -1
- package/lib/services/debugmailer.spec.d.ts +1 -0
- package/lib/services/debugmailer.spec.d.ts.map +1 -0
- package/lib/services/debugmailer.spec.js +6 -3
- package/lib/services/debugmailer.spec.js.map +1 -1
- package/lib/services/domainservice.d.ts +167 -47
- package/lib/services/domainservice.d.ts.map +1 -0
- package/lib/services/domainservice.js +520 -753
- package/lib/services/domainservice.js.map +1 -1
- package/lib/services/domainservice.spec.d.ts +1 -0
- package/lib/services/domainservice.spec.d.ts.map +1 -0
- package/lib/services/domainservice.spec.js +201 -31
- package/lib/services/domainservice.spec.js.map +1 -1
- package/lib/services/filebinary.d.ts +8 -5
- package/lib/services/filebinary.d.ts.map +1 -0
- package/lib/services/filebinary.js +34 -32
- package/lib/services/filebinary.js.map +1 -1
- package/lib/services/filebinary.spec.d.ts +12 -8
- package/lib/services/filebinary.spec.d.ts.map +1 -0
- package/lib/services/filebinary.spec.js +135 -122
- package/lib/services/filebinary.spec.js.map +1 -1
- package/lib/services/fileconfiguration.d.ts +2 -1
- package/lib/services/fileconfiguration.d.ts.map +1 -0
- package/lib/services/fileconfiguration.js +1 -1
- package/lib/services/fileconfiguration.js.map +1 -1
- package/lib/services/fileconfiguration.spec.d.ts +1 -0
- package/lib/services/fileconfiguration.spec.d.ts.map +1 -0
- package/lib/services/fileconfiguration.spec.js +65 -27
- package/lib/services/fileconfiguration.spec.js.map +1 -1
- package/lib/services/invitationservice.d.ts +2 -1
- package/lib/services/invitationservice.d.ts.map +1 -0
- package/lib/services/invitationservice.js +19 -16
- package/lib/services/invitationservice.js.map +1 -1
- package/lib/services/invitationservice.spec.d.ts +1 -0
- package/lib/services/invitationservice.spec.d.ts.map +1 -0
- package/lib/services/invitationservice.spec.js +73 -22
- package/lib/services/invitationservice.spec.js.map +1 -1
- package/lib/services/kubernetesconfiguration.d.ts +1 -0
- package/lib/services/kubernetesconfiguration.d.ts.map +1 -0
- package/lib/services/kubernetesconfiguration.js +0 -2
- package/lib/services/kubernetesconfiguration.js.map +1 -1
- package/lib/services/kubernetesconfiguration.spec.d.ts +1 -0
- package/lib/services/kubernetesconfiguration.spec.d.ts.map +1 -0
- package/lib/services/kubernetesconfiguration.spec.js +67 -8
- package/lib/services/kubernetesconfiguration.spec.js.map +1 -1
- package/lib/services/mailer.d.ts +1 -0
- package/lib/services/mailer.d.ts.map +1 -0
- package/lib/services/mailer.js +3 -3
- package/lib/services/mailer.js.map +1 -1
- package/lib/services/mailer.spec.d.ts +1 -0
- package/lib/services/mailer.spec.d.ts.map +1 -0
- package/lib/services/mailer.spec.js +18 -4
- package/lib/services/mailer.spec.js.map +1 -1
- package/lib/services/notificationservice.d.ts +1 -0
- package/lib/services/notificationservice.d.ts.map +1 -0
- package/lib/services/notificationservice.js +1 -1
- package/lib/services/notificationservice.js.map +1 -1
- package/lib/services/notificationservice.spec.d.ts +1 -0
- package/lib/services/notificationservice.spec.d.ts.map +1 -0
- package/lib/services/notificationservice.spec.js +8 -3
- package/lib/services/notificationservice.spec.js.map +1 -1
- package/lib/services/oauth.d.ts +6 -3
- package/lib/services/oauth.d.ts.map +1 -0
- package/lib/services/oauth.js +11 -8
- package/lib/services/oauth.js.map +1 -1
- package/lib/services/oauth.spec.d.ts +1 -0
- package/lib/services/oauth.spec.d.ts.map +1 -0
- package/lib/services/oauth.spec.js +39 -15
- package/lib/services/oauth.spec.js.map +1 -1
- package/lib/services/prometheus.d.ts +1 -0
- package/lib/services/prometheus.d.ts.map +1 -0
- package/lib/services/prometheus.spec.d.ts +1 -0
- package/lib/services/prometheus.spec.d.ts.map +1 -0
- package/lib/services/prometheus.spec.js +38 -19
- package/lib/services/prometheus.spec.js.map +1 -1
- package/lib/services/resource.d.ts +21 -1
- package/lib/services/resource.d.ts.map +1 -0
- package/lib/services/resource.js +20 -3
- package/lib/services/resource.js.map +1 -1
- package/lib/services/resource.spec.d.ts +1 -0
- package/lib/services/resource.spec.d.ts.map +1 -0
- package/lib/services/resource.spec.js +38 -20
- package/lib/services/resource.spec.js.map +1 -1
- package/lib/services/service.d.ts +2 -2
- package/lib/services/service.d.ts.map +1 -0
- package/lib/services/service.js +13 -23
- package/lib/services/service.js.map +1 -1
- package/lib/services/service.spec.d.ts +1 -0
- package/lib/services/service.spec.d.ts.map +1 -0
- package/lib/services/service.spec.js +58 -40
- package/lib/services/service.spec.js.map +1 -1
- package/lib/stores/aggregator.d.ts +10 -3
- package/lib/stores/aggregator.d.ts.map +1 -0
- package/lib/stores/aggregator.js +6 -6
- package/lib/stores/aggregator.js.map +1 -1
- package/lib/stores/file.d.ts +3 -2
- package/lib/stores/file.d.ts.map +1 -0
- package/lib/stores/file.js +13 -13
- package/lib/stores/file.js.map +1 -1
- package/lib/stores/file.spec.d.ts +5 -11
- package/lib/stores/file.spec.d.ts.map +1 -0
- package/lib/stores/file.spec.js +20 -114
- package/lib/stores/file.spec.js.map +1 -1
- package/lib/stores/mapper.d.ts +2 -1
- package/lib/stores/mapper.d.ts.map +1 -0
- package/lib/stores/mapper.js +12 -12
- package/lib/stores/mapper.js.map +1 -1
- package/lib/stores/mapper.spec.d.ts +1 -0
- package/lib/stores/mapper.spec.d.ts.map +1 -0
- package/lib/stores/mapper.spec.js +24 -17
- package/lib/stores/mapper.spec.js.map +1 -1
- package/lib/stores/memory.d.ts +2 -1
- package/lib/stores/memory.d.ts.map +1 -0
- package/lib/stores/memory.js +15 -15
- package/lib/stores/memory.js.map +1 -1
- package/lib/stores/memory.spec.d.ts +7 -13
- package/lib/stores/memory.spec.d.ts.map +1 -0
- package/lib/stores/memory.spec.js +118 -183
- package/lib/stores/memory.spec.js.map +1 -1
- package/lib/stores/modelmapper.d.ts +1 -0
- package/lib/stores/modelmapper.d.ts.map +1 -0
- package/lib/stores/modelmapper.js +8 -10
- package/lib/stores/modelmapper.js.map +1 -1
- package/lib/stores/store.d.ts +4 -145
- package/lib/stores/store.d.ts.map +1 -0
- package/lib/stores/store.js +54 -654
- package/lib/stores/store.js.map +1 -1
- package/lib/stores/store.spec.d.ts +11 -19
- package/lib/stores/store.spec.d.ts.map +1 -0
- package/lib/stores/store.spec.js +99 -268
- package/lib/stores/store.spec.js.map +1 -1
- package/lib/test.d.ts +109 -6
- package/lib/test.d.ts.map +1 -0
- package/lib/test.js +245 -22
- package/lib/test.js.map +1 -1
- package/lib/unpackedapplication.d.ts +3 -2
- package/lib/unpackedapplication.d.ts.map +1 -0
- package/lib/unpackedapplication.js +29 -16
- package/lib/unpackedapplication.js.map +1 -1
- package/lib/utils/abstractdeployer.d.ts +1 -0
- package/lib/utils/abstractdeployer.d.ts.map +1 -0
- package/lib/utils/abstractdeployer.spec.d.ts +1 -0
- package/lib/utils/abstractdeployer.spec.d.ts.map +1 -0
- package/lib/utils/case.d.ts +1 -0
- package/lib/utils/case.d.ts.map +1 -0
- package/lib/utils/case.spec.d.ts +1 -0
- package/lib/utils/case.spec.d.ts.map +1 -0
- package/lib/utils/context.d.ts +37 -17
- package/lib/utils/context.d.ts.map +1 -0
- package/lib/utils/context.js +53 -42
- package/lib/utils/context.js.map +1 -1
- package/lib/utils/context.spec.d.ts +1 -0
- package/lib/utils/context.spec.d.ts.map +1 -0
- package/lib/utils/context.spec.js +21 -14
- package/lib/utils/context.spec.js.map +1 -1
- package/lib/utils/cookie.d.ts +1 -0
- package/lib/utils/cookie.d.ts.map +1 -0
- package/lib/utils/cookie.js +2 -2
- package/lib/utils/cookie.js.map +1 -1
- package/lib/utils/cookie.spec.d.ts +1 -0
- package/lib/utils/cookie.spec.d.ts.map +1 -0
- package/lib/utils/cookie.spec.js +20 -10
- package/lib/utils/cookie.spec.js.map +1 -1
- package/lib/utils/esm.d.ts +1 -0
- package/lib/utils/esm.d.ts.map +1 -0
- package/lib/utils/httpcontext.d.ts +1 -0
- package/lib/utils/httpcontext.d.ts.map +1 -0
- package/lib/utils/httpcontext.js +7 -7
- package/lib/utils/httpcontext.js.map +1 -1
- package/lib/utils/httpcontext.spec.d.ts +1 -0
- package/lib/utils/httpcontext.spec.d.ts.map +1 -0
- package/lib/utils/httpcontext.spec.js +7 -7
- package/lib/utils/httpcontext.spec.js.map +1 -1
- package/lib/utils/logger.d.ts +1 -0
- package/lib/utils/logger.d.ts.map +1 -0
- package/lib/utils/logger.spec.d.ts +1 -0
- package/lib/utils/logger.spec.d.ts.map +1 -0
- package/lib/utils/logger.spec.js +5 -5
- package/lib/utils/logger.spec.js.map +1 -1
- package/lib/utils/serializers.d.ts +6 -4
- package/lib/utils/serializers.d.ts.map +1 -0
- package/lib/utils/serializers.js +30 -27
- package/lib/utils/serializers.js.map +1 -1
- package/lib/utils/serializers.spec.d.ts +1 -0
- package/lib/utils/serializers.spec.d.ts.map +1 -0
- package/lib/utils/serializers.spec.js +12 -14
- package/lib/utils/serializers.spec.js.map +1 -1
- package/lib/utils/session.d.ts +2 -5
- package/lib/utils/session.d.ts.map +1 -0
- package/lib/utils/session.js +1 -11
- package/lib/utils/session.js.map +1 -1
- package/lib/utils/session.spec.d.ts +1 -0
- package/lib/utils/session.spec.d.ts.map +1 -0
- package/lib/utils/session.spec.js +22 -12
- package/lib/utils/session.spec.js.map +1 -1
- package/lib/utils/throttler.d.ts +1 -4
- package/lib/utils/throttler.d.ts.map +1 -0
- package/lib/utils/throttler.js +1 -9
- package/lib/utils/throttler.js.map +1 -1
- package/lib/utils/throttler.spec.d.ts +1 -0
- package/lib/utils/throttler.spec.d.ts.map +1 -0
- package/lib/utils/throttler.spec.js +4 -6
- package/lib/utils/throttler.spec.js.map +1 -1
- package/lib/utils/waiter.d.ts +1 -0
- package/lib/utils/waiter.d.ts.map +1 -0
- package/lib/utils/waiter.js +3 -3
- package/lib/utils/waiter.js.map +1 -1
- package/lib/utils/waiter.spec.d.ts +1 -0
- package/lib/utils/waiter.spec.d.ts.map +1 -0
- package/lib/utils/waiter.spec.js +6 -6
- package/lib/utils/waiter.spec.js.map +1 -1
- package/package.json +20 -16
- package/test/config.json +6 -90
- package/test/data/.env +1 -0
- package/webda.module.json +607 -377
- package/lib/router.js.map +0 -1
- package/lib/router.spec.d.ts +0 -1
- package/lib/router.spec.js.map +0 -1
- package/lib/stores/aliasstore.d.ts +0 -108
- package/lib/stores/aliasstore.js +0 -168
- package/lib/stores/aliasstore.js.map +0 -1
- package/lib/stores/aliasstore.spec.d.ts +0 -11
- package/lib/stores/aliasstore.spec.js +0 -89
- package/lib/stores/aliasstore.spec.js.map +0 -1
- package/lib/stores/webdaql/WebdaQLLexer.d.ts +0 -54
- package/lib/stores/webdaql/WebdaQLLexer.js +0 -295
- package/lib/stores/webdaql/WebdaQLLexer.js.map +0 -1
- package/lib/stores/webdaql/WebdaQLParserLexer.d.ts +0 -54
- package/lib/stores/webdaql/WebdaQLParserLexer.js +0 -295
- package/lib/stores/webdaql/WebdaQLParserLexer.js.map +0 -1
- package/lib/stores/webdaql/WebdaQLParserListener.d.ts +0 -296
- package/lib/stores/webdaql/WebdaQLParserListener.js +0 -3
- package/lib/stores/webdaql/WebdaQLParserListener.js.map +0 -1
- package/lib/stores/webdaql/WebdaQLParserParser.d.ts +0 -311
- package/lib/stores/webdaql/WebdaQLParserParser.js +0 -1807
- package/lib/stores/webdaql/WebdaQLParserParser.js.map +0 -1
- package/lib/stores/webdaql/WebdaQLParserVisitor.d.ts +0 -181
- package/lib/stores/webdaql/WebdaQLParserVisitor.js +0 -3
- package/lib/stores/webdaql/WebdaQLParserVisitor.js.map +0 -1
- package/lib/stores/webdaql/query.d.ts +0 -390
- package/lib/stores/webdaql/query.js +0 -702
- package/lib/stores/webdaql/query.js.map +0 -1
- package/lib/stores/webdaql/query.spec.d.ts +0 -1
- package/lib/stores/webdaql/query.spec.js +0 -206
- package/lib/stores/webdaql/query.spec.js.map +0 -1
- package/test/config-file-missing-file-no-default.json +0 -44
- package/test/config-file-missing-file.json +0 -55
- package/test/config-file-no-reload.json +0 -69
- package/test/config-file-reload.json +0 -68
- package/test/config-invitation.json +0 -63
- package/test/config-kube-reload.json +0 -68
- package/test/config-reload.json +0 -66
- package/test/config.old.json +0 -152
- package/test/moddas/annotatedservice.js +0 -23
- package/test/moddas/debugmailer.js +0 -13
- package/test/moddas/fakeservice.js +0 -4
- package/test/moddas/voidstore.js +0 -66
- package/test/models/ident.js +0 -36
- package/test/models/task.js +0 -42
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"asyncevents.d.ts","sourceRoot":"","sources":["../../src/services/asyncevents.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,MAAM,qBAAqB,CAAC;AAC1D,OAAO,EAAE,KAAK,EAAE,MAAM,wBAAwB,CAAC;AAC/C,OAAO,EAAE,OAAO,EAAE,iBAAiB,EAAE,MAAM,WAAW,CAAC;AAEvD;;GAEG;AACH,qBAAa,UAAU;IACrB;;OAEG;IACH,OAAO,EAAE,MAAM,CAAC;IAChB;;OAEG;IACH,IAAI,EAAE,MAAM,CAAC;IACb;;OAEG;IACH,OAAO,EAAE,GAAG,CAAC;IACb;;OAEG;IACH,IAAI,EAAE,IAAI,CAAC;IAEX;;OAEG;IACH,MAAM,CAAC,UAAU,SAAqB;gBAE1B,OAAO,EAAE,MAAM,GAAG,OAAO,GAAG,mBAAmB,EAAE,IAAI,KAAA,EAAE,OAAO,KAAK;IAa/E;;;;;;OAMG;IACH,MAAM;;;IAYN;;;;;;OAMG;IACH,MAAM,CAAC,SAAS,CAAC,IAAI,EAAE,GAAG,EAAE,OAAO,EAAE,OAAO;IAe5C;;;OAGG;IACH,SAAS;CAGV;AAED,UAAU,QAAQ;IAChB,CAAC,GAAG,EAAE,MAAM,GAAG,KAAK,CAAC;CACtB;AAED;;GAEG;AACH,qBAAa,sBAAuB,SAAQ,iBAAiB;IAC3D;;OAEG;IACH,MAAM,CAAC,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;KAAE,CAAC;IACnC;;OAEG;IACH,IAAI,CAAC,EAAE,OAAO,CAAC;IAEf;;OAEG;gBACS,MAAM,EAAE,GAAG;CAKxB;AAED;;;GAGG;AACH,cAAM,YAAY,CAAC,CAAC,SAAS,sBAAsB,GAAG,sBAAsB,CAAE,SAAQ,OAAO,CAAC,CAAC,CAAC;IAC9F,UAAU,EAAE,GAAG,CAAM;IACrB,OAAO,EAAE,QAAQ,CAAM;IACvB,aAAa,EAAE,MAAM,CAAM;IAC3B,MAAM,EAAE,OAAO,CAAC;IAEhB;;;;;OAKG;IACH,cAAc,CAAC,MAAM,EAAE,GAAG,GAAG,iBAAiB;IAI9C;;;OAGG;IACG,iBAAiB,IAAI,OAAO,CAAC,IAAI,CAAC;IAiBxC;;;;;;;;;;;;;;;;;;;;;;;OAuBG;IACH,iBAAiB,CAAC,OAAO,EAAE,OAAO,GAAG,mBAAmB,EAAE,KAAK,EAAE,MAAM,EAAE,QAAQ,KAAA,EAAE,KAAK,CAAC,EAAE,MAAM;IAmBjG;;;;;;;;OAQG;IACG,SAAS,CAAC,OAAO,EAAE,OAAO,GAAG,mBAAmB,EAAE,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,GAAG;IASjG;;;;;OAKG;cACa,WAAW,CAAC,KAAK,EAAE,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC;IAc7D;;;;OAIG;cACa,cAAc,CAAC,KAAK,EAAE,UAAU;IAIhD;;;;OAIG;IACH,MAAM,CAAC,KAAK,GAAE,MAA2B,GAAG,OAAO,CAAC,IAAI,CAAC;CAK1D;AAED,OAAO,EAAE,YAAY,EAAE,QAAQ,EAAE,CAAC"}
|
|
@@ -43,7 +43,7 @@ export class AsyncEvent {
|
|
|
43
43
|
* @returns
|
|
44
44
|
*/
|
|
45
45
|
static fromQueue(data, service) {
|
|
46
|
-
|
|
46
|
+
const evt = new AsyncEvent(data.service, data.type, JSON.parse(data.payload, (_key, value) => {
|
|
47
47
|
if (typeof value === "string" && value.startsWith(AsyncEvent.ServiceTag)) {
|
|
48
48
|
return service.getService(value.substring(AsyncEvent.ServiceTag.length));
|
|
49
49
|
}
|
|
@@ -147,7 +147,7 @@ class EventService extends Service {
|
|
|
147
147
|
if (!queue) {
|
|
148
148
|
queue = this._defaultQueue;
|
|
149
149
|
}
|
|
150
|
-
|
|
150
|
+
const mapper = new AsyncEvent(service, event).getMapper();
|
|
151
151
|
if (!this._callbacks[mapper]) {
|
|
152
152
|
if (service instanceof Service) {
|
|
153
153
|
service.on(event, data => this.pushEvent(service, event, queue, data));
|
|
@@ -169,7 +169,7 @@ class EventService extends Service {
|
|
|
169
169
|
* @returns
|
|
170
170
|
*/
|
|
171
171
|
async pushEvent(service, type, queue, payload) {
|
|
172
|
-
|
|
172
|
+
const event = new AsyncEvent(service, type, payload);
|
|
173
173
|
if (this._async) {
|
|
174
174
|
return this._queues[queue].sendMessage(event);
|
|
175
175
|
}
|
|
@@ -187,7 +187,7 @@ class EventService extends Service {
|
|
|
187
187
|
if (!this._callbacks[event.getMapper()]) {
|
|
188
188
|
return Promise.reject("Callbacks should not be empty, possible application version mismatch between emitter and worker");
|
|
189
189
|
}
|
|
190
|
-
|
|
190
|
+
const promises = [];
|
|
191
191
|
this._callbacks[event.getMapper()].map(executor => {
|
|
192
192
|
promises.push(executor(event.payload, event));
|
|
193
193
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"asyncevents.js","sourceRoot":"","sources":["../../src/services/asyncevents.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,OAAO,EAAE,iBAAiB,EAAE,MAAM,WAAW,CAAC;AAEvD;;GAEG;AACH,MAAM,OAAO,UAAU;IAuBrB,YAAY,OAA+C,EAAE,IAAI,EAAE,OAAO,GAAG,EAAE;QAC7E,IAAI,OAAO,YAAY,OAAO,EAAE,CAAC;YAC/B,IAAI,CAAC,OAAO,GAAG,WAAW,OAAO,CAAC,OAAO,EAAE,EAAE,CAAC;QAChD,CAAC;aAAM,IAAI,OAAO,OAAO,KAAK,QAAQ,EAAE,CAAC;YACvC,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;QACzB,CAAC;aAAM,CAAC;YACN,IAAI,CAAC,OAAO,GAAG,SAAS,OAAO,CAAC,IAAI,EAAE,CAAC;QACzC,CAAC;QACD,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;QACjB,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;QACvB,IAAI,CAAC,IAAI,GAAG,IAAI,IAAI,EAAE,CAAC;IACzB,CAAC;IAED;;;;;;OAMG;IACH,MAAM;QACJ,OAAO;YACL,GAAG,IAAI;YACP,OAAO,EAAE,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC,IAAY,EAAE,KAAU,EAAE,EAAE;gBACjE,IAAI,KAAK,YAAY,OAAO,EAAE,CAAC;oBAC7B,OAAO,GAAG,UAAU,CAAC,UAAU,GAAG,KAAK,CAAC,OAAO,EAAE,EAAE,CAAC;gBACtD,CAAC;gBACD,OAAO,KAAK,CAAC;YACf,CAAC,CAAC;SACH,CAAC;IACJ,CAAC;IAED;;;;;;OAMG;IACH,MAAM,CAAC,SAAS,CAAC,IAAS,EAAE,OAAgB;QAC1C,
|
|
1
|
+
{"version":3,"file":"asyncevents.js","sourceRoot":"","sources":["../../src/services/asyncevents.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"asyncevents.spec.d.ts","sourceRoot":"","sources":["../../src/services/asyncevents.spec.ts"],"names":[],"mappings":""}
|
|
@@ -11,12 +11,12 @@ import { WebdaTest } from "../test.js";
|
|
|
11
11
|
import { EventService } from "./asyncevents.js";
|
|
12
12
|
let AsyncEventsTest = class AsyncEventsTest extends WebdaTest {
|
|
13
13
|
async simple() {
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
14
|
+
const users = this.webda.getService("Users");
|
|
15
|
+
let eventsCount = 0;
|
|
16
|
+
let priorityEventsCount = 0;
|
|
17
|
+
const defaultQueue = this.webda.getService("EventQueue");
|
|
18
|
+
const priorityQueue = this.webda.getService("PriorityEventQueue");
|
|
19
|
+
const eventService = this.webda.getService("AsyncEvents");
|
|
20
20
|
users.onAsync("Store.Saved", () => {
|
|
21
21
|
eventsCount++;
|
|
22
22
|
});
|
|
@@ -63,7 +63,7 @@ let AsyncEventsTest = class AsyncEventsTest extends WebdaTest {
|
|
|
63
63
|
assert.strictEqual(priorityEventsCount, 2);
|
|
64
64
|
}
|
|
65
65
|
worker() {
|
|
66
|
-
|
|
66
|
+
const eventService = this.webda.getService("AsyncEvents");
|
|
67
67
|
eventService._queues = {
|
|
68
68
|
plop: {
|
|
69
69
|
// @ts-ignore
|
|
@@ -78,17 +78,17 @@ let AsyncEventsTest = class AsyncEventsTest extends WebdaTest {
|
|
|
78
78
|
assert.strictEqual(eventService.worker(), "default");
|
|
79
79
|
}
|
|
80
80
|
async computeParameters() {
|
|
81
|
-
|
|
81
|
+
const evt = new EventService(this.webda, "none", { sync: false });
|
|
82
82
|
await assert.rejects(() => evt.computeParameters(), /Need at least one queue for async to be ready/);
|
|
83
83
|
}
|
|
84
84
|
async cov() {
|
|
85
|
-
|
|
85
|
+
const evt = new EventService(this.webda, "none", { sync: true });
|
|
86
86
|
assert.throws(() => evt.bindAsyncListener(evt, "plop", undefined, "plop"), /EventService is not configured for asynchronous/);
|
|
87
87
|
await assert.rejects(
|
|
88
88
|
// @ts-ignore
|
|
89
89
|
() => evt.handleEvent({ getMapper: () => "plop" }), /Callbacks should not be empty, possible application version mismatch between emitter and worker/);
|
|
90
90
|
evt._async = true;
|
|
91
|
-
|
|
91
|
+
const stub = sinon.spy(this.webda.getService("Users"), "on");
|
|
92
92
|
try {
|
|
93
93
|
evt.bindAsyncListener(this.webda.getService("Users"), "plop", () => { }, "priority");
|
|
94
94
|
evt.bindAsyncListener(this.webda.getService("Users"), "plop", () => { }, "priority");
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"asyncevents.spec.js","sourceRoot":"","sources":["../../src/services/asyncevents.spec.ts"],"names":[],"mappings":";;;;;;AAAA,OAAO,EAAE,KAAK,EAAE,IAAI,EAAE,MAAM,iBAAiB,CAAC;AAC9C,OAAO,KAAK,MAAM,MAAM,QAAQ,CAAC;AACjC,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAI/B,OAAO,EAAE,SAAS,EAAE,MAAM,SAAS,CAAC;AACpC,OAAO,EAAc,YAAY,EAAE,MAAM,eAAe,CAAC;AAGzD,IAAM,eAAe,GAArB,MAAM,eAAgB,SAAQ,SAAS;IAE/B,AAAN,KAAK,CAAC,MAAM;QACV,
|
|
1
|
+
{"version":3,"file":"asyncevents.spec.js","sourceRoot":"","sources":["../../src/services/asyncevents.spec.ts"],"names":[],"mappings":"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"}
|
|
@@ -6,7 +6,7 @@ import { Service, ServiceParameters } from "../services/service.js";
|
|
|
6
6
|
import { Store } from "../stores/store.js";
|
|
7
7
|
import { OperationContext, WebContext } from "../utils/context.js";
|
|
8
8
|
import { HttpMethodType } from "../utils/httpcontext.js";
|
|
9
|
-
import CryptoService from "./cryptoservice.js";
|
|
9
|
+
import { CryptoService } from "./cryptoservice.js";
|
|
10
10
|
import { Mailer } from "./mailer.js";
|
|
11
11
|
/**
|
|
12
12
|
* Emitted when the /me route is called
|
|
@@ -358,3 +358,4 @@ declare class Authentication<T extends AuthenticationParameters = Authentication
|
|
|
358
358
|
generateEmailValidationToken(user: string, email: string): Promise<string>;
|
|
359
359
|
}
|
|
360
360
|
export { Authentication };
|
|
361
|
+
//# sourceMappingURL=authentication.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"authentication.d.ts","sourceRoot":"","sources":["../../src/services/authentication.ts"],"names":[],"mappings":"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"}
|
|
@@ -6,8 +6,9 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
|
|
|
6
6
|
};
|
|
7
7
|
import bcrypt from "bcryptjs";
|
|
8
8
|
import { Counter } from "../core.js";
|
|
9
|
-
import
|
|
10
|
-
import { Inject,
|
|
9
|
+
import * as WebdaError from "../errors.js";
|
|
10
|
+
import { Inject, Service, ServiceParameters } from "../services/service.js";
|
|
11
|
+
import { Route } from "../rest/router.js";
|
|
11
12
|
import { HttpContext } from "../utils/httpcontext.js";
|
|
12
13
|
export class AuthenticationParameters extends ServiceParameters {
|
|
13
14
|
constructor(params) {
|
|
@@ -211,8 +212,8 @@ class Authentication extends Service {
|
|
|
211
212
|
* @throws 429 if a validation email has been sent recently
|
|
212
213
|
*/
|
|
213
214
|
async _sendEmailValidation(ctx) {
|
|
214
|
-
|
|
215
|
-
|
|
215
|
+
const identKey = ctx.parameters.email + "_email";
|
|
216
|
+
const ident = await this._identModel.ref(identKey).get();
|
|
216
217
|
if (!ident) {
|
|
217
218
|
await this._identModel.ref(`${ctx.parameters.email}_email`).create({
|
|
218
219
|
_lastValidationEmail: Date.now(),
|
|
@@ -221,7 +222,7 @@ class Authentication extends Service {
|
|
|
221
222
|
}
|
|
222
223
|
else {
|
|
223
224
|
// If the ident is linked to someone else - might want to remove it
|
|
224
|
-
if (ident.getUser() !== ctx.getCurrentUserId()) {
|
|
225
|
+
if (ident.getUser().getUuid() !== ctx.getCurrentUserId()) {
|
|
225
226
|
throw new WebdaError.Conflict("Ident is linked to someone else");
|
|
226
227
|
}
|
|
227
228
|
// If the email is already validated
|
|
@@ -241,7 +242,7 @@ class Authentication extends Service {
|
|
|
241
242
|
* @param ctx
|
|
242
243
|
*/
|
|
243
244
|
async _getMe(ctx) {
|
|
244
|
-
|
|
245
|
+
const user = await ctx.getCurrentUser();
|
|
245
246
|
if (user === undefined) {
|
|
246
247
|
throw new WebdaError.NotFound("No user found");
|
|
247
248
|
}
|
|
@@ -335,7 +336,7 @@ class Authentication extends Service {
|
|
|
335
336
|
if (await this._identModel.ref(`${identId}_${provider}`).exists()) {
|
|
336
337
|
throw new Error("Ident is already known");
|
|
337
338
|
}
|
|
338
|
-
|
|
339
|
+
const ctx = await this._webda.newWebContext(new HttpContext("fake", "GET", "/"));
|
|
339
340
|
// Pretend we logged in with the ident
|
|
340
341
|
await this.onIdentLogin(ctx, provider, identId, profile);
|
|
341
342
|
}
|
|
@@ -377,12 +378,12 @@ class Authentication extends Service {
|
|
|
377
378
|
* @param ctx
|
|
378
379
|
*/
|
|
379
380
|
async _passwordRecoveryEmail(ctx) {
|
|
380
|
-
|
|
381
|
-
|
|
381
|
+
const email = ctx.parameter("email");
|
|
382
|
+
const ident = await this._identModel.ref(email + "_email").get();
|
|
382
383
|
if (!ident) {
|
|
383
384
|
throw new WebdaError.NotFound("Email not found");
|
|
384
385
|
}
|
|
385
|
-
|
|
386
|
+
const user = await this._userModel.ref(ident.getUser().toString()).get();
|
|
386
387
|
// Dont allow to do too many request
|
|
387
388
|
if (!user.lastPasswordRecoveryBefore(Date.now() - this.parameters.email.delay)) {
|
|
388
389
|
throw new WebdaError.TooManyRequests("Password recovery already requested recently");
|
|
@@ -400,14 +401,14 @@ class Authentication extends Service {
|
|
|
400
401
|
}
|
|
401
402
|
return;
|
|
402
403
|
}
|
|
403
|
-
|
|
404
|
+
const regexp = new RegExp(this.parameters.password.regexp);
|
|
404
405
|
if (regexp.exec(password) === null) {
|
|
405
406
|
throw new WebdaError.BadRequest("Password does not match the policy");
|
|
406
407
|
}
|
|
407
408
|
}
|
|
408
409
|
async _passwordRecovery(ctx) {
|
|
409
|
-
|
|
410
|
-
|
|
410
|
+
const body = await ctx.getRequestBody();
|
|
411
|
+
const user = await this._userModel.ref(body.login.toLowerCase()).get();
|
|
411
412
|
if (!user) {
|
|
412
413
|
throw new WebdaError.Forbidden("User not found");
|
|
413
414
|
}
|
|
@@ -418,7 +419,7 @@ class Authentication extends Service {
|
|
|
418
419
|
throw new WebdaError.Gone("Expired token");
|
|
419
420
|
}
|
|
420
421
|
await this._verifyPassword(body.password, user);
|
|
421
|
-
|
|
422
|
+
const password = this.hashPassword(body.password);
|
|
422
423
|
await user.patch({
|
|
423
424
|
__password: password
|
|
424
425
|
}, null);
|
|
@@ -479,10 +480,10 @@ class Authentication extends Service {
|
|
|
479
480
|
* @returns
|
|
480
481
|
*/
|
|
481
482
|
async sendRecoveryEmail(ctx, user, email) {
|
|
482
|
-
|
|
483
|
+
const infos = await this.getPasswordRecoveryInfos(user);
|
|
483
484
|
const mailer = this.getMailMan();
|
|
484
|
-
|
|
485
|
-
|
|
485
|
+
const locale = user.locale || ctx.getLocale();
|
|
486
|
+
const mailOptions = {
|
|
486
487
|
to: email,
|
|
487
488
|
locale: locale,
|
|
488
489
|
template: "EMAIL_RECOVERY",
|
|
@@ -505,18 +506,18 @@ class Authentication extends Service {
|
|
|
505
506
|
*/
|
|
506
507
|
async sendValidationEmail(ctx, email) {
|
|
507
508
|
const mailer = this.getMailMan();
|
|
508
|
-
|
|
509
|
+
const replacements = {
|
|
509
510
|
...this.parameters.email,
|
|
510
511
|
context: ctx,
|
|
511
512
|
url: ctx
|
|
512
513
|
.getHttpContext()
|
|
513
514
|
.getAbsoluteUrl(`${this.parameters.url}/email/callback?email=${email}&token=${await this.generateEmailValidationToken(ctx.getCurrentUserId(), email)}`)
|
|
514
515
|
};
|
|
515
|
-
|
|
516
|
+
const userId = ctx.getCurrentUserId();
|
|
516
517
|
if (userId && userId.length > 0) {
|
|
517
518
|
replacements.url += "&user=" + userId;
|
|
518
519
|
}
|
|
519
|
-
|
|
520
|
+
const mailOptions = {
|
|
520
521
|
to: email,
|
|
521
522
|
locale: ctx.getLocale(),
|
|
522
523
|
template: "EMAIL_REGISTER",
|
|
@@ -586,8 +587,8 @@ class Authentication extends Service {
|
|
|
586
587
|
* @param ident
|
|
587
588
|
*/
|
|
588
589
|
async handleLogin(ctx, ident) {
|
|
589
|
-
|
|
590
|
-
|
|
590
|
+
const updates = {};
|
|
591
|
+
const user = await this._userModel.ref(ident.getUser().toString()).get();
|
|
591
592
|
// Check password
|
|
592
593
|
if (this.checkPassword(user.getPassword(), (await ctx.getRequestBody()).password)) {
|
|
593
594
|
if (ident._failedLogin > 0) {
|
|
@@ -629,7 +630,7 @@ class Authentication extends Service {
|
|
|
629
630
|
if (ctx.getCurrentUserId() !== undefined) {
|
|
630
631
|
throw new WebdaError.Gone("Already logged in");
|
|
631
632
|
}
|
|
632
|
-
|
|
633
|
+
const body = await ctx.getRequestBody();
|
|
633
634
|
const mailConfig = this.parameters.email;
|
|
634
635
|
const uuid = body.login.toLowerCase() + "_email";
|
|
635
636
|
let ident = await this._identModel.ref(uuid).get();
|
|
@@ -664,13 +665,13 @@ class Authentication extends Service {
|
|
|
664
665
|
throw new WebdaError.BadRequest("Password is required");
|
|
665
666
|
}
|
|
666
667
|
// Store with a _
|
|
667
|
-
|
|
668
|
+
const __password = this.hashPassword(body.password);
|
|
668
669
|
await this._verifyPassword(body.password);
|
|
669
670
|
// Remove useless attributes
|
|
670
671
|
delete body.password;
|
|
671
672
|
delete body.register;
|
|
672
673
|
delete body.token;
|
|
673
|
-
|
|
674
|
+
const user = await this.registerUser(ctx, {}, uuid, new this._userModel().load({
|
|
674
675
|
...body,
|
|
675
676
|
__password
|
|
676
677
|
}, true));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"authentication.js","sourceRoot":"","sources":["../../src/services/authentication.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"authentication.js","sourceRoot":"","sources":["../../src/services/authentication.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"authentication.spec.d.ts","sourceRoot":"","sources":["../../src/services/authentication.spec.ts"],"names":[],"mappings":""}
|
|
@@ -10,7 +10,7 @@ import { Authentication, WebdaError } from "...js";
|
|
|
10
10
|
import { WebdaTest } from "../test.js";
|
|
11
11
|
import { AuthenticationParameters } from "./authentication.js";
|
|
12
12
|
const validationUrl = /.*\/auth\/email\/callback\?email=([^&]+)&token=([^& ]+)(&user=([^ &]+))?/;
|
|
13
|
-
|
|
13
|
+
let userId;
|
|
14
14
|
let AuthenticationTest = class AuthenticationTest extends WebdaTest {
|
|
15
15
|
constructor() {
|
|
16
16
|
super(...arguments);
|
|
@@ -43,7 +43,7 @@ let AuthenticationTest = class AuthenticationTest extends WebdaTest {
|
|
|
43
43
|
this.mailer.sent = [];
|
|
44
44
|
}
|
|
45
45
|
async registerTest2(ctx) {
|
|
46
|
-
|
|
46
|
+
const executor = this.getExecutor(ctx, "test.webda.io", "POST", "/auth/email", {
|
|
47
47
|
login: "Test2@Webda.io",
|
|
48
48
|
password: "testtest",
|
|
49
49
|
register: true
|
|
@@ -58,10 +58,10 @@ let AuthenticationTest = class AuthenticationTest extends WebdaTest {
|
|
|
58
58
|
this.authentication.addProvider("plop");
|
|
59
59
|
this.authentication.addProvider("plop");
|
|
60
60
|
this.authentication.addProvider("plop2");
|
|
61
|
-
|
|
61
|
+
const ctx = await this.newContext();
|
|
62
62
|
this.authentication._listAuthentications(ctx);
|
|
63
63
|
assert.strictEqual(ctx.getResponseBody(), JSON.stringify(["email", "plop", "plop2"]));
|
|
64
|
-
ctx.
|
|
64
|
+
ctx.setParameters({ provider: "plop" });
|
|
65
65
|
this.authentication.getParameters().password.verifier = "VersionService";
|
|
66
66
|
this.authentication.computeParameters();
|
|
67
67
|
assert.strictEqual(await this.authentication.getPasswordRecoveryInfos("bouzouf"), undefined);
|
|
@@ -80,14 +80,14 @@ let AuthenticationTest = class AuthenticationTest extends WebdaTest {
|
|
|
80
80
|
assert.strictEqual(params.url, "/aaa");
|
|
81
81
|
this.authentication.getParameters().email = undefined;
|
|
82
82
|
assert.strictEqual(this.authentication.getUrl("./emails", ["POST"]), undefined);
|
|
83
|
-
|
|
83
|
+
const auth = new Authentication(this.webda, "auth", {
|
|
84
84
|
email: { mailer: "plop" }
|
|
85
85
|
});
|
|
86
86
|
assert.throws(() => auth.resolve(), /email authentication requires a Mailer service/);
|
|
87
87
|
}
|
|
88
88
|
async register() {
|
|
89
89
|
// By default service does not have postValidation enable
|
|
90
|
-
|
|
90
|
+
const ctx = await this.newContext();
|
|
91
91
|
this.events = 0;
|
|
92
92
|
// Should reject because it is login and not email
|
|
93
93
|
let executor = this.getExecutor(ctx, "test.webda.io", "POST", "/auth/email", {
|
|
@@ -123,7 +123,7 @@ let AuthenticationTest = class AuthenticationTest extends WebdaTest {
|
|
|
123
123
|
userId = ctx.getSession().userId;
|
|
124
124
|
assert.notStrictEqual(ctx.getSession().userId, undefined);
|
|
125
125
|
assert.strictEqual(this.mailer.sent.length, 2);
|
|
126
|
-
|
|
126
|
+
const user = await this.userStore.get(ctx.getSession().userId);
|
|
127
127
|
assert.notStrictEqual(user, undefined);
|
|
128
128
|
assert.notStrictEqual(user.getPassword(), undefined);
|
|
129
129
|
assert.strictEqual(user.locale, "en");
|
|
@@ -134,7 +134,7 @@ let AuthenticationTest = class AuthenticationTest extends WebdaTest {
|
|
|
134
134
|
// Now validate first user
|
|
135
135
|
ctx.getExecutor().getParameters().email.postValidation = false;
|
|
136
136
|
assert.strictEqual(ctx.getSession().userId, undefined);
|
|
137
|
-
|
|
137
|
+
let match = this.mailer.sent[0].replacements.url.match(validationUrl);
|
|
138
138
|
assert.notStrictEqual(match, undefined);
|
|
139
139
|
assert.strictEqual(match[1], "test@webda.io");
|
|
140
140
|
executor = this.getExecutor(ctx, "test.webda.io", "POST", "/auth/email", {
|
|
@@ -148,7 +148,7 @@ let AuthenticationTest = class AuthenticationTest extends WebdaTest {
|
|
|
148
148
|
// Should create it with the data provided
|
|
149
149
|
assert.notStrictEqual(ctx.getSession().userId, undefined);
|
|
150
150
|
ident = await this.identStore.get(ctx.getSession().identUsed);
|
|
151
|
-
assert.strictEqual(ctx.getCurrentUserId(), ident.getUser());
|
|
151
|
+
assert.strictEqual(ctx.getCurrentUserId(), ident.getUser().getUuid());
|
|
152
152
|
// Email should be already validate
|
|
153
153
|
assert.notStrictEqual(ident._validation, undefined);
|
|
154
154
|
assert.strictEqual(this.mailer.sent.length, 2);
|
|
@@ -191,13 +191,13 @@ let AuthenticationTest = class AuthenticationTest extends WebdaTest {
|
|
|
191
191
|
}
|
|
192
192
|
async registerBadPassword() {
|
|
193
193
|
// By default a password of 8 is needed
|
|
194
|
-
|
|
194
|
+
const params = {
|
|
195
195
|
login: "testBad@Webda.io",
|
|
196
196
|
password: "test",
|
|
197
197
|
register: true
|
|
198
198
|
};
|
|
199
|
-
|
|
200
|
-
|
|
199
|
+
const ctx = await this.newContext(params);
|
|
200
|
+
const executor = this.getExecutor(ctx, "test.webda.io", "POST", "/auth/email", {
|
|
201
201
|
login: "testBad@Webda.io",
|
|
202
202
|
register: true
|
|
203
203
|
}, {
|
|
@@ -208,7 +208,7 @@ let AuthenticationTest = class AuthenticationTest extends WebdaTest {
|
|
|
208
208
|
await assert.rejects(() => executor.execute(ctx), (err) => err.getResponseCode() === 400);
|
|
209
209
|
}
|
|
210
210
|
async me() {
|
|
211
|
-
|
|
211
|
+
const ctx = await this.newContext();
|
|
212
212
|
let executor = this.getExecutor(ctx, "test.webda.io", "GET", "/auth/me");
|
|
213
213
|
await assert.rejects(() => executor.execute(ctx), (err) => err.getResponseCode() === 404);
|
|
214
214
|
executor = this.getExecutor(ctx, "test.webda.io", "POST", "/auth/email", {
|
|
@@ -222,18 +222,18 @@ let AuthenticationTest = class AuthenticationTest extends WebdaTest {
|
|
|
222
222
|
// Get me on known user
|
|
223
223
|
executor = this.getExecutor(ctx, "test.webda.io", "GET", "/auth/me");
|
|
224
224
|
await executor.execute(ctx);
|
|
225
|
-
|
|
225
|
+
const user = JSON.parse(ctx.getResponseBody());
|
|
226
226
|
assert.strictEqual(user.plop, "yep");
|
|
227
227
|
assert.strictEqual(user.register, undefined);
|
|
228
228
|
assert.strictEqual(user.locale, "es-ES");
|
|
229
229
|
assert.notStrictEqual(user, undefined);
|
|
230
230
|
}
|
|
231
231
|
async login() {
|
|
232
|
-
|
|
232
|
+
const ctx = await this.newContext();
|
|
233
233
|
await this.registerTest2(ctx);
|
|
234
234
|
await ctx.newSession();
|
|
235
235
|
this.events = 0;
|
|
236
|
-
|
|
236
|
+
const executor = this.getExecutor(ctx, "test.webda.io", "POST", "/auth/email", {
|
|
237
237
|
login: "test3@webda.io",
|
|
238
238
|
password: "testtest"
|
|
239
239
|
});
|
|
@@ -250,7 +250,7 @@ let AuthenticationTest = class AuthenticationTest extends WebdaTest {
|
|
|
250
250
|
assert.strictEqual(this.events, 1); // Login
|
|
251
251
|
assert.notStrictEqual(ctx.getSession().userId, undefined);
|
|
252
252
|
// Verify ident type
|
|
253
|
-
|
|
253
|
+
const ident = await this.identStore.get(ctx.getSession().identUsed);
|
|
254
254
|
assert.strictEqual(ident._type, "email");
|
|
255
255
|
ctx.getHttpContext().setBody({
|
|
256
256
|
login: "test2@webda.io",
|
|
@@ -274,7 +274,7 @@ let AuthenticationTest = class AuthenticationTest extends WebdaTest {
|
|
|
274
274
|
}
|
|
275
275
|
async testPasswordRecovery() {
|
|
276
276
|
let tokenInfo;
|
|
277
|
-
|
|
277
|
+
const ctx = await this.newContext();
|
|
278
278
|
await this.registerTest2(ctx);
|
|
279
279
|
this.mailer.sent = [];
|
|
280
280
|
this.events = 0;
|
|
@@ -343,7 +343,7 @@ let AuthenticationTest = class AuthenticationTest extends WebdaTest {
|
|
|
343
343
|
}
|
|
344
344
|
async addEmailToAccount() {
|
|
345
345
|
// Log in as test2
|
|
346
|
-
|
|
346
|
+
const ctx = await this.newContext();
|
|
347
347
|
await this.registerTest2(ctx);
|
|
348
348
|
this.mailer.sent = [];
|
|
349
349
|
let executor = this.getExecutor(ctx, "test.webda.io", "GET", "/auth/email/newtest@webda.io/validate", {
|
|
@@ -355,7 +355,7 @@ let AuthenticationTest = class AuthenticationTest extends WebdaTest {
|
|
|
355
355
|
assert.notStrictEqual(ident, undefined);
|
|
356
356
|
assert.strictEqual(ident._validation, undefined);
|
|
357
357
|
userId = ctx.getCurrentUserId();
|
|
358
|
-
|
|
358
|
+
const match = this.mailer.sent[0].replacements.url.match(validationUrl);
|
|
359
359
|
assert.notStrictEqual(match, undefined);
|
|
360
360
|
assert.strictEqual(match[1], "newtest@webda.io");
|
|
361
361
|
// Send another one on newtest2
|
|
@@ -364,7 +364,7 @@ let AuthenticationTest = class AuthenticationTest extends WebdaTest {
|
|
|
364
364
|
password: "retesttest"
|
|
365
365
|
});
|
|
366
366
|
await executor.execute(ctx);
|
|
367
|
-
|
|
367
|
+
const match2 = this.mailer.sent[1].replacements.url.match(validationUrl);
|
|
368
368
|
assert.notStrictEqual(match2, undefined);
|
|
369
369
|
assert.strictEqual(match2[1], "newtest2@webda.io");
|
|
370
370
|
// Try to validate with wrong email
|
|
@@ -409,7 +409,7 @@ let AuthenticationTest = class AuthenticationTest extends WebdaTest {
|
|
|
409
409
|
await executor.execute(ctx);
|
|
410
410
|
assert.strictEqual(ctx.statusCode, 302);
|
|
411
411
|
assert.strictEqual(ctx.getResponseHeaders().Location, "https://webda.io/user.html?validation=email");
|
|
412
|
-
await this.identStore.delete("newtest2@webda.io_email"
|
|
412
|
+
await this.identStore.delete("newtest2@webda.io_email");
|
|
413
413
|
await executor.execute(ctx);
|
|
414
414
|
assert.ok(await this.identStore.exists("newtest2@webda.io_email"));
|
|
415
415
|
}
|
|
@@ -418,8 +418,8 @@ let AuthenticationTest = class AuthenticationTest extends WebdaTest {
|
|
|
418
418
|
await assert.rejects(() => this.authentication.createUserWithIdent("email", "test@test.com"), /Ident is already known/);
|
|
419
419
|
}
|
|
420
420
|
async redirectEmailRegister() {
|
|
421
|
-
|
|
422
|
-
|
|
421
|
+
const token = await this.authentication.generateEmailValidationToken(undefined, "test@webda.io");
|
|
422
|
+
const ctx = await this.newContext();
|
|
423
423
|
await this.execute(ctx, "test.webda.io", "GET", `/auth/email/callback?email=test@webda.io&token=${token}`);
|
|
424
424
|
assert.strictEqual(ctx.statusCode, 302);
|
|
425
425
|
assert.strictEqual(ctx.getResponseHeaders().Location, `https://webda.io/register.html?token=${token}&email=test@webda.io`);
|