Sort CAS servers & update langs (#1704)

2019-04-10 21:58:28 +02:00 · 2019-04-10 21:58:28 +02:00 · 1d08372a8c
commit 1d08372a8c
parent 4a21e96426
14 changed files with 32 additions and 4 deletions
--- a/lemonldap-ng-common/lib/Lemonldap/NG/Common/Conf/ReConstants.pm
+++ b/lemonldap-ng-common/lib/Lemonldap/NG/Common/Conf/ReConstants.pm
@ -25,7 +25,7 @@ our $doubleHashKeys = 'issuerDBGetParameters';
 our $simpleHashKeys = '(?:(?:l(?:o(?:calSessionStorageOption|goutService)|dapExportedVar|wp(?:Ssl)?Opt)|re(?:moteGlobalStorageOption|st2f(?:Verify|Init)Arg|loadUrl)|c(?:as(?:StorageOption|Attribute)|ustomAddParam|ombModule)|(?:(?:d(?:emo|bi)|facebook|webID)E|e)xportedVar|g(?:r(?:antSessionRule|oup)|lobalStorageOption)|n(?:otificationStorageOption|ginxCustomHandler)|p(?:ersistentStorageOption|ortalSkinRule)|macro)s|o(?:idcS(?:erviceMetaDataAuthnContext|torageOptions)|penIdExportedVars)|s(?:(?:amlStorageOption|laveExportedVar)s|essionDataToRemember)|a(?:ut(?:hChoiceMod|oSigninR)ules|pplicationList)|S(?:MTPTLSOpts|SLVarIf))';
 our $specialNodeKeys = '(?:(?:(?:saml(?:ID|S)|oidc[OR])P|cas(?:App|Srv))MetaDataNode|virtualHost)s';
 our $casAppMetaDataNodeKeys = 'casAppMetaData(?:Options(?:Servic|Rul)e|ExportedVars)';
-our $casSrvMetaDataNodeKeys = 'casSrvMetaData(?:Options(?:ProxiedServices|DisplayName|Gateway|Renew|Icon|Url)|ExportedVars)';
+our $casSrvMetaDataNodeKeys = 'casSrvMetaData(?:Options(?:ProxiedServices|DisplayName|SortNumber|Gateway|Renew|Icon|Url)|ExportedVars)';
 our $oidcOPMetaDataNodeKeys = 'oidcOPMetaData(?:Options(?:C(?:lient(?:Secret|ID)|heckJWTSignature|onfigurationURI)|S(?:toreIDToken|ortNumber|cope)|TokenEndpointAuthMethod|(?:JWKSTimeou|Promp)t|I(?:DTokenMaxAge|con)|U(?:iLocales|seNonce)|Display(?:Name)?|AcrValues|MaxAge)|ExportedVars|J(?:SON|WKS))';
 our $oidcRPMetaDataNodeKeys = 'oidcRPMetaData(?:Options(?:(?:PostLogoutRedirectUri|ExtraClaim)s|I(?:DToken(?:Expiration|SignAlg)|con)|Logout(?:SessionRequired|Type|Url)|AccessTokenExpiration|R(?:edirectUris|ule)|Client(?:Secret|ID)|BypassConsent|DisplayName|UserIDAttr)|ExportedVars)';
 our $samlIDPMetaDataNodeKeys = 'samlIDPMetaData(?:Options(?:(?:Check(?:S[LS]OMessageSignatur|Audienc|Tim)|EncryptionMod|UserAttribut|DisplayNam)e|S(?:ignS[LS]OMessage|toreSAMLToken|[LS]OBinding|ortNumber)|A(?:llow(?:LoginFromIDP|ProxiedAuthn)|daptSessionUtime)|Re(?:questedAuthnContext|solutionRule|layStateURL)|Force(?:Authn|UTF8)|I(?:sPassive|con)|NameIDFormat)|ExportedAttributes|XML)';
--- a/lemonldap-ng-manager/lib/Lemonldap/NG/Manager/Attributes.pm
+++ b/lemonldap-ng-manager/lib/Lemonldap/NG/Manager/Attributes.pm
@ -721,6 +721,9 @@ sub attributes {
            'default' => 0,
            'type'    => 'bool'
        },
+        'casSrvMetaDataOptionsSortNumber' => {
+            'type' => 'int'
+        },
        'casSrvMetaDataOptionsUrl' => {
            'msgFail' => '__badUrl__',
            'test' =>
--- a/lemonldap-ng-manager/lib/Lemonldap/NG/Manager/Build/Attributes.pm
+++ b/lemonldap-ng-manager/lib/Lemonldap/NG/Manager/Build/Attributes.pm
@ -2770,6 +2770,10 @@ m{^(?:ldapi://[^/]*/?|\w[\w\-\.]*(?::\d{1,5})?|ldap(?:s|\+tls)?://\w[\w\-\.]*(?:
            type          => 'text',
            documentation => 'Path of CAS Server Icon',
        },
+        casSrvMetaDataOptionsSortNumber => {
+            type => 'int',
+            documentation => 'Number to sort buttons',
+        },

        # Fake attribute: used by manager REST API to agglomerate all nodes
        # related to a CAS IDP partner
@ -3344,7 +3348,6 @@ m{^(?:ldapi://[^/]*/?|\w[\w\-\.]*(?::\d{1,5})?|ldap(?:s|\+tls)?://\w[\w\-\.]*(?:
        oidcOPMetaDataOptionsIcon         => { type => 'text', },
        oidcOPMetaDataOptionsStoreIDToken => { type => 'bool', default => 0 },
        oidcOPMetaDataOptionsSortNumber   => { type => 'int', },
-
        oidcRPMetaDataOptionsRule => {
            type          => 'text',
            test          => $perlExpr,
--- a/lemonldap-ng-manager/lib/Lemonldap/NG/Manager/Build/CTrees.pm
+++ b/lemonldap-ng-manager/lib/Lemonldap/NG/Manager/Build/CTrees.pm
@ -243,6 +243,7 @@ sub cTrees {
                nodes => [
                    'casSrvMetaDataOptionsDisplayName',
                    'casSrvMetaDataOptionsIcon',
+                    'casSrvMetaDataOptionsSortNumber',
                ]
            },
        ],
--- a/lemonldap-ng-manager/site/htdocs/static/js/conftree.js
+++ b/lemonldap-ng-manager/site/htdocs/static/js/conftree.js
@ -126,6 +126,12 @@ function templates(tpl,key) {
            "get" : tpl+"s/"+key+"/"+"casSrvMetaDataOptionsIcon",
            "id" : tpl+"s/"+key+"/"+"casSrvMetaDataOptionsIcon",
            "title" : "casSrvMetaDataOptionsIcon"
+         },
+         {
+            "get" : tpl+"s/"+key+"/"+"casSrvMetaDataOptionsSortNumber",
+            "id" : tpl+"s/"+key+"/"+"casSrvMetaDataOptionsSortNumber",
+            "title" : "casSrvMetaDataOptionsSortNumber",
+            "type" : "int"
         }
      ],
      "id" : "casSrvMetaDataOptionsDisplay",
--- a/lemonldap-ng-manager/site/htdocs/static/js/conftree.min.js
+++ b/lemonldap-ng-manager/site/htdocs/static/js/conftree.min.js
--- a/lemonldap-ng-manager/site/htdocs/static/languages/ar.json
+++ b/lemonldap-ng-manager/site/htdocs/static/languages/ar.json
@ -128,6 +128,7 @@
 "casSrvMetaDataOptionsDisplayName":"الاسم المطلوب عرضه",
 "casSrvMetaDataOptionsGateway":"بوابة إثبات الهوية",
 "casSrvMetaDataOptionsIcon":"مسارالأيقونة",
+"casSrvMetaDataOptionsSortNumber":"Order",
 "casSrvMetaDataOptionsRenew":"تجديد إثبات الهوية",
 "casSrvMetaDataOptionsProxiedServices":"خدمات البروكسي",
 "casSrvMetaDataOptionsUrl":" يو أر ل الخادم",
--- a/lemonldap-ng-manager/site/htdocs/static/languages/de.json
+++ b/lemonldap-ng-manager/site/htdocs/static/languages/de.json
@ -128,6 +128,7 @@
 "casSrvMetaDataOptionsDisplayName":"Angezeigter Name",
 "casSrvMetaDataOptionsGateway":"Gateway authentication",
 "casSrvMetaDataOptionsIcon":"Icon path",
+"casSrvMetaDataOptionsSortNumber":"Order",
 "casSrvMetaDataOptionsRenew":"Renew authentication",
 "casSrvMetaDataOptionsProxiedServices":"Proxied services",
 "casSrvMetaDataOptionsUrl":"Server URL",
--- a/lemonldap-ng-manager/site/htdocs/static/languages/en.json
+++ b/lemonldap-ng-manager/site/htdocs/static/languages/en.json
@ -128,6 +128,7 @@
 "casSrvMetaDataOptionsDisplayName":"Name to display",
 "casSrvMetaDataOptionsGateway":"Gateway authentication",
 "casSrvMetaDataOptionsIcon":"Icon path",
+"casSrvMetaDataOptionsSortNumber":"Order",
 "casSrvMetaDataOptionsRenew":"Renew authentication",
 "casSrvMetaDataOptionsProxiedServices":"Proxied services",
 "casSrvMetaDataOptionsUrl":"Server URL",
--- a/lemonldap-ng-manager/site/htdocs/static/languages/fr.json
+++ b/lemonldap-ng-manager/site/htdocs/static/languages/fr.json
@ -128,6 +128,7 @@
 "casSrvMetaDataOptionsDisplayName":"Nom à afficher",
 "casSrvMetaDataOptionsGateway":"Authentification transparente",
 "casSrvMetaDataOptionsIcon":"Chemin de l'icône",
+"casSrvMetaDataOptionsSortNumber":"Ordre",
 "casSrvMetaDataOptionsRenew":"Renouveller l'authentification",
 "casSrvMetaDataOptionsProxiedServices":"Services mandatés",
 "casSrvMetaDataOptionsUrl":"URL du serveur",
--- a/lemonldap-ng-manager/site/htdocs/static/languages/it.json
+++ b/lemonldap-ng-manager/site/htdocs/static/languages/it.json
@ -128,6 +128,7 @@
 "casSrvMetaDataOptionsDisplayName":"Nome da visualizzare",
 "casSrvMetaDataOptionsGateway":"Autenticazione gateway",
 "casSrvMetaDataOptionsIcon":"Path icona",
+"casSrvMetaDataOptionsSortNumber":"Order",
 "casSrvMetaDataOptionsRenew":"Rinnova l'autenticazione",
 "casSrvMetaDataOptionsProxiedServices":"Servizi Proxied",
 "casSrvMetaDataOptionsUrl":"URL del server",
--- a/lemonldap-ng-manager/site/htdocs/static/languages/vi.json
+++ b/lemonldap-ng-manager/site/htdocs/static/languages/vi.json
@ -128,6 +128,7 @@
 "casSrvMetaDataOptionsDisplayName":"Tên để hiển thị",
 "casSrvMetaDataOptionsGateway":"Xác thực Gateway",
 "casSrvMetaDataOptionsIcon":"Đường dẫn Icon",
+"casSrvMetaDataOptionsSortNumber":"Order",
 "casSrvMetaDataOptionsRenew":"Gia hạn chứng thực",
 "casSrvMetaDataOptionsProxiedServices":"Dịch vụ proxy",
 "casSrvMetaDataOptionsUrl":"URL máy chủ",
--- a/lemonldap-ng-manager/site/htdocs/static/languages/zh.json
+++ b/lemonldap-ng-manager/site/htdocs/static/languages/zh.json
@ -128,6 +128,7 @@
 "casSrvMetaDataOptionsDisplayName":"显示名称",
 "casSrvMetaDataOptionsGateway":"网关认证",
 "casSrvMetaDataOptionsIcon":"图标路径",
+"casSrvMetaDataOptionsSortNumber":"Order",
 "casSrvMetaDataOptionsRenew":"Renew authentication",
 "casSrvMetaDataOptionsProxiedServices":"代理服务",
 "casSrvMetaDataOptionsUrl":"服务器 URL",
--- a/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Auth/CAS.pm
+++ b/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Auth/CAS.pm
@ -44,6 +44,8 @@ sub init {
          ->{casSrvMetaDataOptionsDisplayName};
        my $icon = $self->conf->{casSrvMetaDataOptions}->{$_}
          ->{casSrvMetaDataOptionsIcon};
+        my $order = $self->conf->{casSrvMetaDataOptions}->{$_}
+          ->{casSrvMetaDataOptionsSortNumber};
        my $img_src;

        if ($icon) {
@ -52,15 +54,21 @@ sub init {
              ? $icon
              : $portalPath . $self->p->staticPrefix . "/common/" . $icon;
        }
-
        push @list,
          {
            val   => $_,
            name  => $name,
            icon  => $img_src,
+            order => $order,
            class => "openidconnect",
          };
    }
+    @list =
+      sort {
+             $a->{order} <=> $b->{order}
+          or $a->{name} cmp $b->{name}
+          or $a->{val} cmp $b->{val}
+      } @list;
    $self->srvList( \@list );
    return 1;
 }