Skip to content

Commit 270ea96

Browse files
authored
Merge pull request #49 from thivi/master
Fix IE compatibility issues
2 parents 1cc62de + 07bf5b3 commit 270ea96

File tree

3 files changed

+14
-12
lines changed

3 files changed

+14
-12
lines changed

packages/oidc-js/src/models/authenticated-user.ts

-4
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,4 @@ export interface AuthenticatedUserInterface {
4545
* Authenticated user's username.
4646
*/
4747
username: string;
48-
/**
49-
* The session state.
50-
*/
51-
sessionState?: string;
5248
}

packages/oidc-js/src/worker/web-worker-client.ts

+5-5
Original file line numberDiff line numberDiff line change
@@ -164,15 +164,15 @@ export const WebWorkerClient: WebWorkerSingletonClientInterface = ((): WebWorker
164164
*
165165
* @returns {Promise<R>} A promise that resolves with the obtained data.
166166
*/
167-
const communicate = <T, R>(message: Message<T>, timeout: number = 60000): Promise<R> => {
167+
const communicate = <T, R>(message: Message<T>): Promise<R> => {
168168
const channel = new MessageChannel();
169169

170170
worker.postMessage(message, [channel.port2]);
171171

172172
return new Promise((resolve, reject) => {
173173
const timer = setTimeout(() => {
174174
reject("Operation timed out");
175-
}, timeout);
175+
}, requestTimeout);
176176

177177
return (channel.port1.onmessage = ({ data }: { data: ResponseMessage<string> }) => {
178178
clearTimeout(timer);
@@ -249,7 +249,7 @@ export const WebWorkerClient: WebWorkerSingletonClientInterface = ((): WebWorker
249249
type: API_CALL
250250
};
251251

252-
return communicate<AxiosRequestConfig, AxiosResponse<T>>(message, requestTimeout)
252+
return communicate<AxiosRequestConfig, AxiosResponse<T>>(message)
253253
.then((response) => {
254254
return Promise.resolve(response);
255255
})
@@ -281,7 +281,7 @@ export const WebWorkerClient: WebWorkerSingletonClientInterface = ((): WebWorker
281281
type: API_CALL_ALL
282282
};
283283

284-
return communicate<AxiosRequestConfig[], AxiosResponse<T>[]>(message, requestTimeout)
284+
return communicate<AxiosRequestConfig[], AxiosResponse<T>[]>(message)
285285
.then((response) => {
286286
return Promise.resolve(response);
287287
})
@@ -391,7 +391,7 @@ export const WebWorkerClient: WebWorkerSingletonClientInterface = ((): WebWorker
391391
requestSuccessCallback: null
392392
};
393393

394-
requestTimeout = config?.requestTimeout;
394+
requestTimeout = config?.requestTimeout ?? 60000;
395395

396396
worker.onmessage = ({ data }) => {
397397
switch (data.type) {

packages/oidc-js/webpack.config.js

+9-3
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,13 @@ module.exports = [{
3232
}
3333
},
3434
{
35-
exclude: /(node_modules|dist)/,
35+
exclude: {
36+
test: [
37+
/@babel(?:\/|\\{1,2})runtime|core-js/,
38+
/node_modules\/(?!(await_semaphore))/,
39+
/dist/
40+
]
41+
},
3642
test: /\.(ts|js)?$/,
3743
use: "babel-loader"
3844
},
@@ -78,7 +84,7 @@ module.exports = [{
7884
test: /\.tsx?$/,
7985
use: [{
8086
loader: "awesome-typescript-loader?tsconfig=tsconfig.umd.json"
81-
}],
87+
}],
8288
exclude: /node_modules/
8389
}
8490
]
@@ -93,5 +99,5 @@ module.exports = [{
9399
},
94100
resolve: {
95101
extensions: [".tsx", ".ts", ".js"]
96-
}
102+
}
97103
}];

0 commit comments

Comments
 (0)