Docker/portainer
Docker/portainer
1
0
Fork 0
mirror of https://github.com/portainer/portainer.git synced 2025-07-29 10:19:41 +02:00
Code Issues Releases Activity

fix(oauth): fix an UX issue when updating microsoft oauth settings

Browse source
This commit is contained in:
Anthony Lapenna 2019-02-18 16:18:48 +13:00
parent 73f20b5157
commit e325ad10dd
2 changed files with 11 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

8
app/extensions/oauth/components/oauth-settings/oauth-settings-controller.js
View file

@ -37,6 +37,14 @@ angular.module('portainer.extensions.oauth')
if (ctrl.settings.RedirectURI === '') { if (ctrl.settings.RedirectURI === '') {
ctrl.settings.RedirectURI = window.location.origin; ctrl.settings.RedirectURI = window.location.origin;
} }
if (ctrl.settings.AuthorizationURI !== '') {
ctrl.state.provider.authUrl = 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();
}
}
} }
}); });

3
app/extensions/oauth/components/oauth-settings/oauth-settings.html
View file

@ -18,7 +18,8 @@
<div ng-if="$ctrl.settings.OAuthAutoCreateUsers"> <div ng-if="$ctrl.settings.OAuthAutoCreateUsers">
<div class="form-group"> <div class="form-group">
<span class="col-sm-12 text-muted small"> <span class="col-sm-12 text-muted small">
The users created by the automatic provisioning feature can be added to a default team on creation. This setting is optional. <p>The users created by the automatic provisioning feature can be added to a default team on creation.</p>
<p>By assigning newly created users to a team they will be able to access the environments associated to that team. This setting is optional and if not set newly created users won't be able to access any environments.</p>
</span> </span>
</div> </div>
<div class="form-group"> <div class="form-group">