Backport from #20

THM-Health · Jul 19, 2022 · b8251a5 · b8251a5
1 parent 5a95dc7
commit b8251a5
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 2 deletions.
diff --git a/app/Http/Resources/ApplicationSettings.php b/app/Http/Resources/ApplicationSettings.php
@@ -98,6 +98,7 @@ public function toArray($request)
                 'retention_period'  => intval(setting('attendance.retention_period')),
             ],
             'room_token_expiration' => intval(setting('room_token_expiration')),
+            'ldap'                 => config('ldap.enabled'),
         ];
     }
 }
diff --git a/config/ldap.php b/config/ldap.php
@@ -2,6 +2,8 @@
 
 return [
 
+    'enabled'   => env('LDAP_ENABLED', false),
+
     /*
     |--------------------------------------------------------------------------
     | Default LDAP Connection Name

diff --git a/resources/js/views/Login.vue b/resources/js/views/Login.vue
@@ -4,7 +4,7 @@
       <div class="col-12 col-md-8 col-lg-6 offset-md-2 offset-lg-3">
         <b-card no-body bg-variant="light">
           <b-tabs content-class="m-3" align="center" fill active-nav-item-class="bg-success text-white">
-            <b-tab :title="$t('auth.ldap.tabTitle')" active>
+            <b-tab :title="$t('auth.ldap.tabTitle')" v-if="settings('ldap')" >
               <ldap-login-component
                 id="ldap"
                 :title="$t('auth.ldap.title')"
@@ -40,6 +40,7 @@ import EmailLoginComponent from '../components/Login/EmailLoginComponent';
 import LdapLoginComponent from '../components/Login/LdapLoginComponent';
 import env from '../env';
 import Base from '../api/base';
+import { mapGetters } from 'vuex';
 
 export default {
   components: {
@@ -55,6 +56,11 @@ export default {
       }
     };
   },
+  computed: {
+    ...mapGetters({
+      settings: 'session/settings'
+    })
+  },
   methods: {
     /**
      * Handle login request

diff --git a/routes/api.php b/routes/api.php
@@ -49,7 +49,9 @@
     })->name('setLocale');
 
     Route::post('login', [LoginController::class,'usersLogin'])->name('login');
-    Route::post('login/ldap', [LoginController::class,'ldapLogin'])->name('ldapLogin');
+    if (config('ldap.enabled')) {
+        Route::post('login/ldap', [LoginController::class,'ldapLogin'])->name('ldapLogin');
+    }
     Route::post('logout', [LoginController::class,'logout'])->name('logout');
     Route::post('password/reset', [ResetPasswordController::class,'reset'])->name('password.reset')->middleware(['guest', 'throttle:password_reset']);