payload 1.11.2 → 1.11.3
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/components/styles.css +1 -1
- package/dist/admin/components/elements/Button/index.scss +1 -0
- package/dist/admin/components/elements/DatePicker/DatePicker.js +2 -2
- package/dist/admin/components/elements/DatePicker/DatePicker.js.map +1 -1
- package/dist/admin/components/elements/DatePicker/index.scss +57 -2
- package/dist/admin/components/forms/field-types/RichText/elements/link/LinkDrawer/baseFields.js +1 -3
- package/dist/admin/components/forms/field-types/RichText/elements/link/LinkDrawer/baseFields.js.map +1 -1
- package/dist/admin/components/utilities/Auth/index.js +104 -35
- package/dist/admin/components/utilities/Auth/index.js.map +1 -1
- package/dist/admin/components/utilities/Auth/types.d.ts +3 -1
- package/dist/admin/components/views/Account/Default.js +33 -2
- package/dist/admin/components/views/Account/Default.js.map +1 -1
- package/dist/admin/components/views/Account/index.js +10 -9
- package/dist/admin/components/views/Account/index.js.map +1 -1
- package/dist/admin/components/views/collections/Edit/Auth/index.js.map +1 -1
- package/dist/admin/components/views/collections/Edit/Default.js +7 -2
- package/dist/admin/components/views/collections/Edit/Default.js.map +1 -1
- package/dist/admin/components/views/collections/Edit/index.js +32 -16
- package/dist/admin/components/views/collections/Edit/index.js.map +1 -1
- package/dist/auth/operations/getFieldsToSign.d.ts +7 -0
- package/dist/auth/operations/getFieldsToSign.js +29 -0
- package/dist/auth/operations/getFieldsToSign.js.map +1 -0
- package/dist/auth/operations/login.js +4 -19
- package/dist/auth/operations/login.js.map +1 -1
- package/dist/auth/operations/refresh.js +27 -14
- package/dist/auth/operations/refresh.js.map +1 -1
- package/dist/config/schema.js +5 -0
- package/dist/config/schema.js.map +1 -1
- package/dist/config/types.d.ts +14 -1
- package/dist/payload.js +1 -1
- package/dist/payload.js.map +1 -1
- package/dist/utilities/logger.d.ts +1 -1
- package/dist/utilities/logger.js +2 -2
- package/dist/utilities/logger.js.map +1 -1
- package/docs/authentication/config.mdx +16 -0
- package/docs/getting-started/installation.mdx +4 -0
- package/package.json +2 -2
package/components/styles.css
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
.icon--plus{height:1.9230769231rem;width:1.9230769231rem}.icon--plus .stroke,.icon--x line{stroke:var(--theme-elevation-800);stroke-width:1px}.icon--chevron{height:1.9230769231rem;width:1.9230769231rem}.icon--chevron .stroke{fill:none;stroke:var(--theme-elevation-800);stroke-width:2px}.icon--edit{shape-rendering:auto;height:1.9230769231rem;width:1.9230769231rem}.icon--edit .fill{fill:var(--theme-elevation-800);stroke:none}.icon--swap{height:1.9230769231rem;width:1.9230769231rem}.icon--swap .stroke{fill:none;stroke:var(--theme-elevation-800);stroke-width:2px}.icon--link{height:1.9230769231rem;width:1.9230769231rem}.icon--link .stroke{stroke:var(--theme-elevation-800);stroke-width:1px}.tooltip{--caret-size:6px;background-color:var(--theme-elevation-800);border-radius:2px;color:var(--theme-elevation-0);font-weight:400;line-height:1.4423076923rem;opacity:0;padding:.3846153846rem .7692307692rem;visibility:hidden;white-space:nowrap;z-index:2}.tooltip,.tooltip:after{left:50%;position:absolute}.tooltip:after{border-left:var(--caret-size) solid transparent;border-right:var(--caret-size) solid transparent;content:" ";display:block;height:0;transform:translate3d(-50%,100%,0);width:0}.tooltip--show{cursor:default;opacity:1;transition:opacity .2s ease-in-out;visibility:visible}.tooltip--position-top{bottom:100%;transform:translate3d(-50%,calc(var(--caret-size)*-1),0)}.tooltip--position-top:after{border-top:var(--caret-size) solid var(--theme-elevation-800);bottom:1px}.tooltip--position-bottom{top:100%;transform:translate3d(-50%,var(--caret-size),0)}.tooltip--position-bottom:after{border-bottom:var(--caret-size) solid var(--theme-elevation-800);bottom:calc(100% + var(--caret-size) - 1px)}@media(max-width:1024px){.tooltip{display:none}}html[data-theme=light] .tooltip{background-color:var(--theme-error-250);color:var(--theme-error-750)}html[data-theme=light] .tooltip--position-top:after{border-top-color:var(--theme-error-250)}html[data-theme=light] .tooltip--position-bottom:after{border-bottom-color:var(--theme-error-250)}a.btn{display:inline-block}.btn{background:transparent;border:0;border-radius:4px;color:inherit;cursor:pointer;font-size:1rem;font-weight:400;line-height:1.9230769231rem;margin-bottom:1.9230769231rem;margin-top:1.9230769231rem;text-align:center;text-decoration:none}.btn .btn__icon{border:1px solid;border-radius:100%}.btn .btn__icon .stroke{stroke:currentColor;fill:none}.btn .btn__icon .fill{fill:currentColor}.btn--has-tooltip{position:relative}.btn--icon-style-none .btn__icon,.btn--icon-style-without-border .btn__icon{border:none}.btn span{line-height:1.9230769231rem}.btn span,.btn svg{vertical-align:top}.btn--size-medium{padding:.9615384615rem 1.9230769231rem}.btn--size-small{padding:.4807692308rem .9615384615rem}.btn--style-primary{background-color:var(--theme-elevation-800);color:var(--theme-elevation-0)}.btn--style-primary.btn--disabled{background-color:var(--theme-elevation-400)}.btn--style-primary:not(.btn--disabled):hover{background:var(--theme-elevation-750)}.btn--style-primary:not(.btn--disabled):active{background:var(--theme-elevation-700)}.btn--style-primary:focus{box-shadow:0 0 0 2px var(--theme-success-500);outline:none}.btn--style-secondary{background:none;box-shadow:inset 0 0 0 1px var(--theme-elevation-800);color:var(--theme-elevation-800)}.btn--style-secondary:hover{background:var(--theme-elevation-100);box-shadow:inset 0 0 0 1px var(--theme-elevation-700)}.btn--style-secondary:active{background:var(--theme-elevation-200)}.btn--style-secondary.btn--disabled{background:none;box-shadow:inset 0 0 0 1px var(--theme-elevation-400);color:var(--theme-elevation-400)}.btn--style-secondary:focus{box-shadow:inset 0 0 0 1px var(--theme-elevation-700),0 0 0 2px var(--theme-success-500);outline:none}.btn--style-none{border-radius:0;margin:0;padding:0}.btn--style-none:focus{opacity:.8}.btn--style-none:active{opacity:.7}.btn--round{border-radius:100%}.btn--icon span{display:flex;justify-content:space-between}.btn--icon.btn--style-primary .icon .stroke{stroke:var(--theme-elevation-0);fill:none}.btn--icon.btn--style-primary .icon .fill{fill:var(--theme-elevation-0)}.btn--style-icon-label{font-weight:600;padding:0}.btn--style-light-gray{box-shadow:inset 0 0 0 1px var(--theme-elevation-800)}.btn--icon-position-left .btn__content{flex-direction:row-reverse}.btn--icon-position-left .btn__icon{margin-right:.9615384615rem}.btn--icon-position-right .btn__icon{margin-left:.9615384615rem}.btn--icon-only .btn__icon{margin:0;padding:0}.btn--disabled{cursor:default}.btn:hover .btn__icon{background:var(--theme-elevation-800)}.btn:hover .btn__icon .stroke{stroke:var(--theme-elevation-0);fill:none}.btn:hover .btn__icon .fill{fill:var(--theme-elevation-0)}.btn:focus{outline:none}.btn:focus .btn__icon{background:var(--theme-elevation-150)}.btn:focus .btn__icon .stroke{stroke:var(--theme-elevation-800);fill:none}.btn:focus .btn__icon .fill{fill:var(--theme-elevation-800)}.btn:active .btn__icon{background:var(--theme-elevation-700)}.btn:active .btn__icon .stroke{stroke:var(--theme-elevation-0);fill:none}.btn:active .btn__icon .fill{fill:var(--theme-elevation-0)}.popup-button{display:inline-flex}.popup{position:relative}.popup__content{background:var(--theme-input-bg);max-width:calc(100vw - 1.92308rem);opacity:0;pointer-events:none;position:absolute;visibility:hidden;z-index:var(--z-popup)}.popup__content:after{border:12px solid transparent;border-top:12px solid var(--theme-input-bg);content:" ";position:absolute;top:calc(100% - 1px)}.popup__wrap{overflow:hidden}.popup .popup__scroll{overflow-y:auto;padding:1.9230769231rem;padding-right:calc(var(--scrollbar-width) + 1.92308rem);white-space:nowrap;width:calc(100% + var(--scrollbar-width))}.popup--show-scrollbar .popup__scroll{padding-right:0;width:100%}.popup:active,.popup:focus{outline:none}.popup--size-small .popup__scroll{padding:1.4423076923rem calc(var(--scrollbar-width) + 1.44231rem) 1.4423076923rem 1.4423076923rem}.popup--size-small .popup__content{box-shadow:0 0 30px 0 rgba(0,2,4,.12),0 30px 25px -8px rgba(0,2,4,.1)}.popup--size-small.popup--h-align-left .popup__content{left:-.9615384615rem}.popup--size-small.popup--h-align-left .popup__content:after{left:.8173076923rem}.popup--size-large .popup__content{box-shadow:0 20px 35px -10px rgba(0,2,4,.2),0 6px 4px -4px rgba(0,2,4,.02)}.popup--size-large .popup__scroll{padding:2.8846153846rem calc(var(--scrollbar-width) + 2.88462rem) 1.9230769231rem 2.8846153846rem}.popup--size-wide .popup__content{box-shadow:0 0 30px 0 rgba(0,2,4,.12),0 30px 25px -8px rgba(0,2,4,.1)}.popup--size-wide .popup__content:after{border:12px solid transparent;border-top:12px solid var(--theme-input-bg)}.popup--size-wide .popup__scroll{padding:.4807692308rem .9615384615rem}.popup--size-wide.popup--align-left .popup__content{left:-.9615384615rem}.popup--size-wide.popup--align-left .popup__content:after{left:.8173076923rem}.popup--h-align-left .popup__content{left:-3.3653846154rem}.popup--h-align-left .popup__content:after{left:3.3653846154rem}.popup--h-align-center .popup__content,.popup--h-align-center .popup__content:after{left:50%;transform:translateX(-50%)}.popup--h-align-right .popup__content{right:-3.3653846154rem}.popup--h-align-right .popup__content:after{right:3.3653846154rem}.popup--v-align-top .popup__content{bottom:calc(100% + 1.92308rem)}.popup--v-align-bottom .popup__content{box-shadow:0 -2px 20px 7px rgba(0,2,4,.1),0 6px 4px -4px rgba(0,2,4,.02);top:calc(100% + .96154rem)}.popup--v-align-bottom .popup__content:after{border-bottom-color:var(--theme-input-bg);border-top-color:transparent!important;bottom:calc(100% - 1px);top:auto}.popup--v-align-bottom.popup--color-dark .popup__content:after{border-bottom-color:var(--theme-elevation-800)}.popup--color-dark .popup__content{background:var(--theme-elevation-800);color:var(--theme-input-bg)}.popup--color-dark .popup__content:after{border-top-color:var(--theme-elevation-800)}.popup--active .popup__content{opacity:1;pointer-events:all;visibility:visible}@media(max-width:1024px){.popup--size-large .popup__scroll,.popup__scroll{padding:1.4423076923rem;padding-right:calc(var(--scrollbar-width) + 1.44231rem)}.popup--h-align-left .popup__content{left:-.9615384615rem}.popup--h-align-left .popup__content:after{left:.9615384615rem}.popup--h-align-center .popup__content,.popup--h-align-center .popup__content:after{left:50%;transform:translateX(0)}.popup--h-align-right .popup__content{right:-.9615384615rem}.popup--h-align-right .popup__content:after{right:.9615384615rem}.popup--force-h-align-left .popup__content{left:-.9615384615rem;right:auto;transform:none}.popup--force-h-align-left .popup__content:after{left:.9615384615rem;right:auto;transform:none}.popup--force-h-align-right .popup__content{left:auto;right:-.9615384615rem;transform:none}.popup--force-h-align-right .popup__content:after{left:auto;right:.9615384615rem;transform:none}}.banner{background:var(--theme-elevation-100);border:0;border-radius:3px;color:var(--theme-elevation-800);font-size:1rem;line-height:1.9230769231rem;margin-bottom:1.9230769231rem;padding:.9615384615rem;vertical-align:middle}.banner--has-action{cursor:pointer;text-decoration:none}.banner--has-icon{display:flex}.banner--has-icon svg{display:block}.banner--type-default.button--has-action:hover{background:var(--theme-elevation-900)}.banner--type-default.button--has-action:active{background:var(--theme-elevation-950)}.banner--type-error{background:var(--theme-error-100);color:var(--theme-error-500)}.banner--type-error svg .stroke{stroke:var(--theme-error-500);fill:none}.banner--type-error svg .fill{fill:var(--theme-error-500)}.banner--type-error.button--has-action:hover{background:var(--theme-error-200)}.banner--type-error.button--has-action:active{background:var(--theme-error-300)}.banner--type-success{background:var(--theme-success-500);color:var(--color-base-800)}.banner--type-success.button--has-action:active,.banner--type-success.button--has-action:hover{background:var(--theme-success-200)}.template-minimal{align-items:center;display:flex;justify-content:center;margin-left:auto;margin-right:auto;min-height:100%;padding:5.7692307692rem 1.9230769231rem;width:100%}.template-minimal--width-normal .template-minimal__wrap{max-width:500px;width:100%}.template-minimal--width-wide .template-minimal__wrap{max-width:1024px;width:100%}.icon--check{height:1.9230769231rem;width:1.9230769231rem}.icon--check .stroke{fill:none;stroke:var(--theme-elevation-800);stroke-width:2px}.icon--search{height:1.9230769231rem;width:1.9230769231rem}.icon--search .stroke{stroke:var(--theme-elevation-800);stroke-width:1px}.icon--menu .fill{fill:var(--theme-text)}.pill{align-items:center;background:var(--theme-elevation-150);border:0;border-radius:3px;color:var(--theme-elevation-800);cursor:default;display:inline-flex;flex-shrink:0;font-size:1rem;line-height:1.9230769231rem;overflow:hidden;padding:0 .4807692308rem;text-overflow:ellipsis;white-space:nowrap}.pill--rounded{border-radius:var(--style-radius-l);font-size:12px;line-height:18px}.pill:active,.pill:focus{outline:none}.pill--has-action{cursor:pointer;text-decoration:none}.pill--is-dragging{cursor:grabbing}.pill--has-icon svg{display:block}.pill--align-icon-left{padding-left:0}.pill--align-icon-right{padding-right:0}.pill--style-white{background:var(--theme-elevation-0)}.pill--style-light-gray,.pill--style-light.pill--has-action:active,.pill--style-light.pill--has-action:hover,.pill--style-white.pill--has-action:active,.pill--style-white.pill--has-action:hover{background:var(--theme-elevation-100)}.pill--style-light-gray{color:var(--theme-elevation-800)}.pill--style-warning{background:var(--theme-warning-500)}.pill--style-success{background:var(--theme-success-500);color:var(--color-base-800)}.pill--style-dark{background:var(--theme-elevation-800);color:var(--theme-elevation-0)}.pill--style-dark svg .stroke{stroke:var(--theme-elevation-0);fill:none}.pill--style-dark svg .fill{fill:var(--theme-elevation-0)}.pill--style-dark.pill--has-action:hover{background:var(--theme-elevation-750)}.pill--style-dark.pill--has-action:active{background:var(--theme-elevation-700)}html[data-theme=dark] .pill--style-error{background:var(--theme-error-500);color:var(--color-base-1000)}html[data-theme=light] .pill--style-error{background:var(--theme-error-250);color:var(--theme-error-750)}
|
|
1
|
+
.icon--plus{height:1.9230769231rem;width:1.9230769231rem}.icon--plus .stroke,.icon--x line{stroke:var(--theme-elevation-800);stroke-width:1px}.icon--chevron{height:1.9230769231rem;width:1.9230769231rem}.icon--chevron .stroke{fill:none;stroke:var(--theme-elevation-800);stroke-width:2px}.icon--edit{shape-rendering:auto;height:1.9230769231rem;width:1.9230769231rem}.icon--edit .fill{fill:var(--theme-elevation-800);stroke:none}.icon--swap{height:1.9230769231rem;width:1.9230769231rem}.icon--swap .stroke{fill:none;stroke:var(--theme-elevation-800);stroke-width:2px}.icon--link{height:1.9230769231rem;width:1.9230769231rem}.icon--link .stroke{stroke:var(--theme-elevation-800);stroke-width:1px}.tooltip{--caret-size:6px;background-color:var(--theme-elevation-800);border-radius:2px;color:var(--theme-elevation-0);font-weight:400;line-height:1.4423076923rem;opacity:0;padding:.3846153846rem .7692307692rem;visibility:hidden;white-space:nowrap;z-index:2}.tooltip,.tooltip:after{left:50%;position:absolute}.tooltip:after{border-left:var(--caret-size) solid transparent;border-right:var(--caret-size) solid transparent;content:" ";display:block;height:0;transform:translate3d(-50%,100%,0);width:0}.tooltip--show{cursor:default;opacity:1;transition:opacity .2s ease-in-out;visibility:visible}.tooltip--position-top{bottom:100%;transform:translate3d(-50%,calc(var(--caret-size)*-1),0)}.tooltip--position-top:after{border-top:var(--caret-size) solid var(--theme-elevation-800);bottom:1px}.tooltip--position-bottom{top:100%;transform:translate3d(-50%,var(--caret-size),0)}.tooltip--position-bottom:after{border-bottom:var(--caret-size) solid var(--theme-elevation-800);bottom:calc(100% + var(--caret-size) - 1px)}@media(max-width:1024px){.tooltip{display:none}}html[data-theme=light] .tooltip{background-color:var(--theme-error-250);color:var(--theme-error-750)}html[data-theme=light] .tooltip--position-top:after{border-top-color:var(--theme-error-250)}html[data-theme=light] .tooltip--position-bottom:after{border-bottom-color:var(--theme-error-250)}a.btn{display:inline-block}.btn{background:transparent;border:0;border-radius:4px;color:inherit;cursor:pointer;font-size:1rem;font-weight:400;line-height:1.9230769231rem;margin-bottom:1.9230769231rem;margin-top:1.9230769231rem;text-align:center;text-decoration:none}.btn .btn__icon{border:1px solid;border-radius:100%}.btn .btn__icon .stroke{stroke:currentColor;fill:none}.btn .btn__icon .fill{fill:currentColor}.btn--has-tooltip{position:relative}.btn--icon-style-none .btn__icon,.btn--icon-style-without-border .btn__icon{border:none}.btn span{line-height:1.9230769231rem}.btn span,.btn svg{vertical-align:top}.btn--size-medium{padding:.9615384615rem 1.9230769231rem}.btn--size-small{padding:.4807692308rem .9615384615rem}.btn--style-primary{background-color:var(--theme-elevation-800);color:var(--theme-elevation-0)}.btn--style-primary.btn--disabled{background-color:var(--theme-elevation-400)}.btn--style-primary:not(.btn--disabled):hover{background:var(--theme-elevation-750)}.btn--style-primary:not(.btn--disabled):active{background:var(--theme-elevation-700)}.btn--style-primary:focus{box-shadow:0 0 0 2px var(--theme-success-500);outline:none}.btn--style-secondary{-webkit-backdrop-filter:blur(5px);backdrop-filter:blur(5px);background:none;box-shadow:inset 0 0 0 1px var(--theme-elevation-800);color:var(--theme-elevation-800)}.btn--style-secondary:hover{background:var(--theme-elevation-100);box-shadow:inset 0 0 0 1px var(--theme-elevation-700)}.btn--style-secondary:active{background:var(--theme-elevation-200)}.btn--style-secondary.btn--disabled{background:none;box-shadow:inset 0 0 0 1px var(--theme-elevation-400);color:var(--theme-elevation-400)}.btn--style-secondary:focus{box-shadow:inset 0 0 0 1px var(--theme-elevation-700),0 0 0 2px var(--theme-success-500);outline:none}.btn--style-none{border-radius:0;margin:0;padding:0}.btn--style-none:focus{opacity:.8}.btn--style-none:active{opacity:.7}.btn--round{border-radius:100%}.btn--icon span{display:flex;justify-content:space-between}.btn--icon.btn--style-primary .icon .stroke{stroke:var(--theme-elevation-0);fill:none}.btn--icon.btn--style-primary .icon .fill{fill:var(--theme-elevation-0)}.btn--style-icon-label{font-weight:600;padding:0}.btn--style-light-gray{box-shadow:inset 0 0 0 1px var(--theme-elevation-800)}.btn--icon-position-left .btn__content{flex-direction:row-reverse}.btn--icon-position-left .btn__icon{margin-right:.9615384615rem}.btn--icon-position-right .btn__icon{margin-left:.9615384615rem}.btn--icon-only .btn__icon{margin:0;padding:0}.btn--disabled{cursor:default}.btn:hover .btn__icon{background:var(--theme-elevation-800)}.btn:hover .btn__icon .stroke{stroke:var(--theme-elevation-0);fill:none}.btn:hover .btn__icon .fill{fill:var(--theme-elevation-0)}.btn:focus{outline:none}.btn:focus .btn__icon{background:var(--theme-elevation-150)}.btn:focus .btn__icon .stroke{stroke:var(--theme-elevation-800);fill:none}.btn:focus .btn__icon .fill{fill:var(--theme-elevation-800)}.btn:active .btn__icon{background:var(--theme-elevation-700)}.btn:active .btn__icon .stroke{stroke:var(--theme-elevation-0);fill:none}.btn:active .btn__icon .fill{fill:var(--theme-elevation-0)}.popup-button{display:inline-flex}.popup{position:relative}.popup__content{background:var(--theme-input-bg);max-width:calc(100vw - 1.92308rem);opacity:0;pointer-events:none;position:absolute;visibility:hidden;z-index:var(--z-popup)}.popup__content:after{border:12px solid transparent;border-top:12px solid var(--theme-input-bg);content:" ";position:absolute;top:calc(100% - 1px)}.popup__wrap{overflow:hidden}.popup .popup__scroll{overflow-y:auto;padding:1.9230769231rem;padding-right:calc(var(--scrollbar-width) + 1.92308rem);white-space:nowrap;width:calc(100% + var(--scrollbar-width))}.popup--show-scrollbar .popup__scroll{padding-right:0;width:100%}.popup:active,.popup:focus{outline:none}.popup--size-small .popup__scroll{padding:1.4423076923rem calc(var(--scrollbar-width) + 1.44231rem) 1.4423076923rem 1.4423076923rem}.popup--size-small .popup__content{box-shadow:0 0 30px 0 rgba(0,2,4,.12),0 30px 25px -8px rgba(0,2,4,.1)}.popup--size-small.popup--h-align-left .popup__content{left:-.9615384615rem}.popup--size-small.popup--h-align-left .popup__content:after{left:.8173076923rem}.popup--size-large .popup__content{box-shadow:0 20px 35px -10px rgba(0,2,4,.2),0 6px 4px -4px rgba(0,2,4,.02)}.popup--size-large .popup__scroll{padding:2.8846153846rem calc(var(--scrollbar-width) + 2.88462rem) 1.9230769231rem 2.8846153846rem}.popup--size-wide .popup__content{box-shadow:0 0 30px 0 rgba(0,2,4,.12),0 30px 25px -8px rgba(0,2,4,.1)}.popup--size-wide .popup__content:after{border:12px solid transparent;border-top:12px solid var(--theme-input-bg)}.popup--size-wide .popup__scroll{padding:.4807692308rem .9615384615rem}.popup--size-wide.popup--align-left .popup__content{left:-.9615384615rem}.popup--size-wide.popup--align-left .popup__content:after{left:.8173076923rem}.popup--h-align-left .popup__content{left:-3.3653846154rem}.popup--h-align-left .popup__content:after{left:3.3653846154rem}.popup--h-align-center .popup__content,.popup--h-align-center .popup__content:after{left:50%;transform:translateX(-50%)}.popup--h-align-right .popup__content{right:-3.3653846154rem}.popup--h-align-right .popup__content:after{right:3.3653846154rem}.popup--v-align-top .popup__content{bottom:calc(100% + 1.92308rem)}.popup--v-align-bottom .popup__content{box-shadow:0 -2px 20px 7px rgba(0,2,4,.1),0 6px 4px -4px rgba(0,2,4,.02);top:calc(100% + .96154rem)}.popup--v-align-bottom .popup__content:after{border-bottom-color:var(--theme-input-bg);border-top-color:transparent!important;bottom:calc(100% - 1px);top:auto}.popup--v-align-bottom.popup--color-dark .popup__content:after{border-bottom-color:var(--theme-elevation-800)}.popup--color-dark .popup__content{background:var(--theme-elevation-800);color:var(--theme-input-bg)}.popup--color-dark .popup__content:after{border-top-color:var(--theme-elevation-800)}.popup--active .popup__content{opacity:1;pointer-events:all;visibility:visible}@media(max-width:1024px){.popup--size-large .popup__scroll,.popup__scroll{padding:1.4423076923rem;padding-right:calc(var(--scrollbar-width) + 1.44231rem)}.popup--h-align-left .popup__content{left:-.9615384615rem}.popup--h-align-left .popup__content:after{left:.9615384615rem}.popup--h-align-center .popup__content,.popup--h-align-center .popup__content:after{left:50%;transform:translateX(0)}.popup--h-align-right .popup__content{right:-.9615384615rem}.popup--h-align-right .popup__content:after{right:.9615384615rem}.popup--force-h-align-left .popup__content{left:-.9615384615rem;right:auto;transform:none}.popup--force-h-align-left .popup__content:after{left:.9615384615rem;right:auto;transform:none}.popup--force-h-align-right .popup__content{left:auto;right:-.9615384615rem;transform:none}.popup--force-h-align-right .popup__content:after{left:auto;right:.9615384615rem;transform:none}}.banner{background:var(--theme-elevation-100);border:0;border-radius:3px;color:var(--theme-elevation-800);font-size:1rem;line-height:1.9230769231rem;margin-bottom:1.9230769231rem;padding:.9615384615rem;vertical-align:middle}.banner--has-action{cursor:pointer;text-decoration:none}.banner--has-icon{display:flex}.banner--has-icon svg{display:block}.banner--type-default.button--has-action:hover{background:var(--theme-elevation-900)}.banner--type-default.button--has-action:active{background:var(--theme-elevation-950)}.banner--type-error{background:var(--theme-error-100);color:var(--theme-error-500)}.banner--type-error svg .stroke{stroke:var(--theme-error-500);fill:none}.banner--type-error svg .fill{fill:var(--theme-error-500)}.banner--type-error.button--has-action:hover{background:var(--theme-error-200)}.banner--type-error.button--has-action:active{background:var(--theme-error-300)}.banner--type-success{background:var(--theme-success-500);color:var(--color-base-800)}.banner--type-success.button--has-action:active,.banner--type-success.button--has-action:hover{background:var(--theme-success-200)}.template-minimal{align-items:center;display:flex;justify-content:center;margin-left:auto;margin-right:auto;min-height:100%;padding:5.7692307692rem 1.9230769231rem;width:100%}.template-minimal--width-normal .template-minimal__wrap{max-width:500px;width:100%}.template-minimal--width-wide .template-minimal__wrap{max-width:1024px;width:100%}.icon--check{height:1.9230769231rem;width:1.9230769231rem}.icon--check .stroke{fill:none;stroke:var(--theme-elevation-800);stroke-width:2px}.icon--search{height:1.9230769231rem;width:1.9230769231rem}.icon--search .stroke{stroke:var(--theme-elevation-800);stroke-width:1px}.icon--menu .fill{fill:var(--theme-text)}.pill{align-items:center;background:var(--theme-elevation-150);border:0;border-radius:3px;color:var(--theme-elevation-800);cursor:default;display:inline-flex;flex-shrink:0;font-size:1rem;line-height:1.9230769231rem;overflow:hidden;padding:0 .4807692308rem;text-overflow:ellipsis;white-space:nowrap}.pill--rounded{border-radius:var(--style-radius-l);font-size:12px;line-height:18px}.pill:active,.pill:focus{outline:none}.pill--has-action{cursor:pointer;text-decoration:none}.pill--is-dragging{cursor:grabbing}.pill--has-icon svg{display:block}.pill--align-icon-left{padding-left:0}.pill--align-icon-right{padding-right:0}.pill--style-white{background:var(--theme-elevation-0)}.pill--style-light-gray,.pill--style-light.pill--has-action:active,.pill--style-light.pill--has-action:hover,.pill--style-white.pill--has-action:active,.pill--style-white.pill--has-action:hover{background:var(--theme-elevation-100)}.pill--style-light-gray{color:var(--theme-elevation-800)}.pill--style-warning{background:var(--theme-warning-500)}.pill--style-success{background:var(--theme-success-500);color:var(--color-base-800)}.pill--style-dark{background:var(--theme-elevation-800);color:var(--theme-elevation-0)}.pill--style-dark svg .stroke{stroke:var(--theme-elevation-0);fill:none}.pill--style-dark svg .fill{fill:var(--theme-elevation-0)}.pill--style-dark.pill--has-action:hover{background:var(--theme-elevation-750)}.pill--style-dark.pill--has-action:active{background:var(--theme-elevation-700)}html[data-theme=dark] .pill--style-error{background:var(--theme-error-500);color:var(--color-base-1000)}html[data-theme=light] .pill--style-error{background:var(--theme-error-250);color:var(--theme-error-750)}
|
|
@@ -37,7 +37,7 @@ require("react-datepicker/dist/react-datepicker.css");
|
|
|
37
37
|
require("./index.scss");
|
|
38
38
|
const baseClass = 'date-time-picker';
|
|
39
39
|
const DateTime = (props) => {
|
|
40
|
-
const { value, onChange, displayFormat, pickerAppearance, minDate, maxDate, monthsToShow = 1, minTime, maxTime, timeIntervals = 30, timeFormat = 'h:mm aa', readOnly, placeholder: placeholderText, } = props;
|
|
40
|
+
const { value, onChange, displayFormat, pickerAppearance = "dayOnly", minDate, maxDate, monthsToShow = 1, minTime, maxTime, timeIntervals = 30, timeFormat = 'h:mm aa', readOnly, placeholder: placeholderText, } = props;
|
|
41
41
|
// Use the user's AdminUI language preference for the locale
|
|
42
42
|
const { i18n } = (0, react_i18next_1.useTranslation)();
|
|
43
43
|
const locale = (0, getSupportedDateLocale_1.getSupportedDateLocale)(i18n.language);
|
|
@@ -93,7 +93,7 @@ const DateTime = (props) => {
|
|
|
93
93
|
name: 'preventOverflow',
|
|
94
94
|
enabled: true,
|
|
95
95
|
},
|
|
96
|
-
] }))));
|
|
96
|
+
], showMonthDropdown: true, showYearDropdown: true, dropdownMode: "select" }))));
|
|
97
97
|
};
|
|
98
98
|
exports.default = DateTime;
|
|
99
99
|
//# sourceMappingURL=DatePicker.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DatePicker.js","sourceRoot":"","sources":["../../../../../src/admin/components/elements/DatePicker/DatePicker.tsx"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,kDAA0B;AAC1B,qEAA8D;AAC9D,yDAA2C;AAC3C,iDAA+C;AAC/C,oEAAgD;AAChD,sDAAkC;AAElC,iGAA8F;AAE9F,sDAAoD;AACpD,wBAAsB;AAEtB,MAAM,SAAS,GAAG,kBAAkB,CAAC;AAErC,MAAM,QAAQ,GAAoB,CAAC,KAAK,EAAE,EAAE;IAC1C,MAAM,EACJ,KAAK,EACL,QAAQ,EACR,aAAa,EACb,gBAAgB,
|
|
1
|
+
{"version":3,"file":"DatePicker.js","sourceRoot":"","sources":["../../../../../src/admin/components/elements/DatePicker/DatePicker.tsx"],"names":[],"mappings":"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"}
|
|
@@ -99,9 +99,9 @@ $cal-icon-width: 18px;
|
|
|
99
99
|
|
|
100
100
|
.react-datepicker {
|
|
101
101
|
@include shadow-lg;
|
|
102
|
+
border: 1px solid var(--theme-elevation-100);
|
|
102
103
|
background: var(--theme-input-bg);
|
|
103
104
|
display: inline-flex;
|
|
104
|
-
border: none;
|
|
105
105
|
font-family: var(--font-body);
|
|
106
106
|
font-weight: 100;
|
|
107
107
|
border-radius: 0;
|
|
@@ -169,8 +169,12 @@ $cal-icon-width: 18px;
|
|
|
169
169
|
}
|
|
170
170
|
|
|
171
171
|
&__current-month {
|
|
172
|
+
display: none;
|
|
173
|
+
}
|
|
174
|
+
|
|
175
|
+
&__header__dropdown, &-year-header {
|
|
172
176
|
padding: 10px 0;
|
|
173
|
-
font-weight:
|
|
177
|
+
font-weight: bold;
|
|
174
178
|
}
|
|
175
179
|
|
|
176
180
|
&__month-container {
|
|
@@ -185,6 +189,20 @@ $cal-icon-width: 18px;
|
|
|
185
189
|
border-left: none;
|
|
186
190
|
}
|
|
187
191
|
|
|
192
|
+
&__month-text {
|
|
193
|
+
&:hover {
|
|
194
|
+
background: var(--theme-elevation-100);
|
|
195
|
+
}
|
|
196
|
+
}
|
|
197
|
+
|
|
198
|
+
&__month-select,
|
|
199
|
+
&__year-select {
|
|
200
|
+
min-width: 70px;
|
|
201
|
+
border: none;
|
|
202
|
+
background: none;
|
|
203
|
+
outline: none;
|
|
204
|
+
cursor: pointer;
|
|
205
|
+
}
|
|
188
206
|
|
|
189
207
|
&__day-names {
|
|
190
208
|
background-color: var(--theme-elevation-100);
|
|
@@ -239,6 +257,10 @@ $cal-icon-width: 18px;
|
|
|
239
257
|
border: none;
|
|
240
258
|
}
|
|
241
259
|
|
|
260
|
+
.react-datepicker__time-container .react-datepicker__time .react-datepicker__time-box ul.react-datepicker__time-list {
|
|
261
|
+
max-height: 100%;
|
|
262
|
+
}
|
|
263
|
+
|
|
242
264
|
.react-datepicker__day--keyboard-selected,
|
|
243
265
|
.react-datepicker__month-text--keyboard-selected,
|
|
244
266
|
.react-datepicker__time-container .react-datepicker__time .react-datepicker__time-box ul.react-datepicker__time-list li.react-datepicker__time-list-item--selected {
|
|
@@ -281,7 +303,40 @@ $cal-icon-width: 18px;
|
|
|
281
303
|
font-size: base(.5);
|
|
282
304
|
}
|
|
283
305
|
|
|
306
|
+
&__appearance--dayOnly,
|
|
307
|
+
&__appearance--monthOnly {
|
|
308
|
+
.react-datepicker {
|
|
309
|
+
&__month-container {
|
|
310
|
+
border-right: none;
|
|
311
|
+
}
|
|
312
|
+
}
|
|
313
|
+
}
|
|
314
|
+
|
|
284
315
|
@include small-break {
|
|
316
|
+
.react-datepicker {
|
|
317
|
+
flex-direction: column;
|
|
318
|
+
}
|
|
319
|
+
.react-datepicker__month-container {
|
|
320
|
+
border-right: 0;
|
|
321
|
+
}
|
|
322
|
+
.react-datepicker__time-container {
|
|
323
|
+
width: auto;
|
|
324
|
+
}
|
|
325
|
+
.react-datepicker__header--time {
|
|
326
|
+
background-color: var(--theme-elevation-100);
|
|
327
|
+
padding: 8px 0;
|
|
328
|
+
border-bottom: none;
|
|
329
|
+
}
|
|
330
|
+
.react-datepicker__time-container .react-datepicker__time .react-datepicker__time-box {
|
|
331
|
+
height: 120px;
|
|
332
|
+
width: unset;
|
|
333
|
+
> ul {
|
|
334
|
+
height: 120px;
|
|
335
|
+
}
|
|
336
|
+
}
|
|
337
|
+
.react-datepicker__navigation--next--with-time:not(.react-datepicker__navigation--next--with-today-button) {
|
|
338
|
+
right: 0px;
|
|
339
|
+
}
|
|
285
340
|
&__input-wrapper {
|
|
286
341
|
.icon {
|
|
287
342
|
top: calc(50% - #{base(.25)});
|
package/dist/admin/components/forms/field-types/RichText/elements/link/LinkDrawer/baseFields.js
CHANGED
|
@@ -45,9 +45,7 @@ const getBaseFields = (config) => [
|
|
|
45
45
|
type: 'text',
|
|
46
46
|
required: true,
|
|
47
47
|
admin: {
|
|
48
|
-
condition: ({ linkType
|
|
49
|
-
return (typeof linkType === 'undefined' && url) || linkType === 'custom';
|
|
50
|
-
},
|
|
48
|
+
condition: ({ linkType }) => linkType !== 'internal',
|
|
51
49
|
},
|
|
52
50
|
},
|
|
53
51
|
{
|
package/dist/admin/components/forms/field-types/RichText/elements/link/LinkDrawer/baseFields.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"baseFields.js","sourceRoot":"","sources":["../../../../../../../../../src/admin/components/forms/field-types/RichText/elements/link/LinkDrawer/baseFields.ts"],"names":[],"mappings":";;;AAEA,kGAA+F;AAE/F,MAAM,YAAY,GAAG,IAAA,yCAAmB,EAAC;IACvC,sBAAsB;IACtB,iBAAiB;IACjB,0CAA0C;IAC1C,kBAAkB;IAClB,qBAAqB;IACrB,iBAAiB;IACjB,6BAA6B;IAC7B,qBAAqB;CACtB,CAAC,CAAC;AAEI,MAAM,aAAa,GAAG,CAAC,MAAc,EAAW,EAAE,CAAC;IACxD;QACE,IAAI,EAAE,MAAM;QACZ,KAAK,EAAE,YAAY,CAAC,sBAAsB,CAAC;QAC3C,IAAI,EAAE,MAAM;QACZ,QAAQ,EAAE,IAAI;KACf;IACD;QACE,IAAI,EAAE,UAAU;QAChB,KAAK,EAAE,YAAY,CAAC,iBAAiB,CAAC;QACtC,IAAI,EAAE,OAAO;QACb,QAAQ,EAAE,IAAI;QACd,KAAK,EAAE;YACL,WAAW,EAAE,YAAY,CAAC,0CAA0C,CAAC;SACtE;QACD,YAAY,EAAE,QAAQ;QACtB,OAAO,EAAE;YACP;gBACE,KAAK,EAAE,YAAY,CAAC,kBAAkB,CAAC;gBACvC,KAAK,EAAE,QAAQ;aAChB;YACD;gBACE,KAAK,EAAE,YAAY,CAAC,qBAAqB,CAAC;gBAC1C,KAAK,EAAE,UAAU;aAClB;SACF;KACF;IACD;QACE,IAAI,EAAE,KAAK;QACX,KAAK,EAAE,YAAY,CAAC,iBAAiB,CAAC;QACtC,IAAI,EAAE,MAAM;QACZ,QAAQ,EAAE,IAAI;QACd,KAAK,EAAE;YACL,SAAS,EAAE,CAAC,EAAE,QAAQ,EAAE,
|
|
1
|
+
{"version":3,"file":"baseFields.js","sourceRoot":"","sources":["../../../../../../../../../src/admin/components/forms/field-types/RichText/elements/link/LinkDrawer/baseFields.ts"],"names":[],"mappings":";;;AAEA,kGAA+F;AAE/F,MAAM,YAAY,GAAG,IAAA,yCAAmB,EAAC;IACvC,sBAAsB;IACtB,iBAAiB;IACjB,0CAA0C;IAC1C,kBAAkB;IAClB,qBAAqB;IACrB,iBAAiB;IACjB,6BAA6B;IAC7B,qBAAqB;CACtB,CAAC,CAAC;AAEI,MAAM,aAAa,GAAG,CAAC,MAAc,EAAW,EAAE,CAAC;IACxD;QACE,IAAI,EAAE,MAAM;QACZ,KAAK,EAAE,YAAY,CAAC,sBAAsB,CAAC;QAC3C,IAAI,EAAE,MAAM;QACZ,QAAQ,EAAE,IAAI;KACf;IACD;QACE,IAAI,EAAE,UAAU;QAChB,KAAK,EAAE,YAAY,CAAC,iBAAiB,CAAC;QACtC,IAAI,EAAE,OAAO;QACb,QAAQ,EAAE,IAAI;QACd,KAAK,EAAE;YACL,WAAW,EAAE,YAAY,CAAC,0CAA0C,CAAC;SACtE;QACD,YAAY,EAAE,QAAQ;QACtB,OAAO,EAAE;YACP;gBACE,KAAK,EAAE,YAAY,CAAC,kBAAkB,CAAC;gBACvC,KAAK,EAAE,QAAQ;aAChB;YACD;gBACE,KAAK,EAAE,YAAY,CAAC,qBAAqB,CAAC;gBAC1C,KAAK,EAAE,UAAU;aAClB;SACF;KACF;IACD;QACE,IAAI,EAAE,KAAK;QACX,KAAK,EAAE,YAAY,CAAC,iBAAiB,CAAC;QACtC,IAAI,EAAE,MAAM;QACZ,QAAQ,EAAE,IAAI;QACd,KAAK,EAAE;YACL,SAAS,EAAE,CAAC,EAAE,QAAQ,EAAE,EAAE,EAAE,CAAC,QAAQ,KAAK,UAAU;SACrD;KACF;IACD;QACE,IAAI,EAAE,KAAK;QACX,KAAK,EAAE,YAAY,CAAC,6BAA6B,CAAC;QAClD,IAAI,EAAE,cAAc;QACpB,QAAQ,EAAE,IAAI;QACd,UAAU,EAAE,MAAM,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC,EAAE,KAAK,EAAE,EAAE,kBAAkB,EAAE,EAAE,EAAE,EAAE,CAAC,kBAAkB,CAAC,CAAC,GAAG,CAAC,CAAC,EAAE,IAAI,EAAE,EAAE,EAAE,CAAC,IAAI,CAAC;QACxH,KAAK,EAAE;YACL,SAAS,EAAE,CAAC,EAAE,QAAQ,EAAE,EAAE,EAAE;gBAC1B,OAAO,QAAQ,KAAK,UAAU,CAAC;YACjC,CAAC;SACF;KACF;IACD;QACE,IAAI,EAAE,QAAQ;QACd,KAAK,EAAE,YAAY,CAAC,qBAAqB,CAAC;QAC1C,IAAI,EAAE,UAAU;KACjB;CACF,CAAC;AArDW,QAAA,aAAa,iBAqDxB"}
|
|
@@ -32,6 +32,7 @@ const jwt_decode_1 = __importDefault(require("jwt-decode"));
|
|
|
32
32
|
const react_router_dom_1 = require("react-router-dom");
|
|
33
33
|
const modal_1 = require("@faceless-ui/modal");
|
|
34
34
|
const react_i18next_1 = require("react-i18next");
|
|
35
|
+
const react_toastify_1 = require("react-toastify");
|
|
35
36
|
const Config_1 = require("../Config");
|
|
36
37
|
const api_1 = require("../../../api");
|
|
37
38
|
const useDebounce_1 = __importDefault(require("../../../hooks/useDebounce"));
|
|
@@ -43,7 +44,7 @@ const AuthProvider = ({ children }) => {
|
|
|
43
44
|
const { pathname } = (0, react_router_dom_1.useLocation)();
|
|
44
45
|
const { push } = (0, react_router_dom_1.useHistory)();
|
|
45
46
|
const config = (0, Config_1.useConfig)();
|
|
46
|
-
const { admin: { user: userSlug, inactivityRoute: logoutInactivityRoute, }, serverURL, routes: { admin, api, }, } = config;
|
|
47
|
+
const { admin: { user: userSlug, inactivityRoute: logoutInactivityRoute, autoLogin, }, serverURL, routes: { admin, api, }, } = config;
|
|
47
48
|
const exp = user === null || user === void 0 ? void 0 : user.exp;
|
|
48
49
|
const [permissions, setPermissions] = (0, react_1.useState)();
|
|
49
50
|
const { i18n } = (0, react_i18next_1.useTranslation)();
|
|
@@ -51,27 +52,54 @@ const AuthProvider = ({ children }) => {
|
|
|
51
52
|
const [lastLocationChange, setLastLocationChange] = (0, react_1.useState)(0);
|
|
52
53
|
const debouncedLocationChange = (0, useDebounce_1.default)(lastLocationChange, 10000);
|
|
53
54
|
const id = user === null || user === void 0 ? void 0 : user.id;
|
|
54
|
-
const refreshCookie = (0, react_1.useCallback)(() => {
|
|
55
|
+
const refreshCookie = (0, react_1.useCallback)((forceRefresh) => {
|
|
55
56
|
const now = Math.round((new Date()).getTime() / 1000);
|
|
56
57
|
const remainingTime = (exp || 0) - now;
|
|
57
|
-
if (exp && remainingTime < 120) {
|
|
58
|
+
if (forceRefresh || (exp && remainingTime < 120)) {
|
|
58
59
|
setTimeout(async () => {
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
60
|
+
try {
|
|
61
|
+
const request = await api_1.requests.post(`${serverURL}${api}/${userSlug}/refresh-token`, {
|
|
62
|
+
headers: {
|
|
63
|
+
'Accept-Language': i18n.language,
|
|
64
|
+
},
|
|
65
|
+
});
|
|
66
|
+
if (request.status === 200) {
|
|
67
|
+
const json = await request.json();
|
|
68
|
+
setUser(json.user);
|
|
69
|
+
}
|
|
70
|
+
else {
|
|
71
|
+
setUser(null);
|
|
72
|
+
push(`${admin}${logoutInactivityRoute}?redirect=${encodeURIComponent(window.location.pathname)}`);
|
|
73
|
+
}
|
|
67
74
|
}
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
push(`${admin}${logoutInactivityRoute}?redirect=${encodeURIComponent(window.location.pathname)}`);
|
|
75
|
+
catch (e) {
|
|
76
|
+
react_toastify_1.toast.error(e.message);
|
|
71
77
|
}
|
|
72
78
|
}, 1000);
|
|
73
79
|
}
|
|
74
80
|
}, [exp, serverURL, api, userSlug, push, admin, logoutInactivityRoute, i18n]);
|
|
81
|
+
const refreshCookieAsync = (0, react_1.useCallback)(async (skipSetUser) => {
|
|
82
|
+
try {
|
|
83
|
+
const request = await api_1.requests.post(`${serverURL}${api}/${userSlug}/refresh-token`, {
|
|
84
|
+
headers: {
|
|
85
|
+
'Accept-Language': i18n.language,
|
|
86
|
+
},
|
|
87
|
+
});
|
|
88
|
+
if (request.status === 200) {
|
|
89
|
+
const json = await request.json();
|
|
90
|
+
if (!skipSetUser)
|
|
91
|
+
setUser(json.user);
|
|
92
|
+
return json.user;
|
|
93
|
+
}
|
|
94
|
+
setUser(null);
|
|
95
|
+
push(`${admin}${logoutInactivityRoute}`);
|
|
96
|
+
return null;
|
|
97
|
+
}
|
|
98
|
+
catch (e) {
|
|
99
|
+
react_toastify_1.toast.error(`Refreshing token failed: ${e.message}`);
|
|
100
|
+
return null;
|
|
101
|
+
}
|
|
102
|
+
}, [serverURL, api, userSlug, push, admin, logoutInactivityRoute, i18n]);
|
|
75
103
|
const setToken = (0, react_1.useCallback)((token) => {
|
|
76
104
|
const decoded = (0, jwt_decode_1.default)(token);
|
|
77
105
|
setUser(decoded);
|
|
@@ -83,37 +111,76 @@ const AuthProvider = ({ children }) => {
|
|
|
83
111
|
api_1.requests.post(`${serverURL}${api}/${userSlug}/logout`);
|
|
84
112
|
}, [serverURL, api, userSlug]);
|
|
85
113
|
const refreshPermissions = (0, react_1.useCallback)(async () => {
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
'Accept-Language': i18n.language,
|
|
89
|
-
},
|
|
90
|
-
});
|
|
91
|
-
if (request.status === 200) {
|
|
92
|
-
const json = await request.json();
|
|
93
|
-
setPermissions(json);
|
|
94
|
-
}
|
|
95
|
-
else {
|
|
96
|
-
throw new Error(`Fetching permissions failed with status code ${request.status}`);
|
|
97
|
-
}
|
|
98
|
-
}, [serverURL, api, i18n]);
|
|
99
|
-
// On mount, get user and set
|
|
100
|
-
(0, react_1.useEffect)(() => {
|
|
101
|
-
const fetchMe = async () => {
|
|
102
|
-
const request = await api_1.requests.get(`${serverURL}${api}/${userSlug}/me`, {
|
|
114
|
+
try {
|
|
115
|
+
const request = await api_1.requests.get(`${serverURL}${api}/access`, {
|
|
103
116
|
headers: {
|
|
104
117
|
'Accept-Language': i18n.language,
|
|
105
118
|
},
|
|
106
119
|
});
|
|
107
120
|
if (request.status === 200) {
|
|
108
121
|
const json = await request.json();
|
|
109
|
-
|
|
110
|
-
|
|
111
|
-
|
|
122
|
+
setPermissions(json);
|
|
123
|
+
}
|
|
124
|
+
else {
|
|
125
|
+
throw new Error(`Fetching permissions failed with status code ${request.status}`);
|
|
126
|
+
}
|
|
127
|
+
}
|
|
128
|
+
catch (e) {
|
|
129
|
+
react_toastify_1.toast.error(`Refreshing permissions failed: ${e.message}`);
|
|
130
|
+
}
|
|
131
|
+
}, [serverURL, api, i18n]);
|
|
132
|
+
// On mount, get user and set
|
|
133
|
+
(0, react_1.useEffect)(() => {
|
|
134
|
+
const fetchMe = async () => {
|
|
135
|
+
try {
|
|
136
|
+
const request = await api_1.requests.get(`${serverURL}${api}/${userSlug}/me`, {
|
|
137
|
+
headers: {
|
|
138
|
+
'Accept-Language': i18n.language,
|
|
139
|
+
},
|
|
140
|
+
});
|
|
141
|
+
if (request.status === 200) {
|
|
142
|
+
const json = await request.json();
|
|
143
|
+
if (json === null || json === void 0 ? void 0 : json.user) {
|
|
144
|
+
setUser(json.user);
|
|
145
|
+
}
|
|
146
|
+
else if (json === null || json === void 0 ? void 0 : json.token) {
|
|
147
|
+
setToken(json.token);
|
|
148
|
+
}
|
|
149
|
+
else if (autoLogin) {
|
|
150
|
+
// auto log-in with the provided autoLogin credentials. This is used in dev mode
|
|
151
|
+
// so you don't have to log in over and over again
|
|
152
|
+
const autoLoginResult = await api_1.requests.post(`${serverURL}${api}/${userSlug}/login`, {
|
|
153
|
+
body: JSON.stringify({
|
|
154
|
+
email: autoLogin.email,
|
|
155
|
+
password: autoLogin.password,
|
|
156
|
+
}),
|
|
157
|
+
headers: {
|
|
158
|
+
'Accept-Language': i18n.language,
|
|
159
|
+
'Content-Type': 'application/json',
|
|
160
|
+
},
|
|
161
|
+
});
|
|
162
|
+
if (autoLoginResult.status === 200) {
|
|
163
|
+
const autoLoginJson = await autoLoginResult.json();
|
|
164
|
+
setUser(autoLoginJson.user);
|
|
165
|
+
if (autoLoginJson === null || autoLoginJson === void 0 ? void 0 : autoLoginJson.token) {
|
|
166
|
+
setToken(autoLoginJson.token);
|
|
167
|
+
}
|
|
168
|
+
}
|
|
169
|
+
else {
|
|
170
|
+
setUser(null);
|
|
171
|
+
}
|
|
172
|
+
}
|
|
173
|
+
else {
|
|
174
|
+
setUser(null);
|
|
175
|
+
}
|
|
112
176
|
}
|
|
113
177
|
}
|
|
178
|
+
catch (e) {
|
|
179
|
+
react_toastify_1.toast.error(`Fetching user failed: ${e.message}`);
|
|
180
|
+
}
|
|
114
181
|
};
|
|
115
182
|
fetchMe();
|
|
116
|
-
}, [i18n, setToken, api, serverURL, userSlug]);
|
|
183
|
+
}, [i18n, setToken, api, serverURL, userSlug, autoLogin]);
|
|
117
184
|
// When location changes, refresh cookie
|
|
118
185
|
(0, react_1.useEffect)(() => {
|
|
119
186
|
if (id) {
|
|
@@ -161,8 +228,10 @@ const AuthProvider = ({ children }) => {
|
|
|
161
228
|
}, [exp, push, closeAllModals, admin, i18n, logoutInactivityRoute]);
|
|
162
229
|
return (react_1.default.createElement(Context.Provider, { value: {
|
|
163
230
|
user,
|
|
231
|
+
setUser,
|
|
164
232
|
logOut,
|
|
165
233
|
refreshCookie,
|
|
234
|
+
refreshCookieAsync,
|
|
166
235
|
refreshPermissions,
|
|
167
236
|
permissions,
|
|
168
237
|
setToken,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../src/admin/components/utilities/Auth/index.tsx"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,+CAA2F;AAC3F,4DAAmC;AACnC,uDAA2D;AAC3D,8CAA8C;AAC9C,iDAA+C;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../src/admin/components/utilities/Auth/index.tsx"],"names":[],"mappings":"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"}
|
|
@@ -1,8 +1,10 @@
|
|
|
1
1
|
import { User, Permissions } from '../../../../auth/types';
|
|
2
2
|
export type AuthContext<T = User> = {
|
|
3
3
|
user?: T | null;
|
|
4
|
+
setUser: (user: T) => void;
|
|
4
5
|
logOut: () => void;
|
|
5
|
-
refreshCookie: () => void;
|
|
6
|
+
refreshCookie: (forceRefresh?: boolean) => void;
|
|
7
|
+
refreshCookieAsync: () => Promise<User>;
|
|
6
8
|
setToken: (token: string) => void;
|
|
7
9
|
token?: string;
|
|
8
10
|
refreshPermissions: () => Promise<void>;
|
|
@@ -1,9 +1,32 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
+
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
|
3
|
+
if (k2 === undefined) k2 = k;
|
|
4
|
+
var desc = Object.getOwnPropertyDescriptor(m, k);
|
|
5
|
+
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
|
6
|
+
desc = { enumerable: true, get: function() { return m[k]; } };
|
|
7
|
+
}
|
|
8
|
+
Object.defineProperty(o, k2, desc);
|
|
9
|
+
}) : (function(o, m, k, k2) {
|
|
10
|
+
if (k2 === undefined) k2 = k;
|
|
11
|
+
o[k2] = m[k];
|
|
12
|
+
}));
|
|
13
|
+
var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
|
|
14
|
+
Object.defineProperty(o, "default", { enumerable: true, value: v });
|
|
15
|
+
}) : function(o, v) {
|
|
16
|
+
o["default"] = v;
|
|
17
|
+
});
|
|
18
|
+
var __importStar = (this && this.__importStar) || function (mod) {
|
|
19
|
+
if (mod && mod.__esModule) return mod;
|
|
20
|
+
var result = {};
|
|
21
|
+
if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
|
|
22
|
+
__setModuleDefault(result, mod);
|
|
23
|
+
return result;
|
|
24
|
+
};
|
|
2
25
|
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
26
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
27
|
};
|
|
5
28
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
-
const react_1 =
|
|
29
|
+
const react_1 = __importStar(require("react"));
|
|
7
30
|
const react_router_dom_1 = require("react-router-dom");
|
|
8
31
|
const react_i18next_1 = require("react-i18next");
|
|
9
32
|
const Config_1 = require("../../utilities/Config");
|
|
@@ -25,15 +48,23 @@ const ReactSelect_1 = __importDefault(require("../../elements/ReactSelect"));
|
|
|
25
48
|
const Label_1 = __importDefault(require("../../forms/Label"));
|
|
26
49
|
const Loading_1 = require("../../elements/Loading");
|
|
27
50
|
const formatDate_1 = require("../../../utilities/formatDate");
|
|
51
|
+
const Auth_2 = require("../../utilities/Auth");
|
|
28
52
|
require("./index.scss");
|
|
29
53
|
const baseClass = 'account';
|
|
30
54
|
const DefaultAccount = (props) => {
|
|
31
55
|
var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o;
|
|
32
|
-
const { collection, data, permissions, hasSavePermission, apiURL, initialState, isLoading, action, onSave, } = props;
|
|
56
|
+
const { collection, data, permissions, hasSavePermission, apiURL, initialState, isLoading, action, onSave: onSaveFromProps, } = props;
|
|
33
57
|
const { slug, fields, admin: { useAsTitle, preview, }, timestamps, auth, } = collection;
|
|
58
|
+
const { refreshCookieAsync } = (0, Auth_2.useAuth)();
|
|
34
59
|
const { admin: { dateFormat }, routes: { admin } } = (0, Config_1.useConfig)();
|
|
35
60
|
const { t, i18n } = (0, react_i18next_1.useTranslation)('authentication');
|
|
36
61
|
const languageOptions = Object.entries(i18n.options.resources).map(([language, resource]) => ({ label: resource.general.thisLanguage, value: language }));
|
|
62
|
+
const onSave = (0, react_1.useCallback)(async () => {
|
|
63
|
+
await refreshCookieAsync();
|
|
64
|
+
if (typeof onSaveFromProps === 'function') {
|
|
65
|
+
onSaveFromProps();
|
|
66
|
+
}
|
|
67
|
+
}, [onSaveFromProps, refreshCookieAsync]);
|
|
37
68
|
const classes = [
|
|
38
69
|
baseClass,
|
|
39
70
|
].filter(Boolean).join(' ');
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Default.js","sourceRoot":"","sources":["../../../../../src/admin/components/views/Account/Default.tsx"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"Default.js","sourceRoot":"","sources":["../../../../../src/admin/components/views/Account/Default.tsx"],"names":[],"mappings":"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"}
|
|
@@ -45,7 +45,8 @@ const AccountView = () => {
|
|
|
45
45
|
const locale = (0, Locale_1.useLocale)();
|
|
46
46
|
const { setStepNav } = (0, StepNav_1.useStepNav)();
|
|
47
47
|
const { user } = (0, Auth_1.useAuth)();
|
|
48
|
-
const
|
|
48
|
+
const userRef = (0, react_1.useRef)(user);
|
|
49
|
+
const [internalState, setInternalState] = (0, react_1.useState)();
|
|
49
50
|
const { id, preferencesKey, docPermissions, getDocPermissions, slug, getDocPreferences } = (0, DocumentInfo_1.useDocumentInfo)();
|
|
50
51
|
const { getPreference } = (0, Preferences_1.usePreferences)();
|
|
51
52
|
const { serverURL, routes: { api }, collections, admin: { components: { views: { Account: CustomAccount, } = {
|
|
@@ -69,7 +70,7 @@ const AccountView = () => {
|
|
|
69
70
|
getDocPermissions();
|
|
70
71
|
const preferences = await getDocPreferences();
|
|
71
72
|
const state = await (0, buildStateFromSchema_1.default)({ fieldSchema: collection.fields, preferences, data: json.doc, user, id, operation: 'update', locale, t });
|
|
72
|
-
|
|
73
|
+
setInternalState(state);
|
|
73
74
|
}, [collection, user, id, t, locale, getDocPermissions, getDocPreferences]);
|
|
74
75
|
(0, react_1.useEffect)(() => {
|
|
75
76
|
const nav = [{
|
|
@@ -78,7 +79,7 @@ const AccountView = () => {
|
|
|
78
79
|
setStepNav(nav);
|
|
79
80
|
}, [setStepNav, t]);
|
|
80
81
|
(0, react_1.useEffect)(() => {
|
|
81
|
-
const
|
|
82
|
+
const awaitInternalState = async () => {
|
|
82
83
|
const preferences = await getDocPreferences();
|
|
83
84
|
const state = await (0, buildStateFromSchema_1.default)({
|
|
84
85
|
fieldSchema: fields,
|
|
@@ -86,24 +87,24 @@ const AccountView = () => {
|
|
|
86
87
|
data: dataToRender,
|
|
87
88
|
operation: 'update',
|
|
88
89
|
id,
|
|
89
|
-
user,
|
|
90
|
+
user: userRef.current,
|
|
90
91
|
locale,
|
|
91
92
|
t,
|
|
92
93
|
});
|
|
93
94
|
await getPreference(preferencesKey);
|
|
94
|
-
|
|
95
|
+
setInternalState(state);
|
|
95
96
|
};
|
|
96
97
|
if (dataToRender)
|
|
97
|
-
|
|
98
|
-
}, [dataToRender, fields, id,
|
|
99
|
-
const isLoading = !
|
|
98
|
+
awaitInternalState();
|
|
99
|
+
}, [dataToRender, fields, id, locale, preferencesKey, getPreference, t, getDocPreferences]);
|
|
100
|
+
const isLoading = !internalState || !docPermissions || isLoadingData;
|
|
100
101
|
return (react_1.default.createElement(RenderCustomComponent_1.default, { DefaultComponent: Default_1.default, CustomComponent: CustomAccount, componentProps: {
|
|
101
102
|
action,
|
|
102
103
|
data,
|
|
103
104
|
collection,
|
|
104
105
|
permissions: docPermissions,
|
|
105
106
|
hasSavePermission,
|
|
106
|
-
initialState,
|
|
107
|
+
initialState: internalState,
|
|
107
108
|
apiURL,
|
|
108
109
|
isLoading,
|
|
109
110
|
onSave,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../src/admin/components/views/Account/index.tsx"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,+
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../src/admin/components/views/Account/index.tsx"],"names":[],"mappings":"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"}
|