@imposium-hub/components 2.4.0-1 → 2.4.0-2
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/cjs/components/app-wrapper/AppWrapper.js +14 -17
- package/dist/cjs/components/app-wrapper/AppWrapper.js.map +1 -1
- package/dist/cjs/components/auth-gate/AuthGate.js +2 -3
- package/dist/cjs/components/auth-gate/AuthGate.js.map +1 -1
- package/dist/cjs/services/Session.d.ts +6 -6
- package/dist/cjs/services/Session.js +16 -14
- package/dist/cjs/services/Session.js.map +1 -1
- package/dist/esm/components/app-wrapper/AppWrapper.js +14 -17
- package/dist/esm/components/app-wrapper/AppWrapper.js.map +1 -1
- package/dist/esm/components/auth-gate/AuthGate.js +2 -3
- package/dist/esm/components/auth-gate/AuthGate.js.map +1 -1
- package/dist/esm/services/Session.d.ts +6 -6
- package/dist/esm/services/Session.js +16 -14
- package/dist/esm/services/Session.js.map +1 -1
- package/package.json +1 -1
- package/src/components/app-wrapper/AppWrapper.tsx +12 -15
- package/src/components/auth-gate/AuthGate.tsx +2 -3
- package/src/services/Session.ts +16 -14
|
@@ -167,20 +167,18 @@ var AppWrapper = /** @class */ (function (_super) {
|
|
|
167
167
|
/*
|
|
168
168
|
Bust cached creds if exist, invoke auth failure handler
|
|
169
169
|
*/
|
|
170
|
-
_this.handleCheckSessionFailure = function (e
|
|
171
|
-
if (
|
|
172
|
-
|
|
173
|
-
|
|
174
|
-
|
|
175
|
-
|
|
176
|
-
|
|
177
|
-
|
|
178
|
-
|
|
179
|
-
|
|
180
|
-
|
|
181
|
-
|
|
182
|
-
Session_1.default.clearCachedOrgId(sub);
|
|
183
|
-
}
|
|
170
|
+
_this.handleCheckSessionFailure = function (e) {
|
|
171
|
+
if (_this.props.storyId) {
|
|
172
|
+
Session_1.default.cacheStoryId(_this.props.storyId);
|
|
173
|
+
}
|
|
174
|
+
else {
|
|
175
|
+
Session_1.default.clearCachedStoryId();
|
|
176
|
+
}
|
|
177
|
+
if (_this.props.organizationId) {
|
|
178
|
+
Session_1.default.cacheOrgId(_this.props.organizationId);
|
|
179
|
+
}
|
|
180
|
+
else {
|
|
181
|
+
Session_1.default.clearCachedOrgId();
|
|
184
182
|
}
|
|
185
183
|
_this.props.clearCachedAuth();
|
|
186
184
|
_this.props.onAuthenticationFailure(e);
|
|
@@ -196,10 +194,9 @@ var AppWrapper = /** @class */ (function (_super) {
|
|
|
196
194
|
}
|
|
197
195
|
Auth0_1.default.checkSession()
|
|
198
196
|
.then(function (freshIdentity) {
|
|
199
|
-
var sub = freshIdentity.idTokenPayload.sub;
|
|
200
197
|
var orgId = _this.props.organizationId
|
|
201
198
|
? _this.props.organizationId
|
|
202
|
-
: Session_1.default.getCachedOrgId(
|
|
199
|
+
: Session_1.default.getCachedOrgId();
|
|
203
200
|
Session_1.default.getAccessData(freshIdentity.accessToken, baseUrl, false, orgId)
|
|
204
201
|
.then(function (freshAccess) {
|
|
205
202
|
_this.props.setAccessData(freshAccess);
|
|
@@ -208,7 +205,7 @@ var AppWrapper = /** @class */ (function (_super) {
|
|
|
208
205
|
})
|
|
209
206
|
.catch(function (e) {
|
|
210
207
|
console.error(e);
|
|
211
|
-
_this.handleCheckSessionFailure(e
|
|
208
|
+
_this.handleCheckSessionFailure(e);
|
|
212
209
|
});
|
|
213
210
|
})
|
|
214
211
|
.catch(function (e) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AppWrapper.js","sourceRoot":"","sources":["../../../../src/components/app-wrapper/AppWrapper.tsx"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"AppWrapper.js","sourceRoot":"","sources":["../../../../src/components/app-wrapper/AppWrapper.tsx"],"names":[],"mappings":"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"}
|
|
@@ -62,10 +62,9 @@ var AuthGate = /** @class */ (function (_super) {
|
|
|
62
62
|
else {
|
|
63
63
|
Auth0_1.default.parseIdFromHash(auth0Hash)
|
|
64
64
|
.then(function (freshIdentity) {
|
|
65
|
-
var sub = freshIdentity.idTokenPayload.sub;
|
|
66
65
|
// Use the cached org ID and story ID if it exists
|
|
67
|
-
var orgId = Session_1.default.getCachedOrgId(
|
|
68
|
-
var storyId = Session_1.default.getCachedStoryId(
|
|
66
|
+
var orgId = Session_1.default.getCachedOrgId() || null;
|
|
67
|
+
var storyId = Session_1.default.getCachedStoryId() || null;
|
|
69
68
|
Session_1.default.getAccessData(freshIdentity.accessToken, baseUrl, false, orgId)
|
|
70
69
|
.then(function (freshAccess) {
|
|
71
70
|
_this.props.login(freshIdentity);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AuthGate.js","sourceRoot":"","sources":["../../../../src/components/auth-gate/AuthGate.tsx"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,2CAA+B;AAC/B,2EAAqD;AACrD,mEAAoD;AACpD,+DAA8D;AAC9D,2CAAsC;AACtC,+BAA2C;AAC3C,iDAAiD;AACjD,qDAA2D;AAc3D;IAAuB,4BAAmC;IAGtD,kBAAY,CAAiB;QACzB,YAAA,MAAK,YAAC,CAAC,CAAC,SAAC;QAGN,uBAAiB,GAAG;YACjB,IAAA,KAAsE,KAAI,CAAC,KAAK,EAA9E,aAAa,mBAAA,EAAE,SAAS,eAAA,EAAE,WAAW,iBAAA,EAAE,eAAe,qBAAA,EAAE,OAAO,aAAe,CAAC;YAEvF,eAAW,CAAC,YAAY,CAAC,aAAa,EAAE,WAAW,CAAC,CAAC;YAErD,IAAI,CAAC,SAAS,EAAE,CAAC;gBACb,eAAW,CAAC,KAAK,EAAE,CAAC;YACxB,CAAC;iBAAM,CAAC;gBACJ,eAAW,CAAC,eAAe,CAAC,SAAS,CAAC;qBACjC,IAAI,CAAC,UAAC,aAAwB;oBAC3B,
|
|
1
|
+
{"version":3,"file":"AuthGate.js","sourceRoot":"","sources":["../../../../src/components/auth-gate/AuthGate.tsx"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,2CAA+B;AAC/B,2EAAqD;AACrD,mEAAoD;AACpD,+DAA8D;AAC9D,2CAAsC;AACtC,+BAA2C;AAC3C,iDAAiD;AACjD,qDAA2D;AAc3D;IAAuB,4BAAmC;IAGtD,kBAAY,CAAiB;QACzB,YAAA,MAAK,YAAC,CAAC,CAAC,SAAC;QAGN,uBAAiB,GAAG;YACjB,IAAA,KAAsE,KAAI,CAAC,KAAK,EAA9E,aAAa,mBAAA,EAAE,SAAS,eAAA,EAAE,WAAW,iBAAA,EAAE,eAAe,qBAAA,EAAE,OAAO,aAAe,CAAC;YAEvF,eAAW,CAAC,YAAY,CAAC,aAAa,EAAE,WAAW,CAAC,CAAC;YAErD,IAAI,CAAC,SAAS,EAAE,CAAC;gBACb,eAAW,CAAC,KAAK,EAAE,CAAC;YACxB,CAAC;iBAAM,CAAC;gBACJ,eAAW,CAAC,eAAe,CAAC,SAAS,CAAC;qBACjC,IAAI,CAAC,UAAC,aAAwB;oBAC3B,kDAAkD;oBAClD,IAAM,KAAK,GAAG,iBAAc,CAAC,cAAc,EAAE,IAAI,IAAI,CAAC;oBACtD,IAAM,OAAO,GAAG,iBAAc,CAAC,gBAAgB,EAAE,IAAI,IAAI,CAAC;oBAE1D,iBAAc,CAAC,aAAa,CAAC,aAAa,CAAC,WAAW,EAAE,OAAO,EAAE,KAAK,EAAE,KAAK,CAAC;yBACzE,IAAI,CAAC,UAAC,WAAgB;wBACnB,KAAI,CAAC,KAAK,CAAC,KAAK,CAAC,aAAa,CAAC,CAAC;wBAChC,KAAI,CAAC,KAAK,CAAC,aAAa,CAAC,WAAW,CAAC,CAAC;wBACtC,iBAAc,CAAC,iBAAiB,CAAC,aAAa,EAAE,KAAK,EAAE,OAAO,CAAC,CAAC;wBAChE,eAAe,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC;oBACpC,CAAC,CAAC;yBACD,KAAK,CAAC,UAAC,CAAC;wBACL,eAAW,CAAC,KAAK,EAAE,CAAC;oBACxB,CAAC,CAAC,CAAC;gBACX,CAAC,CAAC;qBACD,KAAK,CAAC,UAAC,CAAC;oBACL,eAAW,CAAC,KAAK,EAAE,CAAC;gBACxB,CAAC,CAAC,CAAC;YACX,CAAC;QACL,CAAC,CAAC;QAEK,YAAM,GAAG;YACZ,OAAO,CACH,6BAAK,SAAS,EAAC,WAAW;gBACtB,oBAAC,qBAAW,IAAC,KAAK,EAAE,QAAQ,CAAC,YAAY,GAAI,CAC3C,CACT,CAAC;QACN,CAAC,CAAC;;IAvCF,CAAC;IAJuB,qBAAY,GAAW,SAAS,AAApB,CAAqB;IA4C7D,eAAC;CAAA,AA7CD,CAAuB,KAAK,CAAC,aAAa,GA6CzC;AAED,IAAM,kBAAkB,GAAG,UAAC,QAAQ;IAChC,OAAO,IAAA,0BAAkB,EACrB;QACI,KAAK,cAAA;QACL,aAAa,wBAAA;KAChB,EACD,QAAQ,CACX,CAAC;AACN,CAAC,CAAC;AAEF,kBAAe,IAAA,qBAAO,EAAC,IAAI,EAAE,kBAAkB,CAAC,CAAC,QAAQ,CAAC,CAAC"}
|
|
@@ -14,12 +14,12 @@ export default class SessionService {
|
|
|
14
14
|
static removeSession: () => void;
|
|
15
15
|
static buildFreshSession: (freshIdentity: IIdentity, orgId?: string, storyId?: string) => void;
|
|
16
16
|
static storeSession: (values: any, auth0Expiry: number) => void;
|
|
17
|
-
static cacheOrgId: (organizationId: string
|
|
18
|
-
static clearCachedOrgId: (
|
|
19
|
-
static getCachedOrgId: (
|
|
20
|
-
static cacheStoryId: (storyId: string
|
|
21
|
-
static clearCachedStoryId: (
|
|
22
|
-
static getCachedStoryId: (
|
|
17
|
+
static cacheOrgId: (organizationId: string) => void;
|
|
18
|
+
static clearCachedOrgId: () => void;
|
|
19
|
+
static getCachedOrgId: () => string;
|
|
20
|
+
static cacheStoryId: (storyId: string) => void;
|
|
21
|
+
static clearCachedStoryId: () => void;
|
|
22
|
+
static getCachedStoryId: () => string;
|
|
23
23
|
static updateSession: (values: any, auth0Expiry: number) => void;
|
|
24
24
|
private static scrapeDomain;
|
|
25
25
|
private static determineAccessUrl;
|
|
@@ -42,8 +42,8 @@ var axios_1 = __importDefault(require("axios"));
|
|
|
42
42
|
var SessionService = /** @class */ (function () {
|
|
43
43
|
function SessionService() {
|
|
44
44
|
}
|
|
45
|
-
SessionService.LOGIN_STORY_ID_CACHE = 'imp_hub_last_story_id
|
|
46
|
-
SessionService.LOGIN_ORG_ID_CACHE = 'imp_hub_last_org_id
|
|
45
|
+
SessionService.LOGIN_STORY_ID_CACHE = 'imp_hub_last_story_id';
|
|
46
|
+
SessionService.LOGIN_ORG_ID_CACHE = 'imp_hub_last_org_id';
|
|
47
47
|
SessionService.SESSION_COOKIE_NAME = 'auth_state';
|
|
48
48
|
SessionService.FRESH_COOKIE = {
|
|
49
49
|
sub: '',
|
|
@@ -80,6 +80,8 @@ var SessionService = /** @class */ (function () {
|
|
|
80
80
|
SessionService.removeSession = function () {
|
|
81
81
|
var domain = SessionService.scrapeDomain();
|
|
82
82
|
Cookies.remove(SessionService.SESSION_COOKIE_NAME, { domain: domain });
|
|
83
|
+
SessionService.clearCachedOrgId();
|
|
84
|
+
SessionService.clearCachedStoryId();
|
|
83
85
|
};
|
|
84
86
|
SessionService.buildFreshSession = function (freshIdentity, orgId, storyId) {
|
|
85
87
|
if (orgId === void 0) { orgId = null; }
|
|
@@ -102,23 +104,23 @@ var SessionService = /** @class */ (function () {
|
|
|
102
104
|
var expiry = new Date(auth0Expiry * 1000);
|
|
103
105
|
Cookies.set(SessionService.SESSION_COOKIE_NAME, cookieData, { domain: domain, expires: expiry });
|
|
104
106
|
};
|
|
105
|
-
SessionService.cacheOrgId = function (organizationId
|
|
106
|
-
localStorage.setItem(SessionService.LOGIN_ORG_ID_CACHE
|
|
107
|
+
SessionService.cacheOrgId = function (organizationId) {
|
|
108
|
+
localStorage.setItem(SessionService.LOGIN_ORG_ID_CACHE, organizationId);
|
|
107
109
|
};
|
|
108
|
-
SessionService.clearCachedOrgId = function (
|
|
109
|
-
localStorage.removeItem(SessionService.LOGIN_ORG_ID_CACHE
|
|
110
|
+
SessionService.clearCachedOrgId = function () {
|
|
111
|
+
localStorage.removeItem(SessionService.LOGIN_ORG_ID_CACHE);
|
|
110
112
|
};
|
|
111
|
-
SessionService.getCachedOrgId = function (
|
|
112
|
-
return localStorage.getItem(SessionService.LOGIN_ORG_ID_CACHE
|
|
113
|
+
SessionService.getCachedOrgId = function () {
|
|
114
|
+
return localStorage.getItem(SessionService.LOGIN_ORG_ID_CACHE);
|
|
113
115
|
};
|
|
114
|
-
SessionService.cacheStoryId = function (storyId
|
|
115
|
-
localStorage.setItem(SessionService.LOGIN_STORY_ID_CACHE
|
|
116
|
+
SessionService.cacheStoryId = function (storyId) {
|
|
117
|
+
localStorage.setItem(SessionService.LOGIN_STORY_ID_CACHE, storyId);
|
|
116
118
|
};
|
|
117
|
-
SessionService.clearCachedStoryId = function (
|
|
118
|
-
localStorage.removeItem(SessionService.LOGIN_STORY_ID_CACHE
|
|
119
|
+
SessionService.clearCachedStoryId = function () {
|
|
120
|
+
localStorage.removeItem(SessionService.LOGIN_STORY_ID_CACHE);
|
|
119
121
|
};
|
|
120
|
-
SessionService.getCachedStoryId = function (
|
|
121
|
-
return localStorage.getItem(SessionService.LOGIN_STORY_ID_CACHE
|
|
122
|
+
SessionService.getCachedStoryId = function () {
|
|
123
|
+
return localStorage.getItem(SessionService.LOGIN_STORY_ID_CACHE);
|
|
122
124
|
};
|
|
123
125
|
SessionService.updateSession = function (values, auth0Expiry) {
|
|
124
126
|
var prevCookieData = SessionService.getSession();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Session.js","sourceRoot":"","sources":["../../../src/services/Session.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,iDAAqC;AACrC,gDAAyD;AASzD;IAAA;
|
|
1
|
+
{"version":3,"file":"Session.js","sourceRoot":"","sources":["../../../src/services/Session.ts"],"names":[],"mappings":"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"}
|
|
@@ -129,20 +129,18 @@ class AppWrapper extends React.Component {
|
|
|
129
129
|
/*
|
|
130
130
|
Bust cached creds if exist, invoke auth failure handler
|
|
131
131
|
*/
|
|
132
|
-
handleCheckSessionFailure = (e
|
|
133
|
-
if (
|
|
134
|
-
|
|
135
|
-
|
|
136
|
-
|
|
137
|
-
|
|
138
|
-
|
|
139
|
-
|
|
140
|
-
|
|
141
|
-
|
|
142
|
-
|
|
143
|
-
|
|
144
|
-
SessionService.clearCachedOrgId(sub);
|
|
145
|
-
}
|
|
132
|
+
handleCheckSessionFailure = (e) => {
|
|
133
|
+
if (this.props.storyId) {
|
|
134
|
+
SessionService.cacheStoryId(this.props.storyId);
|
|
135
|
+
}
|
|
136
|
+
else {
|
|
137
|
+
SessionService.clearCachedStoryId();
|
|
138
|
+
}
|
|
139
|
+
if (this.props.organizationId) {
|
|
140
|
+
SessionService.cacheOrgId(this.props.organizationId);
|
|
141
|
+
}
|
|
142
|
+
else {
|
|
143
|
+
SessionService.clearCachedOrgId();
|
|
146
144
|
}
|
|
147
145
|
this.props.clearCachedAuth();
|
|
148
146
|
this.props.onAuthenticationFailure(e);
|
|
@@ -157,10 +155,9 @@ class AppWrapper extends React.Component {
|
|
|
157
155
|
}
|
|
158
156
|
AuthService.checkSession()
|
|
159
157
|
.then((freshIdentity) => {
|
|
160
|
-
const sub = freshIdentity.idTokenPayload.sub;
|
|
161
158
|
const orgId = this.props.organizationId
|
|
162
159
|
? this.props.organizationId
|
|
163
|
-
: SessionService.getCachedOrgId(
|
|
160
|
+
: SessionService.getCachedOrgId();
|
|
164
161
|
SessionService.getAccessData(freshIdentity.accessToken, baseUrl, false, orgId)
|
|
165
162
|
.then((freshAccess) => {
|
|
166
163
|
this.props.setAccessData(freshAccess);
|
|
@@ -169,7 +166,7 @@ class AppWrapper extends React.Component {
|
|
|
169
166
|
})
|
|
170
167
|
.catch((e) => {
|
|
171
168
|
console.error(e);
|
|
172
|
-
this.handleCheckSessionFailure(e
|
|
169
|
+
this.handleCheckSessionFailure(e);
|
|
173
170
|
});
|
|
174
171
|
})
|
|
175
172
|
.catch((e) => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AppWrapper.js","sourceRoot":"","sources":["../../../../src/components/app-wrapper/AppWrapper.tsx"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"AppWrapper.js","sourceRoot":"","sources":["../../../../src/components/app-wrapper/AppWrapper.tsx"],"names":[],"mappings":"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"}
|
|
@@ -20,10 +20,9 @@ class AuthGate extends React.PureComponent {
|
|
|
20
20
|
else {
|
|
21
21
|
AuthService.parseIdFromHash(auth0Hash)
|
|
22
22
|
.then((freshIdentity) => {
|
|
23
|
-
const sub = freshIdentity.idTokenPayload.sub;
|
|
24
23
|
// Use the cached org ID and story ID if it exists
|
|
25
|
-
const orgId = SessionService.getCachedOrgId(
|
|
26
|
-
const storyId = SessionService.getCachedStoryId(
|
|
24
|
+
const orgId = SessionService.getCachedOrgId() || null;
|
|
25
|
+
const storyId = SessionService.getCachedStoryId() || null;
|
|
27
26
|
SessionService.getAccessData(freshIdentity.accessToken, baseUrl, false, orgId)
|
|
28
27
|
.then((freshAccess) => {
|
|
29
28
|
this.props.login(freshIdentity);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AuthGate.js","sourceRoot":"","sources":["../../../../src/components/auth-gate/AuthGate.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAC/B,OAAO,WAAW,MAAM,4BAA4B,CAAC;AACrD,OAAO,cAAc,MAAM,wBAAwB,CAAC;AACpD,OAAO,WAA0B,MAAM,sBAAsB,CAAC;AAC9D,OAAO,EAAE,OAAO,EAAE,MAAM,aAAa,CAAC;AACtC,OAAO,EAAE,kBAAkB,EAAE,MAAM,OAAO,CAAC;AAC3C,OAAO,EAAE,KAAK,EAAE,MAAM,0BAA0B,CAAC;AACjD,OAAO,EAAE,aAAa,EAAE,MAAM,4BAA4B,CAAC;AAc3D,MAAM,QAAS,SAAQ,KAAK,CAAC,aAA6B;IAC9C,MAAM,CAAU,YAAY,GAAW,SAAS,CAAC;IAEzD,YAAY,CAAiB;QACzB,KAAK,CAAC,CAAC,CAAC,CAAC;IACb,CAAC;IAEM,iBAAiB,GAAG,GAAS,EAAE;QAClC,MAAM,EAAE,aAAa,EAAE,SAAS,EAAE,WAAW,EAAE,eAAe,EAAE,OAAO,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC;QAEvF,WAAW,CAAC,YAAY,CAAC,aAAa,EAAE,WAAW,CAAC,CAAC;QAErD,IAAI,CAAC,SAAS,EAAE,CAAC;YACb,WAAW,CAAC,KAAK,EAAE,CAAC;QACxB,CAAC;aAAM,CAAC;YACJ,WAAW,CAAC,eAAe,CAAC,SAAS,CAAC;iBACjC,IAAI,CAAC,CAAC,aAAwB,EAAE,EAAE;gBAC/B,
|
|
1
|
+
{"version":3,"file":"AuthGate.js","sourceRoot":"","sources":["../../../../src/components/auth-gate/AuthGate.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAC/B,OAAO,WAAW,MAAM,4BAA4B,CAAC;AACrD,OAAO,cAAc,MAAM,wBAAwB,CAAC;AACpD,OAAO,WAA0B,MAAM,sBAAsB,CAAC;AAC9D,OAAO,EAAE,OAAO,EAAE,MAAM,aAAa,CAAC;AACtC,OAAO,EAAE,kBAAkB,EAAE,MAAM,OAAO,CAAC;AAC3C,OAAO,EAAE,KAAK,EAAE,MAAM,0BAA0B,CAAC;AACjD,OAAO,EAAE,aAAa,EAAE,MAAM,4BAA4B,CAAC;AAc3D,MAAM,QAAS,SAAQ,KAAK,CAAC,aAA6B;IAC9C,MAAM,CAAU,YAAY,GAAW,SAAS,CAAC;IAEzD,YAAY,CAAiB;QACzB,KAAK,CAAC,CAAC,CAAC,CAAC;IACb,CAAC;IAEM,iBAAiB,GAAG,GAAS,EAAE;QAClC,MAAM,EAAE,aAAa,EAAE,SAAS,EAAE,WAAW,EAAE,eAAe,EAAE,OAAO,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC;QAEvF,WAAW,CAAC,YAAY,CAAC,aAAa,EAAE,WAAW,CAAC,CAAC;QAErD,IAAI,CAAC,SAAS,EAAE,CAAC;YACb,WAAW,CAAC,KAAK,EAAE,CAAC;QACxB,CAAC;aAAM,CAAC;YACJ,WAAW,CAAC,eAAe,CAAC,SAAS,CAAC;iBACjC,IAAI,CAAC,CAAC,aAAwB,EAAE,EAAE;gBAC/B,kDAAkD;gBAClD,MAAM,KAAK,GAAG,cAAc,CAAC,cAAc,EAAE,IAAI,IAAI,CAAC;gBACtD,MAAM,OAAO,GAAG,cAAc,CAAC,gBAAgB,EAAE,IAAI,IAAI,CAAC;gBAE1D,cAAc,CAAC,aAAa,CAAC,aAAa,CAAC,WAAW,EAAE,OAAO,EAAE,KAAK,EAAE,KAAK,CAAC;qBACzE,IAAI,CAAC,CAAC,WAAgB,EAAE,EAAE;oBACvB,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,aAAa,CAAC,CAAC;oBAChC,IAAI,CAAC,KAAK,CAAC,aAAa,CAAC,WAAW,CAAC,CAAC;oBACtC,cAAc,CAAC,iBAAiB,CAAC,aAAa,EAAE,KAAK,EAAE,OAAO,CAAC,CAAC;oBAChE,eAAe,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC;gBACpC,CAAC,CAAC;qBACD,KAAK,CAAC,CAAC,CAAC,EAAE,EAAE;oBACT,WAAW,CAAC,KAAK,EAAE,CAAC;gBACxB,CAAC,CAAC,CAAC;YACX,CAAC,CAAC;iBACD,KAAK,CAAC,CAAC,CAAC,EAAE,EAAE;gBACT,WAAW,CAAC,KAAK,EAAE,CAAC;YACxB,CAAC,CAAC,CAAC;QACX,CAAC;IACL,CAAC,CAAC;IAEK,MAAM,GAAG,GAAgB,EAAE;QAC9B,OAAO,CACH,6BAAK,SAAS,EAAC,WAAW;YACtB,oBAAC,WAAW,IAAC,KAAK,EAAE,QAAQ,CAAC,YAAY,GAAI,CAC3C,CACT,CAAC;IACN,CAAC,CAAC;;AAGN,MAAM,kBAAkB,GAAG,CAAC,QAAQ,EAAE,EAAE;IACpC,OAAO,kBAAkB,CACrB;QACI,KAAK;QACL,aAAa;KAChB,EACD,QAAQ,CACX,CAAC;AACN,CAAC,CAAC;AAEF,eAAe,OAAO,CAAC,IAAI,EAAE,kBAAkB,CAAC,CAAC,QAAQ,CAAC,CAAC"}
|
|
@@ -14,12 +14,12 @@ export default class SessionService {
|
|
|
14
14
|
static removeSession: () => void;
|
|
15
15
|
static buildFreshSession: (freshIdentity: IIdentity, orgId?: string, storyId?: string) => void;
|
|
16
16
|
static storeSession: (values: any, auth0Expiry: number) => void;
|
|
17
|
-
static cacheOrgId: (organizationId: string
|
|
18
|
-
static clearCachedOrgId: (
|
|
19
|
-
static getCachedOrgId: (
|
|
20
|
-
static cacheStoryId: (storyId: string
|
|
21
|
-
static clearCachedStoryId: (
|
|
22
|
-
static getCachedStoryId: (
|
|
17
|
+
static cacheOrgId: (organizationId: string) => void;
|
|
18
|
+
static clearCachedOrgId: () => void;
|
|
19
|
+
static getCachedOrgId: () => string;
|
|
20
|
+
static cacheStoryId: (storyId: string) => void;
|
|
21
|
+
static clearCachedStoryId: () => void;
|
|
22
|
+
static getCachedStoryId: () => string;
|
|
23
23
|
static updateSession: (values: any, auth0Expiry: number) => void;
|
|
24
24
|
private static scrapeDomain;
|
|
25
25
|
private static determineAccessUrl;
|
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
import * as Cookies from 'js-cookie';
|
|
2
2
|
import axios from 'axios';
|
|
3
3
|
export default class SessionService {
|
|
4
|
-
static LOGIN_STORY_ID_CACHE = 'imp_hub_last_story_id
|
|
5
|
-
static LOGIN_ORG_ID_CACHE = 'imp_hub_last_org_id
|
|
4
|
+
static LOGIN_STORY_ID_CACHE = 'imp_hub_last_story_id';
|
|
5
|
+
static LOGIN_ORG_ID_CACHE = 'imp_hub_last_org_id';
|
|
6
6
|
static SESSION_COOKIE_NAME = 'auth_state';
|
|
7
7
|
static FRESH_COOKIE = {
|
|
8
8
|
sub: '',
|
|
@@ -36,6 +36,8 @@ export default class SessionService {
|
|
|
36
36
|
static removeSession = () => {
|
|
37
37
|
const domain = SessionService.scrapeDomain();
|
|
38
38
|
Cookies.remove(SessionService.SESSION_COOKIE_NAME, { domain });
|
|
39
|
+
SessionService.clearCachedOrgId();
|
|
40
|
+
SessionService.clearCachedStoryId();
|
|
39
41
|
};
|
|
40
42
|
static buildFreshSession = (freshIdentity, orgId = null, storyId = null) => {
|
|
41
43
|
const { idTokenPayload: { sub, exp } } = freshIdentity;
|
|
@@ -56,23 +58,23 @@ export default class SessionService {
|
|
|
56
58
|
const expiry = new Date(auth0Expiry * 1000);
|
|
57
59
|
Cookies.set(SessionService.SESSION_COOKIE_NAME, cookieData, { domain, expires: expiry });
|
|
58
60
|
};
|
|
59
|
-
static cacheOrgId = (organizationId
|
|
60
|
-
localStorage.setItem(SessionService.LOGIN_ORG_ID_CACHE
|
|
61
|
+
static cacheOrgId = (organizationId) => {
|
|
62
|
+
localStorage.setItem(SessionService.LOGIN_ORG_ID_CACHE, organizationId);
|
|
61
63
|
};
|
|
62
|
-
static clearCachedOrgId = (
|
|
63
|
-
localStorage.removeItem(SessionService.LOGIN_ORG_ID_CACHE
|
|
64
|
+
static clearCachedOrgId = () => {
|
|
65
|
+
localStorage.removeItem(SessionService.LOGIN_ORG_ID_CACHE);
|
|
64
66
|
};
|
|
65
|
-
static getCachedOrgId = (
|
|
66
|
-
return localStorage.getItem(SessionService.LOGIN_ORG_ID_CACHE
|
|
67
|
+
static getCachedOrgId = () => {
|
|
68
|
+
return localStorage.getItem(SessionService.LOGIN_ORG_ID_CACHE);
|
|
67
69
|
};
|
|
68
|
-
static cacheStoryId = (storyId
|
|
69
|
-
localStorage.setItem(SessionService.LOGIN_STORY_ID_CACHE
|
|
70
|
+
static cacheStoryId = (storyId) => {
|
|
71
|
+
localStorage.setItem(SessionService.LOGIN_STORY_ID_CACHE, storyId);
|
|
70
72
|
};
|
|
71
|
-
static clearCachedStoryId = (
|
|
72
|
-
localStorage.removeItem(SessionService.LOGIN_STORY_ID_CACHE
|
|
73
|
+
static clearCachedStoryId = () => {
|
|
74
|
+
localStorage.removeItem(SessionService.LOGIN_STORY_ID_CACHE);
|
|
73
75
|
};
|
|
74
|
-
static getCachedStoryId = (
|
|
75
|
-
return localStorage.getItem(SessionService.LOGIN_STORY_ID_CACHE
|
|
76
|
+
static getCachedStoryId = () => {
|
|
77
|
+
return localStorage.getItem(SessionService.LOGIN_STORY_ID_CACHE);
|
|
76
78
|
};
|
|
77
79
|
static updateSession = (values, auth0Expiry) => {
|
|
78
80
|
const prevCookieData = SessionService.getSession();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Session.js","sourceRoot":"","sources":["../../../src/services/Session.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,OAAO,MAAM,WAAW,CAAC;AACrC,OAAO,KAAoC,MAAM,OAAO,CAAC;AASzD,MAAM,CAAC,OAAO,OAAO,cAAc;IACvB,MAAM,CAAU,oBAAoB,GAAW,
|
|
1
|
+
{"version":3,"file":"Session.js","sourceRoot":"","sources":["../../../src/services/Session.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -210,19 +210,17 @@ class AppWrapper extends React.Component<IAppWrapperProps, IAppWrapperState> {
|
|
|
210
210
|
/*
|
|
211
211
|
Bust cached creds if exist, invoke auth failure handler
|
|
212
212
|
*/
|
|
213
|
-
private handleCheckSessionFailure = (e: Error
|
|
214
|
-
if (
|
|
215
|
-
|
|
216
|
-
|
|
217
|
-
|
|
218
|
-
|
|
219
|
-
}
|
|
213
|
+
private handleCheckSessionFailure = (e: Error): void => {
|
|
214
|
+
if (this.props.storyId) {
|
|
215
|
+
SessionService.cacheStoryId(this.props.storyId);
|
|
216
|
+
} else {
|
|
217
|
+
SessionService.clearCachedStoryId();
|
|
218
|
+
}
|
|
220
219
|
|
|
221
|
-
|
|
222
|
-
|
|
223
|
-
|
|
224
|
-
|
|
225
|
-
}
|
|
220
|
+
if (this.props.organizationId) {
|
|
221
|
+
SessionService.cacheOrgId(this.props.organizationId);
|
|
222
|
+
} else {
|
|
223
|
+
SessionService.clearCachedOrgId();
|
|
226
224
|
}
|
|
227
225
|
|
|
228
226
|
this.props.clearCachedAuth();
|
|
@@ -240,10 +238,9 @@ class AppWrapper extends React.Component<IAppWrapperProps, IAppWrapperState> {
|
|
|
240
238
|
}
|
|
241
239
|
AuthService.checkSession()
|
|
242
240
|
.then((freshIdentity: IIdentity) => {
|
|
243
|
-
const sub = freshIdentity.idTokenPayload.sub;
|
|
244
241
|
const orgId = this.props.organizationId
|
|
245
242
|
? this.props.organizationId
|
|
246
|
-
: SessionService.getCachedOrgId(
|
|
243
|
+
: SessionService.getCachedOrgId();
|
|
247
244
|
SessionService.getAccessData(freshIdentity.accessToken, baseUrl, false, orgId)
|
|
248
245
|
.then((freshAccess: any) => {
|
|
249
246
|
this.props.setAccessData(freshAccess);
|
|
@@ -252,7 +249,7 @@ class AppWrapper extends React.Component<IAppWrapperProps, IAppWrapperState> {
|
|
|
252
249
|
})
|
|
253
250
|
.catch((e: Error) => {
|
|
254
251
|
console.error(e);
|
|
255
|
-
this.handleCheckSessionFailure(e
|
|
252
|
+
this.handleCheckSessionFailure(e);
|
|
256
253
|
});
|
|
257
254
|
})
|
|
258
255
|
.catch((e: Error) => {
|
|
@@ -36,10 +36,9 @@ class AuthGate extends React.PureComponent<IAuthGateProps> {
|
|
|
36
36
|
} else {
|
|
37
37
|
AuthService.parseIdFromHash(auth0Hash)
|
|
38
38
|
.then((freshIdentity: IIdentity) => {
|
|
39
|
-
const sub = freshIdentity.idTokenPayload.sub;
|
|
40
39
|
// Use the cached org ID and story ID if it exists
|
|
41
|
-
const orgId = SessionService.getCachedOrgId(
|
|
42
|
-
const storyId = SessionService.getCachedStoryId(
|
|
40
|
+
const orgId = SessionService.getCachedOrgId() || null;
|
|
41
|
+
const storyId = SessionService.getCachedStoryId() || null;
|
|
43
42
|
|
|
44
43
|
SessionService.getAccessData(freshIdentity.accessToken, baseUrl, false, orgId)
|
|
45
44
|
.then((freshAccess: any) => {
|
package/src/services/Session.ts
CHANGED
|
@@ -9,9 +9,9 @@ export interface IHubSession {
|
|
|
9
9
|
}
|
|
10
10
|
|
|
11
11
|
export default class SessionService {
|
|
12
|
-
private static readonly LOGIN_STORY_ID_CACHE: string = 'imp_hub_last_story_id
|
|
12
|
+
private static readonly LOGIN_STORY_ID_CACHE: string = 'imp_hub_last_story_id';
|
|
13
13
|
|
|
14
|
-
private static readonly LOGIN_ORG_ID_CACHE: string = 'imp_hub_last_org_id
|
|
14
|
+
private static readonly LOGIN_ORG_ID_CACHE: string = 'imp_hub_last_org_id';
|
|
15
15
|
|
|
16
16
|
private static readonly SESSION_COOKIE_NAME: string = 'auth_state';
|
|
17
17
|
|
|
@@ -59,6 +59,8 @@ export default class SessionService {
|
|
|
59
59
|
public static removeSession = (): void => {
|
|
60
60
|
const domain: string = SessionService.scrapeDomain();
|
|
61
61
|
Cookies.remove(SessionService.SESSION_COOKIE_NAME, { domain });
|
|
62
|
+
SessionService.clearCachedOrgId();
|
|
63
|
+
SessionService.clearCachedStoryId();
|
|
62
64
|
};
|
|
63
65
|
|
|
64
66
|
public static buildFreshSession = (
|
|
@@ -93,28 +95,28 @@ export default class SessionService {
|
|
|
93
95
|
Cookies.set(SessionService.SESSION_COOKIE_NAME, cookieData, { domain, expires: expiry });
|
|
94
96
|
};
|
|
95
97
|
|
|
96
|
-
public static cacheOrgId = (organizationId: string
|
|
97
|
-
localStorage.setItem(SessionService.LOGIN_ORG_ID_CACHE
|
|
98
|
+
public static cacheOrgId = (organizationId: string): void => {
|
|
99
|
+
localStorage.setItem(SessionService.LOGIN_ORG_ID_CACHE, organizationId);
|
|
98
100
|
};
|
|
99
101
|
|
|
100
|
-
public static clearCachedOrgId = (
|
|
101
|
-
localStorage.removeItem(SessionService.LOGIN_ORG_ID_CACHE
|
|
102
|
+
public static clearCachedOrgId = () => {
|
|
103
|
+
localStorage.removeItem(SessionService.LOGIN_ORG_ID_CACHE);
|
|
102
104
|
};
|
|
103
105
|
|
|
104
|
-
public static getCachedOrgId = (
|
|
105
|
-
return localStorage.getItem(SessionService.LOGIN_ORG_ID_CACHE
|
|
106
|
+
public static getCachedOrgId = (): string => {
|
|
107
|
+
return localStorage.getItem(SessionService.LOGIN_ORG_ID_CACHE);
|
|
106
108
|
};
|
|
107
109
|
|
|
108
|
-
public static cacheStoryId = (storyId: string
|
|
109
|
-
localStorage.setItem(SessionService.LOGIN_STORY_ID_CACHE
|
|
110
|
+
public static cacheStoryId = (storyId: string): void => {
|
|
111
|
+
localStorage.setItem(SessionService.LOGIN_STORY_ID_CACHE, storyId);
|
|
110
112
|
};
|
|
111
113
|
|
|
112
|
-
public static clearCachedStoryId = (
|
|
113
|
-
localStorage.removeItem(SessionService.LOGIN_STORY_ID_CACHE
|
|
114
|
+
public static clearCachedStoryId = (): void => {
|
|
115
|
+
localStorage.removeItem(SessionService.LOGIN_STORY_ID_CACHE);
|
|
114
116
|
};
|
|
115
117
|
|
|
116
|
-
public static getCachedStoryId = (
|
|
117
|
-
return localStorage.getItem(SessionService.LOGIN_STORY_ID_CACHE
|
|
118
|
+
public static getCachedStoryId = (): string => {
|
|
119
|
+
return localStorage.getItem(SessionService.LOGIN_STORY_ID_CACHE);
|
|
118
120
|
};
|
|
119
121
|
|
|
120
122
|
public static updateSession = (values: any, auth0Expiry: number): void => {
|