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

feat(oauth): update UI/UX

pull/2749/head
Anthony Lapenna 2019-02-19 14:38:42 +13:00
parent 9918c1260b
commit ce9e009e22
1 changed files with 17 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -5,7 +5,7 @@
<div class="form-group"> <div class="form-group">
<span class="col-sm-12 text-muted small"> <span class="col-sm-12 text-muted small">
With automatic user provisioning enabled, Portainer will create user(s) automatically with standard user role. If With automatic user provisioning enabled, Portainer will create user(s) automatically with standard user role. If
disabled, users must be created in Portainer in order to login. disabled, users must be created beforehand in Portainer in order to login.
</span> </span>
</div> </div>
<div class="form-group"> <div class="form-group">
@ -60,7 +60,7 @@
<div class="form-group"> <div class="form-group">
<label for="oauth_client_id" class="col-sm-3 col-lg-2 control-label text-left"> <label for="oauth_client_id" class="col-sm-3 col-lg-2 control-label text-left">
Client ID Client ID
<portainer-tooltip position="bottom" message="Client ID that authorization server supports"></portainer-tooltip> <portainer-tooltip position="bottom" message="Public identifier of the OAuth application"></portainer-tooltip>
</label> </label>
<div class="col-sm-9 col-lg-10"> <div class="col-sm-9 col-lg-10">
<input <input
@ -75,11 +75,7 @@
<div class="form-group"> <div class="form-group">
<label for="oauth_client_secret" class="col-sm-3 col-lg-2 control-label text-left"> <label for="oauth_client_secret" class="col-sm-3 col-lg-2 control-label text-left">
Client Secret Client secret
<portainer-tooltip
position="bottom"
message="Client secret that authorization server supports"
></portainer-tooltip>
</label> </label>
<div class="col-sm-9 col-lg-10"> <div class="col-sm-9 col-lg-10">
<input <input
@ -94,10 +90,10 @@
<div class="form-group" ng-if="$ctrl.state.provider.name == 'custom' || $ctrl.state.overrideConfiguration"> <div class="form-group" ng-if="$ctrl.state.provider.name == 'custom' || $ctrl.state.overrideConfiguration">
<label for="oauth_authorization_uri" class="col-sm-3 col-lg-2 control-label text-left"> <label for="oauth_authorization_uri" class="col-sm-3 col-lg-2 control-label text-left">
Authorization URI Authorization URL
<portainer-tooltip <portainer-tooltip
position="bottom" position="bottom"
message="URI where the user is redirected in order to login with OAuth provider" message="URL used to authenticate against the OAuth provider. Will redirect the user to the OAuth provider login view"
></portainer-tooltip> ></portainer-tooltip>
</label> </label>
<div class="col-sm-9 col-lg-10"> <div class="col-sm-9 col-lg-10">
@ -113,10 +109,10 @@
<div class="form-group" ng-if="$ctrl.state.provider.name == 'custom' || $ctrl.state.overrideConfiguration"> <div class="form-group" ng-if="$ctrl.state.provider.name == 'custom' || $ctrl.state.overrideConfiguration">
<label for="oauth_access_token_uri" class="col-sm-3 col-lg-2 control-label text-left"> <label for="oauth_access_token_uri" class="col-sm-3 col-lg-2 control-label text-left">
Access Token URI Access token URL
<portainer-tooltip <portainer-tooltip
position="bottom" position="bottom"
message="URI where portainer will attempt to obtain an access token" message="URL used by Portainer to exchange a valid OAuth authentication code for an access token"
></portainer-tooltip> ></portainer-tooltip>
</label> </label>
<div class="col-sm-9 col-lg-10"> <div class="col-sm-9 col-lg-10">
@ -132,10 +128,10 @@
<div class="form-group" ng-if="$ctrl.state.provider.name == 'custom' || $ctrl.state.overrideConfiguration"> <div class="form-group" ng-if="$ctrl.state.provider.name == 'custom' || $ctrl.state.overrideConfiguration">
<label for="oauth_resource_uri" class="col-sm-3 col-lg-2 control-label text-left"> <label for="oauth_resource_uri" class="col-sm-3 col-lg-2 control-label text-left">
Resource URI Resource URL
<portainer-tooltip <portainer-tooltip
position="bottom" position="bottom"
message="URI where portainer will attempt to retrieve the user identifier value" message="URL used by Portainer to retrieve information about the authenticated user"
></portainer-tooltip> ></portainer-tooltip>
</label> </label>
<div class="col-sm-9 col-lg-10"> <div class="col-sm-9 col-lg-10">
@ -151,8 +147,11 @@
<div class="form-group" ng-if="$ctrl.state.provider.name == 'custom' || $ctrl.state.overrideConfiguration"> <div class="form-group" ng-if="$ctrl.state.provider.name == 'custom' || $ctrl.state.overrideConfiguration">
<label for="oauth_redirect_uri" class="col-sm-3 col-lg-2 control-label text-left"> <label for="oauth_redirect_uri" class="col-sm-3 col-lg-2 control-label text-left">
Redirect URI Redirect URL
<portainer-tooltip position="bottom" message="Set this as your portainer index"></portainer-tooltip> <portainer-tooltip
position="bottom"
message="URL used by the OAuth provider to redirect the user after successful authentication. Should be set to your Portainer instance URL"
></portainer-tooltip>
</label> </label>
<div class="col-sm-9 col-lg-10"> <div class="col-sm-9 col-lg-10">
<input <input
@ -167,10 +166,10 @@
<div class="form-group" ng-if="$ctrl.state.provider.name == 'custom' || $ctrl.state.overrideConfiguration"> <div class="form-group" ng-if="$ctrl.state.provider.name == 'custom' || $ctrl.state.overrideConfiguration">
<label for="oauth_user_identifier" class="col-sm-3 col-lg-2 control-label text-left"> <label for="oauth_user_identifier" class="col-sm-3 col-lg-2 control-label text-left">
User Identifier User identifier
<portainer-tooltip <portainer-tooltip
position="bottom" position="bottom"
message="Key that identifies the user in the resource server request" message="Identifier that will be used by Portainer to create an account for the authenticated user. Retrieved from the resource server specified via the Resource URL field"
></portainer-tooltip> ></portainer-tooltip>
</label> </label>
<div class="col-sm-9 col-lg-10"> <div class="col-sm-9 col-lg-10">
@ -189,7 +188,7 @@
Scopes Scopes
<portainer-tooltip <portainer-tooltip
position="bottom" position="bottom"
message="Scopes that are required to obtain the user identifier separated by delimiter if server expects it" message="Scopes required by the OAuth provider to retrieve information about the authenticated user. Refer to your OAuth provider documentation for more information about this"
></portainer-tooltip> ></portainer-tooltip>
</label> </label>
<div class="col-sm-9 col-lg-10"> <div class="col-sm-9 col-lg-10">