mirror of
				https://github.com/NginxProxyManager/nginx-proxy-manager.git
				synced 2025-10-31 15:53:33 +00:00 
			
		
		
		
	- Updated objection, knex, liquidjs, signale and sqlite3 packages
- Changes for objection migration - Moved common access template code to an include - Fixed access rules configuration generation
This commit is contained in:
		| @@ -50,7 +50,6 @@ class AccessList extends Model { | ||||
| 				}, | ||||
| 				modify: function (qb) { | ||||
| 					qb.where('user.is_deleted', 0); | ||||
| 					qb.omit(['id', 'created_on', 'modified_on', 'is_deleted', 'email', 'roles']); | ||||
| 				} | ||||
| 			}, | ||||
| 			items: { | ||||
| @@ -59,9 +58,6 @@ class AccessList extends Model { | ||||
| 				join:       { | ||||
| 					from: 'access_list.id', | ||||
| 					to:   'access_list_auth.access_list_id' | ||||
| 				}, | ||||
| 				modify: function (qb) { | ||||
| 					qb.omit(['id', 'created_on', 'modified_on', 'access_list_id', 'meta']); | ||||
| 				} | ||||
| 			}, | ||||
| 			clients: { | ||||
| @@ -70,9 +66,6 @@ class AccessList extends Model { | ||||
| 				join:       { | ||||
| 					from: 'access_list.id', | ||||
| 					to:   'access_list_client.access_list_id' | ||||
| 				}, | ||||
| 				modify: function (qb) { | ||||
| 					qb.omit(['id', 'created_on', 'modified_on', 'access_list_id', 'meta']); | ||||
| 				} | ||||
| 			}, | ||||
| 			proxy_hosts: { | ||||
| @@ -84,19 +77,10 @@ class AccessList extends Model { | ||||
| 				}, | ||||
| 				modify: function (qb) { | ||||
| 					qb.where('proxy_host.is_deleted', 0); | ||||
| 					qb.omit(['is_deleted', 'meta']); | ||||
| 				} | ||||
| 			} | ||||
| 		}; | ||||
| 	} | ||||
|  | ||||
| 	get satisfy() { | ||||
| 		return this.satisfy_any ? 'satisfy any' : 'satisfy all'; | ||||
| 	} | ||||
|  | ||||
| 	get passauth() { | ||||
| 		return this.pass_auth ? '' : 'proxy_set_header Authorization "";'; | ||||
| 	} | ||||
| } | ||||
|  | ||||
| module.exports = AccessList; | ||||
|   | ||||
		Reference in New Issue
	
	Block a user