Implemented/Fixed OpenID Connect support

.jshintrc

@@ -14,6 +14,6 @@
 	"globals": {
 		"axios": true,
 		"define": true,
-		"UserManager": true
+		"OidcClient": true
 	}
 }

src/authprovider.js

@@ -1,6 +1,6 @@
 const Environment = require('./env');
 const Utils = require('@openeo/js-commons/src/utils');
-const { UserManager } = require('oidc-client');
+const OidcClient = require('oidc-client');
 
 class AuthProvider {
 
@@ -78,6 +78,10 @@ class OidcProvider extends AuthProvider {
 		this.user = null;
 	}
 
+	static isSupported() {
+		return (Utils.isObject(OidcClient) && !!OidcClient.UserManager);
+	}
+
 	/**
 	 * Globally sets the UI method (redirect, popup) to use for OIDC authentication.
 	 * 
@@ -100,7 +104,7 @@ class OidcProvider extends AuthProvider {
 	 */
 	static async signinCallback(provider = null) {
 		try {
-			var oidc = new UserManager();
+			var oidc = new OidcClient.UserManager();
 			if (OidcProvider.uiMethod === 'popup') {
 				await oidc.signinPopupCallback();
 			}
@@ -128,14 +132,14 @@ class OidcProvider extends AuthProvider {
 		if (!this.issuer || typeof this.issuer !== 'string') {
 			throw "No Issuer URL available for OpenID Connect";
 		}
-		else if (!this.client_id || typeof this.client_id !== 'string') {
+		else if (!client_id || typeof client_id !== 'string') {
 			throw "No Client ID specified for OpenID Connect";
 		}
-		else if (!this.redirect_uri || typeof this.redirect_uri !== 'string') {
+		else if (!redirect_uri || typeof redirect_uri !== 'string') {
 			throw "No Redirect URI specified for OpenID Connect";
 		}
 
-		this.manager = new UserManager(Object.assign({
+		this.manager = new OidcClient.UserManager(Object.assign({
 			client_id: client_id,
 			redirect_uri: redirect_uri,
 			authority: this.issuer.replace('/.well-known/openid-configuration', ''),
@@ -144,7 +148,7 @@ class OidcProvider extends AuthProvider {
 		}, options));
 
 		if (OidcProvider.uiMethod === 'popup') {
-			this.setUserOIDC(await this.manager.signinPopup());
+			this.setUser(await this.manager.signinPopup());
 		}
 		else {
 			await this.manager.signinRedirect();
@@ -167,7 +171,7 @@ class OidcProvider extends AuthProvider {
 	 * Sets the OIDC User.
 	 * 
 	 * @see https://github.com/IdentityModel/oidc-client-js/wiki#user
-	 * @param {User} user - The OIDC User returned by OpenEO.signinCallbackOIDC(). Passing `null` resets OIDC authentication details.
+	 * @param {User} user - The OIDC User returned by OidcProvider.signinCallback(). Passing `null` resets OIDC authentication details.
 	 */
 	setUser(user) {
 		if (!user) {
@@ -187,7 +191,11 @@ class OidcProvider extends AuthProvider {
 	 */
 	async logout() {
 		if (this.manager !== null) {
-			await this.manager.signoutRedirect();
+			try {
+				await this.manager.signoutRedirect();
+			} catch (error) {
+				console.warn(error);
+			}
 			super.logout();
 			this.manager = null;
 			this.setUser(null);

src/browser.js

@@ -8,13 +8,6 @@
  */
 module.exports = class Environment {
 
-	static checkOidcSupport() {
-		if (typeof UserManager === 'undefined') {
-			return false;
-		}
-		return true;
-	}
-
 	static handleErrorResponse(error) {
 		return new Promise((_, reject) => {
 			let fileReader = new FileReader();

src/connection.js

@@ -137,30 +137,30 @@ module.exports = class Connection {
 	 * List all authentication methods supported by the back-end.
 	 * 
 	 * @async
-	 * @returns {object} An object containing AuthProviders.
+	 * @returns {array} An array containing all supported AuthProviders (including all OIDC providers and HTTP Basic).
 	 * @throws {Error}
 	 */
 	async listAuthProviders() {
 		if (this.authProviderList !== null) {
 			return this.authProviderList;
 		}
 
-		this.authProviderList = {};
+		this.authProviderList = [];
 		let cap = this.capabilities();
 
 		// Add OIDC providers
-		if (Environment.checkOidcSupport() && cap.hasFeature('authenticateOIDC')) {
+		if (cap.hasFeature('authenticateOIDC') && OidcProvider.isSupported()) {
 			let res = await this._get('/credentials/oidc');
 			if (Utils.isObject(res.data) && Array.isArray(res.data.providers)) {
 				for(let i in res.data.providers) {
-					this._addAuthProvider(new OidcProvider(this, res.data.providers[i]));
+					this.authProviderList.push(new OidcProvider(this, res.data.providers[i]));
 				}
 			}
 		}
 
 		// Add Basic provider
 		if (cap.hasFeature('authenticateBasic')) {
-			this._addAuthProvider(new BasicProvider(this));
+			this.authProviderList.push(new BasicProvider(this));
 		}
 
 		return this.authProviderList;
@@ -185,10 +185,6 @@ module.exports = class Connection {
 		return this.authProvider;
 	}
 
-	_addAuthProvider(provider) {
-		this.authProviderList[provider.getId()] = provider;
-	}
-
 	/**
 	 * Get information about the authenticated user.
 	 * 

src/node.js

@@ -12,10 +12,6 @@ const path = require("path");
  */
 module.exports = class Environment {
 
-	static checkOidcSupport() {
-		return false;
-	}
-
 	static handleErrorResponse(error) {
 		return new Promise((_, reject) => {
 			let chunks = [];