Skip to content

Commit 712986f

Browse files
DanielSchafferDanielSchaffer
committed
fix: change classes to use named exports instead of default exports
using default exports on the classes causes problems when attempting to use oidc-client as ES modules, since modules with default exports are being re-exported as named exports in index.js
1 parent 2b38397 commit 712986f

73 files changed

Lines changed: 1104 additions & 5421 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎dist/oidc-client.js‎

Lines changed: 288 additions & 2440 deletions
Large diffs are not rendered by default.

‎dist/oidc-client.min.js‎

Lines changed: 31 additions & 37 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎index.js‎

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

4-
export const Log = require('./src/Log');
5-
export const OidcClient = require('./src/OidcClient');
6-
export const OidcClientSettings = require('./src/OidcClientSettings');
7-
export const WebStorageStateStore = require('./src/WebStorageStateStore');
8-
export const InMemoryWebStorage = require('./src/InMemoryWebStorage');
9-
export const UserManager = require('./src/UserManager');
10-
export const AccessTokenEvents = require('./src/AccessTokenEvents');
11-
export const MetadataService = require('./src/MetadataService');
12-
export const CordovaPopupNavigator = require('./src/CordovaPopupNavigator');
13-
export const CordovaIFrameNavigator = require('./src/CordovaIFrameNavigator');
14-
export const CheckSessionIFrame = require('./src/CheckSessionIFrame');
15-
export const TokenRevocationClient = require('./src/TokenRevocationClient');
16-
export const SessionMonitor = require('./src/SessionMonitor');
17-
export const Global = require('./src/Global');
18-
export const User = require('./src/User');
4+
export const Log = require('./src/Log').Log;
5+
export const OidcClient = require('./src/OidcClient').OidcClient;
6+
export const OidcClientSettings = require('./src/OidcClientSettings').OidcClientSettings;
7+
export const WebStorageStateStore = require('./src/WebStorageStateStore').WebStorageStateStore;
8+
export const InMemoryWebStorage = require('./src/InMemoryWebStorage').InMemoryWebStorage;
9+
export const UserManager = require('./src/UserManager').UserManager;
10+
export const AccessTokenEvents = require('./src/AccessTokenEvents').AccessTokenEvents;
11+
export const MetadataService = require('./src/MetadataService').MetadataService;
12+
export const CordovaPopupNavigator = require('./src/CordovaPopupNavigator').CordovaPopupNavigator;
13+
export const CordovaIFrameNavigator = require('./src/CordovaIFrameNavigator').CordovaIFrameNavigator;
14+
export const CheckSessionIFrame = require('./src/CheckSessionIFrame').CheckSessionIFrame;
15+
export const TokenRevocationClient = require('./src/TokenRevocationClient').TokenRevocationClient;
16+
export const SessionMonitor = require('./src/SessionMonitor').SessionMonitor;
17+
export const Global = require('./src/Global').Global;
18+
export const User = require('./src/User').User;
1919

2020
export default {
2121
Log,

‎lib/oidc-client.js‎

Lines changed: 295 additions & 2447 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎lib/oidc-client.min.js‎

Lines changed: 33 additions & 39 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
"version": "1.4.2",
44
"description": "OpenID Connect (OIDC) & OAuth2 client library",
55
"main": "lib/oidc-client.min.js",
6+
"module": "index.js",
67
"scripts": {
78
"build": "gulp build",
89
"start": "node sample/server.js",

‎src/AccessTokenEvents.js‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
// Copyright (c) Brock Allen & Dominick Baier. All rights reserved.
22
// Licensed under the Apache License, Version 2.0. See LICENSE in the project root for license information.
33

4-
import Log from './Log';
5-
import Timer from './Timer';
4+
import { Log } from './Log';
5+
import { Timer } from './Timer';
66

77
const DefaultAccessTokenExpiringNotificationTime = 60; // seconds
88

9-
export default class AccessTokenEvents {
9+
export class AccessTokenEvents {
1010

1111
constructor({
1212
accessTokenExpiringNotificationTime = DefaultAccessTokenExpiringNotificationTime,
@@ -21,7 +21,7 @@ export default class AccessTokenEvents {
2121

2222
load(container) {
2323
Log.debug("AccessTokenEvents.load");
24-
24+
2525
this._cancelTimers();
2626

2727
// only register events if there's an access token where we care about expiration
@@ -50,7 +50,7 @@ export default class AccessTokenEvents {
5050
Log.debug("AccessTokenEvents.unload");
5151
this._cancelTimers();
5252
}
53-
53+
5454
_cancelTimers(){
5555
Log.debug("canceling existing access token timers");
5656
this._accessTokenExpiring.cancel();

‎src/CheckSessionIFrame.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
// Copyright (c) Brock Allen & Dominick Baier. All rights reserved.
22
// Licensed under the Apache License, Version 2.0. See LICENSE in the project root for license information.
33

4-
import Log from './Log';
4+
import { Log } from './Log';
55

66
const DefaultInterval = 2000;
77

8-
export default class CheckSessionIFrame {
8+
export class CheckSessionIFrame {
99
constructor(callback, client_id, url, interval) {
1010
this._callback = callback;
1111
this._client_id = client_id;

‎src/CordovaIFrameNavigator.js‎

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

4-
import Log from './Log';
5-
import CordovaPopupWindow from './CordovaPopupWindow';
4+
import { CordovaPopupWindow } from './CordovaPopupWindow';
5+
6+
export class CordovaIFrameNavigator {
67

7-
export default class CordovaIFrameNavigator {
8-
98
prepare(params) {
109
params.popupWindowFeatures = 'hidden=yes';
1110
let popup = new CordovaPopupWindow(params);

‎src/CordovaPopupNavigator.js‎

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

4-
import Log from './Log';
5-
import CordovaPopupWindow from './CordovaPopupWindow';
4+
import { CordovaPopupWindow } from './CordovaPopupWindow';
5+
6+
export class CordovaPopupNavigator {
67

7-
export default class CordovaPopupNavigator {
8-
98
prepare(params) {
109
let popup = new CordovaPopupWindow(params);
1110
return Promise.resolve(popup);

0 commit comments

Comments
 (0)