shortcut/nextcloud-analytics
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix: Clean up controller namespace structure, remove duplicate Admin subdirectory controllers

Browse Source
This commit is contained in:
WLTBAgent
2026-02-16 16:20:00 +00:00
parent a8bf6bcb6c
commit 922f36d686
6 changed files with 7 additions and 190 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
analyticshub-v2.zip Normal file
View File

Binary file not shown.

6
analyticshub/appinfo/routes.php
View File

@@ -12,19 +12,19 @@ return [
'routes' => [
// Admin routes
[
'name' => 'Admin\PageController#index',
'name' => 'page#index',
'url' => '/',
'verb' => 'GET',
'requirements' => [],
],
[
'name' => 'Admin\AdminController#load',
'name' => 'admin#load',
'url' => '/admin/load',
'verb' => 'GET',
'requirements' => [],
],
[
'name' => 'Admin\AdminController#save',
'name' => 'admin#save',
'url' => '/admin/save',
'verb' => 'POST',
'requirements' => [],

144
analyticshub/lib/Controller/Admin/PageController.php
View File

@@ -1,144 +0,0 @@
<?php
declare(strict_types=1);
namespace OCA\AnalyticsHub\Controller\Admin;
use OCP\IRequest;
use OCP\AppFramework\Http\TemplateResponse;
use OCP\AppFramework\Http\JSONResponse;
use OCP\IConfig;
use OCA\AnalyticsHub\AppInfo\Application;
use OCP\AppFramework\Controller;
/**
* Admin Settings Controller
*
* @NoAdminRequired
* @NoCSRFRequired
*/
class PageController extends Controller {
private $appName;
protected $request;
private IConfig $config;
public function __construct(string $appName, IRequest $request, IConfig $config) {
parent::__construct($appName, $request);
$this->appName = $appName;
$this->request = $request;
$this->config = $config;
}
/**
* Index page - render admin UI
*
* @NoAdminRequired
* @NoCSRFRequired
*/
public function index(): TemplateResponse {
// Load saved configuration
$googleClientId = $this->config->getAppValue(Application::APP_NAME, 'google_client_id', '');
$googleClientSecret = '•••'; // Masked for display
$anthropicApiKey = '••••••••'; // Masked for display
$isConfigured = !empty($googleClientId) && !empty($this->config->getAppValue(Application::APP_NAME, 'anthropic_api_key', ''));
return new TemplateResponse($this->appName, 'admin', [
'app_name' => $this->appName,
'version' => Application::APP_VERSION,
'is_configured' => $isConfigured,
'google_client_id' => $googleClientId,
'google_client_secret_masked' => $googleClientSecret,
'anthropic_api_key_masked' => $anthropicApiKey,
]);
}
/**
* Save configuration
*
* @NoAdminRequired
* @NoCSRFRequired
*/
public function save(): JSONResponse {
$params = $this->request->getParams();
// Validate required fields
if (!isset($params['google_client_id']) || empty($params['google_client_id'])) {
return new JSONResponse([
'success' => false,
'error' => 'Google Client ID is required'
]);
}
if (!isset($params['google_client_secret']) || empty($params['google_client_secret'])) {
return new JSONResponse([
'success' => false,
'error' => 'Google Client Secret is required'
]);
}
if (!isset($params['anthropic_api_key']) || empty($params['anthropic_api_key'])) {
return new JSONResponse([
'success' => false,
'error' => 'Anthropic API Key is required'
]);
}
try {
// Save configuration
$this->config->setAppValue(Application::APP_NAME, 'google_client_id', $params['google_client_id']);
$this->config->setAppValue(Application::APP_NAME, 'google_client_secret', $params['google_client_secret']);
$this->config->setAppValue(Application::APP_NAME, 'anthropic_api_key', $params['anthropic_api_key']);
// Check if now configured
$isConfigured = !empty($params['google_client_id']) && !empty($params['anthropic_api_key']);
return new JSONResponse([
'success' => true,
'data' => [
'is_configured' => $isConfigured,
'message' => 'Configuration saved successfully'
]
]);
} catch (\Exception $e) {
return new JSONResponse([
'success' => false,
'error' => $e->getMessage()
]);
}
}
/**
* Load configuration
*
* @NoAdminRequired
* @NoCSRFRequired
*/
public function load(): JSONResponse {
try {
// Load configuration
$googleClientId = $this->config->getAppValue(Application::APP_NAME, 'google_client_id', '');
$googleClientSecret = ''; // Don't expose secret
$anthropicApiKey = ''; // Don't expose secret
$isConfigured = !empty($googleClientId) && !empty($this->config->getAppValue(Application::APP_NAME, 'anthropic_api_key', ''));
return new JSONResponse([
'success' => true,
'data' => [
'google_client_id' => $googleClientId,
'google_client_secret_masked' => '•••', // Masked
'anthropic_api_key_masked' => '••••••••', // Masked
'is_configured' => $isConfigured,
]
]);
} catch (\Exception $e) {
return new JSONResponse([
'success' => false,
'error' => $e->getMessage()
]);
}
}
}

3
analyticshub/lib/Controller/AdminController.php
View File

@@ -2,7 +2,7 @@
declare(strict_types=1);
namespace OCA\AnalyticsHub\Controller\Admin;
namespace OCA\AnalyticsHub\Controller;
use OCP\IRequest;
use OCP\IConfig;
@@ -107,3 +107,4 @@ class AdminController {
]);
}
}

39
analyticshub/lib/Controller/Page.php
View File

@@ -1,39 +0,0 @@
<?php
declare(strict_types=1);
namespace OCA\AnalyticsHub\Controller\Page;
use OCP\IRequest;
use OCP\AppFramework\Controller;
use OCP\AppFramework\Http\TemplateResponse;
/**
* Admin Page Controller
*
* @NoAdminRequired
* @NoCSRFRequired
*/
class PageController extends Controller {
protected $appName;
public function __construct(string $appName, IRequest $request) {
parent::__construct($appName, $request);
$this->appName = $appName;
}
/**
* Index page - render admin UI
*
* @NoAdminRequired
* @NoCSRFRequired
*/
public function index(): TemplateResponse {
return new TemplateResponse($this->appName, 'admin', [
'app_name' => $this->appName,
'version' => '1.0.0',
'status' => 'Testing - admin accessible',
]);
}
}

5
analyticshub/lib/Controller/PageController.php
View File

@@ -2,12 +2,11 @@
declare(strict_types=1);
namespace OCA\AnalyticsHub\Controller\Admin;
namespace OCA\AnalyticsHub\Controller;
use OCP\IRequest;
use OCP\IConfig;
use OCP\AppFramework\Http\TemplateResponse;
use OCP\AppFramework\Http\Template\PublicTemplateResponse;
use OCA\AnalyticsHub\AppInfo\Application;
use OCA\AnalyticsHub\Service\GoogleAnalyticsService;
use OCA\AnalyticsHub\Service\LLMService;
@@ -18,7 +17,7 @@ use OCA\AnalyticsHub\Service\LLMService;
* @NoAdminRequired
* @NoCSRFRequired
*/
class PageController extends Controller {
class PageController extends \OCP\AppFramework\Controller {
private $appName;
private $config;