Differential D2635 Diff 7597 src/app/Providers/AppServiceProvider.php

Changeset View

Standalone View

src/app/Providers/AppServiceProvider.php

Show First 20 Lines • Show All 57 Lines • ▼ Show 20 Lines	public function boot()
implode(', ', $query->bindings),		implode(', ', $query->bindings),
$query->time / 1000		$query->time / 1000
)		)
);		);
});		});
}		}

// Register some template helpers		// Register some template helpers
Blade::directive('theme_asset', function ($path) {		Blade::directive(
		'theme_asset',
		function ($path) {
$path = trim($path, '/\'"');		$path = trim($path, '/\'"');
return "<?php echo secure_asset('themes/' . \$env['app.theme'] . '/' . '$path'); ?>";		return "<?php echo secure_asset('themes/' . \$env['app.theme'] . '/' . '$path'); ?>";
});		}
		);

// Query builder 'withEnvTenant' macro		Builder::macro(
Builder::macro('withEnvTenant', function (string $table = null) {		'withEnvTenantContext',
$tenant_id = \config('app.tenant_id');		function (string $table = null) {
		$tenantId = \config('app.tenant_id');

if ($tenant_id) {		if ($tenantId) {
/** @var Builder $this */		/** @var Builder $this */
return $this->where(($table ? "$table." : '') . 'tenant_id', $tenant_id);		return $this->where(($table ? "$table." : "") . "tenant_id", $tenantId);
}		}

/** @var Builder $this */		/** @var Builder $this */
return $this->whereNull(($table ? "$table." : '') . 'tenant_id');		return $this->whereNull(($table ? "$table." : "") . "tenant_id");
});		}
		);

		Builder::macro(
		'withObjectTenantContext',
		function (object $object, string $table = null) {
		// backend artisan cli
		if (app()->runningInConsole()) {
		/** @var Builder $this */
		return $this->where(($table ? "$table." : "") . "tenant_id", $object->tenant_id);
		}

// Query builder 'withUserTenant' macro		$subject = auth()->user();
Builder::macro('withUserTenant', function (string $table = null) {
$tenant_id = auth()->user()->tenant_id;

if ($tenant_id) {		if ($subject->role == "admin") {
/** @var Builder $this */		/** @var Builder $this */
return $this->where(($table ? "$table." : '') . 'tenant_id', $tenant_id);		return $this->where(($table ? "$table." : "") . "tenant_id", $object->tenant_id);
}		}

		$tenantId = $subject->tenant_id;

		if ($tenantId) {
		machniakUnsubmitted Done Inline Actions I guess we could be more specific on the $object type. We expect a Model. machniak: I guess we could be more specific on the $object type. We expect a Model.
/** @var Builder $this */		/** @var Builder $this */
return $this->whereNull(($table ? "$table." : '') . 'tenant_id');		return $this->where(($table ? "$table." : "") . "tenant_id", $tenantId);
});		}
		machniakUnsubmitted Done Inline Actions I don't like this method. 'withObjectTenantContext' means "with object's tenant" not "with object's tenant depending on who's asking". machniak: I don't like this method. 'withObjectTenantContext' means "with object's tenant" not "with…
		vanmeeuwenAuthorUnsubmitted Done Inline Actions Only administrators are supposed to be allowed to switch tenant contexts from their own, or the APP_TENANT_ID, in to the object's tenant context. This is a sanity check against abuse of the macro. That said, we should also add a CLI check. vanmeeuwen: Only administrators are supposed to be allowed to switch tenant contexts from their own, or the…

		/** @var Builder $this */
		return $this->whereNull(($table ? "$table." : "") . "tenant_id");
		}
		);

		Builder::macro(
		'withSubjectTenantContext',
		function (string $table = null) {
		if ($user = auth()->user()) {
		$tenantId = $user->tenant_id;
		} else {
		$tenantId = \config('app.tenant_id');
		}

		if ($tenantId) {
		/** @var Builder $this */
		return $this->where(($table ? "$table." : "") . "tenant_id", $tenantId);
		}

		/** @var Builder $this */
		return $this->whereNull(($table ? "$table." : "") . "tenant_id");
		}
		);

// Query builder 'whereLike' mocro		// Query builder 'whereLike' mocro
Builder::macro('whereLike', function (string $column, string $search, int $mode = 0) {		Builder::macro(
		machniakUnsubmitted Done Inline Actions There's no $object defined here. machniak: There's no $object defined here.
		'whereLike',
		function (string $column, string $search, int $mode = 0) {
$search = addcslashes($search, '%_');		$search = addcslashes($search, '%_');

switch ($mode) {		switch ($mode) {
case 2:		case 2:
$search .= '%';		$search .= '%';
break;		break;
case 1:		case 1:
$search = '%' . $search;		$search = '%' . $search;
break;		break;
default:		default:
$search = '%' . $search . '%';		$search = '%' . $search . '%';
}		}

/** @var Builder $this */		/** @var Builder $this */
return $this->where($column, 'like', $search);		return $this->where($column, 'like', $search);
});		}
		);
}		}
}		}