Work on login

php/auto/connection.php

@@ -1,8 +1,8 @@
 <?php
-$servername = getenv('DB_HOSTNAME');
+$servername = $_ENV['DB_HOSTNAME'];
-$username = getenv('DB_USERNAME');
+$username = $_ENV['DB_USERNAME'];
-$password = getenv('DB_PASS');
+$password = $_ENV['DB_PASS'];
-$dbname = getenv('DB_NAME');
+$dbname = $_ENV['DB_NAME'];
 
 try {
   $conn = new PDO("mysql:host=$servername;dbname=$dbname", $username, $password);
@@ -11,7 +11,7 @@ try {
   $conn->setAttribute(PDO::ATTR_DEFAULT_FETCH_MODE, PDO::FETCH_ASSOC);
   $conn->setAttribute(PDO::ATTR_EMULATE_PREPARES, false);
 } catch(PDOException $e) {
-  echo json_encode(["error" => "error.connect.faild"]);
+  echo json_encode(["error" => "error.connect.faild", "exc" => $e->getMessage()]);
   exit;
 }
 

php/auto/user.php

@@ -1,11 +1,12 @@
 <?php
 
-function hasPermission(string $resourceName, string $actionName): bool
+function hasPermission(string $resourceName, string $actionName)
 {
     global $conn;
 
     if(!isset($_SESSION['id'])){
-        return false;
+        http_response_code(401);
+        exit;  
     }
 
     $sql = "
@@ -28,5 +29,8 @@ function hasPermission(string $resourceName, string $actionName): bool
  
     $result = $stmt->fetch();
  
-    return ((int) $result['permission_count']) > 0;
+    if(((int) $result['permission_count']) <= 0){
+        http_response_code(403);
+        exit;
+    }
 }

php/user/is_loged_in.php

@@ -0,0 +1,9 @@
+<?php
+
+if (!isset($_SESSION['id'])) {
+    http_response_code(401);
+    exit;
+}
+
+http_response_code(200);
+echo 'ok';

php/user/ldapLogin.php

@@ -2,6 +2,24 @@
 
 require_once $_SERVER['DOCUMENT_ROOT'] . '/php/auto/auto.php';
 
+if ($_ENV['DEV_EMAIL']) {
+  $email = $_ENV['DEV_EMAIL'];
+  $find = $conn->prepare("SELECT user_id, username, display_name FROM users WHERE email = :email");
+  $find->execute([':email' => $email]);
+  $obstojeciUporabnik = $find->fetch();
+
+  $_SESSION['id'] = $obstojeciUporabnik['user_id'];
+  $_SESSION['username'] = $obstojeciUporabnik['username'];
+  $_SESSION['displayname'] = $obstojeciUporabnik['display_name'];
+  $_SESSION['email'] = $email;
+
+  echo json_encode([
+    "res" => "res.user.login.true",
+    "displayname" => $_SESSION['displayname']
+  ]);
+  exit;
+}
+
 use LdapRecord\Connection;
 $nimrodLDAP = new Connection([
   'hosts' => [getenv('LDAP_HOST')],
@@ -61,8 +79,8 @@ $find->execute([':email' => $email]);
 $obstojeciUporabnik = $find->fetch();
 
 if ($obstojeciUporabnik) {
-  $update = $conn->prepare("UPDATE users SET display_name = :display_name WHERE user_id = :user_id");
+  //$update = $conn->prepare("UPDATE users SET display_name = :display_name WHERE user_id = :user_id");
-  $update->execute([':display_name' => $uporabnik, ':user_id' => $obstojeciUporabnik['user_id']]);
+  //$update->execute([':display_name' => $uporabnik, ':user_id' => $obstojeciUporabnik['user_id']]);
 
   $_SESSION['id'] = $obstojeciUporabnik['user_id'];
   $_SESSION['username'] = $obstojeciUporabnik['username'];
@@ -76,4 +94,7 @@ if ($obstojeciUporabnik) {
 $_SESSION['displayname'] = $uporabnik;
 $_SESSION['email'] = $email;
 
-echo json_encode(["res" => "res.user.login.true"]);
+echo json_encode([
+  "res" => "res.user.login.true",
+  "displayname" => $_SESSION['displayname']
+]);

php/user/list.php

@@ -0,0 +1,10 @@
+<?php
+
+require_once $_SERVER['DOCUMENT_ROOT'] . '/php/auto/auto.php';
+
+
+$sql = "SELECT username, email, group_id FROM users;";
+
+$res = $conn->query($sql);
+
+echo json_encode($res);

typed-router.d.ts

@@ -38,6 +38,13 @@ declare module 'vue-router/auto-routes' {
       Record<never, never>,
       | never
     >,
+    '/login': RouteRecordInfo<
+      '/login',
+      '/login',
+      Record<never, never>,
+      Record<never, never>,
+      | never
+    >,
     '/settings': RouteRecordInfo<
       '/settings',
       '/settings',
@@ -88,6 +95,14 @@ declare module 'vue-router/auto-routes' {
       pathParamNames:
         | never
     }
+    'vue/routes/login.vue': {
+      routes:
+        | '/login'
+      views:
+        | never
+      pathParamNames:
+        | never
+    }
     'vue/routes/settings.vue': {
       routes:
         | '/settings'

vue/app.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="is-flex">
-    <Sidebar />
+    <Sidebar v-if="isLogedIn"/>
     <main class="p-5 is-flex-grow-1">
       <RouterView />
     </main>
@@ -8,11 +8,10 @@
 </template>
 
 <script setup>
-import { useI18n } from 'vue-i18n'
 import { applyTheme } from '@/components/theme';
 import Sidebar from '@/components/Sidebar.vue';
+import { isLogedIn } from './global';
 
 applyTheme();
 
-const { t } = useI18n();
 </script>

vue/components/Sidebar.vue

@@ -23,6 +23,7 @@
         </RouterLink>
       </li>
     </ul>
+    <p class="menu-label" v-if="!collapsed">{{ displayName }}</p>
   </aside>
 </template>
 
@@ -30,6 +31,7 @@
 import { ref } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { RouterLink } from 'vue-router';
+import { displayName } from '@/global.js';
 
 const { t } = useI18n()
 

vue/components/ThemeSwitcher.vue

@@ -2,16 +2,16 @@
   <div class="dropdown is-hoverable">
     <div class="dropdown-trigger">
       <button class="button">
-        <span>Barvna tema</span>
+        <span>{{ t('userSettings.themeSelect') }}</span>
       </button>
     </div>
     <div class="dropdown-menu">
       <div class="dropdown-content">
         <button class="dropdown-item" @click.prevent="setTheme('light')">
-          Svetlo
+          {{ t('userSettings.light') }}
         </button>
         <button class="dropdown-item" @click.prevent="setTheme('dark')">
-          Temno
+          {{ t('userSettings.dark') }}
         </button>
       </div>
     </div>
@@ -19,5 +19,7 @@
 </template>
 
 <script setup>
+import { useI18n } from 'vue-i18n';
 import { setTheme } from './theme';
+const {t} = useI18n();
 </script>

vue/global.js

@@ -0,0 +1,5 @@
+import { ref } from "vue";
+
+
+export const isLogedIn = ref(false);
+export const displayName = ref("");

vue/locales/en.json

@@ -1,4 +1,9 @@
 {
+  "userSettings":{
+    "themeSelect": "Select theme",
+    "light":"Light",
+    "dark":"Dark"
+  },
   "menu": {
     "settings": "Settings",
     "userSettings": "User settings",
@@ -18,8 +23,8 @@
     "search": "Search",
     "loading": "Loading..."
   },
-  "app": {
+  "login": {
-    "hello": "HELLO",
+    "username": "Username",
-    "world": "WORLD"
+    "password": "Password"
   }
 }

vue/locales/sl.json

@@ -1,9 +1,18 @@
 {
+  "userSettings": {
+    "themeSelect": "Izberi temo",
+    "light": "Svetlo",
+    "dark": "Temno"
+  },
   "menu": {
     "settings": "Nastavitve",
     "userSettings": "Uporabniške nastavitve",
     "dashboard": "Nadzorna plošča"
   },
+  "settings": {
+    "users": "Uporabni",
+    "groups": "Skupine"
+  },
   "common": {
     "save": "Shrani",
     "cancel": "Prekliči",
@@ -14,8 +23,8 @@
     "search": "Iskanje",
     "loading": "Nalaganje..."
   },
-  "app": {
+  "login": {
-    "hello": "ZDRAVO",
+    "username": "Uporabniško ime",
-    "world": "SVET"
+    "password": "Geslo"
   }
 }

vue/main.js

@@ -6,6 +6,7 @@ import { i18n, setLocale, initialLocale } from './i18n.js'
 import './css/all.css'
 
 import App from './app.vue'
+import { isLogedIn } from './global.js'
 
 await setLocale(initialLocale())
 
@@ -18,5 +19,12 @@ if (import.meta.hot) {
   handleHotUpdate(router)
 }
 
+router.beforeEach(async (to, from) => {
+  if (!isLogedIn.value && to.name != '/login' ) {
+    // redirect the user to the login page
+    return { name: '/login' }
+  }
+})
+
 createApp(App).use(router).use(i18n).mount('#app')
 

vue/routes/login.vue

@@ -0,0 +1,53 @@
+<template>
+  <div class="columns is-vcentered" style="height: 50rem;">
+    <div class="column is-2 is-offset-5">
+      <form @submit.prevent="logIn">
+        <div class="field">
+          <label class="label">{{ t('login.username') }}</label>
+          <div class="control">
+            <input class="input" type="text" v-model="userName">
+          </div>
+        </div>
+        <div class="field">
+          <label class="label">{{ t('login.password') }}</label>
+          <div class="control">
+            <input class="input" type="password" v-model="password">
+          </div>
+        </div>
+        <div class="field">
+          <div class="control">
+            <button class="button is-primary">{{ t('common.confirm') }}</button>
+          </div>
+        </div>
+      </form>
+    </div>
+  </div>
+</template>
+
+<script setup>
+import { ref } from 'vue';
+import { useI18n } from 'vue-i18n';
+import { displayName, isLogedIn } from '../global';
+import { useRouter } from 'vue-router';
+const { t } = useI18n();
+const route = useRouter();
+
+const userName = ref();
+const password = ref();
+
+async function logIn(){
+  const mes = {
+    "username": userName.value,
+    "pass": password.value
+  }
+  const res = await fetch("/php/user/ldapLogin.php", {
+    "body": mes,
+    "method": "POST"
+  });
+  const body = await res.json();
+  isLogedIn.value = true;
+  displayName.value = body.displayname;
+  route.push("/");
+}
+
+</script>