@jetbrains/ring-ui 5.0.155 → 5.0.157
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/checkbox/checkbox.css +1 -1
- package/components/global/variables_dark.css +2 -2
- package/components/radio/radio.css +1 -1
- package/dist/_helpers/_rollupPluginBabelHelpers.js +642 -1
- package/dist/_helpers/anchor.js +6 -7
- package/dist/_helpers/button__classes.js +16 -28
- package/dist/_helpers/card.js +107 -95
- package/dist/_helpers/dialog__body-scroll-preventer.js +20 -11
- package/dist/_helpers/footer.js +29 -34
- package/dist/_helpers/query-assist__suggestions.js +91 -74
- package/dist/_helpers/select__filter.js +71 -48
- package/dist/_helpers/services-link.js +41 -29
- package/dist/_helpers/sidebar.js +103 -99
- package/dist/_helpers/theme.js +42 -35
- package/dist/_helpers/title.js +71 -57
- package/dist/alert/alert.js +199 -158
- package/dist/alert/container.js +43 -32
- package/dist/alert-service/alert-service.js +172 -104
- package/dist/analytics/analytics.js +92 -68
- package/dist/analytics/analytics__custom-plugin.js +84 -60
- package/dist/analytics/analytics__fus-plugin.js +28 -15
- package/dist/analytics/analytics__ga-plugin.js +60 -43
- package/dist/analytics/analytics__plugin-utils.js +28 -22
- package/dist/auth/auth.js +36 -4
- package/dist/auth/auth__core.js +1458 -732
- package/dist/auth/background-flow.js +129 -87
- package/dist/auth/down-notification.js +75 -30
- package/dist/auth/iframe-flow.js +136 -75
- package/dist/auth/landing.js +90 -30
- package/dist/auth/request-builder.js +82 -46
- package/dist/auth/response-parser.js +119 -86
- package/dist/auth/storage.js +333 -171
- package/dist/auth/token-validator.js +244 -137
- package/dist/auth/window-flow.js +136 -92
- package/dist/auth-dialog/auth-dialog.js +176 -114
- package/dist/auth-dialog-service/auth-dialog-service.js +32 -7
- package/dist/auth-ng/auth-ng.js +70 -34
- package/dist/auth-ng/auth-ng.mock.js +6 -6
- package/dist/autofocus-ng/autofocus-ng.js +23 -8
- package/dist/avatar/avatar-example-datauri.js +1 -23
- package/dist/avatar/avatar.js +155 -119
- package/dist/avatar/fallback-avatar.js +41 -22
- package/dist/avatar-editor-ng/avatar-editor-ng.js +56 -23
- package/dist/avatar-editor-ng/avatar-editor-ng__template.js +1 -28
- package/dist/avatar-ng/avatar-ng.js +23 -1
- package/dist/badge/badge.js +43 -35
- package/dist/badge-ng/badge-ng.js +13 -1
- package/dist/breadcrumb-ng/breadcrumb-ng.js +15 -29
- package/dist/button/button.js +111 -87
- package/dist/button/button__classes.js +1 -0
- package/dist/button-group/button-group.js +35 -19
- package/dist/button-group/caption.js +22 -14
- package/dist/button-group-ng/button-group-ng.js +13 -7
- package/dist/button-ng/button-ng.js +154 -133
- package/dist/button-set/button-set.js +34 -20
- package/dist/button-set-ng/button-set-ng.js +2 -2
- package/dist/button-toolbar/button-toolbar.js +33 -19
- package/dist/button-toolbar-ng/button-toolbar-ng.js +5 -3
- package/dist/caret/caret.js +225 -188
- package/dist/checkbox/checkbox.js +104 -76
- package/dist/checkbox-ng/checkbox-ng.js +18 -27
- package/dist/clipboard/clipboard-fallback.js +10 -10
- package/dist/clipboard/clipboard.js +131 -34
- package/dist/code/code.js +168 -92
- package/dist/compiler-ng/compiler-ng.js +18 -15
- package/dist/confirm/confirm.js +108 -66
- package/dist/confirm-ng/confirm-ng.js +33 -4
- package/dist/confirm-service/confirm-service.js +66 -42
- package/dist/content-layout/content-layout.js +64 -43
- package/dist/content-layout/sidebar.js +1 -0
- package/dist/contenteditable/contenteditable.js +61 -50
- package/dist/control-label/control-label.js +11 -15
- package/dist/data-list/data-list.js +184 -128
- package/dist/data-list/data-list.mock.js +11 -2
- package/dist/data-list/item.js +174 -143
- package/dist/data-list/selection.js +139 -76
- package/dist/data-list/title.js +13 -1
- package/dist/data-list-ng/data-list-ng.js +31 -1
- package/dist/date-picker/consts.js +18 -15
- package/dist/date-picker/date-input.js +147 -115
- package/dist/date-picker/date-picker.js +285 -228
- package/dist/date-picker/date-popup.js +397 -356
- package/dist/date-picker/day.js +98 -84
- package/dist/date-picker/month-names.js +64 -43
- package/dist/date-picker/month-slider.js +74 -51
- package/dist/date-picker/month.js +21 -15
- package/dist/date-picker/months.js +48 -43
- package/dist/date-picker/weekdays.js +18 -12
- package/dist/date-picker/years.js +109 -84
- package/dist/dialog/dialog.js +189 -141
- package/dist/dialog/dialog__body-scroll-preventer.js +5 -0
- package/dist/dialog-ng/dialog-ng.js +401 -287
- package/dist/dialog-ng/dialog-ng__template.js +1 -70
- package/dist/docked-panel-ng/docked-panel-ng.js +33 -18
- package/dist/dropdown/anchor.js +10 -0
- package/dist/dropdown/dropdown.js +214 -182
- package/dist/dropdown-menu/dropdown-menu.js +102 -72
- package/dist/editable-heading/editable-heading.js +100 -58
- package/dist/error-bubble/error-bubble.js +64 -31
- package/dist/error-message/error-message.js +61 -38
- package/dist/error-message-ng/error-message-ng.js +11 -22
- package/dist/footer/footer.js +11 -1
- package/dist/footer-ng/footer-ng.js +64 -36
- package/dist/form-ng/form-ng.js +66 -56
- package/dist/global/angular-component-factory.js +76 -53
- package/dist/global/compose.js +10 -1
- package/dist/global/composeRefs.js +12 -7
- package/dist/global/controls-height.js +2 -2
- package/dist/global/create-stateful-context.js +19 -19
- package/dist/global/data-tests.js +15 -7
- package/dist/global/dom.js +95 -53
- package/dist/global/focus-sensor-hoc.js +134 -122
- package/dist/global/fuzzy-highlight.js +41 -27
- package/dist/global/get-event-key.js +8 -8
- package/dist/global/get-uid.js +8 -4
- package/dist/global/inject-styles.js +15 -10
- package/dist/global/linear-function.js +2 -2
- package/dist/global/listeners.js +53 -27
- package/dist/global/memoize.js +13 -6
- package/dist/global/normalize-indent.js +51 -19
- package/dist/global/promise-with-timeout.js +8 -6
- package/dist/global/prop-types.js +5 -3
- package/dist/global/react-dom-renderer.js +47 -28
- package/dist/global/react-render-adapter.js +19 -13
- package/dist/global/rerender-hoc.js +41 -16
- package/dist/global/ring-angular-component.js +20 -10
- package/dist/global/schedule-raf.js +6 -5
- package/dist/global/sniffer.js +1 -1
- package/dist/global/theme.js +24 -0
- package/dist/global/trivial-template-tag.js +10 -3
- package/dist/global/typescript-utils.js +6 -2
- package/dist/global/url.js +27 -21
- package/dist/global/use-event-callback.js +4 -6
- package/dist/grid/col.js +55 -35
- package/dist/grid/grid.js +36 -17
- package/dist/grid/row.js +48 -35
- package/dist/group/group.js +27 -17
- package/dist/group-ng/group-ng.js +2 -2
- package/dist/header/header.js +80 -33
- package/dist/header/logo.js +39 -20
- package/dist/header/profile.js +188 -150
- package/dist/header/services-link.js +9 -0
- package/dist/header/services.js +118 -73
- package/dist/header/smart-profile.js +207 -111
- package/dist/header/smart-services.js +115 -62
- package/dist/header/tray-icon.js +38 -21
- package/dist/header/tray.js +34 -21
- package/dist/heading/heading.js +25 -26
- package/dist/heading-ng/heading-ng.js +11 -1
- package/dist/http/http.js +368 -215
- package/dist/http/http.mock.js +104 -49
- package/dist/hub-source/hub-source.js +191 -83
- package/dist/hub-source/hub-source__user.js +45 -11
- package/dist/hub-source/hub-source__users-groups.js +67 -37
- package/dist/i18n/i18n-context.js +14 -10
- package/dist/i18n/i18n.js +11 -7
- package/dist/icon/icon.js +94 -76
- package/dist/icon/icon__svg.js +31 -24
- package/dist/icon/index.js +9 -0
- package/dist/icon-ng/icon-ng.js +27 -15
- package/dist/input/input.js +184 -145
- package/dist/input-ng/input-ng.js +96 -118
- package/dist/island/adaptive-island-hoc.js +45 -30
- package/dist/island/content.js +130 -115
- package/dist/island/header.js +69 -56
- package/dist/island/island.js +40 -28
- package/dist/island-legacy/content-legacy.js +27 -17
- package/dist/island-legacy/header-legacy.js +29 -19
- package/dist/island-legacy/island-legacy.js +27 -17
- package/dist/island-ng/island-content-ng.js +17 -26
- package/dist/island-ng/island-header-ng.js +9 -12
- package/dist/island-ng/island-ng-class-fixer.js +3 -0
- package/dist/island-ng/island-ng.js +6 -10
- package/dist/link/clickableLink.js +61 -44
- package/dist/link/link.js +85 -74
- package/dist/link-ng/link-ng.js +3 -5
- package/dist/list/consts.js +1 -1
- package/dist/list/list.js +696 -602
- package/dist/list/list__custom.js +61 -44
- package/dist/list/list__hint.js +21 -10
- package/dist/list/list__item.js +167 -129
- package/dist/list/list__link.js +54 -37
- package/dist/list/list__separator.js +24 -14
- package/dist/list/list__title.js +32 -22
- package/dist/list/list__users-groups-source.js +131 -54
- package/dist/loader/loader.js +78 -43
- package/dist/loader/loader__core.js +257 -189
- package/dist/loader-inline/loader-inline.js +37 -23
- package/dist/loader-inline-ng/loader-inline-ng.js +2 -2
- package/dist/loader-ng/loader-ng.js +46 -19
- package/dist/loader-screen/loader-screen.js +48 -25
- package/dist/loader-screen-ng/loader-screen-ng.js +46 -30
- package/dist/login-dialog/login-dialog.js +162 -111
- package/dist/login-dialog/service.js +35 -7
- package/dist/markdown/code.js +31 -9
- package/dist/markdown/heading.js +3 -5
- package/dist/markdown/link.js +13 -6
- package/dist/markdown/markdown.js +66 -33
- package/dist/message/message.js +157 -125
- package/dist/message-bundle-ng/message-bundle-ng.js +128 -44
- package/dist/old-browsers-message/old-browsers-message.js +19 -11
- package/dist/old-browsers-message/old-browsers-message__stop.js +8 -0
- package/dist/old-browsers-message/white-list.js +16 -9
- package/dist/pager/pager.js +275 -210
- package/dist/pager-ng/pager-ng.js +36 -1
- package/dist/panel/panel.js +27 -17
- package/dist/panel-ng/panel-ng.js +14 -1
- package/dist/permissions/permissions.js +173 -127
- package/dist/permissions/permissions__cache.js +225 -194
- package/dist/permissions-ng/permissions-ng.js +86 -35
- package/dist/place-under-ng/place-under-ng.js +68 -45
- package/dist/popup/popup.consts.js +1 -1
- package/dist/popup/popup.js +342 -280
- package/dist/popup/popup.target.js +8 -9
- package/dist/popup/position.js +153 -153
- package/dist/popup-menu/popup-menu.js +86 -44
- package/dist/progress-bar/progress-bar.js +97 -80
- package/dist/progress-bar-ng/progress-bar-ng.js +11 -1
- package/dist/promised-click-ng/promised-click-ng.js +92 -58
- package/dist/proxy-attrs/proxy-attrs.js +18 -9
- package/dist/query-assist/query-assist.js +903 -832
- package/dist/query-assist/query-assist__suggestions.js +33 -1
- package/dist/query-assist-ng/query-assist-ng.js +38 -1
- package/dist/radio/radio.js +36 -19
- package/dist/radio/radio__item.js +71 -52
- package/dist/radio-ng/radio-ng.js +14 -25
- package/dist/save-field-ng/save-field-ng.js +86 -52
- package/dist/save-field-ng/save-field-ng__template.js +1 -32
- package/dist/select/select.js +937 -835
- package/dist/select/select__filter.js +33 -0
- package/dist/select/select__popup.js +472 -359
- package/dist/select-ng/select-ng.js +125 -74
- package/dist/select-ng/select-ng__lazy.js +101 -50
- package/dist/select-ng/select-ng__options.js +107 -81
- package/dist/shortcuts/core.js +218 -166
- package/dist/shortcuts/shortcut-title.js +11 -6
- package/dist/shortcuts/shortcuts-hoc.js +47 -19
- package/dist/shortcuts/shortcuts.js +77 -50
- package/dist/shortcuts-hint-ng/shortcuts-hint-ng.js +104 -53
- package/dist/shortcuts-hint-ng/shortcuts-hint-ng__template.js +1 -48
- package/dist/shortcuts-ng/shortcuts-ng.js +86 -51
- package/dist/sidebar-ng/sidebar-ng.js +53 -22
- package/dist/sidebar-ng/sidebar-ng__button-template.js +1 -18
- package/dist/sidebar-ng/sidebar-ng__template.js +1 -10
- package/dist/storage/storage.js +35 -4
- package/dist/storage/storage__fallback.js +224 -149
- package/dist/storage/storage__local.js +156 -90
- package/dist/style.css +1 -1
- package/dist/tab-trap/tab-trap.js +157 -122
- package/dist/table/cell.js +28 -14
- package/dist/table/disable-hover-hoc.js +53 -33
- package/dist/table/header-cell.js +87 -64
- package/dist/table/header.js +126 -98
- package/dist/table/multitable.js +127 -107
- package/dist/table/row-with-focus-sensor.js +73 -25
- package/dist/table/row.js +208 -170
- package/dist/table/selection-adapter.js +3 -1
- package/dist/table/selection-shortcuts-hoc.js +184 -181
- package/dist/table/selection.js +228 -156
- package/dist/table/smart-table.js +93 -51
- package/dist/table/table.js +348 -281
- package/dist/table-legacy-ng/table-legacy-ng.js +117 -102
- package/dist/table-legacy-ng/table-legacy-ng__pager.js +42 -10
- package/dist/table-legacy-ng/table-legacy-ng__selection-navigate-actions.js +92 -69
- package/dist/table-legacy-ng/table-legacy-ng__selection.js +169 -119
- package/dist/table-legacy-ng/table-legacy-ng__toolbar.js +36 -21
- package/dist/table-ng/smart-table-ng.js +31 -1
- package/dist/table-ng/table-ng.js +31 -1
- package/dist/tabs/collapsible-more.js +87 -50
- package/dist/tabs/collapsible-tab.js +45 -38
- package/dist/tabs/collapsible-tabs.js +161 -94
- package/dist/tabs/custom-item.js +2 -4
- package/dist/tabs/dumb-tabs.js +122 -75
- package/dist/tabs/smart-tabs.js +75 -29
- package/dist/tabs/tab-link.js +29 -19
- package/dist/tabs/tab.js +33 -19
- package/dist/tabs/tabs.js +35 -0
- package/dist/tabs-ng/tabs-ng.js +38 -24
- package/dist/tabs-ng/tabs-ng__template.js +1 -38
- package/dist/tag/tag.js +170 -133
- package/dist/tags-input/tags-input.js +428 -327
- package/dist/tags-input-ng/tags-input-ng.js +37 -1
- package/dist/tags-list/tags-list.js +80 -56
- package/dist/template-ng/template-ng.js +50 -39
- package/dist/text/text.js +38 -28
- package/dist/title-ng/title-ng.js +28 -23
- package/dist/toggle/toggle.js +72 -56
- package/dist/toggle-ng/toggle-ng.js +14 -1
- package/dist/tooltip/tooltip.js +192 -146
- package/dist/tooltip-ng/tooltip-ng.js +51 -25
- package/dist/user-agreement/service.js +374 -227
- package/dist/user-agreement/toolbox.eula.js +1 -160
- package/dist/user-agreement/user-agreement.js +128 -86
- package/dist/user-card/card.js +32 -0
- package/dist/user-card/smart-user-card-tooltip.js +116 -51
- package/dist/user-card/tooltip.js +90 -48
- package/dist/user-card/user-card.js +32 -0
- package/dist/user-card-ng/user-card-ng.js +34 -2
- package/package.json +13 -13
|
@@ -1,3 +1,7 @@
|
|
|
1
|
+
import { c as _defineProperty, j as _inherits, k as _createSuper, b as _classCallCheck, m as _assertThisInitialized, e as _asyncToGenerator, _ as _createClass, f as _regeneratorRuntime } from '../_helpers/_rollupPluginBabelHelpers.js';
|
|
2
|
+
import 'core-js/modules/es.array.concat.js';
|
|
3
|
+
import 'core-js/modules/es.regexp.exec.js';
|
|
4
|
+
import 'core-js/modules/es.string.replace.js';
|
|
1
5
|
import React, { Component } from 'react';
|
|
2
6
|
import PropTypes from 'prop-types';
|
|
3
7
|
import classNames from 'classnames';
|
|
@@ -6,8 +10,10 @@ import Dialog from '../dialog/dialog.js';
|
|
|
6
10
|
import { Button } from '../button/button.js';
|
|
7
11
|
import { H2 } from '../heading/heading.js';
|
|
8
12
|
import ContentWrapper from '../island/content.js';
|
|
9
|
-
import '../_helpers/_rollupPluginBabelHelpers.js';
|
|
10
13
|
import '../global/data-tests.js';
|
|
14
|
+
import 'core-js/modules/es.array.reduce.js';
|
|
15
|
+
import 'core-js/modules/es.object.to-string.js';
|
|
16
|
+
import 'core-js/modules/es.object.entries.js';
|
|
11
17
|
import '../island/adaptive-island-hoc.js';
|
|
12
18
|
import '../global/linear-function.js';
|
|
13
19
|
import '../_helpers/island.js';
|
|
@@ -17,13 +23,30 @@ import '../global/schedule-raf.js';
|
|
|
17
23
|
import 'react-dom';
|
|
18
24
|
import '@jetbrains/icons/close';
|
|
19
25
|
import '../global/get-uid.js';
|
|
26
|
+
import 'core-js/modules/es.regexp.to-string.js';
|
|
20
27
|
import '../shortcuts/shortcuts.js';
|
|
28
|
+
import 'core-js/modules/es.array.map.js';
|
|
21
29
|
import '../shortcuts/core.js';
|
|
30
|
+
import 'core-js/modules/es.array.includes.js';
|
|
31
|
+
import 'core-js/modules/es.string.includes.js';
|
|
32
|
+
import 'core-js/modules/es.object.assign.js';
|
|
33
|
+
import 'core-js/modules/es.array.slice.js';
|
|
34
|
+
import 'core-js/modules/es.array.splice.js';
|
|
35
|
+
import 'core-js/modules/es.string.match.js';
|
|
36
|
+
import 'core-js/modules/es.array.find-index.js';
|
|
22
37
|
import 'combokeys';
|
|
23
38
|
import '../global/sniffer.js';
|
|
24
39
|
import 'sniffr';
|
|
25
40
|
import '../tab-trap/tab-trap.js';
|
|
41
|
+
import 'core-js/modules/es.array.filter.js';
|
|
26
42
|
import '../global/dom.js';
|
|
43
|
+
import 'core-js/modules/web.dom-collections.for-each.js';
|
|
44
|
+
import 'core-js/modules/es.string.split.js';
|
|
45
|
+
import 'core-js/modules/es.object.keys.js';
|
|
46
|
+
import 'core-js/modules/es.array.iterator.js';
|
|
47
|
+
import 'core-js/modules/es.set.js';
|
|
48
|
+
import 'core-js/modules/es.string.iterator.js';
|
|
49
|
+
import 'core-js/modules/web.dom-collections.iterator.js';
|
|
27
50
|
import '../popup/popup.target.js';
|
|
28
51
|
import '../_helpers/dialog__body-scroll-preventer.js';
|
|
29
52
|
import 'scrollbar-width';
|
|
@@ -33,129 +56,168 @@ import 'util-deprecate';
|
|
|
33
56
|
import '../icon/icon__constants.js';
|
|
34
57
|
import '../_helpers/icon.js';
|
|
35
58
|
import '../icon/icon__svg.js';
|
|
59
|
+
import 'core-js/modules/es.string.starts-with.js';
|
|
36
60
|
import '../global/memoize.js';
|
|
61
|
+
import 'core-js/modules/es.map.js';
|
|
62
|
+
import 'core-js/modules/es.weak-map.js';
|
|
37
63
|
import '../link/clickableLink.js';
|
|
38
64
|
import '../global/controls-height.js';
|
|
39
65
|
import '../_helpers/button__classes.js';
|
|
40
66
|
|
|
41
67
|
var modules_ae521deb = {"unit":"i__const_unit_0","light":"light_rui_2ac4","dialog":"dialog_rui_159b","content":"content_rui_159b font_rui_8bff","button":"button_rui_159b","firstButton":"firstButton_rui_159b button_rui_159b","title":"title_rui_159b","logo":"logo_rui_159b","error":"error_rui_159b"};
|
|
42
68
|
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
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
|
-
|
|
69
|
+
var AuthDialog = /*#__PURE__*/function (_Component) {
|
|
70
|
+
_inherits(AuthDialog, _Component);
|
|
71
|
+
var _super = _createSuper(AuthDialog);
|
|
72
|
+
function AuthDialog() {
|
|
73
|
+
var _this;
|
|
74
|
+
_classCallCheck(this, AuthDialog);
|
|
75
|
+
for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
|
|
76
|
+
args[_key] = arguments[_key];
|
|
77
|
+
}
|
|
78
|
+
_this = _super.call.apply(_super, [this].concat(args));
|
|
79
|
+
_defineProperty(_assertThisInitialized(_this), "state", {
|
|
80
|
+
retrying: false
|
|
81
|
+
});
|
|
82
|
+
_defineProperty(_assertThisInitialized(_this), "onEscPress", function () {
|
|
83
|
+
if (_this.props.cancelOnEsc) {
|
|
84
|
+
_this.props.onCancel();
|
|
85
|
+
}
|
|
86
|
+
});
|
|
87
|
+
_defineProperty(_assertThisInitialized(_this), "onRetryPress", /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
|
|
88
|
+
return _regeneratorRuntime().wrap(function _callee$(_context) {
|
|
89
|
+
while (1) switch (_context.prev = _context.next) {
|
|
90
|
+
case 0:
|
|
91
|
+
if (!(!_this.props.onTryAgain || _this.state.retrying)) {
|
|
92
|
+
_context.next = 2;
|
|
93
|
+
break;
|
|
94
|
+
}
|
|
95
|
+
return _context.abrupt("return");
|
|
96
|
+
case 2:
|
|
97
|
+
_this.setState({
|
|
98
|
+
retrying: true
|
|
99
|
+
});
|
|
100
|
+
_context.prev = 3;
|
|
101
|
+
_context.next = 6;
|
|
102
|
+
return _this.props.onTryAgain();
|
|
103
|
+
case 6:
|
|
104
|
+
_context.next = 10;
|
|
105
|
+
break;
|
|
106
|
+
case 8:
|
|
107
|
+
_context.prev = 8;
|
|
108
|
+
_context.t0 = _context["catch"](3);
|
|
109
|
+
case 10:
|
|
110
|
+
_context.prev = 10;
|
|
111
|
+
_this.setState({
|
|
112
|
+
retrying: false
|
|
113
|
+
});
|
|
114
|
+
return _context.finish(10);
|
|
115
|
+
case 13:
|
|
116
|
+
case "end":
|
|
117
|
+
return _context.stop();
|
|
118
|
+
}
|
|
119
|
+
}, _callee, null, [[3, 8, 10, 13]]);
|
|
120
|
+
})));
|
|
121
|
+
return _this;
|
|
80
122
|
}
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
123
|
+
_createClass(AuthDialog, [{
|
|
124
|
+
key: "componentDidMount",
|
|
125
|
+
value: function componentDidMount() {
|
|
126
|
+
window.addEventListener('online', this.onRetryPress);
|
|
84
127
|
}
|
|
85
|
-
}
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
128
|
+
}, {
|
|
129
|
+
key: "componentWillUnmount",
|
|
130
|
+
value: function componentWillUnmount() {
|
|
131
|
+
window.removeEventListener('online', this.onRetryPress);
|
|
89
132
|
}
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
|
|
133
|
+
}, {
|
|
134
|
+
key: "render",
|
|
135
|
+
value: function render() {
|
|
136
|
+
var _this2 = this;
|
|
137
|
+
var _this$props = this.props,
|
|
138
|
+
show = _this$props.show,
|
|
139
|
+
className = _this$props.className,
|
|
140
|
+
errorMessage = _this$props.errorMessage,
|
|
141
|
+
serviceImage = _this$props.serviceImage,
|
|
142
|
+
serviceName = _this$props.serviceName,
|
|
143
|
+
loginCaption = _this$props.loginCaption,
|
|
144
|
+
loginToCaption = _this$props.loginToCaption,
|
|
145
|
+
confirmLabel = _this$props.confirmLabel,
|
|
146
|
+
cancelLabel = _this$props.cancelLabel,
|
|
147
|
+
tryAgainLabel = _this$props.tryAgainLabel,
|
|
148
|
+
onConfirm = _this$props.onConfirm,
|
|
149
|
+
onCancel = _this$props.onCancel,
|
|
150
|
+
onTryAgain = _this$props.onTryAgain;
|
|
151
|
+
var retrying = this.state.retrying;
|
|
152
|
+
var defaultTitle = serviceName ? loginToCaption : loginCaption;
|
|
153
|
+
var title = (this.props.title || defaultTitle).replace('%serviceName%', serviceName !== null && serviceName !== void 0 ? serviceName : '').replace('{{serviceName}}', serviceName !== null && serviceName !== void 0 ? serviceName : '');
|
|
154
|
+
return /*#__PURE__*/React.createElement(Dialog, {
|
|
155
|
+
label: title,
|
|
156
|
+
"data-test": "ring-auth-dialog",
|
|
157
|
+
className: className,
|
|
158
|
+
contentClassName: classNames(className, modules_ae521deb.dialog),
|
|
159
|
+
onEscPress: this.onEscPress,
|
|
160
|
+
show: show,
|
|
161
|
+
trapFocus: true
|
|
162
|
+
}, /*#__PURE__*/React.createElement(ContentWrapper, null, /*#__PURE__*/React.createElement("div", {
|
|
163
|
+
className: modules_ae521deb.content
|
|
164
|
+
}, serviceImage && /*#__PURE__*/React.createElement("img", {
|
|
165
|
+
alt: "".concat(serviceName, " logo"),
|
|
166
|
+
className: modules_ae521deb.logo,
|
|
167
|
+
src: serviceImage
|
|
168
|
+
}), /*#__PURE__*/React.createElement(H2, {
|
|
169
|
+
className: modules_ae521deb.title
|
|
170
|
+
}, title), errorMessage && /*#__PURE__*/React.createElement("div", {
|
|
171
|
+
className: modules_ae521deb.error
|
|
172
|
+
}, errorMessage), /*#__PURE__*/React.createElement(Button, {
|
|
173
|
+
primary: true,
|
|
174
|
+
className: modules_ae521deb.firstButton,
|
|
175
|
+
"data-test": "auth-dialog-confirm-button",
|
|
176
|
+
onClick: onConfirm
|
|
177
|
+
}, confirmLabel), onTryAgain && /*#__PURE__*/React.createElement(Button, {
|
|
178
|
+
className: modules_ae521deb.button,
|
|
179
|
+
"data-test": "auth-dialog-retry-button",
|
|
180
|
+
onClick: function onClick() {
|
|
181
|
+
return _this2.onRetryPress();
|
|
182
|
+
},
|
|
183
|
+
loader: retrying,
|
|
184
|
+
disabled: retrying
|
|
185
|
+
}, tryAgainLabel), /*#__PURE__*/React.createElement(Button, {
|
|
186
|
+
className: modules_ae521deb.button,
|
|
187
|
+
"data-test": "auth-dialog-cancel-button",
|
|
188
|
+
onClick: onCancel
|
|
189
|
+
}, cancelLabel))));
|
|
101
190
|
}
|
|
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
|
-
|
|
127
|
-
|
|
128
|
-
|
|
129
|
-
|
|
130
|
-
|
|
131
|
-
|
|
132
|
-
|
|
133
|
-
className: modules_ae521deb.content
|
|
134
|
-
}, serviceImage && /*#__PURE__*/React.createElement("img", {
|
|
135
|
-
alt: `${serviceName} logo`,
|
|
136
|
-
className: modules_ae521deb.logo,
|
|
137
|
-
src: serviceImage
|
|
138
|
-
}), /*#__PURE__*/React.createElement(H2, {
|
|
139
|
-
className: modules_ae521deb.title
|
|
140
|
-
}, title), errorMessage && /*#__PURE__*/React.createElement("div", {
|
|
141
|
-
className: modules_ae521deb.error
|
|
142
|
-
}, errorMessage), /*#__PURE__*/React.createElement(Button, {
|
|
143
|
-
primary: true,
|
|
144
|
-
className: modules_ae521deb.firstButton,
|
|
145
|
-
"data-test": "auth-dialog-confirm-button",
|
|
146
|
-
onClick: onConfirm
|
|
147
|
-
}, confirmLabel), onTryAgain && /*#__PURE__*/React.createElement(Button, {
|
|
148
|
-
className: modules_ae521deb.button,
|
|
149
|
-
"data-test": "auth-dialog-retry-button",
|
|
150
|
-
onClick: () => this.onRetryPress(),
|
|
151
|
-
loader: retrying,
|
|
152
|
-
disabled: retrying
|
|
153
|
-
}, tryAgainLabel), /*#__PURE__*/React.createElement(Button, {
|
|
154
|
-
className: modules_ae521deb.button,
|
|
155
|
-
"data-test": "auth-dialog-cancel-button",
|
|
156
|
-
onClick: onCancel
|
|
157
|
-
}, cancelLabel))));
|
|
158
|
-
}
|
|
159
|
-
}
|
|
191
|
+
}]);
|
|
192
|
+
return AuthDialog;
|
|
193
|
+
}(Component);
|
|
194
|
+
_defineProperty(AuthDialog, "propTypes", {
|
|
195
|
+
className: PropTypes.string,
|
|
196
|
+
title: PropTypes.string,
|
|
197
|
+
errorMessage: PropTypes.string,
|
|
198
|
+
serviceImage: PropTypes.string,
|
|
199
|
+
serviceName: PropTypes.string,
|
|
200
|
+
loginCaption: PropTypes.string,
|
|
201
|
+
loginToCaption: PropTypes.string,
|
|
202
|
+
show: PropTypes.bool,
|
|
203
|
+
cancelOnEsc: PropTypes.bool,
|
|
204
|
+
confirmLabel: PropTypes.string,
|
|
205
|
+
cancelLabel: PropTypes.string,
|
|
206
|
+
tryAgainLabel: PropTypes.string,
|
|
207
|
+
onConfirm: PropTypes.func,
|
|
208
|
+
onCancel: PropTypes.func,
|
|
209
|
+
onTryAgain: PropTypes.func
|
|
210
|
+
});
|
|
211
|
+
_defineProperty(AuthDialog, "defaultProps", {
|
|
212
|
+
loginCaption: 'Log in',
|
|
213
|
+
loginToCaption: 'Log in to %serviceName%',
|
|
214
|
+
tryAgainLabel: 'Try again',
|
|
215
|
+
show: false,
|
|
216
|
+
cancelOnEsc: true,
|
|
217
|
+
confirmLabel: 'Log in',
|
|
218
|
+
cancelLabel: 'Remain a guest',
|
|
219
|
+
onConfirm: function onConfirm() {},
|
|
220
|
+
onCancel: function onCancel() {}
|
|
221
|
+
});
|
|
160
222
|
|
|
161
223
|
export { AuthDialog as default };
|
|
@@ -1,13 +1,23 @@
|
|
|
1
|
+
import { a as _objectSpread2 } from '../_helpers/_rollupPluginBabelHelpers.js';
|
|
1
2
|
import React from 'react';
|
|
2
3
|
import { ControlsHeightContext, getGlobalControlsHeight } from '../global/controls-height.js';
|
|
3
4
|
import { render } from '../global/react-render-adapter.js';
|
|
4
5
|
import AuthDialog from '../auth-dialog/auth-dialog.js';
|
|
6
|
+
import 'core-js/modules/es.array.iterator.js';
|
|
7
|
+
import 'core-js/modules/es.object.to-string.js';
|
|
8
|
+
import 'core-js/modules/es.string.iterator.js';
|
|
9
|
+
import 'core-js/modules/es.weak-map.js';
|
|
10
|
+
import 'core-js/modules/web.dom-collections.iterator.js';
|
|
5
11
|
import 'react-dom';
|
|
12
|
+
import 'core-js/modules/es.array.concat.js';
|
|
13
|
+
import 'core-js/modules/es.regexp.exec.js';
|
|
14
|
+
import 'core-js/modules/es.string.replace.js';
|
|
6
15
|
import 'prop-types';
|
|
7
16
|
import 'classnames';
|
|
8
17
|
import '../island/island.js';
|
|
9
|
-
import '../_helpers/_rollupPluginBabelHelpers.js';
|
|
10
18
|
import '../global/data-tests.js';
|
|
19
|
+
import 'core-js/modules/es.array.reduce.js';
|
|
20
|
+
import 'core-js/modules/es.object.entries.js';
|
|
11
21
|
import '../island/adaptive-island-hoc.js';
|
|
12
22
|
import '../global/linear-function.js';
|
|
13
23
|
import '../_helpers/island.js';
|
|
@@ -18,13 +28,27 @@ import '../global/schedule-raf.js';
|
|
|
18
28
|
import '../dialog/dialog.js';
|
|
19
29
|
import '@jetbrains/icons/close';
|
|
20
30
|
import '../global/get-uid.js';
|
|
31
|
+
import 'core-js/modules/es.regexp.to-string.js';
|
|
21
32
|
import '../shortcuts/shortcuts.js';
|
|
33
|
+
import 'core-js/modules/es.array.map.js';
|
|
22
34
|
import '../shortcuts/core.js';
|
|
35
|
+
import 'core-js/modules/es.array.includes.js';
|
|
36
|
+
import 'core-js/modules/es.string.includes.js';
|
|
37
|
+
import 'core-js/modules/es.object.assign.js';
|
|
38
|
+
import 'core-js/modules/es.array.slice.js';
|
|
39
|
+
import 'core-js/modules/es.array.splice.js';
|
|
40
|
+
import 'core-js/modules/es.string.match.js';
|
|
41
|
+
import 'core-js/modules/es.array.find-index.js';
|
|
23
42
|
import 'combokeys';
|
|
24
43
|
import '../global/sniffer.js';
|
|
25
44
|
import 'sniffr';
|
|
26
45
|
import '../tab-trap/tab-trap.js';
|
|
46
|
+
import 'core-js/modules/es.array.filter.js';
|
|
27
47
|
import '../global/dom.js';
|
|
48
|
+
import 'core-js/modules/web.dom-collections.for-each.js';
|
|
49
|
+
import 'core-js/modules/es.string.split.js';
|
|
50
|
+
import 'core-js/modules/es.object.keys.js';
|
|
51
|
+
import 'core-js/modules/es.set.js';
|
|
28
52
|
import '../button/button.js';
|
|
29
53
|
import '@jetbrains/icons/chevron-10px';
|
|
30
54
|
import '../icon/icon.js';
|
|
@@ -32,7 +56,9 @@ import 'util-deprecate';
|
|
|
32
56
|
import '../icon/icon__constants.js';
|
|
33
57
|
import '../_helpers/icon.js';
|
|
34
58
|
import '../icon/icon__svg.js';
|
|
59
|
+
import 'core-js/modules/es.string.starts-with.js';
|
|
35
60
|
import '../global/memoize.js';
|
|
61
|
+
import 'core-js/modules/es.map.js';
|
|
36
62
|
import '../link/clickableLink.js';
|
|
37
63
|
import '../_helpers/button__classes.js';
|
|
38
64
|
import '../popup/popup.target.js';
|
|
@@ -43,7 +69,7 @@ import '../heading/heading.js';
|
|
|
43
69
|
/**
|
|
44
70
|
* @name Auth Dialog Service
|
|
45
71
|
*/
|
|
46
|
-
|
|
72
|
+
var containerElement = document.createElement('div');
|
|
47
73
|
/**
|
|
48
74
|
* Renders AuthDialog into virtual node to skip maintaining container
|
|
49
75
|
*/
|
|
@@ -53,12 +79,11 @@ function renderAuthDialog(props) {
|
|
|
53
79
|
}, /*#__PURE__*/React.createElement(AuthDialog, props)), containerElement);
|
|
54
80
|
}
|
|
55
81
|
function showAuthDialog() {
|
|
56
|
-
|
|
57
|
-
renderAuthDialog({
|
|
58
|
-
...props,
|
|
82
|
+
var props = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
|
|
83
|
+
renderAuthDialog(_objectSpread2(_objectSpread2({}, props), {}, {
|
|
59
84
|
show: true
|
|
60
|
-
});
|
|
61
|
-
return ()
|
|
85
|
+
}));
|
|
86
|
+
return function () {
|
|
62
87
|
renderAuthDialog({
|
|
63
88
|
show: false
|
|
64
89
|
});
|
package/dist/auth-ng/auth-ng.js
CHANGED
|
@@ -1,19 +1,36 @@
|
|
|
1
|
+
import 'core-js/modules/es.array.index-of.js';
|
|
2
|
+
import 'core-js/modules/es.regexp.exec.js';
|
|
3
|
+
import 'core-js/modules/es.string.replace.js';
|
|
1
4
|
import angular from 'angular';
|
|
2
5
|
import '../auth/auth.js';
|
|
3
6
|
import Auth from '../auth/auth__core.js';
|
|
7
|
+
import '../_helpers/_rollupPluginBabelHelpers.js';
|
|
4
8
|
import '../auth/window-flow.js';
|
|
9
|
+
import 'core-js/modules/es.array.concat.js';
|
|
10
|
+
import 'core-js/modules/es.object.to-string.js';
|
|
11
|
+
import 'core-js/modules/es.promise.js';
|
|
5
12
|
import '../auth/response-parser.js';
|
|
13
|
+
import 'core-js/modules/web.dom-collections.for-each.js';
|
|
14
|
+
import 'core-js/modules/es.object.keys.js';
|
|
15
|
+
import 'core-js/modules/es.regexp.to-string.js';
|
|
6
16
|
import 'es6-error';
|
|
7
17
|
import '../global/url.js';
|
|
18
|
+
import 'core-js/modules/es.string.match.js';
|
|
8
19
|
import '../auth/down-notification.js';
|
|
20
|
+
import 'core-js/modules/es.array.filter.js';
|
|
9
21
|
import 'react';
|
|
10
22
|
import 'prop-types';
|
|
11
23
|
import '../alert-service/alert-service.js';
|
|
12
|
-
import '
|
|
24
|
+
import 'core-js/modules/es.array.map.js';
|
|
13
25
|
import '../global/react-render-adapter.js';
|
|
26
|
+
import 'core-js/modules/es.array.iterator.js';
|
|
27
|
+
import 'core-js/modules/es.string.iterator.js';
|
|
28
|
+
import 'core-js/modules/es.weak-map.js';
|
|
29
|
+
import 'core-js/modules/web.dom-collections.iterator.js';
|
|
14
30
|
import 'react-dom';
|
|
15
31
|
import '../global/get-uid.js';
|
|
16
32
|
import '../alert/alert.js';
|
|
33
|
+
import 'core-js/modules/es.object.values.js';
|
|
17
34
|
import 'classnames';
|
|
18
35
|
import '@jetbrains/icons/exception';
|
|
19
36
|
import '@jetbrains/icons/checkmark';
|
|
@@ -24,11 +41,18 @@ import 'util-deprecate';
|
|
|
24
41
|
import '../icon/icon__constants.js';
|
|
25
42
|
import '../_helpers/icon.js';
|
|
26
43
|
import '../icon/icon__svg.js';
|
|
44
|
+
import 'core-js/modules/es.string.starts-with.js';
|
|
27
45
|
import '../global/memoize.js';
|
|
46
|
+
import 'core-js/modules/es.map.js';
|
|
28
47
|
import '../loader-inline/loader-inline.js';
|
|
29
48
|
import '../global/data-tests.js';
|
|
49
|
+
import 'core-js/modules/es.array.reduce.js';
|
|
50
|
+
import 'core-js/modules/es.object.entries.js';
|
|
30
51
|
import '../_helpers/loader-inline.js';
|
|
31
52
|
import '../global/dom.js';
|
|
53
|
+
import 'core-js/modules/es.object.assign.js';
|
|
54
|
+
import 'core-js/modules/es.string.split.js';
|
|
55
|
+
import 'core-js/modules/es.set.js';
|
|
32
56
|
import '../button/button.js';
|
|
33
57
|
import '@jetbrains/icons/chevron-10px';
|
|
34
58
|
import '../link/clickableLink.js';
|
|
@@ -40,19 +64,28 @@ import '../popup/popup.js';
|
|
|
40
64
|
import '../global/schedule-raf.js';
|
|
41
65
|
import '../shortcuts/shortcuts.js';
|
|
42
66
|
import '../shortcuts/core.js';
|
|
67
|
+
import 'core-js/modules/es.array.includes.js';
|
|
68
|
+
import 'core-js/modules/es.string.includes.js';
|
|
69
|
+
import 'core-js/modules/es.array.slice.js';
|
|
70
|
+
import 'core-js/modules/es.array.splice.js';
|
|
71
|
+
import 'core-js/modules/es.array.find-index.js';
|
|
43
72
|
import 'combokeys';
|
|
44
73
|
import '../global/sniffer.js';
|
|
45
74
|
import 'sniffr';
|
|
46
75
|
import '../tab-trap/tab-trap.js';
|
|
47
76
|
import '../popup/position.js';
|
|
77
|
+
import 'core-js/modules/es.array.sort.js';
|
|
48
78
|
import '../popup/popup.consts.js';
|
|
49
79
|
import '../alert/container.js';
|
|
50
80
|
import '../link/link.js';
|
|
51
81
|
import '../_helpers/link.js';
|
|
52
82
|
import '../group/group.js';
|
|
53
83
|
import '../_helpers/group.js';
|
|
84
|
+
import 'core-js/modules/es.parse-int.js';
|
|
85
|
+
import 'core-js/modules/es.string.search.js';
|
|
54
86
|
import '../global/listeners.js';
|
|
55
87
|
import '../http/http.js';
|
|
88
|
+
import 'core-js/modules/es.reflect.delete-property.js';
|
|
56
89
|
import '../global/promise-with-timeout.js';
|
|
57
90
|
import '../i18n/i18n.js';
|
|
58
91
|
import '../auth/storage.js';
|
|
@@ -68,20 +101,20 @@ import '../auth/token-validator.js';
|
|
|
68
101
|
/**
|
|
69
102
|
* @name Auth Ng
|
|
70
103
|
*/
|
|
71
|
-
|
|
104
|
+
var angularModule = angular.module('Ring.auth', []);
|
|
72
105
|
angularModule.provider('auth', ["$httpProvider", function provider($httpProvider) {
|
|
73
106
|
/**
|
|
74
107
|
* @type Auth
|
|
75
108
|
*/
|
|
76
|
-
|
|
109
|
+
var auth;
|
|
77
110
|
/**
|
|
78
111
|
* @type {{cleanHash: boolean}} config
|
|
79
112
|
*/
|
|
80
|
-
|
|
113
|
+
var defaultConfig = {
|
|
81
114
|
cleanHash: false //prevents infinite redirect on angular>1.2.26
|
|
82
115
|
};
|
|
83
116
|
|
|
84
|
-
this.init = authInstance
|
|
117
|
+
this.init = function (authInstance) {
|
|
85
118
|
auth = authInstance;
|
|
86
119
|
};
|
|
87
120
|
|
|
@@ -94,43 +127,46 @@ angularModule.provider('auth', ["$httpProvider", function provider($httpProvider
|
|
|
94
127
|
* cleanHash: boolean?
|
|
95
128
|
* }} config
|
|
96
129
|
*/
|
|
97
|
-
this.config = config
|
|
98
|
-
|
|
130
|
+
this.config = function (config) {
|
|
131
|
+
var configCopy = angular.extend({}, defaultConfig, config);
|
|
99
132
|
auth = new Auth(configCopy);
|
|
100
133
|
};
|
|
101
|
-
$httpProvider.interceptors.push(['$q', '$injector', 'auth', ($q, $injector, authInstance)
|
|
134
|
+
$httpProvider.interceptors.push(['$q', '$injector', 'auth', function ($q, $injector, authInstance) {
|
|
102
135
|
function urlEndsWith(config, suffix) {
|
|
103
136
|
return config && config.url && config.url.indexOf(suffix) === config.url.length - suffix.length;
|
|
104
137
|
}
|
|
105
138
|
return {
|
|
106
|
-
request(config) {
|
|
139
|
+
request: function request(config) {
|
|
107
140
|
if (!authInstance || urlEndsWith(config, '.html') || config && config.noAuthorization) {
|
|
108
141
|
// Don't intercept angular template requests
|
|
109
142
|
return config;
|
|
110
143
|
}
|
|
111
|
-
return authInstance.promise.then(
|
|
144
|
+
return authInstance.promise.then(function () {
|
|
145
|
+
return authInstance.auth.requestToken();
|
|
146
|
+
}).then(function (accessToken) {
|
|
112
147
|
if (accessToken) {
|
|
113
|
-
config.headers.Authorization =
|
|
148
|
+
config.headers.Authorization = "Bearer ".concat(accessToken);
|
|
114
149
|
}
|
|
115
150
|
return config;
|
|
116
151
|
});
|
|
117
152
|
},
|
|
118
|
-
responseError(rejection) {
|
|
153
|
+
responseError: function responseError(rejection) {
|
|
119
154
|
if (authInstance && !urlEndsWith(rejection.config, '.html') && rejection.data != null && Auth.shouldRefreshToken(rejection.data.error)) {
|
|
120
155
|
// Use $injector to avoid circular dependency
|
|
121
|
-
|
|
122
|
-
|
|
123
|
-
data,
|
|
124
|
-
method,
|
|
125
|
-
params,
|
|
126
|
-
url
|
|
127
|
-
|
|
128
|
-
|
|
129
|
-
|
|
130
|
-
|
|
131
|
-
|
|
132
|
-
|
|
133
|
-
|
|
156
|
+
var $http = $injector.get('$http');
|
|
157
|
+
var _rejection$config = rejection.config,
|
|
158
|
+
data = _rejection$config.data,
|
|
159
|
+
method = _rejection$config.method,
|
|
160
|
+
params = _rejection$config.params,
|
|
161
|
+
url = _rejection$config.url;
|
|
162
|
+
return authInstance.auth.forceTokenUpdate().then(function () {
|
|
163
|
+
return $http({
|
|
164
|
+
data: data,
|
|
165
|
+
method: method,
|
|
166
|
+
params: params,
|
|
167
|
+
url: url
|
|
168
|
+
});
|
|
169
|
+
});
|
|
134
170
|
}
|
|
135
171
|
return $q.reject(rejection);
|
|
136
172
|
}
|
|
@@ -143,8 +179,8 @@ angularModule.provider('auth', ["$httpProvider", function provider($httpProvider
|
|
|
143
179
|
return null;
|
|
144
180
|
}
|
|
145
181
|
if (auth.config.reloadOnUserChange === false) {
|
|
146
|
-
auth.addListener('userChange', ()
|
|
147
|
-
|
|
182
|
+
auth.addListener('userChange', function () {
|
|
183
|
+
var $route = $injector.get('$route');
|
|
148
184
|
$route.reload();
|
|
149
185
|
});
|
|
150
186
|
}
|
|
@@ -152,21 +188,21 @@ angularModule.provider('auth', ["$httpProvider", function provider($httpProvider
|
|
|
152
188
|
/**
|
|
153
189
|
* @type {Promise.<string>}
|
|
154
190
|
*/
|
|
155
|
-
|
|
191
|
+
var authInitPromise = auth.init();
|
|
156
192
|
|
|
157
193
|
/**
|
|
158
194
|
* @param {string?} restoreLocationURL
|
|
159
195
|
*/
|
|
160
196
|
function restoreLocation(restoreLocationURL) {
|
|
161
197
|
if (restoreLocationURL) {
|
|
162
|
-
|
|
163
|
-
|
|
198
|
+
var bases = document.getElementsByTagName('base');
|
|
199
|
+
var baseURI = auth.config.redirectUri;
|
|
164
200
|
if (bases.length > 0) {
|
|
165
201
|
baseURI = bases[0].href;
|
|
166
202
|
}
|
|
167
203
|
if (restoreLocationURL.indexOf(baseURI) === 0) {
|
|
168
|
-
|
|
169
|
-
|
|
204
|
+
var $location = $injector.get('$location');
|
|
205
|
+
var relativeURI = restoreLocationURL.substr(baseURI.length);
|
|
170
206
|
|
|
171
207
|
// We have to turn url with hash to simple relative url in HashbangInHtml5 mode
|
|
172
208
|
// And there is no other and documented way to detect that mode
|
|
@@ -179,13 +215,13 @@ angularModule.provider('auth', ["$httpProvider", function provider($httpProvider
|
|
|
179
215
|
}
|
|
180
216
|
}
|
|
181
217
|
}
|
|
182
|
-
authInitPromise.then(restoreLocation, e
|
|
218
|
+
authInitPromise.then(restoreLocation, function (e) {
|
|
183
219
|
if (!e.authRedirect) {
|
|
184
220
|
$log.error(e);
|
|
185
221
|
}
|
|
186
222
|
});
|
|
187
223
|
return {
|
|
188
|
-
auth,
|
|
224
|
+
auth: auth,
|
|
189
225
|
requestUser: auth.requestUser.bind(auth),
|
|
190
226
|
clientId: auth.config.clientId,
|
|
191
227
|
logout: auth.logout.bind(auth),
|