From 13120fd1e246fc0a3db9a6e73d5c50d8551ea06c Mon Sep 17 00:00:00 2001
From: Christophe Maudoux <chrmdx@gmail.com>
Date: Sun, 28 Aug 2022 00:46:50 +0200
Subject: [PATCH] Remove dead code

---
 .../lib/Lemonldap/NG/Common/Session/REST.pm   |  8 +----
 .../lib/Lemonldap/NG/Manager/Conf.pm          | 35 ++++++++-----------
 2 files changed, 16 insertions(+), 27 deletions(-)

diff --git a/lemonldap-ng-common/lib/Lemonldap/NG/Common/Session/REST.pm b/lemonldap-ng-common/lib/Lemonldap/NG/Common/Session/REST.pm
index a3fba4b0f..77a0f2ef5 100644
--- a/lemonldap-ng-common/lib/Lemonldap/NG/Common/Session/REST.pm
+++ b/lemonldap-ng-common/lib/Lemonldap/NG/Common/Session/REST.pm
@@ -5,7 +5,7 @@ use Mouse;
 use Lemonldap::NG::Common::Conf::Constants;
 use JSON qw(from_json to_json);
 
-our $VERSION = '2.0.14';
+our $VERSION = '2.0.15';
 
 has sessionTypes => ( is => 'rw' );
 
@@ -45,8 +45,6 @@ sub hAttr {
 
 sub delSession {
     my ( $self, $req ) = @_;
-    return $self->sendJSONresponse( $req, { result => 1 } )
-      if ( $self->{demoMode} );
     my $mod = $self->getMod($req)
       or return $self->sendError( $req, undef, 400 );
     my $id = $req->params('sessionId')
@@ -64,8 +62,6 @@ sub delSession {
 
 sub deleteOIDCConsent {
     my ( $self, $req ) = @_;
-    return $self->sendJSONresponse( $req, { result => 1 } )
-      if ( $self->{demoMode} );
     my $mod = $self->getMod($req)
       or return $self->sendError( $req, undef, 400 );
     my $id = $req->params('sessionId')
@@ -137,8 +133,6 @@ sub deleteOIDCConsent {
 
 sub delete2F {
     my ( $self, $req ) = @_;
-    return $self->sendJSONresponse( $req, { result => 1 } )
-      if ( $self->{demoMode} );
     my $mod = $self->getMod($req)
       or return $self->sendError( $req, undef, 400 );
     my $id = $req->params('sessionId')
diff --git a/lemonldap-ng-manager/lib/Lemonldap/NG/Manager/Conf.pm b/lemonldap-ng-manager/lib/Lemonldap/NG/Manager/Conf.pm
index 9b59998f8..99f1921dd 100644
--- a/lemonldap-ng-manager/lib/Lemonldap/NG/Manager/Conf.pm
+++ b/lemonldap-ng-manager/lib/Lemonldap/NG/Manager/Conf.pm
@@ -460,28 +460,23 @@ sub newRawConf {
     }
 
     my $res = {};
-    if ( $self->p->{demoMode} ) {
-        $res->{message} = '__demoModeOn__';
+
+    # When uploading a new conf, always force it since cfgNum has a few
+    # chances to be equal to last config cfgNum
+    my $s = $self->confAcc->saveConf( $new, force => 1 );
+    if ( $s > 0 ) {
+        $self->userLogger->notice(
+            'User ' . $self->p->userId($req) . " has stored (raw) conf $s" );
+        $res->{result} = 1;
+        $res->{cfgNum} = $s;
     }
     else {
-        # When uploading a new conf, always force it since cfgNum has a few
-        # chances to be equal to last config cfgNum
-        my $s = $self->confAcc->saveConf( $new, force => 1 );
-        if ( $s > 0 ) {
-            $self->userLogger->notice( 'User '
-                  . $self->p->userId($req)
-                  . " has stored (raw) conf $s" );
-            $res->{result} = 1;
-            $res->{cfgNum} = $s;
-        }
-        else {
-            $self->userLogger->notice(
-                'Raw saving attempt rejected, asking for confirmation to '
-                  . $self->p->userId($req) );
-            $res->{result}      = 0;
-            $res->{needConfirm} = 1 if ( $s == CONFIG_WAS_CHANGED );
-            $res->{message} .= '__needConfirmation__';
-        }
+        $self->userLogger->notice(
+            'Raw saving attempt rejected, asking for confirmation to '
+              . $self->p->userId($req) );
+        $res->{result}      = 0;
+        $res->{needConfirm} = 1 if ( $s == CONFIG_WAS_CHANGED );
+        $res->{message} .= '__needConfirmation__';
     }
     return $self->sendJSONresponse( $req, $res );
 }