Skip to content

Commit be95dd6

Browse files
brockallenbrockallen
committed
change init/cancel to load/unload
1 parent c7fb4a8 commit be95dd6

5 files changed

Lines changed: 42 additions & 26 deletions

File tree

‎src/AccessTokenEvents.js‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -10,18 +10,18 @@ export default class AccessTokenEvents {
1010

1111
constructor({
1212
accessTokenExpiringNotificationTime = DefaultAccessTokenExpiringNotificationTime,
13-
accessTokenExpiringTimer = new Timer(),
14-
accessTokenExpiredTimer = new Timer()
13+
accessTokenExpiringTimer = new Timer("Access token expiring"),
14+
accessTokenExpiredTimer = new Timer("Access token expired")
1515
} = {}) {
1616
this._accessTokenExpiringNotificationTime = accessTokenExpiringNotificationTime;
1717

1818
this._accessTokenExpiring = accessTokenExpiringTimer;
1919
this._accessTokenExpired = accessTokenExpiredTimer;
2020
}
2121

22-
init(container) {
23-
Log.info("AccessTokenEvents.init");
24-
this.cancel();
22+
load(container) {
23+
Log.info("AccessTokenEvents.load");
24+
this.unload();
2525

2626
// only register events if there's an access token where we care about expiration
2727
if (container.access_token) {
@@ -45,8 +45,8 @@ export default class AccessTokenEvents {
4545
}
4646
}
4747

48-
cancel() {
49-
Log.info("AccessTokenEvents.canceling timers");
48+
unload() {
49+
Log.info("AccessTokenEvents.unload: canceling timers");
5050
this._accessTokenExpiring.cancel();
5151
this._accessTokenExpired.cancel();
5252
}

‎src/UserManager.js‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ export default class UserManager extends OidcClient {
4444
if (user) {
4545
Log.info("user loaded");
4646

47-
this._events.init(user);
47+
this._events.load(user);
4848

4949
return user;
5050
}
@@ -57,11 +57,11 @@ export default class UserManager extends OidcClient {
5757

5858
removeUser() {
5959
Log.info("UserManager.removeUser");
60-
60+
6161
return this._storeUser(null).then(() => {
6262
Log.info("user removed from storage");
63-
64-
this._events.cancel();
63+
64+
this._events.unload();
6565
});
6666
}
6767

@@ -170,7 +170,7 @@ export default class UserManager extends OidcClient {
170170
return this._storeUser(user).then(() => {
171171
Log.info("user stored");
172172

173-
this._events.init(user);
173+
this._events.load(user);
174174

175175
return user;
176176
});

‎src/UserManagerEvents.js‎

Lines changed: 21 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,17 +9,34 @@ export default class UserManagerEvents extends AccessTokenEvents {
99

1010
constructor(settings) {
1111
super(settings);
12+
this._userLoaded = new Event();
13+
this._userUnloaded = new Event();
1214
this._silentRenewError = new Event();
1315
}
1416

15-
init(user) {
16-
super.init(user);
17+
load(user) {
18+
super.load(user);
19+
this._userLoaded.raise(user);
20+
}
21+
unload() {
22+
super.unload();
23+
this._userUnloaded.raise();
1724
}
1825

19-
cancel() {
20-
super.cancel();
26+
addUserLoaded(cb) {
27+
this._userLoaded.addHandler(cb);
28+
}
29+
removeUserLoaded(cb) {
30+
this._userLoaded.removeHandler(cb);
2131
}
2232

33+
addUserUnloaded(cb) {
34+
this._userUnloaded.addHandler(cb);
35+
}
36+
removeUserUnloaded(cb) {
37+
this._userUnloaded.removeHandler(cb);
38+
}
39+
2340
addSilentRenewError(cb) {
2441
this._silentRenewError.addHandler(cb);
2542
}

‎test/unit/AccessTokenEvents.spec.js‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -47,17 +47,17 @@ describe("AccessTokenEvents", function () {
4747

4848
});
4949

50-
describe("init", function () {
50+
describe("load", function () {
5151

5252
it("should cancel existing timers", function () {
53-
subject.init({});
53+
subject.load({});
5454

5555
accessTokenExpiringTimer.cancelWasCalled.should.be.true;
5656
accessTokenExpiredTimer.cancelWasCalled.should.be.true;
5757
});
5858

5959
it("should initialize timers", function () {
60-
subject.init({
60+
subject.load({
6161
access_token:"token",
6262
expires_in : 70
6363
});
@@ -67,7 +67,7 @@ describe("AccessTokenEvents", function () {
6767
});
6868

6969
it("should immediately schedule expiring timer if expiration is soon", function () {
70-
subject.init({
70+
subject.load({
7171
access_token:"token",
7272
expires_in : 10
7373
});
@@ -76,7 +76,7 @@ describe("AccessTokenEvents", function () {
7676
});
7777

7878
it("should not initialize expiring timer if already expired", function () {
79-
subject.init({
79+
subject.load({
8080
access_token:"token",
8181
expires_in : 0
8282
});
@@ -85,7 +85,7 @@ describe("AccessTokenEvents", function () {
8585
});
8686

8787
it("should initialize expired timer if already expired", function () {
88-
subject.init({
88+
subject.load({
8989
access_token:"token",
9090
expires_in : 0
9191
});
@@ -94,7 +94,7 @@ describe("AccessTokenEvents", function () {
9494
});
9595

9696
it("should not initialize timers if no access token", function () {
97-
subject.init({
97+
subject.load({
9898
expires_in : 70
9999
});
100100

@@ -104,11 +104,11 @@ describe("AccessTokenEvents", function () {
104104

105105
});
106106

107-
describe("cancel", function () {
107+
describe("unload", function () {
108108

109109
it("should cancel timers", function () {
110110

111-
subject.cancel();
111+
subject.unload();
112112

113113
accessTokenExpiringTimer.cancelWasCalled.should.be.true;
114114
accessTokenExpiredTimer.cancelWasCalled.should.be.true;

‎test/unit/UserManagerEvents.spec.js‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
21
// Copyright (c) Brock Allen & Dominick Baier. All rights reserved.
32
// Licensed under the Apache License, Version 2.0. See LICENSE in the project root for license information.
43

0 commit comments

Comments
 (0)