Add OAuth2 vhostType (#1146)

lemonldap-ng-common/lib/Lemonldap/NG/Common/Conf/Constants.pm

@@ -5,7 +5,7 @@ use strict;
 use Exporter 'import';
 use base qw(Exporter);
 
-our $VERSION = '2.0.3';
+our $VERSION = '2.0.4';
 
 # CONSTANTS
 

lemonldap-ng-common/lib/Lemonldap/NG/Common/Conf/DefaultValues.pm

@@ -1,7 +1,7 @@
 # This file is generated by Lemonldap::NG::Manager::Build. Don't modify it by hand
 package Lemonldap::NG::Common::Conf::DefaultValues;
 
-our $VERSION = '2.0.3';
+our $VERSION = '2.0.4';
 
 sub defaultValues {
     return {

lemonldap-ng-common/lib/Lemonldap/NG/Common/Conf/ReConstants.pm

@@ -5,7 +5,7 @@ use strict;
 use Exporter 'import';
 use base qw(Exporter);
 
-our $VERSION = '2.0.3';
+our $VERSION = '2.0.4';
 
 our %EXPORT_TAGS = ( 'all' => [qw($simpleHashKeys $doubleHashKeys $specialNodeKeys $casAppMetaDataNodeKeys $casSrvMetaDataNodeKeys $oidcOPMetaDataNodeKeys $oidcRPMetaDataNodeKeys $samlIDPMetaDataNodeKeys $samlSPMetaDataNodeKeys $virtualHostKeys $specialNodeHash $authParameters $issuerParameters $samlServiceParameters $oidcServiceParameters $casServiceParameters)] );
 our @EXPORT_OK   = ( @{ $EXPORT_TAGS{'all'} } );

lemonldap-ng-manager/lib/Lemonldap/NG/Manager/Attributes.pm

@@ -1,7 +1,7 @@
 # This file is generated by Lemonldap::NG::Manager::Build. Don't modify it by hand
 package Lemonldap::NG::Manager::Attributes;
 
-our $VERSION = '2.0.3';
+our $VERSION = '2.0.4';
 
 sub types {
     return {
@@ -3545,21 +3545,9 @@ qr/^(?:(?:(?:(?:(?:(?:[a-zA-Z0-9][-a-zA-Z0-9]*)?[a-zA-Z0-9])[.])*(?:[a-zA-Z][-a-
         'vhostType' => {
             'default' => 'Main',
             'select'  => [ {
-                    'k' => 'Main',
-                    'v' => 'Main'
-                },
-                {
-                    'k' => 'Zimbra',
-                    'v' => 'ZimbraPreAuth'
-                },
-                {
                     'k' => 'AuthBasic',
                     'v' => 'AuthBasic'
                 },
-                {
-                    'k' => 'SecureToken',
-                    'v' => 'SecureToken'
-                },
                 {
                     'k' => 'CDA',
                     'v' => 'CDA'
@@ -3572,9 +3560,25 @@ qr/^(?:(?:(?:(?:(?:(?:[a-zA-Z0-9][-a-zA-Z0-9]*)?[a-zA-Z0-9])[.])*(?:[a-zA-Z][-a-
                     'k' => 'DevOpsST',
                     'v' => 'DevOpsST'
                 },
+                {
+                    'k' => 'Main',
+                    'v' => 'Main'
+                },
+                {
+                    'k' => 'OAuth2',
+                    'v' => 'OAuth2'
+                },
+                {
+                    'k' => 'SecureToken',
+                    'v' => 'SecureToken'
+                },
                 {
                     'k' => 'ServiceToken',
                     'v' => 'ServiceToken'
+                },
+                {
+                    'k' => 'Zimbra',
+                    'v' => 'ZimbraPreAuth'
                 }
             ],
             'type' => 'select'

lemonldap-ng-manager/lib/Lemonldap/NG/Manager/Build/Attributes.pm

@@ -6,7 +6,7 @@
 
 package Lemonldap::NG::Manager::Build::Attributes;
 
-our $VERSION = '2.0.3';
+our $VERSION = '2.0.4';
 use strict;
 use Regexp::Common qw/URI/;
 
@@ -1695,14 +1695,15 @@ sub attributes {
         vhostType    => {
             type   => 'select',
             select => [
-                { k => 'Main',         v => 'Main' },
-                { k => 'Zimbra',       v => 'ZimbraPreAuth' },
                 { k => 'AuthBasic',    v => 'AuthBasic' },
-                { k => 'SecureToken',  v => 'SecureToken' },
                 { k => 'CDA',          v => 'CDA' },
                 { k => 'DevOps',       v => 'DevOps' },
                 { k => 'DevOpsST',     v => 'DevOpsST' },
+                { k => 'Main',         v => 'Main' },
+                { k => 'OAuth2',       v => 'OAuth2' },
+                { k => 'SecureToken',  v => 'SecureToken' },
                 { k => 'ServiceToken', v => 'ServiceToken' },
+                { k => 'Zimbra',       v => 'ZimbraPreAuth' },
             ],
             default       => 'Main',
             documentation => 'Handler type',
@@ -2771,7 +2772,7 @@ m{^(?:ldapi://[^/]*/?|\w[\w\-\.]*(?::\d{1,5})?|ldap(?:s|\+tls)?://\w[\w\-\.]*(?:
             documentation => 'Path of CAS Server Icon',
         },
         casSrvMetaDataOptionsSortNumber => {
-            type => 'int',
+            type          => 'int',
             documentation => 'Number to sort buttons',
         },
 

lemonldap-ng-manager/site/htdocs/static/js/conftree.js

@@ -1139,22 +1139,10 @@ function templates(tpl,key) {
             "get" : tpl+"s/"+key+"/"+"vhostType",
             "id" : tpl+"s/"+key+"/"+"vhostType",
             "select" : [
-               {
-                  "k" : "Main",
-                  "v" : "Main"
-               },
-               {
-                  "k" : "Zimbra",
-                  "v" : "ZimbraPreAuth"
-               },
                {
                   "k" : "AuthBasic",
                   "v" : "AuthBasic"
                },
-               {
-                  "k" : "SecureToken",
-                  "v" : "SecureToken"
-               },
                {
                   "k" : "CDA",
                   "v" : "CDA"
@@ -1167,9 +1155,25 @@ function templates(tpl,key) {
                   "k" : "DevOpsST",
                   "v" : "DevOpsST"
                },
+               {
+                  "k" : "Main",
+                  "v" : "Main"
+               },
+               {
+                  "k" : "OAuth2",
+                  "v" : "OAuth2"
+               },
+               {
+                  "k" : "SecureToken",
+                  "v" : "SecureToken"
+               },
                {
                   "k" : "ServiceToken",
                   "v" : "ServiceToken"
+               },
+               {
+                  "k" : "Zimbra",
+                  "v" : "ZimbraPreAuth"
                }
             ],
             "title" : "vhostType",