diff --git a/api/exec/extension.go b/api/exec/extension.go
index d70cd98bb..036cfc01a 100644
--- a/api/exec/extension.go
+++ b/api/exec/extension.go
@@ -26,9 +26,8 @@ var extensionDownloadBaseURL = portainer.AssetsServerURL + "/extensions/"
var extensionVersionRegexp = regexp.MustCompile(`\d+(\.\d+)+`)
var extensionBinaryMap = map[portainer.ExtensionID]string{
- portainer.RegistryManagementExtension: "extension-registry-management",
- portainer.OAuthAuthenticationExtension: "extension-oauth-authentication",
- portainer.RBACExtension: "extension-rbac",
+ portainer.RegistryManagementExtension: "extension-registry-management",
+ portainer.RBACExtension: "extension-rbac",
}
// ExtensionManager represents a service used to
@@ -114,8 +113,6 @@ func (manager *ExtensionManager) InstallExtension(extension *portainer.Extension
switch extension.ID {
case portainer.RegistryManagementExtension:
extension.Name = "Registry Manager"
- case portainer.OAuthAuthenticationExtension:
- extension.Name = "External Authentication"
case portainer.RBACExtension:
extension.Name = "Role-Based Access Control"
}
diff --git a/api/http/proxy/factory/factory.go b/api/http/proxy/factory/factory.go
index e3e4c1e3b..3068a8cea 100644
--- a/api/http/proxy/factory/factory.go
+++ b/api/http/proxy/factory/factory.go
@@ -17,9 +17,8 @@ import (
const azureAPIBaseURL = "https://management.azure.com"
var extensionPorts = map[portainer.ExtensionID]string{
- portainer.RegistryManagementExtension: "7001",
- portainer.OAuthAuthenticationExtension: "7002",
- portainer.RBACExtension: "7003",
+ portainer.RegistryManagementExtension: "7001",
+ portainer.RBACExtension: "7003",
}
type (
diff --git a/api/portainer.go b/api/portainer.go
index 4226bb778..b87666e17 100644
--- a/api/portainer.go
+++ b/api/portainer.go
@@ -1257,7 +1257,7 @@ const (
_ ExtensionID = iota
// RegistryManagementExtension represents the registry management extension
RegistryManagementExtension
- // OAuthAuthenticationExtension represents the OAuth authentication extension
+ // OAuthAuthenticationExtension represents the OAuth authentication extension (Deprecated)
OAuthAuthenticationExtension
// RBACExtension represents the RBAC extension
RBACExtension
diff --git a/app/portainer/oauth/components/oauth-providers-selector/oauth-provider-selector-controller.js b/app/portainer/oauth/components/oauth-providers-selector/oauth-provider-selector-controller.js
index 6d7afc099..32a527120 100644
--- a/app/portainer/oauth/components/oauth-providers-selector/oauth-provider-selector-controller.js
+++ b/app/portainer/oauth/components/oauth-providers-selector/oauth-provider-selector-controller.js
@@ -2,39 +2,6 @@ angular.module('portainer.oauth').controller('OAuthProviderSelectorController',
var ctrl = this;
this.providers = [
- {
- authUrl: 'https://login.microsoftonline.com/TENANT_ID/oauth2/authorize',
- accessTokenUrl: 'https://login.microsoftonline.com/TENANT_ID/oauth2/token',
- resourceUrl: 'https://graph.windows.net/TENANT_ID/me?api-version=2013-11-08',
- userIdentifier: 'userPrincipalName',
- scopes: 'id,email,name',
- name: 'microsoft',
- label: 'Microsoft',
- description: 'Microsoft OAuth provider',
- icon: 'fab fa-microsoft',
- },
- {
- authUrl: 'https://accounts.google.com/o/oauth2/auth',
- accessTokenUrl: 'https://accounts.google.com/o/oauth2/token',
- resourceUrl: 'https://www.googleapis.com/oauth2/v1/userinfo?alt=json',
- userIdentifier: 'email',
- scopes: 'profile email',
- name: 'google',
- label: 'Google',
- description: 'Google OAuth provider',
- icon: 'fab fa-google',
- },
- {
- authUrl: 'https://github.com/login/oauth/authorize',
- accessTokenUrl: 'https://github.com/login/oauth/access_token',
- resourceUrl: 'https://api.github.com/user',
- userIdentifier: 'login',
- scopes: 'id email name',
- name: 'github',
- label: 'Github',
- description: 'Github OAuth provider',
- icon: 'fab fa-github',
- },
{
authUrl: '',
accessTokenUrl: '',
diff --git a/app/portainer/oauth/components/oauth-settings/oauth-settings-controller.js b/app/portainer/oauth/components/oauth-settings/oauth-settings-controller.js
index ba1424956..84b8634f9 100644
--- a/app/portainer/oauth/components/oauth-settings/oauth-settings-controller.js
+++ b/app/portainer/oauth/components/oauth-settings/oauth-settings-controller.js
@@ -1,75 +1,19 @@
-import _ from 'lodash-es';
-
angular.module('portainer.oauth').controller('OAuthSettingsController', function OAuthSettingsController() {
var ctrl = this;
this.state = {
provider: {},
- overrideConfiguration: false,
- microsoftTenantID: '',
};
- this.$onInit = onInit;
- this.onSelectProvider = onSelectProvider;
- this.onMicrosoftTenantIDChange = onMicrosoftTenantIDChange;
- this.useDefaultProviderConfiguration = useDefaultProviderConfiguration;
+ this.$onInit = $onInit;
- function onMicrosoftTenantIDChange() {
- var tenantID = ctrl.state.microsoftTenantID;
-
- ctrl.settings.AuthorizationURI = _.replace('https://login.microsoftonline.com/TENANT_ID/oauth2/authorize', 'TENANT_ID', tenantID);
- ctrl.settings.AccessTokenURI = _.replace('https://login.microsoftonline.com/TENANT_ID/oauth2/token', 'TENANT_ID', tenantID);
- ctrl.settings.ResourceURI = _.replace('https://graph.windows.net/TENANT_ID/me?api-version=2013-11-08', 'TENANT_ID', tenantID);
- }
-
- function useDefaultProviderConfiguration() {
- ctrl.settings.AuthorizationURI = ctrl.state.provider.authUrl;
- ctrl.settings.AccessTokenURI = ctrl.state.provider.accessTokenUrl;
- ctrl.settings.ResourceURI = ctrl.state.provider.resourceUrl;
- ctrl.settings.UserIdentifier = ctrl.state.provider.userIdentifier;
- ctrl.settings.Scopes = ctrl.state.provider.scopes;
-
- if (ctrl.state.provider.name === 'microsoft' && ctrl.state.microsoftTenantID !== '') {
- onMicrosoftTenantIDChange();
- }
- }
-
- function useExistingConfiguration() {
- var provider = ctrl.state.provider;
- ctrl.settings.AuthorizationURI = ctrl.settings.AuthorizationURI === '' ? provider.authUrl : ctrl.settings.AuthorizationURI;
- ctrl.settings.AccessTokenURI = ctrl.settings.AccessTokenURI === '' ? provider.accessTokenUrl : ctrl.settings.AccessTokenURI;
- ctrl.settings.ResourceURI = ctrl.settings.ResourceURI === '' ? provider.resourceUrl : ctrl.settings.ResourceURI;
- ctrl.settings.UserIdentifier = ctrl.settings.UserIdentifier === '' ? provider.userIdentifier : ctrl.settings.UserIdentifier;
- ctrl.settings.Scopes = ctrl.settings.Scopes === '' ? provider.scopes : ctrl.settings.Scopes;
-
- if (provider.name === 'microsoft' && ctrl.state.microsoftTenantID !== '') {
- onMicrosoftTenantIDChange();
- }
- }
-
- function onSelectProvider(provider, overrideConfiguration) {
- ctrl.state.provider = provider;
-
- if (overrideConfiguration) {
- useDefaultProviderConfiguration();
- } else {
- useExistingConfiguration();
- }
- }
-
- function onInit() {
+ function $onInit() {
if (ctrl.settings.RedirectURI === '') {
ctrl.settings.RedirectURI = window.location.origin;
}
if (ctrl.settings.AuthorizationURI !== '') {
ctrl.state.provider.authUrl = ctrl.settings.AuthorizationURI;
-
- if (ctrl.settings.AuthorizationURI.indexOf('login.microsoftonline.com') > -1) {
- var tenantID = ctrl.settings.AuthorizationURI.match(/login.microsoftonline.com\/(.*?)\//)[1];
- ctrl.state.microsoftTenantID = tenantID;
- onMicrosoftTenantIDChange();
- }
}
}
});
diff --git a/app/portainer/oauth/components/oauth-settings/oauth-settings.html b/app/portainer/oauth/components/oauth-settings/oauth-settings.html
index 0050835e9..f6703c812 100644
--- a/app/portainer/oauth/components/oauth-settings/oauth-settings.html
+++ b/app/portainer/oauth/components/oauth-settings/oauth-settings.html
@@ -39,30 +39,11 @@
-
-
OAuth Configuration
-
-