github
/
portainer
mirror of https://github.com/portainer/portainer
1
0
Fork 0
Code Issues Releases Wiki Activity

fix(settings/oauth): show internal auth prompt by default [EE-4576] (#8481) 

* fix(settings/oauth): show internal auth prompt by default [EE-4576]

fix [EE-4576]

* fix(oauth): use new confirm modal
pull/8527/head
Chaim Lev-Ari 2023-02-28 16:49:46 +02:00 committed by GitHub
parent 86d0e30eb7
commit 2c247efd0f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 27 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
app/portainer/oauth/components/oauth-settings/oauth-settings.controller.js
View File

@ -1,14 +1,18 @@
import { baseHref } from '@/portainer/helpers/pathHelper'; import { baseHref } from '@/portainer/helpers/pathHelper';
import { isLimitedToBE } from '@/react/portainer/feature-flags/feature-flags.service';
import { FeatureId } from '@/react/portainer/feature-flags/enums'; import { FeatureId } from '@/react/portainer/feature-flags/enums';
import { isLimitedToBE } from '@/react/portainer/feature-flags/feature-flags.service';
import { ModalType } from '@@/modals';
import { confirm } from '@@/modals/confirm';
import { buildConfirmButton } from '@@/modals/utils';
import providers, { getProviderByUrl } from './providers'; import providers, { getProviderByUrl } from './providers';
const MS_TENANT_ID_PLACEHOLDER = 'TENANT_ID'; const MS_TENANT_ID_PLACEHOLDER = 'TENANT_ID';
export default class OAuthSettingsController { export default class OAuthSettingsController {
/* @ngInject */ /* @ngInject */
constructor($scope) { constructor($scope, $async) {
Object.assign(this, { $scope }); Object.assign(this, { $scope, $async });
this.limitedFeature = FeatureId.HIDE_INTERNAL_AUTH; this.limitedFeature = FeatureId.HIDE_INTERNAL_AUTH;
this.limitedFeatureClass = 'limited-be'; this.limitedFeatureClass = 'limited-be';
@ -69,15 +73,30 @@ export default class OAuthSettingsController {
updateSSO(checked) { updateSSO(checked) {
this.$scope.$evalAsync(() => { this.$scope.$evalAsync(() => {
this.settings.SSO = checked; this.settings.SSO = checked;
this.onChangeHideInternalAuth(checked); this.settings.HideInternalAuth = false;
}); });
} }
onChangeHideInternalAuth(checked) { async onChangeHideInternalAuth(checked) {
this.$scope.$evalAsync(() => { this.$async(async () => {
if (!this.isLimitedToBE) { if (this.isLimitedToBE) {
this.settings.HideInternalAuth = checked; return;
} }
if (checked) {
const confirmed = await confirm({
title: 'Hide internal authentication prompt',
message: 'By hiding internal authentication prompt, you will only be able to login via SSO. Are you sure?',
confirmButton: buildConfirmButton('Confirm', 'btn-warning'),
modalType: ModalType.Warn,
});
if (!confirmed) {
return;
}
}
this.settings.HideInternalAuth = checked;
}); });
} }