@singularsystems/neo-core 0.10.44 → 0.10.45
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/dist/Components/DatePicker/DatePicker.js +10 -10
- package/dist/Security/IAuthenticationService.d.ts +5 -1
- package/dist/Security/Oidc/OidcAuthService.d.ts +3 -4
- package/dist/Security/Oidc/OidcAuthService.js +15 -12
- package/dist/Security/Oidc/OidcAuthService.js.map +1 -1
- package/package.json +1 -1
|
@@ -228,7 +228,7 @@ var DatePicker = /** @class */ (function () {
|
|
|
228
228
|
var header = this.createAndAppend(this.popup, "div", "neo-datepicker-header");
|
|
229
229
|
this.prevButton = this.createAndAppend(header, "button", "left-button");
|
|
230
230
|
this.prevButton.type = "button";
|
|
231
|
-
this.prevButton.
|
|
231
|
+
this.prevButton.innerText = "<";
|
|
232
232
|
this.prevButton.tabIndex = -1;
|
|
233
233
|
this.prevButton.addEventListener("mousedown", this.previousClick.bind(this));
|
|
234
234
|
this.headerContainer = this.createAndAppend(header, "div", "header-text-container");
|
|
@@ -236,20 +236,20 @@ var DatePicker = /** @class */ (function () {
|
|
|
236
236
|
this.headerAnimationHelper = new AnimationHelper(this.headerContainer, DatePicker.AnimationClassName);
|
|
237
237
|
this.nextButton = this.createAndAppend(header, "button", "right-button");
|
|
238
238
|
this.nextButton.type = "button";
|
|
239
|
-
this.nextButton.
|
|
239
|
+
this.nextButton.innerText = ">";
|
|
240
240
|
this.nextButton.tabIndex = -1;
|
|
241
241
|
this.nextButton.addEventListener("mousedown", this.nextClick.bind(this));
|
|
242
242
|
};
|
|
243
243
|
DatePicker.prototype.createHeaderLabel = function () {
|
|
244
244
|
this.currentHeaderLabel = this.createAndAppend(this.headerContainer, "div", "header-text");
|
|
245
245
|
if (this.currentViewType == ViewType.Days) {
|
|
246
|
-
this.currentHeaderLabel.
|
|
246
|
+
this.currentHeaderLabel.innerText = DateUtils.format(this.currentViewDate, "MMMM yyyy");
|
|
247
247
|
}
|
|
248
248
|
else if (this.currentViewType == ViewType.Months) {
|
|
249
|
-
this.currentHeaderLabel.
|
|
249
|
+
this.currentHeaderLabel.innerText = DateUtils.format(this.currentViewDate, "yyyy");
|
|
250
250
|
}
|
|
251
251
|
else {
|
|
252
|
-
this.currentHeaderLabel.
|
|
252
|
+
this.currentHeaderLabel.innerText = this.currentViewDate.getFullYear() + " - " + (this.currentViewDate.getFullYear() + YearsInYearView - 1);
|
|
253
253
|
}
|
|
254
254
|
if (this.currentViewType < ViewType.Years && !(this.prevButton.disabled && this.nextButton.disabled)) {
|
|
255
255
|
this.currentHeaderLabel.className += " selectable";
|
|
@@ -311,12 +311,12 @@ var DatePicker = /** @class */ (function () {
|
|
|
311
311
|
var dayHeader = DateUtils.i18n.dayNames[currentDate.getDay()];
|
|
312
312
|
if (!this.options.display3DayLetters)
|
|
313
313
|
dayHeader = dayHeader.substring(0, 2);
|
|
314
|
-
this.createAndAppend(trHead, "th").
|
|
314
|
+
this.createAndAppend(trHead, "th").innerText = dayHeader;
|
|
315
315
|
}
|
|
316
316
|
var cell = this.createAndAppend(trBody, "td");
|
|
317
317
|
var date = currentDate.getDate();
|
|
318
318
|
var month = currentDate.getMonth();
|
|
319
|
-
cell.
|
|
319
|
+
cell.innerText = date.toString();
|
|
320
320
|
this.setupCell(cell, currentDate.getFullYear() + "," + month + "," + date, currentDate.getTime() >= this.options.minDateNoTime.getTime() && currentDate.getTime() <= this.options.maxDateNoTime.getTime(), currentDate.getTime() == this.today.getTime(), this.boundDateNoTime != null && currentDate.getTime() == this.boundDateNoTime.getTime());
|
|
321
321
|
if (month != this.currentViewDate.getMonth()) {
|
|
322
322
|
cell.classList.add("outside-month");
|
|
@@ -342,7 +342,7 @@ var DatePicker = /** @class */ (function () {
|
|
|
342
342
|
trBody = this.createAndAppend(tBody, "tr");
|
|
343
343
|
}
|
|
344
344
|
var cell = this.createAndAppend(trBody, "td");
|
|
345
|
-
cell.
|
|
345
|
+
cell.innerText = DateUtils.i18n.monthNames[i];
|
|
346
346
|
this.setupCell(cell, i, monthEndDate > this.options.minDateNoTime.getTime() && monthStartDate <= this.options.maxDateNoTime.getTime(), this.today.getFullYear() == year && this.today.getMonth() == i, this.boundDateNoTime != null && this.boundDateNoTime.getFullYear() == year && this.boundDateNoTime.getMonth() == i);
|
|
347
347
|
}
|
|
348
348
|
this.prevButton.disabled = this.options.minDateNoTime.getFullYear() >= year;
|
|
@@ -358,8 +358,8 @@ var DatePicker = /** @class */ (function () {
|
|
|
358
358
|
trBody = this.createAndAppend(tBody, "tr");
|
|
359
359
|
}
|
|
360
360
|
var cell = this.createAndAppend(trBody, "td");
|
|
361
|
-
cell.
|
|
362
|
-
this.setupCell(cell, cell.
|
|
361
|
+
cell.innerText = (year + i).toString();
|
|
362
|
+
this.setupCell(cell, cell.innerText, year + i >= this.options.minDateNoTime.getFullYear() && year + i <= this.options.maxDateNoTime.getFullYear(), this.today.getFullYear() == year + i, this.boundDateNoTime != null && this.boundDateNoTime.getFullYear() == year + i);
|
|
363
363
|
}
|
|
364
364
|
this.prevButton.disabled = this.options.minDateNoTime.getFullYear() >= year;
|
|
365
365
|
this.nextButton.disabled = this.options.maxDateNoTime.getFullYear() < year + YearsInYearView;
|
|
@@ -2,9 +2,13 @@ import { IUser } from './IUser';
|
|
|
2
2
|
import { ISignInResult } from './SignInResult';
|
|
3
3
|
export default interface IAuthenticationService {
|
|
4
4
|
/**
|
|
5
|
-
*
|
|
5
|
+
* @deprecated Use loadUserFromSession() instead.
|
|
6
6
|
*/
|
|
7
7
|
loadUserFromToken(): Promise<IUser | null>;
|
|
8
|
+
/**
|
|
9
|
+
* Load a user from session storage if there is a stored token.
|
|
10
|
+
*/
|
|
11
|
+
loadUserFromSession(): Promise<IUser | null>;
|
|
8
12
|
/**
|
|
9
13
|
* Starts the sign in process
|
|
10
14
|
* @param redirectLocal The path to redirect to after calling endSignIn
|
|
@@ -11,16 +11,15 @@ export default abstract class OidcAuthService<TUser extends OidcUser = OidcUser>
|
|
|
11
11
|
protected userManager: IUserManager;
|
|
12
12
|
private axios;
|
|
13
13
|
private _user;
|
|
14
|
+
private afterUserLoadedPromise;
|
|
14
15
|
/**
|
|
15
16
|
* Creates an Oidc auth service
|
|
16
17
|
* @param userManager Oidc-client user manager instance
|
|
17
18
|
* @param user User which existed in storage at startup
|
|
18
19
|
*/
|
|
19
20
|
constructor(userManager: IUserManager, axios: AxiosInstance);
|
|
20
|
-
/**
|
|
21
|
-
* Load a user from session storage if there is a stored token.
|
|
22
|
-
*/
|
|
23
21
|
loadUserFromToken(): Promise<TUser | null>;
|
|
22
|
+
loadUserFromSession(): Promise<TUser | null>;
|
|
24
23
|
/**
|
|
25
24
|
* Redirect to identity server to get the auth token.
|
|
26
25
|
* @param redirectPath Local path to redirect to once login is complete.
|
|
@@ -37,7 +36,7 @@ export default abstract class OidcAuthService<TUser extends OidcUser = OidcUser>
|
|
|
37
36
|
tryCompleteSignIn(): Promise<SignInResult>;
|
|
38
37
|
endSignInSilent(): Promise<any>;
|
|
39
38
|
private onUserLoaded;
|
|
40
|
-
protected afterUserLoaded(): void;
|
|
39
|
+
protected afterUserLoaded(): Promise<void> | void;
|
|
41
40
|
protected createUser(user: IOidcUser): OidcUser;
|
|
42
41
|
private onUserUnloaded;
|
|
43
42
|
private setUser;
|
|
@@ -23,10 +23,10 @@ var OidcAuthService = /** @class */ (function () {
|
|
|
23
23
|
this.userManager.events.addUserUnloaded(this.onUserUnloaded.bind(this));
|
|
24
24
|
this.userManager.events.addAccessTokenExpiring(this.signinSilent.bind(this));
|
|
25
25
|
}
|
|
26
|
-
/**
|
|
27
|
-
* Load a user from session storage if there is a stored token.
|
|
28
|
-
*/
|
|
29
26
|
OidcAuthService.prototype.loadUserFromToken = function () {
|
|
27
|
+
return this.loadUserFromSession();
|
|
28
|
+
};
|
|
29
|
+
OidcAuthService.prototype.loadUserFromSession = function () {
|
|
30
30
|
return __awaiter(this, void 0, void 0, function () {
|
|
31
31
|
var user;
|
|
32
32
|
return __generator(this, function (_a) {
|
|
@@ -89,18 +89,24 @@ var OidcAuthService = /** @class */ (function () {
|
|
|
89
89
|
loginErrorHandler = Misc.Globals.appService.get(NeoTypes.Security.LoginErrorHandler);
|
|
90
90
|
if (!(!stateKey || window.localStorage.getItem("oidc." + stateKey) === null)) return [3 /*break*/, 1];
|
|
91
91
|
loginErrorHandler.onMissingLoginState();
|
|
92
|
-
return [3 /*break*/,
|
|
92
|
+
return [3 /*break*/, 6];
|
|
93
93
|
case 1:
|
|
94
|
-
_a.trys.push([1,
|
|
94
|
+
_a.trys.push([1, 5, , 6]);
|
|
95
95
|
return [4 /*yield*/, this.endSignIn()];
|
|
96
96
|
case 2:
|
|
97
97
|
redirectPath = _a.sent();
|
|
98
|
-
return [
|
|
98
|
+
if (!this.afterUserLoadedPromise) return [3 /*break*/, 4];
|
|
99
|
+
return [4 /*yield*/, this.afterUserLoadedPromise];
|
|
99
100
|
case 3:
|
|
101
|
+
_a.sent();
|
|
102
|
+
this.afterUserLoadedPromise = undefined;
|
|
103
|
+
_a.label = 4;
|
|
104
|
+
case 4: return [2 /*return*/, new SignInResult(true, redirectPath)];
|
|
105
|
+
case 5:
|
|
100
106
|
e_2 = _a.sent();
|
|
101
107
|
loginErrorHandler.onException(e_2);
|
|
102
|
-
return [3 /*break*/,
|
|
103
|
-
case
|
|
108
|
+
return [3 /*break*/, 6];
|
|
109
|
+
case 6: return [2 /*return*/, new SignInResult(false, "")];
|
|
104
110
|
}
|
|
105
111
|
});
|
|
106
112
|
});
|
|
@@ -109,11 +115,8 @@ var OidcAuthService = /** @class */ (function () {
|
|
|
109
115
|
return this.userManager.signinSilentCallback();
|
|
110
116
|
};
|
|
111
117
|
OidcAuthService.prototype.onUserLoaded = function (user) {
|
|
112
|
-
var _this = this;
|
|
113
118
|
this.setUser(this.createUser(user));
|
|
114
|
-
|
|
115
|
-
// IAuthenticationService will cause a stack overflow (since the IAuthenticationService is under construction).
|
|
116
|
-
setTimeout(function () { return _this.afterUserLoaded(); }, 0);
|
|
119
|
+
this.afterUserLoadedPromise = this.afterUserLoaded();
|
|
117
120
|
};
|
|
118
121
|
OidcAuthService.prototype.afterUserLoaded = function () {
|
|
119
122
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"OidcAuthService.js","sourceRoot":"","sources":["../../../src/Security/Oidc/OidcAuthService.ts"],"names":[],"mappings":";AACA,OAAO,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AACpD,OAAO,QAAQ,MAAM,YAAY,CAAC;AAGlC,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAC/C,OAAO,EAAE,IAAI,EAAE,MAAM,QAAQ,CAAC;AAC9B,OAAO,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAC;AAE7C;;;GAGG;AACH;
|
|
1
|
+
{"version":3,"file":"OidcAuthService.js","sourceRoot":"","sources":["../../../src/Security/Oidc/OidcAuthService.ts"],"names":[],"mappings":"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"}
|