Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

2.1.1 Release #258

Merged
merged 10 commits into from
Oct 23, 2024
Merged

2.1.1 Release #258

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
c321f0e
chore: Bump version to 2.1.1-dev
dogukanoksuz Oct 16, 2024
2d9bbf8
feat: Remove unnecessary permission_data table
dogukanoksuz Oct 16, 2024
1fe065d
feat: Drop all old tables that is not used
dogukanoksuz Oct 16, 2024
ec7b013
fix: ID fields was not marked as primary key
dogukanoksuz Oct 16, 2024
c4646c8
feat: Added type field on variables
dogukanoksuz Oct 17, 2024
45afe73
refactor: Simplify conditionals in ExtensionController and Helpers.php
dogukanoksuz Oct 17, 2024
a2ec296
refactor: Simplify conditionals in RoleController.php and add extensi…
dogukanoksuz Oct 18, 2024
48aa406
feat: 2.1.1 Release
dogukanoksuz Oct 23, 2024
a3e7855
feat: 2.1.1 Release
dogukanoksuz Oct 23, 2024
b1b2c14
feat: New search system
dogukanoksuz Oct 23, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 1 addition & 7 deletions app/Http/Controllers/API/ExtensionController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,13 +150,7 @@ public function render(Request $request)
$this->checkPermissions(extension());
$this->checkForMissingSettings($dbJson);

if (extension()->status == '0') {
return response()->json([
'message' => 'Eklenti şu anda güncelleniyor, biraz sonra tekrar deneyiniz.',
], Response::HTTP_SERVICE_UNAVAILABLE);
}

if (extension()->require_key == 'true' && server()->key() == null) {
if (extension()->require_key == true && server()->key() == null) {
return response()->json([
'message' => 'Bu eklentiyi kullanabilmek için bir anahtara ihtiyacınız var, lütfen kasa üzerinden bir anahtar ekleyin.',
], Response::HTTP_FORBIDDEN);
Expand Down
209 changes: 125 additions & 84 deletions app/Http/Controllers/API/SearchController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
use App\Models\Server;
use Illuminate\Http\JsonResponse;
use Illuminate\Http\Request;
use Illuminate\Support\Facades\Cache;

/**
* Search Controller
Expand All @@ -24,114 +25,154 @@ class SearchController extends Controller
public function search(Request $request)
{
$searchable = [];
$searchQuery = strtolower($request->input('query'));

// Get constant searchables
if (user()->isAdmin()) {
foreach (config('liman.search.admin') as $constant) {
if (isset($constant['children'])) {
foreach ($constant['children'] as $child) {
if (! isset($searchable[$constant['name']])) {
$searchable[$constant['name']] = [];
}
$child['name'] = __($child['name']);
$searchable[$constant['name']][] = $child;
}
} else {
if (! isset($searchable['Yönetim'])) {
$searchable['Yönetim'] = [];
}
$constant['name'] = __($constant['name']);
$searchable['Yönetim'][] = $constant;
}
$results = Cache::remember(auth('api')->user()->id . '_searchable_' . $searchQuery, now()->addHour(), function () use ($searchable, $searchQuery) {
$configs = [
'user' => 'Kullanıcı',
'common' => 'Genel'
];

if (auth('api')->user()->isAdmin()) {
$configs['admin'] = 'Yönetici';
}
}

foreach (config('liman.search.user') as $constant) {
if (isset($constant['children'])) {
foreach ($constant['children'] as $child) {
if (! isset($searchable[$constant['name']])) {
$searchable[$constant['name']] = [];
}
$child['name'] = __($child['name']);
$searchable[$constant['name']][] = $child;
}
} else {
if (! isset($searchable['Kullanıcı'])) {
$searchable['Kullanıcı'] = [];
}
$constant['name'] = __($constant['name']);
$searchable['Kullanıcı'][] = $constant;
}
}

foreach (config('liman.search.common') as $constant) {
if (isset($constant['children'])) {
foreach ($constant['children'] as $child) {
if (! isset($searchable[$constant['name']])) {
$searchable[$constant['name']] = [];
foreach ($configs as $configKey => $defaultCategory) {
foreach (config("liman.search.$configKey") as $constant) {
$category = $constant['name'] ?? $defaultCategory;
if (isset($constant['children'])) {
foreach ($constant['children'] as $child) {
$child['name'] = __($child['name']);
$searchable[$category][] = $child;
}
} else {
$constant['name'] = __($constant['name']);
$searchable[$defaultCategory][] = $constant;
}
$child['name'] = __($child['name']);
$searchable[$constant['name']][] = $child;
}
} else {
if (! isset($searchable['Genel'])) {
$searchable['Genel'] = [];
}
$constant['name'] = __($constant['name']);
$searchable['Genel'][] = $constant;
}
}

// Server searching
$servers = Server::select('id', 'name')->get()
->filter(function ($server) {
return Permission::can(user()->id, 'server', 'id', $server->id);
});
$servers = Server::select('id', 'name')
->get()
->filter(function ($server) {
return Permission::can(user()->id, 'server', 'id', $server->id);
});

$searchable['Sunucular'] = [];
foreach ($servers as $server) {
if (Permission::can(user()->id, 'liman', 'id', 'server_details')) {
foreach ($servers as $server) {
$searchable['Sunucular'][] = [
'name' => $server->name,
'url' => "/servers/$server->id",
];
}

$extensions = $server->extensions();
foreach ($extensions as $extension) {
if (! isset($searchable[$server->name])) {
$searchable[$server->name] = [];
}

if (! empty($extension->display_name)) {
foreach ($server->extensions() as $extension) {
$searchable[$server->name][] = [
'name' => $extension->display_name,
'name' => $extension->display_name ?: $extension->name,
'url' => "/servers/$server->id/extensions/$extension->id",
];

continue;
$searchSettings = getExtensionJson($extension->name)["search"] ?? [];
foreach ($searchSettings as $search) {
$searchable[$server->name] = [
...$searchable[$server->name],
...$this->searchFromExtensions($server, $extension, $search, $searchQuery)
];
}
}
$searchable[$server->name][] = [
'name' => $extension->name,
'url' => "/servers/$server->id/extensions/$extension->id",
];
}
}

$results = [];
$searchQuery = $request->input('query');

foreach ($searchable as $category => $items) {
foreach ($items as $item) {
if (str_contains(strtolower($item['name']), strtolower($searchQuery))) {
if (! isset($results[$category])) {
$results[$category] = [];
$results = [];
foreach ($searchable as $category => $items) {
foreach ($items as $item) {
if (str_contains(strtolower($item['name']), $searchQuery)) {
$results[$category][] = $item;
}
$results[$category][] = $item;
}
}

return json_encode($results);
});

return $results;
}

/**
* Search from microservices
*/
private function searchFromExtensions($server, $extension, $settings, $searchQuery) {
// Check if permission exists
if (! Permission::can(auth('api')->user()->id, 'function', 'name', $extension->name, $settings['permission']))
return [];

if (strlen($searchQuery) < 2)
return [];

if (is_array($settings['search']['query_parameters']))
$settings['search']['query_parameters'] = json_encode($settings['search']['query_parameters']);

$settings['search']['query_parameters'] = str_replace(
sprintf("%%%%%s%%%%", $settings['search']['key']),
$searchQuery,
$settings['search']['query_parameters']
);

$settings['request'][$settings['search']['append_to']] .=
sprintf("?%s=%s", $settings['search']['query_key'], $settings['search']['query_parameters']);

$extensionCall = Cache::remember(
sprintf(
"%s_search_%s_%s_%s_%s",
auth('api')->user()->id,
$server->id,
$extension->id,
$searchQuery,
json_encode($settings['request'])
),
$settings['metadata']['cache_enabled'] ? now()->addHours(2) : now()->addSeconds(15),
function () use ($server, $extension, $settings) {
return callExtensionFunction(
$extension,
$server,
$settings['request'],
$settings['function'],
($settings['metadata']['timeout_ms'] / 1000) ?: 5
);
},
);

$records = [];
if (is_array($extensionCall)) {
$records = empty($settings['result']['take_from']) ? $extensionCall : ($extensionCall[$settings['result']['take_from']] ?? []);
} elseif (is_object($extensionCall)) {
$records = empty($settings['result']['take_from']) ? (array) $extensionCall : ((array) $extensionCall->{$settings['result']['take_from']} ?? []);
}

$results = [];
preg_match_all("/%%(.*?)%%/", $settings['result']['format'], $resultKeys);
preg_match_all("/%%(.*?)%%/", $settings['metadata']['url_format'], $urlKeys);
foreach ($records as $record) {
$record = (array) $record;
$results[] = [
'name' => (function () use ($resultKeys, $record, $settings) {
$name = $settings['result']['format'];
foreach ($resultKeys[1] as $key) {
$name = str_replace("%%$key%%", $record[$key] ?? '', $name);
}
return $name;
})(),
'url' => (function () use ($urlKeys, $record, $settings, $server, $extension) {
$url = $settings['metadata']['url_format'];
foreach ($urlKeys[1] as $key) {
$url = str_replace("%%$key%%", $record[$key] ?? '', $url);
}
return sprintf(
"/servers/%s/extensions/%s",
$server->id,
$extension->id
) . $url;
})(),
];
}

return response()->json((object) $results);
return $results;
}
}
19 changes: 4 additions & 15 deletions app/Http/Controllers/API/Settings/ExtensionController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,10 +102,9 @@ public function upload()
(string) request()->file('extension')->path()
);
}
$list = $this->setupNewExtension($zipFile, $verify);
$error = $list[0];
$new = $list[1];
$old = $list[2] ?? [];

list($error, $new, $old) = $this->setupNewExtension($zipFile);
$old = $old ?? [];

if ($error) {
return $error;
Expand Down Expand Up @@ -284,7 +283,7 @@ public function download()
*
* @throws GuzzleException
*/
private function setupNewExtension($zipFile, $verify = false)
private function setupNewExtension($zipFile)
{
// Initialize Zip Archive Object to use it later.
$zip = new ZipArchive();
Expand Down Expand Up @@ -339,12 +338,6 @@ private function setupNewExtension($zipFile, $verify = false)
];
}

if ($verify) {
$json['issuer'] = explode(' ', (string) $verify, 4)[3];
} else {
$json['issuer'] = '';
}

// Check If Extension Already Exists.
$extension = Extension::where('name', $json['name'])->first();
if ($extension) {
Expand All @@ -369,12 +362,8 @@ private function setupNewExtension($zipFile, $verify = false)
} else {
$new = new Extension();
}
unset($json['issuer']);
unset($json['status']);
unset($json['order']);
$json['display_name'] = json_encode($json['display_name']);
$new->fill($json);
$new->status = '1';
$new->save();

if (array_key_exists('dependencies', $json) && $json['dependencies'] != '') {
Expand Down
Loading
Loading