Login Done

php/auto/auto.php

@@ -8,3 +8,13 @@ $dotenv->load();
 
 require_once $_SERVER['DOCUMENT_ROOT'] . '/php/auto/connection.php';
 require_once $_SERVER['DOCUMENT_ROOT'] . '/php/auto/user.php';
+
+if ($_SERVER['REQUEST_METHOD'] == 'POST') {
+  $contentType = $_SERVER['CONTENT_TYPE'] ?? '';
+  if (str_contains($contentType, 'application/json') || str_contains($contentType, 'text/plain')) {
+    $input = json_decode(file_get_contents("php://input"), true);
+    if (is_array($input)) {
+      $_POST = [...$_POST, ...$input];
+    }
+  }
+}

php/user/is_loged_in.php

@@ -1,9 +1,13 @@
 <?php
+require_once $_SERVER['DOCUMENT_ROOT'] . '/php/auto/auto.php';
 
 if (!isset($_SESSION['id'])) {
-    http_response_code(401);
+  http_response_code(401);
-    exit;
+  exit;
 }
 
 http_response_code(200);
-echo 'ok';
+echo json_encode([
+  "res" => "res.user.login.true",
+  "displayname" => $_SESSION['displayname']
+]);

php/user/ldapLogin.php

@@ -2,8 +2,8 @@
 
 require_once $_SERVER['DOCUMENT_ROOT'] . '/php/auto/auto.php';
 
-if ($_ENV['DEV_EMAIL']) {
+if (isset($_ENV['DEV_LOGIN'])) {
-  $email = $_ENV['DEV_EMAIL'];
+  $email = $_POST['username'];
   $find = $conn->prepare("SELECT user_id, username, display_name FROM users WHERE email = :email");
   $find->execute([':email' => $email]);
   $obstojeciUporabnik = $find->fetch();
@@ -22,30 +22,33 @@ if ($_ENV['DEV_EMAIL']) {
 
 use LdapRecord\Connection;
 $nimrodLDAP = new Connection([
-  'hosts' => [getenv('LDAP_HOST')],
+  'hosts' => [$_ENV['LDAP_HOST']],
   'port' => 389,
-  'base_dn' => getenv('LDAP_BASEDN'),
+  'base_dn' => $_ENV['LDAP_BASEDN'],
-  'username' => getenv('LDAP_USER'),
+  'username' => $_ENV['LDAP_USER'],
-  'password' => getenv('LDAP_SECRET')
+  'password' => $_ENV['LDAP_SECRET']
 ]);
 
-if (!isset($_POST['uporabnik']) || !isset($_POST['geslo'])) {
+if (!isset($_POST['username']) || !isset($_POST['pass'])) {
+  http_response_code(401);
   echo json_encode(["error" => "error.user.login.missing"]);
   exit;
 }
 
-$username = $_POST['uporabnik'];
+$username = $_POST['username'];
-$geslo = $_POST['geslo'];
+$geslo = $_POST['pass'];
 
 try {
   $nimrodLDAP->connect();
 } catch (Exception $e) {
+  http_response_code(401);
   echo json_encode(["error" => "error.user.login.connect"]);
   exit;
 }
 
 $LUser = $nimrodLDAP->query()->findBy('samaccountname', $username);
 if (empty($LUser)) {
+  http_response_code(401);
   echo json_encode(["error" => "error.user.login.notFound"]);
   exit;
 }
@@ -53,6 +56,7 @@ if (empty($LUser)) {
 $emailUserja = $LUser['userprincipalname'][0];
 $user = $LUser['distinguishedname'][0];
 if (!$nimrodLDAP->auth()->attempt($user, $geslo, $stayAuthenticated = true)) {
+  http_response_code(401);
   echo json_encode(["error" => "error.user.login.wrongPassword"]);
   exit;
 }
@@ -67,6 +71,7 @@ $razlikaGrup = array_intersect(
   array_map('strtolower', $dGrupe)
 );
 if (count($razlikaGrup) <= 0) {
+  http_response_code(401);
   echo json_encode(["error" => "error.user.login.groupRight"]);
   exit;
 }

php/user/logout.php

@@ -1,3 +1,4 @@
 <?php
+session_start();
 session_destroy();
 echo json_encode(["res" => "res.user.loginout.true"]);

typed-router.d.ts

@@ -45,6 +45,13 @@ declare module 'vue-router/auto-routes' {
       Record<never, never>,
       | never
     >,
+    '/logout': RouteRecordInfo<
+      '/logout',
+      '/logout',
+      Record<never, never>,
+      Record<never, never>,
+      | never
+    >,
     '/settings': RouteRecordInfo<
       '/settings',
       '/settings',
@@ -103,6 +110,14 @@ declare module 'vue-router/auto-routes' {
       pathParamNames:
         | never
     }
+    'vue/routes/logout.vue': {
+      routes:
+        | '/logout'
+      views:
+        | never
+      pathParamNames:
+        | never
+    }
     'vue/routes/settings.vue': {
       routes:
         | '/settings'

vue/components/Sidebar.vue

@@ -51,5 +51,6 @@ const items = [
   // { label: 'Reports', icon: 'fa-chart-line', to: '/reports' },
   { label: 'menu.userSettings', icon: 'fa-user-gear', to: '/user_settings' },
   { label: 'menu.settings', icon: 'fa-gear', to: '/settings' },
+  { label: 'menu.logout', icon: 'fa-right-from-bracket', to: '/logout' },
 ];
 </script>

vue/locales/en.json

@@ -1,17 +1,18 @@
 {
-  "userSettings":{
+  "userSettings": {
     "themeSelect": "Select theme",
-    "light":"Light",
+    "light": "Light",
-    "dark":"Dark"
+    "dark": "Dark"
   },
   "menu": {
     "settings": "Settings",
     "userSettings": "User settings",
-    "dashboard": "Dashboard"
+    "dashboard": "Dashboard",
+    "logout": "Logout"
   },
-  "settings":{
+  "settings": {
-    "users":"Users",
+    "users": "Users",
-    "groups":"Groups"
+    "groups": "Groups"
   },
   "common": {
     "save": "Save",

vue/locales/sl.json

@@ -7,7 +7,8 @@
   "menu": {
     "settings": "Nastavitve",
     "userSettings": "Uporabniške nastavitve",
-    "dashboard": "Nadzorna plošča"
+    "dashboard": "Nadzorna plošča",
+    "logout": "Odjava"
   },
   "settings": {
     "users": "Uporabni",

vue/routes/login.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="columns is-vcentered" style="height: 50rem;">
-    <div class="column is-2 is-offset-5">
+    <div class="column is-4 is-offset-4">
       <form @submit.prevent="logIn">
         <div class="field">
           <label class="label">{{ t('login.username') }}</label>
@@ -25,29 +25,47 @@
 </template>
 
 <script setup>
-import { ref } from 'vue';
+import { onMounted, ref } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { displayName, isLogedIn } from '../global';
 import { useRouter } from 'vue-router';
 const { t } = useI18n();
 const route = useRouter();
 
+onMounted(async () => {
+  console.log("HE");
+  const res = await fetch("/php/user/is_loged_in.php");
+  if (res.ok) {
+    const body = await res.json();
+    displayName.value = body.displayname;
+    isLogedIn.value = true;
+    route.push("/");
+  }
+});
+
+
 const userName = ref();
 const password = ref();
 
-async function logIn(){
+async function logIn() {
   const mes = {
     "username": userName.value,
     "pass": password.value
   }
   const res = await fetch("/php/user/ldapLogin.php", {
-    "body": mes,
+    "body": JSON.stringify(mes),
     "method": "POST"
   });
+
   const body = await res.json();
-  isLogedIn.value = true;
+  if (res.ok) {
-  displayName.value = body.displayname;
+    isLogedIn.value = true;
-  route.push("/");
+    displayName.value = body.displayname;
+    route.push("/");
+  } else {
+    console.log(body.error);
+    isLogedIn.value = true;
+  }
 }
 
 </script>

vue/routes/logout.vue

@@ -0,0 +1,18 @@
+<template>
+
+</template>
+<script setup>
+import { onMounted } from 'vue';
+import { useRouter } from 'vue-router';
+import { displayName, isLogedIn } from '../global';
+
+const router = useRouter();
+
+onMounted(async () => {
+  await fetch("/php/user/logout.php");
+  isLogedIn.value = false;
+  displayName.value = "";
+  router.push("/login");
+});
+
+</script>