@galadrim/galadmin 0.1.206 → 0.1.208

package/dist/types/config.d.ts

@@ -339,6 +339,7 @@ export type AuthRole = {
     usernameField: string;
     passwordField: string;
     idField: string;
+    filters?: string;
 };
 export type Config = {
     name: string;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@galadrim/galadmin",
-  "version": "0.1.206",
+  "version": "0.1.208",
   "main": "dist/index.js",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1",

package/src/api.ts

@@ -212,7 +212,7 @@ export default (db, config, user) => {
             customQuery: view.customQuery,
             join: view.join,
             selectExpression: view.selectExpression,
-            orderBy: req.body.orderBy || (view.subviews && req.body.subviewIndex !== undefined ? view.subviews[req.body.subviewIndex]?.orderBy : null) || view.orderBy,
+            orderBy: [req.body.orderBy || (view.subviews && req.body.subviewIndex !== undefined ? view.subviews[req.body.subviewIndex]?.orderBy : null) || view.orderBy, view.primaryId].filter(x => x).join(", "),
             isDesc: req.body.isDesc === null ? view.isDesc : req.body.isDesc,
             primaryId: view.primaryId,
             query: req.body.query,

package/src/index.ts

@@ -84,7 +84,8 @@ export default (config: Config): any => {
             res.send({ success: true })
         } else if (config.authRoles) {
             for (const authRole of config.authRoles) {
-                const { rows } = await db.query("SELECT * FROM ?? WHERE ?? = ?", [authRole.table, authRole.usernameField, req.body.username]);
+                const filters = authRole.filters ? `AND ${authRole.filters}` : ""
+                const { rows } = await db.query(`SELECT * FROM ?? WHERE ?? = ? ${filters}`, [authRole.table, authRole.usernameField, req.body.username]);
                 let user;
                 for (const row of rows) {
                     if (await passwordMatch(req.body.password, row[authRole.passwordField])) {

package/src/types/config.ts

@@ -183,7 +183,7 @@ export type CustomAction = {
   successMessage?: string;
   isBulkAction?: boolean;
   /**
-   * A callback that will be called after the action finishes successfully  
+   * A callback that will be called after the action finishes successfully
    * If set, the default success action will be ignored
    * @param record The record the action was called on
    * @param response The response from the action
@@ -406,6 +406,7 @@ export type AuthRole = {
   usernameField: string;
   passwordField: string;
   idField: string;
+  filters?: string;
 };
 
 export type Config = {