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

style(auth): remove comments and change error

pull/2749/head
Chaim Lev Ari 2019-01-16 17:53:10 +02:00
parent dc067b3308
commit b09f491f62
4 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
api/http/handler/settings/settings_update.go
View File

@ -26,7 +26,7 @@ type settingsUpdatePayload struct {
func (payload *settingsUpdatePayload) Validate(r *http.Request) error { func (payload *settingsUpdatePayload) Validate(r *http.Request) error {
if *payload.AuthenticationMethod != 1 && *payload.AuthenticationMethod != 2 && *payload.AuthenticationMethod != 3 { if *payload.AuthenticationMethod != 1 && *payload.AuthenticationMethod != 2 && *payload.AuthenticationMethod != 3 {
return portainer.Error("Invalid authentication method value. Value must be one of: 1 (internal) or 2 (LDAP/AD)") return portainer.Error("Invalid authentication method value. Value must be one of: 1 (internal), 2 (LDAP/AD) or 3 (OAuth)")
} }
if payload.LogoURL != nil && *payload.LogoURL != "" && !govalidator.IsURL(*payload.LogoURL) { if payload.LogoURL != nil && *payload.LogoURL != "" && !govalidator.IsURL(*payload.LogoURL) {
return portainer.Error("Invalid logo URL. Must correspond to a valid URL format") return portainer.Error("Invalid logo URL. Must correspond to a valid URL format")

2
api/oauth/oauth.go
View File

@ -18,7 +18,7 @@ import (
const ( const (
// ErrInvalidCode defines an error raised when the user authorization code is invalid // ErrInvalidCode defines an error raised when the user authorization code is invalid
ErrInvalidCode = portainer.Error("Authorization code is invalid") ErrInvalidCode = portainer.Error("Invalid OAuth authorization code")
) )
// Service represents a service used to authenticate users against an authorization server // Service represents a service used to authenticate users against an authorization server

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

1
app/extensions/oauth/components/oauth-settings/oauth-settings.js
View File

@ -3,5 +3,4 @@ angular.module('portainer.extensions.oauth').component('oauthSettings', {
bindings: { bindings: {
settings: '<' settings: '<'
} }
// controller: 'oauthSettingsController'
}); });