From 3db9bec58802964c77427cc499ddaf003017b52a Mon Sep 17 00:00:00 2001
From: Xavier Guimard <xavier.guimard@laposte.net>
Date: Mon, 10 Apr 2017 07:25:41 +0000
Subject: [PATCH] Move UA to macro (partial revert r6447) [#1044]

---
 _example/conf/lmConf-1.json                              | 5 ++---
 e2e-tests/manager/06-form.js                             | 2 +-
 e2e-tests/manager/36-diff.js                             | 2 +-
 e2e-tests/manager/40-sessions.js                         | 2 +-
 .../lib/Lemonldap/NG/Manager/Conf/Zero.pm                | 9 ++++-----
 5 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/_example/conf/lmConf-1.json b/_example/conf/lmConf-1.json
index f5f88dafc..9aef1bfa0 100644
--- a/_example/conf/lmConf-1.json
+++ b/_example/conf/lmConf-1.json
@@ -102,9 +102,7 @@
          "Auth-User" : "$uid"
       }
    },
-   "exportedVars" : {
-      "UA" : "HTTP_USER_AGENT"
-   },
+   "exportedVars" : {},
    "globalStorage" : "Apache::Session::File",
    "globalStorageOptions" : {
       "Directory" : "__SESSIONDIR__",
@@ -138,6 +136,7 @@
    },
    "loginHistoryEnabled" : 1,
    "macros" : {
+      "UA" : "HTTP_USER_AGENT",
       "_whatToTrace" : "$_auth eq 'SAML' ? \"$_user\\@$_idpConfKey\" : $_auth eq 'OpenIDConnect' ? \"$_user\\@$_oidcConnectedRP\" : \"$_user\""
    },
    "mailUrl" : "http://auth.__DNSDOMAIN__/resetpwd",
diff --git a/e2e-tests/manager/06-form.js b/e2e-tests/manager/06-form.js
index 0f4ed2bb6..39c1f6945 100644
--- a/e2e-tests/manager/06-form.js
+++ b/e2e-tests/manager/06-form.js
@@ -17,4 +17,4 @@ describe('Lemonldap::NG Manager', function() {
       expect(skinChoice.count()).toEqual(1);
     });
   });
-});
+});
\ No newline at end of file
diff --git a/e2e-tests/manager/36-diff.js b/e2e-tests/manager/36-diff.js
index 0d57f0182..7aca5827c 100644
--- a/e2e-tests/manager/36-diff.js
+++ b/e2e-tests/manager/36-diff.js
@@ -17,4 +17,4 @@ describe('Lemonldap::NG Manager', function() {
     });
 
   });
-});
+});
\ No newline at end of file
diff --git a/e2e-tests/manager/40-sessions.js b/e2e-tests/manager/40-sessions.js
index a787410e1..393be452f 100644
--- a/e2e-tests/manager/40-sessions.js
+++ b/e2e-tests/manager/40-sessions.js
@@ -50,4 +50,4 @@ describe('Lemonldap::NG Session explorer', function() {
     expect(t.count()).toBeGreaterThan(0);
   });
 
-});
+});
\ No newline at end of file
diff --git a/lemonldap-ng-manager/lib/Lemonldap/NG/Manager/Conf/Zero.pm b/lemonldap-ng-manager/lib/Lemonldap/NG/Manager/Conf/Zero.pm
index 968d9f3ce..e92e27d8f 100644
--- a/lemonldap-ng-manager/lib/Lemonldap/NG/Manager/Conf/Zero.pm
+++ b/lemonldap-ng-manager/lib/Lemonldap/NG/Manager/Conf/Zero.pm
@@ -108,7 +108,8 @@ sub zeroConf {
         },
         'macros' => {
             '_whatToTrace' =>
-'$_auth eq \'SAML\' ? "$_user\\@$_idpConfKey" : $_auth eq \'OpenIDConnect\' ? "$_user\\@$_oidcConnectedRP" : "$_user"'
+'$_auth eq \'SAML\' ? "$_user\\@$_idpConfKey" : $_auth eq \'OpenIDConnect\' ? "$_user\\@$_oidcConnectedRP" : "$_user"',
+            'UA' => 'HTTP_USER_AGENT'
         },
         'notificationStorageOptions' => {
             'dirName' => $notificationDir
@@ -167,10 +168,8 @@ sub zeroConf {
         'cookieName'    => 'lemonldap',
         'cfgAuthor'     => 'The LemonLDAP::NG team',
         'cfgVersion'    => $VERSION,
-        'exportedVars'  => {
-            'UA' => 'HTTP_USER_AGENT'
-        },
-        'portalSkin' => 'bootstrap',
+        'exportedVars'  => {},
+        'portalSkin'    => 'bootstrap',
         'portalSkinBackground' =>
           '1280px-Cedar_Breaks_National_Monument_partially.jpg',
         'mailUrl'                    => "http://auth.$domain/resetpwd",
-- 
GitLab