@jetbrains/ring-ui-built 6.1.1-beta.0 → 7.0.0-beta.10
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/_helpers/_rollupPluginBabelHelpers.js +1 -504
- package/components/_helpers/anchor.js +7 -10
- package/components/_helpers/button__classes.js +23 -20
- package/components/_helpers/caption.js +11 -21
- package/components/_helpers/card.js +91 -123
- package/components/_helpers/dialog__body-scroll-preventer.js +10 -17
- package/components/_helpers/header.js +1 -1
- package/components/_helpers/icon__svg.js +27 -29
- package/components/_helpers/input.js +151 -193
- package/components/_helpers/query-assist__suggestions.js +79 -94
- package/components/_helpers/select__filter.js +56 -75
- package/components/_helpers/services-link.js +23 -39
- package/components/_helpers/sidebar.js +91 -102
- package/components/_helpers/tab-link.js +8 -12
- package/components/_helpers/table.js +1 -1
- package/components/_helpers/theme.js +61 -51
- package/components/_helpers/title.js +59 -84
- package/components/alert/alert.d.ts +7 -24
- package/components/alert/alert.js +111 -179
- package/components/alert/container.d.ts +0 -5
- package/components/alert/container.js +32 -44
- package/components/alert-service/alert-service.js +104 -162
- package/components/analytics/analytics.js +12 -20
- package/components/analytics/analytics__custom-plugin.js +52 -68
- package/components/auth/auth.js +2 -31
- package/components/auth/auth__core.d.ts +1 -1
- package/components/auth/auth__core.js +754 -1440
- package/components/auth/background-flow.js +84 -121
- package/components/auth/down-notification.js +32 -79
- package/components/auth/iframe-flow.js +71 -125
- package/components/auth/request-builder.js +46 -77
- package/components/auth/response-parser.js +84 -112
- package/components/auth/storage.js +162 -324
- package/components/auth/token-validator.js +132 -227
- package/components/auth/window-flow.js +84 -121
- package/components/auth-dialog/auth-dialog.d.ts +0 -18
- package/components/auth-dialog/auth-dialog.js +107 -176
- package/components/auth-dialog-service/auth-dialog-service.js +12 -33
- package/components/avatar/avatar-example-datauri.js +1 -1
- package/components/avatar/avatar.d.ts +0 -13
- package/components/avatar/avatar.js +94 -136
- package/components/avatar/fallback-avatar.d.ts +1 -10
- package/components/avatar/fallback-avatar.js +20 -40
- package/components/badge/badge.d.ts +0 -10
- package/components/badge/badge.js +32 -48
- package/components/breadcrumbs/breadcrumbs.js +13 -17
- package/components/button/button.d.ts +0 -21
- package/components/button/button.js +68 -104
- package/components/button/button__classes.d.ts +1 -1
- package/components/button-group/button-group.d.ts +0 -5
- package/components/button-group/button-group.js +27 -41
- package/components/button-group/caption.d.ts +0 -4
- package/components/button-group/caption.js +0 -1
- package/components/button-set/button-set.d.ts +0 -6
- package/components/button-set/button-set.js +19 -33
- package/components/button-toolbar/button-toolbar.d.ts +0 -6
- package/components/button-toolbar/button-toolbar.js +17 -31
- package/components/caret/caret.js +184 -211
- package/components/checkbox/checkbox.d.ts +0 -19
- package/components/checkbox/checkbox.js +69 -104
- package/components/clipboard/clipboard-fallback.js +7 -7
- package/components/clipboard/clipboard.js +36 -129
- package/components/code/code.d.ts +0 -12
- package/components/code/code.js +83 -163
- package/components/collapse/collapse-content.js +42 -60
- package/components/collapse/collapse-context.js +2 -2
- package/components/collapse/collapse-control.js +12 -12
- package/components/collapse/collapse.js +12 -17
- package/components/collapse/consts.js +4 -4
- package/components/collapse/utils.js +1 -3
- package/components/confirm/confirm.d.ts +0 -14
- package/components/confirm/confirm.js +68 -112
- package/components/confirm-service/confirm-service.js +25 -47
- package/components/content-layout/content-layout.d.ts +0 -7
- package/components/content-layout/content-layout.js +41 -63
- package/components/content-layout/sidebar.d.ts +0 -9
- package/components/content-layout/sidebar.js +1 -2
- package/components/contenteditable/contenteditable.d.ts +1 -22
- package/components/contenteditable/contenteditable.js +37 -60
- package/components/control-help/control-help.js +5 -3
- package/components/control-label/control-label.js +9 -14
- package/components/data-list/data-list.d.ts +4 -6
- package/components/data-list/data-list.js +115 -179
- package/components/data-list/data-list.mock.js +3 -6
- package/components/data-list/item.js +119 -165
- package/components/data-list/selection.js +77 -135
- package/components/data-list/title.d.ts +2 -2
- package/components/data-list/title.js +2 -12
- package/components/date-picker/consts.d.ts +0 -2
- package/components/date-picker/consts.js +16 -24
- package/components/date-picker/date-input.d.ts +0 -20
- package/components/date-picker/date-input.js +100 -148
- package/components/date-picker/date-picker.d.ts +0 -29
- package/components/date-picker/date-picker.js +143 -224
- package/components/date-picker/date-popup.d.ts +0 -22
- package/components/date-picker/date-popup.js +282 -352
- package/components/date-picker/day.d.ts +0 -14
- package/components/date-picker/day.js +72 -109
- package/components/date-picker/month-names.d.ts +1 -11
- package/components/date-picker/month-names.js +42 -72
- package/components/date-picker/month-slider.d.ts +0 -9
- package/components/date-picker/month-slider.js +43 -71
- package/components/date-picker/month.d.ts +1 -9
- package/components/date-picker/month.js +18 -30
- package/components/date-picker/months.d.ts +1 -9
- package/components/date-picker/months.js +45 -55
- package/components/date-picker/weekdays.d.ts +2 -8
- package/components/date-picker/weekdays.js +12 -25
- package/components/date-picker/years.d.ts +0 -6
- package/components/date-picker/years.js +77 -104
- package/components/dialog/dialog.d.ts +0 -20
- package/components/dialog/dialog.js +153 -210
- package/components/dialog/dialog__body-scroll-preventer.js +0 -3
- package/components/dropdown/anchor.d.ts +1 -8
- package/components/dropdown/anchor.js +0 -7
- package/components/dropdown/dropdown.d.ts +4 -22
- package/components/dropdown/dropdown.js +134 -176
- package/components/dropdown-menu/dropdown-menu.js +51 -103
- package/components/editable-heading/editable-heading.js +69 -118
- package/components/error-bubble/error-bubble.d.ts +0 -6
- package/components/error-bubble/error-bubble.js +30 -60
- package/components/error-message/error-message.d.ts +0 -10
- package/components/error-message/error-message.js +34 -59
- package/components/footer/footer.js +28 -44
- package/components/form/form.js +1 -1
- package/components/global/compose.js +1 -8
- package/components/global/composeRefs.d.ts +0 -3
- package/components/global/composeRefs.js +8 -15
- package/components/global/controls-height.js +2 -2
- package/components/global/create-stateful-context.d.ts +0 -4
- package/components/global/create-stateful-context.js +14 -17
- package/components/global/data-tests.js +7 -12
- package/components/global/dom.js +49 -82
- package/components/global/focus-sensor-hoc.js +95 -122
- package/components/global/fuzzy-highlight.js +23 -34
- package/components/global/get-event-key.js +8 -8
- package/components/global/get-uid.js +3 -7
- package/components/global/inject-styles.js +7 -14
- package/components/global/listeners.js +28 -47
- package/components/global/memoize.js +6 -10
- package/components/global/normalize-indent.js +19 -46
- package/components/global/promise-with-timeout.js +6 -8
- package/components/global/react-dom-renderer.d.ts +0 -5
- package/components/global/react-dom-renderer.js +29 -45
- package/components/global/rerender-hoc.d.ts +2 -2
- package/components/global/rerender-hoc.js +16 -32
- package/components/global/schedule-raf.js +4 -4
- package/components/global/sniffer.js +1 -1
- package/components/global/theme.d.ts +8 -2
- package/components/global/theme.js +2 -20
- package/components/global/trivial-template-tag.js +4 -9
- package/components/global/typescript-utils.js +2 -6
- package/components/global/url.js +20 -23
- package/components/global/use-event-callback.js +7 -4
- package/components/grid/col.d.ts +0 -14
- package/components/grid/col.js +27 -53
- package/components/grid/grid.d.ts +0 -5
- package/components/grid/grid.js +20 -32
- package/components/grid/row.d.ts +0 -18
- package/components/grid/row.js +23 -47
- package/components/group/group.d.ts +0 -5
- package/components/group/group.js +18 -27
- package/components/header/header-icon.d.ts +10 -0
- package/components/header/header-icon.js +39 -0
- package/components/header/header.d.ts +3 -7
- package/components/header/header.js +32 -74
- package/components/header/links.d.ts +2 -0
- package/components/header/links.js +20 -0
- package/components/header/logo.d.ts +0 -4
- package/components/header/logo.js +15 -30
- package/components/header/profile.d.ts +1 -39
- package/components/header/profile.js +126 -190
- package/components/header/services-link.d.ts +0 -10
- package/components/header/services-link.js +1 -4
- package/components/header/services.d.ts +0 -14
- package/components/header/services.js +67 -112
- package/components/header/smart-profile.d.ts +0 -9
- package/components/header/smart-profile.js +116 -205
- package/components/header/smart-services.d.ts +0 -4
- package/components/header/smart-services.js +73 -142
- package/components/header/tray.d.ts +0 -5
- package/components/header/tray.js +21 -35
- package/components/heading/heading.d.ts +1 -4
- package/components/heading/heading.js +25 -42
- package/components/http/http.js +162 -319
- package/components/http/http.mock.js +50 -98
- package/components/hub-source/hub-source.js +77 -182
- package/components/hub-source/hub-source__user.js +9 -37
- package/components/hub-source/hub-source__users-groups.js +34 -60
- package/components/i18n/i18n-context.js +7 -8
- package/components/i18n/i18n.js +3 -6
- package/components/icon/icon.d.ts +0 -11
- package/components/icon/icon.js +60 -85
- package/components/icon/icon__svg.d.ts +0 -8
- package/components/icon/icon__svg.js +0 -6
- package/components/icon/index.js +0 -6
- package/components/input/input-legacy.js +1 -1
- package/components/input/input.js +2 -14
- package/components/input-size/input-size.js +1 -1
- package/components/island/adaptive-island-hoc.d.ts +4 -5
- package/components/island/adaptive-island-hoc.js +30 -39
- package/components/island/content.d.ts +0 -10
- package/components/island/content.js +99 -119
- package/components/island/header.js +55 -73
- package/components/island/island.d.ts +4 -13
- package/components/island/island.js +25 -41
- package/components/island-legacy/content-legacy.d.ts +0 -5
- package/components/island-legacy/content-legacy.js +16 -27
- package/components/island-legacy/header-legacy.d.ts +0 -5
- package/components/island-legacy/header-legacy.js +19 -30
- package/components/island-legacy/island-legacy.d.ts +0 -5
- package/components/island-legacy/island-legacy.js +16 -27
- package/components/link/clickableLink.d.ts +0 -9
- package/components/link/clickableLink.js +33 -51
- package/components/link/link.d.ts +8 -33
- package/components/link/link.js +47 -68
- package/components/list/consts.js +2 -2
- package/components/list/list.d.ts +0 -32
- package/components/list/list.js +399 -516
- package/components/list/list__custom.js +51 -78
- package/components/list/list__hint.d.ts +0 -4
- package/components/list/list__hint.js +8 -21
- package/components/list/list__item.js +147 -211
- package/components/list/list__link.js +39 -59
- package/components/list/list__separator.js +15 -30
- package/components/list/list__title.js +25 -41
- package/components/list/list__users-groups-source.js +55 -123
- package/components/loader/loader.d.ts +0 -10
- package/components/loader/loader.js +38 -70
- package/components/loader/loader__core.js +123 -184
- package/components/loader-inline/loader-inline.d.ts +0 -6
- package/components/loader-inline/loader-inline.js +24 -38
- package/components/loader-screen/loader-screen.d.ts +0 -6
- package/components/loader-screen/loader-screen.js +24 -46
- package/components/login-dialog/login-dialog.d.ts +0 -11
- package/components/login-dialog/login-dialog.js +94 -145
- package/components/login-dialog/service.js +11 -33
- package/components/markdown/markdown.js +16 -29
- package/components/message/message.js +171 -218
- package/components/old-browsers-message/old-browsers-message.js +11 -14
- package/components/old-browsers-message/old-browsers-message__stop.js +1 -4
- package/components/old-browsers-message/white-list.js +8 -13
- package/components/pager/pager.d.ts +1 -0
- package/components/pager/pager.js +211 -275
- package/components/panel/panel.d.ts +0 -5
- package/components/panel/panel.js +16 -27
- package/components/permissions/permissions.js +118 -161
- package/components/permissions/permissions__cache.js +191 -218
- package/components/popup/popup.consts.js +1 -1
- package/components/popup/popup.js +237 -329
- package/components/popup/popup.target.js +9 -12
- package/components/popup/position.js +94 -101
- package/components/popup-menu/popup-menu.js +31 -76
- package/components/progress-bar/progress-bar.d.ts +19 -33
- package/components/progress-bar/progress-bar.js +55 -99
- package/components/query-assist/query-assist.d.ts +63 -93
- package/components/query-assist/query-assist.js +585 -748
- package/components/query-assist/query-assist__suggestions.js +2 -28
- package/components/radio/radio.d.ts +0 -8
- package/components/radio/radio.js +15 -35
- package/components/radio/radio__item.d.ts +0 -9
- package/components/radio/radio__item.js +52 -72
- package/components/scrollable-section/scrollable-section.d.ts +2 -0
- package/components/scrollable-section/scrollable-section.js +53 -0
- package/components/select/select.d.ts +3 -0
- package/components/select/select.js +714 -863
- package/components/select/select__filter.js +2 -29
- package/components/select/select__popup.js +317 -465
- package/components/shortcuts/core.js +147 -195
- package/components/shortcuts/shortcut-title.js +6 -10
- package/components/shortcuts/shortcuts-hoc.d.ts +4 -9
- package/components/shortcuts/shortcuts-hoc.js +23 -46
- package/components/shortcuts/shortcuts.d.ts +0 -8
- package/components/shortcuts/shortcuts.js +41 -72
- package/components/slider/slider.js +93 -113
- package/components/slider/slider.utils.js +16 -23
- package/components/storage/storage.d.ts +2 -3
- package/components/storage/storage.js +2 -46
- package/components/storage/storage__local.js +89 -148
- package/components/style.css +1 -1
- package/components/tab-trap/tab-trap.js +35 -61
- package/components/table/cell.d.ts +0 -6
- package/components/table/cell.js +11 -27
- package/components/table/disable-hover-hoc.d.ts +4 -5
- package/components/table/disable-hover-hoc.js +27 -42
- package/components/table/header-cell.d.ts +0 -10
- package/components/table/header-cell.js +59 -85
- package/components/table/header.d.ts +1 -23
- package/components/table/header.js +89 -126
- package/components/table/multitable.d.ts +0 -4
- package/components/table/multitable.js +83 -93
- package/components/table/row-with-focus-sensor.d.ts +2 -2
- package/components/table/row-with-focus-sensor.js +26 -60
- package/components/table/row.js +170 -235
- package/components/table/selection-adapter.js +2 -2
- package/components/table/selection-shortcuts-hoc.js +102 -126
- package/components/table/selection.js +150 -217
- package/components/table/simple-table.d.ts +17 -0
- package/components/table/simple-table.js +83 -0
- package/components/table/smart-table.d.ts +0 -46
- package/components/table/smart-table.js +41 -83
- package/components/table/table.d.ts +9 -6
- package/components/table/table.js +270 -372
- package/components/tabs/collapsible-more.d.ts +1 -9
- package/components/tabs/collapsible-more.js +47 -97
- package/components/tabs/collapsible-tab.js +32 -44
- package/components/tabs/collapsible-tabs.d.ts +2 -29
- package/components/tabs/collapsible-tabs.js +89 -161
- package/components/tabs/custom-item.d.ts +1 -7
- package/components/tabs/custom-item.js +4 -7
- package/components/tabs/dumb-tabs.d.ts +0 -11
- package/components/tabs/dumb-tabs.js +60 -104
- package/components/tabs/smart-tabs.d.ts +0 -6
- package/components/tabs/smart-tabs.js +29 -68
- package/components/tabs/tab-link.d.ts +0 -8
- package/components/tabs/tab-link.js +1 -4
- package/components/tabs/tab.d.ts +0 -8
- package/components/tabs/tab.js +14 -32
- package/components/tabs/tabs.js +1 -28
- package/components/tag/tag.d.ts +0 -19
- package/components/tag/tag.js +120 -179
- package/components/tags-input/tags-input.d.ts +7 -33
- package/components/tags-input/tags-input.js +224 -339
- package/components/tags-list/tags-list.d.ts +0 -13
- package/components/tags-list/tags-list.js +45 -74
- package/components/text/text.d.ts +0 -7
- package/components/text/text.js +27 -43
- package/components/toggle/toggle.d.ts +0 -15
- package/components/toggle/toggle.js +53 -78
- package/components/tooltip/tooltip.d.ts +4 -10
- package/components/tooltip/tooltip.js +105 -137
- package/components/user-agreement/service.d.ts +2 -1
- package/components/user-agreement/service.js +260 -405
- package/components/user-agreement/user-agreement.d.ts +0 -18
- package/components/user-agreement/user-agreement.js +92 -138
- package/components/user-card/card.d.ts +0 -35
- package/components/user-card/card.js +2 -27
- package/components/user-card/smart-user-card-tooltip.d.ts +0 -5
- package/components/user-card/smart-user-card-tooltip.js +52 -108
- package/components/user-card/tooltip.d.ts +0 -9
- package/components/user-card/tooltip.js +35 -74
- package/components/user-card/user-card.js +1 -26
- package/package.json +5 -7
- package/components/global/prop-types.d.ts +0 -4
- package/components/global/prop-types.js +0 -9
- package/components/global/react-render-adapter.d.ts +0 -1
- package/components/global/react-render-adapter.js +0 -6
- package/components/header/tray-icon.d.ts +0 -32
- package/components/header/tray-icon.js +0 -56
- package/components/storage/storage__fallback.d.ts +0 -79
- package/components/storage/storage__fallback.js +0 -253
@@ -1,41 +1,22 @@
|
|
1
|
-
import { _ as _defineProperty
|
2
|
-
import 'core-js/modules/es.array.filter.js';
|
3
|
-
import 'core-js/modules/es.array.includes.js';
|
4
|
-
import 'core-js/modules/es.object.to-string.js';
|
5
|
-
import 'core-js/modules/es.string.includes.js';
|
1
|
+
import { _ as _defineProperty } from '../_helpers/_rollupPluginBabelHelpers.js';
|
6
2
|
import ExtendableError from 'es6-error';
|
7
3
|
import { CODE } from '../http/http.js';
|
8
|
-
import 'core-js/modules/es.array.concat.js';
|
9
|
-
import 'core-js/modules/es.array.index-of.js';
|
10
|
-
import 'core-js/modules/es.array.iterator.js';
|
11
|
-
import 'core-js/modules/es.object.entries.js';
|
12
|
-
import 'core-js/modules/es.promise.js';
|
13
|
-
import 'core-js/modules/es.reflect.delete-property.js';
|
14
|
-
import 'core-js/modules/es.weak-map.js';
|
15
|
-
import 'core-js/modules/web.dom-collections.for-each.js';
|
16
4
|
import 'core-js/modules/web.dom-collections.iterator.js';
|
17
5
|
import '../global/url.js';
|
18
6
|
import 'core-js/modules/es.regexp.exec.js';
|
19
|
-
import 'core-js/modules/es.string.match.js';
|
20
7
|
import 'core-js/modules/es.string.replace.js';
|
21
8
|
|
22
|
-
|
23
|
-
|
24
|
-
|
25
|
-
|
26
|
-
|
27
|
-
|
28
|
-
|
29
|
-
_this.cause = cause;
|
30
|
-
_this.authRedirect = true;
|
31
|
-
return _this;
|
9
|
+
class TokenValidationError extends ExtendableError {
|
10
|
+
constructor(message, cause) {
|
11
|
+
super(message);
|
12
|
+
_defineProperty(this, "cause", void 0);
|
13
|
+
_defineProperty(this, "authRedirect", void 0);
|
14
|
+
this.cause = cause;
|
15
|
+
this.authRedirect = true;
|
32
16
|
}
|
33
|
-
|
34
|
-
|
35
|
-
|
36
|
-
var TokenValidator = /*#__PURE__*/function () {
|
37
|
-
function TokenValidator(config, getUser, storage) {
|
38
|
-
_classCallCheck(this, TokenValidator);
|
17
|
+
}
|
18
|
+
class TokenValidator {
|
19
|
+
constructor(config, getUser, storage) {
|
39
20
|
_defineProperty(this, "_getUser", void 0);
|
40
21
|
_defineProperty(this, "_config", void 0);
|
41
22
|
_defineProperty(this, "_storage", void 0);
|
@@ -49,211 +30,135 @@ var TokenValidator = /*#__PURE__*/function () {
|
|
49
30
|
* @return {number} epoch, seconds since 1970
|
50
31
|
* @private
|
51
32
|
*/
|
52
|
-
|
53
|
-
|
54
|
-
|
55
|
-
|
56
|
-
|
57
|
-
|
58
|
-
|
59
|
-
|
60
|
-
|
33
|
+
static _epoch() {
|
34
|
+
const milliseconds = 1000.0;
|
35
|
+
return Math.round(Date.now() / milliseconds);
|
36
|
+
}
|
37
|
+
/**
|
38
|
+
* @const {number}
|
39
|
+
*/
|
40
|
+
// eslint-disable-next-line @typescript-eslint/no-magic-numbers
|
41
|
+
|
42
|
+
/**
|
43
|
+
* Check token validity against all conditions.
|
44
|
+
* @returns {Promise.<string>}
|
45
|
+
*/
|
46
|
+
validateTokenLocally() {
|
47
|
+
return this._getValidatedToken([TokenValidator._validateExistence, TokenValidator._validateExpiration, this._validateScopes.bind(this)]);
|
48
|
+
}
|
49
|
+
/**
|
50
|
+
* Check token validity against all conditions.
|
51
|
+
* @returns {Promise.<string>}
|
52
|
+
*/
|
53
|
+
validateToken() {
|
54
|
+
return this._getValidatedToken([TokenValidator._validateExistence, TokenValidator._validateExpiration, this._validateScopes.bind(this), this._validateAgainstUser.bind(this)]);
|
55
|
+
}
|
56
|
+
/**
|
57
|
+
* Check if there is a token
|
58
|
+
* @param {StoredToken} storedToken
|
59
|
+
* @return {Promise.<StoredToken>}
|
60
|
+
* @private
|
61
|
+
*/
|
62
|
+
static _validateExistence(storedToken) {
|
63
|
+
if (!storedToken || !storedToken.accessToken) {
|
64
|
+
throw new TokenValidator.TokenValidationError('Token not found');
|
61
65
|
}
|
62
|
-
|
63
|
-
|
64
|
-
|
65
|
-
|
66
|
-
|
67
|
-
|
68
|
-
|
69
|
-
|
66
|
+
}
|
67
|
+
/**
|
68
|
+
* Check expiration
|
69
|
+
* @param {StoredToken} storedToken
|
70
|
+
* @return {Promise.<StoredToken>}
|
71
|
+
* @private
|
72
|
+
*/
|
73
|
+
static _validateExpiration(_ref) {
|
74
|
+
let {
|
75
|
+
expires,
|
76
|
+
lifeTime
|
77
|
+
} = _ref;
|
78
|
+
const REFRESH_BEFORE_RATIO = 6;
|
79
|
+
const refreshBefore = lifeTime ? Math.ceil(lifeTime / REFRESH_BEFORE_RATIO) : TokenValidator.DEFAULT_REFRESH_BEFORE;
|
80
|
+
if (expires && expires < TokenValidator._epoch() + refreshBefore) {
|
81
|
+
throw new TokenValidator.TokenValidationError('Token expired');
|
70
82
|
}
|
71
|
-
|
72
|
-
|
73
|
-
|
74
|
-
|
75
|
-
|
76
|
-
|
77
|
-
|
78
|
-
|
79
|
-
|
80
|
-
|
81
|
-
|
82
|
-
|
83
|
-
|
84
|
-
|
85
|
-
|
86
|
-
|
87
|
-
|
88
|
-
|
89
|
-
|
90
|
-
var requiredScopes = optionalScopes ? scope.filter(function (scopeId) {
|
91
|
-
return !optionalScopes.includes(scopeId);
|
92
|
-
}) : scope;
|
93
|
-
var hasAllScopes = requiredScopes.every(function (scopeId) {
|
94
|
-
var _storedToken$scopes;
|
95
|
-
return (_storedToken$scopes = storedToken.scopes) === null || _storedToken$scopes === void 0 ? void 0 : _storedToken$scopes.includes(scopeId);
|
96
|
-
});
|
97
|
-
if (!hasAllScopes) {
|
98
|
-
throw new TokenValidator.TokenValidationError('Token doesn\'t match required scopes');
|
99
|
-
}
|
83
|
+
}
|
84
|
+
/**
|
85
|
+
* Check scopes
|
86
|
+
* @param {StoredToken} storedToken
|
87
|
+
* @return {Promise.<StoredToken>}
|
88
|
+
* @private
|
89
|
+
*/
|
90
|
+
_validateScopes(storedToken) {
|
91
|
+
const {
|
92
|
+
scope,
|
93
|
+
optionalScopes
|
94
|
+
} = this._config;
|
95
|
+
const requiredScopes = optionalScopes ? scope.filter(scopeId => !optionalScopes.includes(scopeId)) : scope;
|
96
|
+
const hasAllScopes = requiredScopes.every(scopeId => {
|
97
|
+
var _storedToken$scopes;
|
98
|
+
return (_storedToken$scopes = storedToken.scopes) === null || _storedToken$scopes === void 0 ? void 0 : _storedToken$scopes.includes(scopeId);
|
99
|
+
});
|
100
|
+
if (!hasAllScopes) {
|
101
|
+
throw new TokenValidator.TokenValidationError('Token doesn\'t match required scopes');
|
100
102
|
}
|
101
|
-
|
102
|
-
|
103
|
-
|
104
|
-
|
105
|
-
|
106
|
-
|
107
|
-
|
108
|
-
|
109
|
-
|
110
|
-
|
111
|
-
|
112
|
-
|
113
|
-
|
114
|
-
|
115
|
-
|
116
|
-
|
117
|
-
|
118
|
-
|
119
|
-
|
120
|
-
|
121
|
-
|
122
|
-
|
123
|
-
|
124
|
-
|
125
|
-
|
126
|
-
case 6:
|
127
|
-
_context.prev = 6;
|
128
|
-
_context.t0 = _context["catch"](0);
|
129
|
-
response = {};
|
130
|
-
_context.prev = 9;
|
131
|
-
_context.next = 12;
|
132
|
-
return _context.t0.response.json();
|
133
|
-
case 12:
|
134
|
-
response = _context.sent;
|
135
|
-
_context.next = 17;
|
136
|
-
break;
|
137
|
-
case 15:
|
138
|
-
_context.prev = 15;
|
139
|
-
_context.t1 = _context["catch"](9);
|
140
|
-
case 17:
|
141
|
-
if (!(_context.t0.status === CODE.UNAUTHORIZED || TokenValidator.shouldRefreshToken(response.error))) {
|
142
|
-
_context.next = 19;
|
143
|
-
break;
|
144
|
-
}
|
145
|
-
throw new TokenValidator.TokenValidationError(response.error || _context.t0.message, (_errorResponse$data = _context.t0.data) !== null && _errorResponse$data !== void 0 && _errorResponse$data.error ? new Error((_errorResponse$data2 = _context.t0.data) === null || _errorResponse$data2 === void 0 ? void 0 : _errorResponse$data2.error) : undefined);
|
146
|
-
case 19:
|
147
|
-
throw _context.t0;
|
148
|
-
case 20:
|
149
|
-
case "end":
|
150
|
-
return _context.stop();
|
151
|
-
}
|
152
|
-
}, _callee, this, [[0, 6], [9, 15]]);
|
153
|
-
}));
|
154
|
-
function _validateAgainstUser(_x) {
|
155
|
-
return _validateAgainstUser2.apply(this, arguments);
|
103
|
+
}
|
104
|
+
/**
|
105
|
+
* Check by error code if token should be refreshed
|
106
|
+
* @param {string} error
|
107
|
+
* @return {boolean}
|
108
|
+
*/
|
109
|
+
static shouldRefreshToken(error) {
|
110
|
+
return error === 'invalid_grant' || error === 'invalid_request' || error === 'invalid_token';
|
111
|
+
}
|
112
|
+
/**
|
113
|
+
* Check scopes
|
114
|
+
* @param {StoredToken} storedToken
|
115
|
+
* @return {Promise.<StoredToken>}
|
116
|
+
* @private
|
117
|
+
*/
|
118
|
+
async _validateAgainstUser(storedToken) {
|
119
|
+
try {
|
120
|
+
return await this._getUser(storedToken.accessToken);
|
121
|
+
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
122
|
+
} catch (errorResponse) {
|
123
|
+
let response = {};
|
124
|
+
try {
|
125
|
+
response = await errorResponse.response.json();
|
126
|
+
} catch (e) {
|
127
|
+
// Skip JSON parsing errors
|
156
128
|
}
|
157
|
-
|
158
|
-
|
159
|
-
|
160
|
-
|
161
|
-
* @typedef {(function(StoredToken): Promise<StoredToken>)} TokenValidator
|
162
|
-
*/
|
163
|
-
/**
|
164
|
-
* Gets stored token and applies provided validators
|
165
|
-
* @param {TokenValidator[]} validators An array of validation
|
166
|
-
* functions to check the stored token against.
|
167
|
-
* @return {Promise.<string>} promise that is resolved to access token if the stored token is valid. If it is
|
168
|
-
* invalid then the promise is rejected. If invalid token should be re-requested then rejection object will
|
169
|
-
* have {authRedirect: true}.
|
170
|
-
* @private
|
171
|
-
*/
|
172
|
-
)
|
173
|
-
}, {
|
174
|
-
key: "_getValidatedToken",
|
175
|
-
value: (function () {
|
176
|
-
var _getValidatedToken2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(validators) {
|
177
|
-
var storedToken, i;
|
178
|
-
return _regeneratorRuntime().wrap(function _callee2$(_context2) {
|
179
|
-
while (1) switch (_context2.prev = _context2.next) {
|
180
|
-
case 0:
|
181
|
-
_context2.next = 2;
|
182
|
-
return this._storage.getToken();
|
183
|
-
case 2:
|
184
|
-
storedToken = _context2.sent;
|
185
|
-
if (!(storedToken == null)) {
|
186
|
-
_context2.next = 5;
|
187
|
-
break;
|
188
|
-
}
|
189
|
-
throw new TokenValidator.TokenValidationError('Token not found');
|
190
|
-
case 5:
|
191
|
-
i = 0;
|
192
|
-
case 6:
|
193
|
-
if (!(i < validators.length)) {
|
194
|
-
_context2.next = 12;
|
195
|
-
break;
|
196
|
-
}
|
197
|
-
_context2.next = 9;
|
198
|
-
return validators[i](storedToken);
|
199
|
-
case 9:
|
200
|
-
i++;
|
201
|
-
_context2.next = 6;
|
202
|
-
break;
|
203
|
-
case 12:
|
204
|
-
return _context2.abrupt("return", storedToken.accessToken);
|
205
|
-
case 13:
|
206
|
-
case "end":
|
207
|
-
return _context2.stop();
|
208
|
-
}
|
209
|
-
}, _callee2, this);
|
210
|
-
}));
|
211
|
-
function _getValidatedToken(_x2) {
|
212
|
-
return _getValidatedToken2.apply(this, arguments);
|
129
|
+
if (errorResponse.status === CODE.UNAUTHORIZED || TokenValidator.shouldRefreshToken(response.error)) {
|
130
|
+
var _errorResponse$data, _errorResponse$data2;
|
131
|
+
// Token expired
|
132
|
+
throw new TokenValidator.TokenValidationError(response.error || errorResponse.message, (_errorResponse$data = errorResponse.data) !== null && _errorResponse$data !== void 0 && _errorResponse$data.error ? new Error((_errorResponse$data2 = errorResponse.data) === null || _errorResponse$data2 === void 0 ? void 0 : _errorResponse$data2.error) : undefined);
|
213
133
|
}
|
214
|
-
|
215
|
-
|
216
|
-
}], [{
|
217
|
-
key: "_epoch",
|
218
|
-
value: function _epoch() {
|
219
|
-
var milliseconds = 1000.0;
|
220
|
-
return Math.round(Date.now() / milliseconds);
|
134
|
+
// Request unexpectedly failed
|
135
|
+
throw errorResponse;
|
221
136
|
}
|
222
|
-
|
223
|
-
|
224
|
-
|
225
|
-
|
226
|
-
|
227
|
-
|
228
|
-
|
229
|
-
|
230
|
-
|
231
|
-
|
232
|
-
|
233
|
-
|
234
|
-
|
235
|
-
|
236
|
-
|
237
|
-
|
238
|
-
|
239
|
-
|
240
|
-
key: "_validateExpiration",
|
241
|
-
value: function _validateExpiration(_ref) {
|
242
|
-
var expires = _ref.expires,
|
243
|
-
lifeTime = _ref.lifeTime;
|
244
|
-
var REFRESH_BEFORE_RATIO = 6;
|
245
|
-
var refreshBefore = lifeTime ? Math.ceil(lifeTime / REFRESH_BEFORE_RATIO) : TokenValidator.DEFAULT_REFRESH_BEFORE;
|
246
|
-
if (expires && expires < TokenValidator._epoch() + refreshBefore) {
|
247
|
-
throw new TokenValidator.TokenValidationError('Token expired');
|
248
|
-
}
|
137
|
+
}
|
138
|
+
/**
|
139
|
+
* Token Validator function
|
140
|
+
* @typedef {(function(StoredToken): Promise<StoredToken>)} TokenValidator
|
141
|
+
*/
|
142
|
+
/**
|
143
|
+
* Gets stored token and applies provided validators
|
144
|
+
* @param {TokenValidator[]} validators An array of validation
|
145
|
+
* functions to check the stored token against.
|
146
|
+
* @return {Promise.<string>} promise that is resolved to access token if the stored token is valid. If it is
|
147
|
+
* invalid then the promise is rejected. If invalid token should be re-requested then rejection object will
|
148
|
+
* have {authRedirect: true}.
|
149
|
+
* @private
|
150
|
+
*/
|
151
|
+
async _getValidatedToken(validators) {
|
152
|
+
const storedToken = await this._storage.getToken();
|
153
|
+
if (storedToken == null) {
|
154
|
+
throw new TokenValidator.TokenValidationError('Token not found');
|
249
155
|
}
|
250
|
-
|
251
|
-
|
252
|
-
value: function shouldRefreshToken(error) {
|
253
|
-
return error === 'invalid_grant' || error === 'invalid_request' || error === 'invalid_token';
|
156
|
+
for (let i = 0; i < validators.length; i++) {
|
157
|
+
await validators[i](storedToken);
|
254
158
|
}
|
255
|
-
|
256
|
-
}
|
159
|
+
return storedToken.accessToken;
|
160
|
+
}
|
161
|
+
}
|
257
162
|
_defineProperty(TokenValidator, "DEFAULT_REFRESH_BEFORE", 10 * 60);
|
258
163
|
// 20 min in s
|
259
164
|
/**
|
@@ -1,41 +1,32 @@
|
|
1
|
-
import {
|
2
|
-
import 'core-js/modules/es.array.concat.js';
|
3
|
-
import 'core-js/modules/es.object.to-string.js';
|
4
|
-
import 'core-js/modules/es.promise.js';
|
1
|
+
import { _ as _defineProperty } from '../_helpers/_rollupPluginBabelHelpers.js';
|
5
2
|
import AuthResponseParser from './response-parser.js';
|
6
|
-
import 'core-js/modules/es.array.index-of.js';
|
7
3
|
import 'core-js/modules/es.regexp.exec.js';
|
8
|
-
import 'core-js/modules/es.regexp.to-string.js';
|
9
4
|
import 'core-js/modules/es.string.replace.js';
|
10
|
-
import 'core-js/modules/web.dom-collections.for-each.js';
|
11
5
|
import 'es6-error';
|
12
6
|
import '../global/url.js';
|
13
|
-
import 'core-js/modules/es.string.match.js';
|
14
7
|
|
15
|
-
|
16
|
-
|
17
|
-
|
18
|
-
|
19
|
-
var _this = this;
|
20
|
-
_classCallCheck(this, WindowFlow);
|
8
|
+
const NAVBAR_HEIGHT = 50;
|
9
|
+
const CLOSED_CHECK_INTERVAL = 200;
|
10
|
+
class WindowFlow {
|
11
|
+
constructor(requestBuilder, storage) {
|
21
12
|
_defineProperty(this, "_timeoutId", undefined);
|
22
13
|
_defineProperty(this, "_requestBuilder", void 0);
|
23
14
|
_defineProperty(this, "_storage", void 0);
|
24
15
|
_defineProperty(this, "reject", void 0);
|
25
16
|
_defineProperty(this, "_loginWindow", void 0);
|
26
17
|
_defineProperty(this, "_promise", void 0);
|
27
|
-
_defineProperty(this, "checkIsClosed",
|
18
|
+
_defineProperty(this, "checkIsClosed", () => {
|
28
19
|
var _this$_loginWindow;
|
29
|
-
if ((_this$_loginWindow =
|
30
|
-
|
20
|
+
if ((_this$_loginWindow = this._loginWindow) !== null && _this$_loginWindow !== void 0 && _this$_loginWindow.closed) {
|
21
|
+
this.stop();
|
31
22
|
return;
|
32
23
|
}
|
33
|
-
|
24
|
+
this._timeoutId = window.setTimeout(this.checkIsClosed, CLOSED_CHECK_INTERVAL);
|
34
25
|
});
|
35
|
-
_defineProperty(this, "_reset",
|
36
|
-
|
37
|
-
|
38
|
-
clearTimeout(
|
26
|
+
_defineProperty(this, "_reset", () => {
|
27
|
+
this._promise = null;
|
28
|
+
this._loginWindow = null;
|
29
|
+
clearTimeout(this._timeoutId);
|
39
30
|
});
|
40
31
|
this._requestBuilder = requestBuilder;
|
41
32
|
this._storage = storage;
|
@@ -46,108 +37,80 @@ var WindowFlow = /*#__PURE__*/function () {
|
|
46
37
|
* @param {string} url
|
47
38
|
* @private
|
48
39
|
*/
|
49
|
-
|
50
|
-
|
51
|
-
|
52
|
-
|
53
|
-
|
54
|
-
|
55
|
-
|
56
|
-
|
57
|
-
|
58
|
-
|
59
|
-
|
60
|
-
|
61
|
-
|
62
|
-
|
63
|
-
|
64
|
-
|
65
|
-
|
66
|
-
|
67
|
-
|
68
|
-
|
69
|
-
|
70
|
-
|
71
|
-
|
72
|
-
|
73
|
-
|
74
|
-
|
75
|
-
|
76
|
-
|
77
|
-
|
78
|
-
|
79
|
-
|
80
|
-
|
81
|
-
|
82
|
-
|
83
|
-
|
84
|
-
|
85
|
-
|
86
|
-
|
87
|
-
|
88
|
-
|
89
|
-
|
90
|
-
|
91
|
-
|
92
|
-
|
93
|
-
|
94
|
-
|
95
|
-
|
96
|
-
|
97
|
-
|
98
|
-
|
99
|
-
|
100
|
-
|
101
|
-
resolve(token.accessToken);
|
102
|
-
}
|
103
|
-
});
|
104
|
-
var removeStateListener = _this2._storage.onStateChange(authRequest.stateId, function (state) {
|
105
|
-
if (state && state.error) {
|
106
|
-
cleanUp();
|
107
|
-
reject(new AuthResponseParser.AuthError(state));
|
108
|
-
}
|
109
|
-
});
|
110
|
-
if (_this2._loginWindow == null || _this2._loginWindow.closed) {
|
111
|
-
_this2._loginWindow = _this2._openWindow(authRequest.url);
|
112
|
-
} else {
|
113
|
-
_this2._loginWindow.location.href = authRequest.url;
|
114
|
-
}
|
115
|
-
_this2.checkIsClosed();
|
116
|
-
}));
|
117
|
-
case 4:
|
118
|
-
case "end":
|
119
|
-
return _context.stop();
|
120
|
-
}
|
121
|
-
}, _callee, this);
|
122
|
-
}));
|
123
|
-
function _load() {
|
124
|
-
return _load2.apply(this, arguments);
|
125
|
-
}
|
126
|
-
return _load;
|
127
|
-
}())
|
128
|
-
}, {
|
129
|
-
key: "stop",
|
130
|
-
value: function stop() {
|
131
|
-
if (this._loginWindow != null) {
|
132
|
-
this._loginWindow.close();
|
133
|
-
}
|
134
|
-
if (this.reject) {
|
135
|
-
this.reject('Authorization window closed');
|
40
|
+
_openWindow(url) {
|
41
|
+
const height = 700;
|
42
|
+
const width = 750;
|
43
|
+
const screenHalves = 2;
|
44
|
+
const top = (window.screen.height - height - NAVBAR_HEIGHT) / screenHalves;
|
45
|
+
const left = (window.screen.width - width) / screenHalves;
|
46
|
+
return window.open(url, 'HubLoginWindow', "height=".concat(height, ", width=").concat(width, ", left=").concat(left, ", top=").concat(top));
|
47
|
+
}
|
48
|
+
/**
|
49
|
+
* Initiates authorization in window
|
50
|
+
*/
|
51
|
+
async _load() {
|
52
|
+
const authRequest = await this._requestBuilder.prepareAuthRequest(
|
53
|
+
// eslint-disable-next-line camelcase
|
54
|
+
{
|
55
|
+
request_credentials: 'required',
|
56
|
+
auth_mode: 'bypass_to_login'
|
57
|
+
}, {
|
58
|
+
nonRedirect: true
|
59
|
+
});
|
60
|
+
return new Promise((resolve, reject) => {
|
61
|
+
this.reject = reject;
|
62
|
+
let cleanRun;
|
63
|
+
const cleanUp = () => {
|
64
|
+
var _this$_loginWindow2;
|
65
|
+
if (cleanRun) {
|
66
|
+
return;
|
67
|
+
}
|
68
|
+
cleanRun = true;
|
69
|
+
/* eslint-disable @typescript-eslint/no-use-before-define */
|
70
|
+
removeStateListener();
|
71
|
+
removeTokenListener();
|
72
|
+
/* eslint-enable @typescript-eslint/no-use-before-define */
|
73
|
+
(_this$_loginWindow2 = this._loginWindow) === null || _this$_loginWindow2 === void 0 || _this$_loginWindow2.close();
|
74
|
+
clearTimeout(this._timeoutId);
|
75
|
+
};
|
76
|
+
const removeTokenListener = this._storage.onTokenChange(token => {
|
77
|
+
if (token) {
|
78
|
+
cleanUp();
|
79
|
+
resolve(token.accessToken);
|
80
|
+
}
|
81
|
+
});
|
82
|
+
const removeStateListener = this._storage.onStateChange(authRequest.stateId, state => {
|
83
|
+
if (state && state.error) {
|
84
|
+
cleanUp();
|
85
|
+
reject(new AuthResponseParser.AuthError(state));
|
86
|
+
}
|
87
|
+
});
|
88
|
+
if (this._loginWindow == null || this._loginWindow.closed) {
|
89
|
+
this._loginWindow = this._openWindow(authRequest.url);
|
90
|
+
} else {
|
91
|
+
this._loginWindow.location.href = authRequest.url;
|
136
92
|
}
|
137
|
-
this.
|
93
|
+
this.checkIsClosed();
|
94
|
+
});
|
95
|
+
}
|
96
|
+
stop() {
|
97
|
+
if (this._loginWindow != null) {
|
98
|
+
this._loginWindow.close();
|
138
99
|
}
|
139
|
-
|
140
|
-
|
141
|
-
|
142
|
-
|
143
|
-
|
144
|
-
|
145
|
-
|
146
|
-
this.
|
147
|
-
this._promise.then(this._reset, this._reset);
|
100
|
+
if (this.reject) {
|
101
|
+
this.reject('Authorization window closed');
|
102
|
+
}
|
103
|
+
this._reset();
|
104
|
+
}
|
105
|
+
authorize() {
|
106
|
+
if (this._promise != null && this._loginWindow != null && !this._loginWindow.closed) {
|
107
|
+
this._loginWindow.focus();
|
148
108
|
return this._promise;
|
149
109
|
}
|
150
|
-
|
151
|
-
|
110
|
+
this._promise = this._load();
|
111
|
+
this._promise.then(this._reset, this._reset);
|
112
|
+
return this._promise;
|
113
|
+
}
|
114
|
+
}
|
152
115
|
|
153
116
|
export { WindowFlow as default };
|
@@ -1,5 +1,4 @@
|
|
1
1
|
import { Component } from 'react';
|
2
|
-
import PropTypes from 'prop-types';
|
3
2
|
/**
|
4
3
|
* @name Auth Dialog
|
5
4
|
*/
|
@@ -21,23 +20,6 @@ export interface AuthDialogProps {
|
|
21
20
|
onTryAgain?: () => void;
|
22
21
|
}
|
23
22
|
export default class AuthDialog extends Component<AuthDialogProps> {
|
24
|
-
static propTypes: {
|
25
|
-
className: PropTypes.Requireable<string>;
|
26
|
-
title: PropTypes.Requireable<string>;
|
27
|
-
errorMessage: PropTypes.Requireable<string>;
|
28
|
-
serviceImage: PropTypes.Requireable<string>;
|
29
|
-
serviceName: PropTypes.Requireable<string>;
|
30
|
-
loginCaption: PropTypes.Requireable<string>;
|
31
|
-
loginToCaption: PropTypes.Requireable<string>;
|
32
|
-
show: PropTypes.Requireable<boolean>;
|
33
|
-
cancelOnEsc: PropTypes.Requireable<boolean>;
|
34
|
-
confirmLabel: PropTypes.Requireable<string>;
|
35
|
-
cancelLabel: PropTypes.Requireable<string>;
|
36
|
-
tryAgainLabel: PropTypes.Requireable<string>;
|
37
|
-
onConfirm: PropTypes.Requireable<(...args: any[]) => any>;
|
38
|
-
onCancel: PropTypes.Requireable<(...args: any[]) => any>;
|
39
|
-
onTryAgain: PropTypes.Requireable<(...args: any[]) => any>;
|
40
|
-
};
|
41
23
|
static defaultProps: {
|
42
24
|
loginCaption: string;
|
43
25
|
loginToCaption: string;
|