underpost 2.8.872 → 2.8.873

package/src/client/services/user/user.management.js

@@ -13,6 +13,7 @@ const UserManagement = {
         add: role === 'admin',
         remove: role === 'admin',
       },
+      usePagination: true,
       columnDefs: [
         { field: 'username', headerName: 'username', editable: role === 'admin' },
         { field: 'email', headerName: 'email', editable: role === 'admin' },
@@ -44,6 +45,11 @@ const UserManagement = {
       ],
       defaultColKeyFocus: 'username',
       ServiceProvider: UserService,
+      serviceOptions: {
+        get: {
+          id: 'all',
+        },
+      },
     });
   },
 };

package/src/client/services/user/user.service.js

@@ -36,9 +36,15 @@ const UserService = {
           return reject(error);
         }),
     ),
-  get: (options = { id: '' }) =>
-    new Promise((resolve, reject) =>
-      fetch(getApiBaseUrl({ id: options.id, endpoint }), {
+  get: (options = { id: '', page: 1, limit: 10 }) => {
+    const { id = '', page, limit } = options;
+    const query = new URLSearchParams();
+    if (page) query.set('page', page);
+    if (limit) query.set('limit', limit);
+    const queryString = query.toString();
+    const url = `${getApiBaseUrl({ id, endpoint })}${queryString ? (id.includes('?') ? '&' : '?') + queryString : ''}`;
+    return new Promise((resolve, reject) =>
+      fetch(url, {
         method: 'GET',
         headers: headersFactory(),
       })
@@ -53,7 +59,8 @@ const UserService = {
           logger.error(error);
           return reject(error);
         }),
-    ),
+    );
+  },
   delete: (options = { id: '', body: {} }) =>
     new Promise((resolve, reject) =>
       fetch(getApiBaseUrl({ id: options.id, endpoint }), {

package/src/index.js

@@ -35,7 +35,7 @@ class Underpost {
    * @type {String}
    * @memberof Underpost
    */
-  static version = 'v2.8.872';
+  static version = 'v2.8.873';
   /**
    * Repository cli API
    * @static
@@ -171,6 +171,28 @@ const up = Underpost;
 
 const underpost = Underpost;
 
-export { underpost, up, Underpost };
+export {
+  underpost,
+  up,
+  Underpost,
+  UnderpostBaremetal,
+  UnderpostCloudInit,
+  UnderpostCluster,
+  UnderpostCron,
+  UnderpostDB,
+  UnderpostDeploy,
+  UnderpostRootEnv,
+  UnderpostFileStorage,
+  UnderpostImage,
+  UnderpostLxd,
+  UnderpostMonitor,
+  UnderpostRepository,
+  UnderpostRun,
+  UnderpostScript,
+  UnderpostSecret,
+  UnderpostSSH,
+  UnderpostTest,
+  UnderpostStartUp,
+};
 
 export default Underpost;

package/src/runtime/lampp/Lampp.js

@@ -1,6 +1,5 @@
 import fs from 'fs-extra';
-import { shellCd, shellExec } from '../../server/process.js';
-import { timer } from '../../client/components/core/CommonJs.js';
+import { getRootDirectory, shellCd, shellExec } from '../../server/process.js';
 import { loggerFactory } from '../../server/logger.js';
 
 const logger = loggerFactory(import.meta);
@@ -107,6 +106,94 @@ const Lampp = {
         break;
     }
   },
+  createApp: async ({ port, host, path, directory, rootHostPath, redirect, redirectTarget }) => {
+    if (!Lampp.enabled()) return { disabled: true };
+    if (!Lampp.ports.includes(port)) Lampp.ports.push(port);
+    if (currentPort === initPort) Lampp.removeRouter();
+    Lampp.appendRouter(`
+Listen ${port}
+
+<VirtualHost *:${port}>
+  DocumentRoot "${directory ? directory : `${getRootDirectory()}${rootHostPath}`}"
+  ServerName ${host}:${port}
+
+  <Directory "${directory ? directory : `${getRootDirectory()}${rootHostPath}`}">
+    Options Indexes FollowSymLinks MultiViews
+    AllowOverride All
+    Require all granted
+  </Directory>
+
+  ${
+    redirect
+      ? `
+    RewriteEngine on
+
+    RewriteCond %{REQUEST_URI} !^/.well-known/acme-challenge
+    RewriteRule ^(.*)$ ${redirectTarget}%{REQUEST_URI} [R=302,L]
+  `
+      : ''
+  }
+
+  ErrorDocument 400 ${path === '/' ? '' : path}/400.html
+  ErrorDocument 404 ${path === '/' ? '' : path}/400.html
+  ErrorDocument 500 ${path === '/' ? '' : path}/500.html
+  ErrorDocument 502 ${path === '/' ? '' : path}/500.html
+  ErrorDocument 503 ${path === '/' ? '' : path}/500.html
+  ErrorDocument 504 ${path === '/' ? '' : path}/500.html
+
+</VirtualHost>
+            
+`);
+    // ERR too many redirects:
+    // Check: SELECT * FROM database.wp_options where option_name = 'siteurl' or option_name = 'home';
+    // Check: wp-config.php
+    // if (isset($_SERVER['HTTP_X_FORWARDED_PROTO']) && $_SERVER['HTTP_X_FORWARDED_PROTO'] === 'https') {
+    //   $_SERVER['HTTPS'] = 'on';
+    // }
+    // For plugins:
+    // define( 'FS_METHOD', 'direct' );
+
+    // ErrorDocument 404 /custom_404.html
+    // ErrorDocument 500 /custom_50x.html
+    // ErrorDocument 502 /custom_50x.html
+    // ErrorDocument 503 /custom_50x.html
+    // ErrorDocument 504 /custom_50x.html
+
+    // Respond When Error Pages are Directly Requested
+
+    // <Files "custom_404.html">
+    //     <If "-z %{ENV:REDIRECT_STATUS}">
+    //         RedirectMatch 404 ^/custom_404.html$
+    //     </If>
+    // </Files>
+
+    // <Files "custom_50x.html">
+    //     <If "-z %{ENV:REDIRECT_STATUS}">
+    //         RedirectMatch 404 ^/custom_50x.html$
+    //     </If>
+    // </Files>
+
+    // Add www or https with htaccess rewrite
+
+    // Options +FollowSymLinks
+    // RewriteEngine On
+    // RewriteCond %{HTTP_HOST} ^ejemplo.com [NC]
+    // RewriteRule ^(.*)$ http://ejemplo.com/$1 [R=301,L]
+
+    // Redirect http to https with htaccess rewrite
+
+    // RewriteEngine On
+    // RewriteCond %{SERVER_PORT} 80
+    // RewriteRule ^(.*)$ https://www.ejemplo.com/$1 [R,L]
+
+    // Redirect to HTTPS with www subdomain
+
+    // RewriteEngine On
+    // RewriteCond %{HTTPS} off [OR]
+    // RewriteCond %{HTTP_HOST} ^www\. [NC]
+    // RewriteCond %{HTTP_HOST} ^(?:www\.)?(.+)$ [NC]
+    // RewriteRule ^ https://%1%{REQUEST_URI} [L,NE,R=301]
+  },
 };
 
 export { Lampp };

package/src/runtime/xampp/Xampp.js

@@ -1,5 +1,5 @@
 import fs from 'fs-extra';
-import { shellExec } from '../../server/process.js';
+import { shellExec, getRootDirectory } from '../../server/process.js';
 
 const Xampp = {
   ports: [],
@@ -31,6 +31,53 @@ const Xampp = {
     this.router = undefined;
     if (fs.existsSync(`./tmp/xampp-router.conf`)) fs.rmSync(`./tmp/xampp-router.conf`);
   },
+  createApp: async ({ port, host, path, directory, rootHostPath, redirect, redirectTarget }) => {
+    if (!Xampp.enabled()) {
+      return { disabled: true };
+    }
+    if (!Xampp.ports.includes(port)) Xampp.ports.push(port);
+    if (currentPort === initPort) Xampp.removeRouter();
+    Xampp.appendRouter(`
+Listen ${port}
+
+<VirtualHost *:${port}>    
+  DocumentRoot "${directory ? directory : `${getRootDirectory()}${rootHostPath}`}"
+  ServerName ${host}:${port}
+
+  <Directory "${directory ? directory : `${getRootDirectory()}${rootHostPath}`}">
+    Options Indexes FollowSymLinks MultiViews
+    AllowOverride All
+    Require all granted
+  </Directory>
+
+  ${
+    redirect
+      ? `
+    RewriteEngine on
+    
+    RewriteCond %{REQUEST_URI} !^/.well-known/acme-challenge
+    RewriteRule ^(.*)$ ${redirectTarget}%{REQUEST_URI} [R=302,L]
+  `
+      : ''
+  }
+
+  ErrorDocument 400 ${path === '/' ? '' : path}/400.html
+  ErrorDocument 404 ${path === '/' ? '' : path}/400.html
+  ErrorDocument 500 ${path === '/' ? '' : path}/500.html
+  ErrorDocument 502 ${path === '/' ? '' : path}/500.html
+  ErrorDocument 503 ${path === '/' ? '' : path}/500.html
+  ErrorDocument 504 ${path === '/' ? '' : path}/500.html
+
+</VirtualHost>
+
+`);
+    // ERR too many redirects:
+    // Check: SELECT * FROM database.wp_options where option_name = 'siteurl' or option_name = 'home';
+    // Check: wp-config.php
+    // if (isset($_SERVER['HTTP_X_FORWARDED_PROTO']) && $_SERVER['HTTP_X_FORWARDED_PROTO'] === 'https') {
+    //   $_SERVER['HTTPS'] = 'on';
+    // }
+  },
 };
 
 export { Xampp };