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

feat(oauth): update OAuth UX

pull/2749/head
Anthony Lapenna 2019-02-17 17:01:36 +13:00
parent 17cf374c30
commit 78e2aaf7d4
3 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/extensions/oauth/components/oauth-providers-selector/oauth-provider-selector-controller.js
View File

@ -4,6 +4,9 @@ angular.module('portainer.extensions.oauth')
this.providers = [ 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: 'mail', userIdentifier: 'mail',
scope: 'id,email,name', scope: 'id,email,name',
name: 'microsoft' name: 'microsoft'

4
app/extensions/oauth/components/oauth-settings/oauth-settings-controller.js
View File

@ -27,6 +27,10 @@ angular.module('portainer.extensions.oauth')
ctrl.settings.ResourceURI = provider.resourceUrl; ctrl.settings.ResourceURI = provider.resourceUrl;
ctrl.settings.UserIdentifier = provider.userIdentifier; ctrl.settings.UserIdentifier = provider.userIdentifier;
ctrl.settings.Scopes = provider.scopes; ctrl.settings.Scopes = provider.scopes;
if (provider.name === 'microsoft' && ctrl.state.microsoftTenantID !== '') {
onMicrosoftTenantIDChange();
}
} }
function onInit() { function onInit() {

4
app/extensions/oauth/components/oauth-settings/oauth-settings.html
View File

@ -205,10 +205,10 @@
<div class="form-group" ng-if="$ctrl.state.provider.name != 'custom'"> <div class="form-group" ng-if="$ctrl.state.provider.name != 'custom'">
<div class="col-sm-12"> <div class="col-sm-12">
<a class="small interactive" ng-if="!$ctrl.state.overrideConfiguration" ng-click="$ctrl.state.overrideConfiguration = true;"> <a class="small interactive" ng-if="!$ctrl.state.overrideConfiguration" ng-click="$ctrl.state.overrideConfiguration = true;">
<i class="fa fa-plus space-right" aria-hidden="true"></i> Override configuration <i class="fa fa-wrench space-right" aria-hidden="true"></i> Override configuration
</a> </a>
<a class="small interactive" ng-if="$ctrl.state.overrideConfiguration" ng-click="$ctrl.state.overrideConfiguration = false;"> <a class="small interactive" ng-if="$ctrl.state.overrideConfiguration" ng-click="$ctrl.state.overrideConfiguration = false;">
<i class="fa fa-minus space-right" aria-hidden="true"></i> Hide advanced options <i class="fa fa-cogs space-right" aria-hidden="true"></i> Use default configuration
</a> </a>
</div> </div>
</div> </div>