refactor: added controller for users, removed old code

thorsten · Oct 27, 2023 · 93cddb2 · 93cddb2
1 parent 326d902
commit 93cddb2
Show file tree

Hide file tree

Showing 9 changed files with 425 additions and 317 deletions.
diff --git a/nginx.conf b/nginx.conf
@@ -158,6 +158,13 @@ server {
             rewrite admin/api/group/members                /admin/api/index.php last;
             rewrite admin/api/group/permissions            /admin/api/index.php last;
             rewrite admin/api/search/term                  /admin/api/index.php last;
+            rewrite admin/api/user/users                   /admin/api/index.php last;
+            rewrite admin/api/user/activate                /admin/api/index.php last;
+            rewrite admin/api/user/add                     /admin/api/index.php last;
+            rewrite admin/api/user/data                    /admin/api/index.php last;
+            rewrite admin/api/user/delete                  /admin/api/index.php last;
+            rewrite admin/api/user/permissions             /admin/api/index.php last;
+            rewrite admin/api/user/overwrite-password      /admin/api/index.php last;
             rewrite admin/api/health-check                 /admin/api/index.php last;
             rewrite admin/api/updates                      /admin/api/index.php last;
             rewrite admin/api/update-check                 /admin/api/index.php last;

diff --git a/phpmyfaq/.htaccess b/phpmyfaq/.htaccess
@@ -169,6 +169,13 @@ RewriteRule admin/api/group/members                admin/api/index.php
 RewriteRule admin/api/group/permissions            admin/api/index.php
 RewriteRule admin/api/group/users                  admin/api/index.php
 RewriteRule admin/api/search/term                  admin/api/index.php
+RewriteRule admin/api/user/users                   admin/api/index.php
+RewriteRule admin/api/user/activate                admin/api/index.php
+RewriteRule admin/api/user/add                     admin/api/index.php
+RewriteRule admin/api/user/data                    admin/api/index.php
+RewriteRule admin/api/user/delete                  admin/api/index.php
+RewriteRule admin/api/user/permissions             admin/api/index.php
+RewriteRule admin/api/user/overwrite-password      admin/api/index.php
 RewriteRule admin/api/health-check                 admin/api/index.php
 RewriteRule admin/api/versions                     admin/api/index.php
 RewriteRule admin/api/update-check                 admin/api/index.php

diff --git a/phpmyfaq/admin/api/user.php b/phpmyfaq/admin/api/user.php
diff --git a/phpmyfaq/admin/assets/src/api/user.js b/phpmyfaq/admin/assets/src/api/user.js
@@ -14,7 +14,7 @@
  */
 
 export const fetchUsers = async (userName) => {
-  return await fetch(`index.php?action=ajax&ajax=user&ajaxaction=get_user_list&q=${userName}`, {
+  return await fetch(`./api/user/users?filter=${userName}`, {
     method: 'GET',
     cache: 'no-cache',
     headers: {
@@ -39,7 +39,7 @@ export const fetchUsers = async (userName) => {
 };
 
 export const fetchUserData = async (userId) => {
-  return await fetch(`index.php?action=ajax&ajax=user&ajaxaction=get_user_data&user_id=${userId}`, {
+  return await fetch(`./api/user/data/${userId}`, {
     method: 'GET',
     cache: 'no-cache',
     headers: {
@@ -60,7 +60,7 @@ export const fetchUserData = async (userId) => {
 };
 
 export const fetchUserRights = async (userId) => {
-  return await fetch(`index.php?action=ajax&ajax=user&ajaxaction=get_user_rights&user_id=${userId}`, {
+  return await fetch(`./api/user/permissions/${userId}`, {
     method: 'GET',
     cache: 'no-cache',
     headers: {
@@ -81,7 +81,7 @@ export const fetchUserRights = async (userId) => {
 };
 
 export const fetchAllUsers = async () => {
-  return await fetch('index.php?action=ajax&ajax=user&ajaxaction=get_all_user_data', {
+  return await fetch('./api/user/users', {
     method: 'GET',
     cache: 'no-cache',
     headers: {

diff --git a/phpmyfaq/admin/assets/src/user/user-list.js b/phpmyfaq/admin/assets/src/user/user-list.js
@@ -18,7 +18,7 @@
 import { addElement } from '../../../../assets/src/utils';
 
 const activateUser = (userId, csrfToken) => {
-  fetch('index.php?action=ajax&ajax=user&ajaxaction=activate_user', {
+  fetch('./api/user/activate', {
     method: 'POST',
     headers: {
       Accept: 'application/json, text/plain, */*',
@@ -53,7 +53,7 @@ const activateUser = (userId, csrfToken) => {
 
 const deleteUser = (userId, csrfToken) => {
   const message = document.getElementById('pmf-user-message');
-  fetch('index.php?action=ajax&ajax=user&ajaxaction=delete_user', {
+  fetch('./api/user/delete', {
     method: 'DELETE',
     headers: {
       Accept: 'application/json, text/plain, */*',