brandon/nextcloud-mcp-server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: resolve CI linting issues for Astroglobe

Browse Source 
Fix all ESLint, Stylelint, PHP CS Fixer, and Psalm workflow errors.

Changes:
- ESLint fixes:
  - Remove unused APP_NAME constant
  - Remove unused TextBoxOutline and TextBoxRemoveOutline components
  - Remove unused container variable in adminSettings.js
  - Auto-fix trailing commas, line breaks, attribute ordering
- PHP CS Fixer:
  - Add trailing commas after last function parameters
  - Convert double quotes to single quotes in log messages
  - Remove unused NoCSRFRequired import
  - Fix arrow function formatting
- Stylelint:
  - Update config to use @nextcloud/stylelint-config
  - Fix extends directive (was using non-existent package)
- Psalm workflow:
  - Fix jq object indexing (.include[0] instead of .[0])
  - Correctly extract OCP version from matrix output

All checks now pass locally.

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude Sonnet 4.5 <noreply@anthropic.com>
This commit is contained in:
Chris Coutinho
2025-12-15 22:05:14 +01:00
parent 5a6205476a
commit dfc81923ba
15 changed files with 109 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files
third_party/astroglobe/lib/Controller/ApiController.php
Vendored
+4 -5
View File
@@ -12,7 +12,6 @@ use OCA\Astroglobe\Settings\Admin as AdminSettings;
use OCP\AppFramework\Controller;
use OCP\AppFramework\Http;
use OCP\AppFramework\Http\Attribute\NoAdminRequired;
use OCP\AppFramework\Http\Attribute\NoCSRFRequired;
use OCP\AppFramework\Http\JSONResponse;
use OCP\AppFramework\Http\RedirectResponse;
use OCP\IConfig;
@@ -44,7 +43,7 @@ class ApiController extends Controller {
LoggerInterface $logger,
McpTokenStorage $tokenStorage,
IConfig $config,
IdpTokenRefresher $tokenRefresher
IdpTokenRefresher $tokenRefresher,
) {
parent::__construct($appName, $request);
$this->client = $client;
@@ -126,7 +125,7 @@ class ApiController extends Controller {
string $algorithm = 'hybrid',
int $limit = 10,
string $doc_types = '',
string $include_pca = 'true'
string $include_pca = 'true',
): JSONResponse {
if (empty($query)) {
return new JSONResponse([
@@ -185,7 +184,7 @@ class ApiController extends Controller {
$validDocTypes = ['note', 'file', 'deck_card', 'calendar', 'contact', 'news_item'];
$docTypesArray = array_filter(
explode(',', $doc_types),
fn($t) => in_array(trim($t), $validDocTypes)
fn ($t) => in_array(trim($t), $validDocTypes)
);
$docTypesArray = array_map('trim', $docTypesArray);
if (empty($docTypesArray)) {
@@ -678,7 +677,7 @@ class ApiController extends Controller {
string $doc_type,
string $doc_id,
int $start,
int $end
int $end,
): JSONResponse {
$user = $this->userSession->getUser();
if (!$user) {
third_party/astroglobe/lib/Controller/OAuthController.php
Vendored
+12 -12
View File
@@ -47,7 +47,7 @@ class OAuthController extends Controller {
McpTokenStorage $tokenStorage,
LoggerInterface $logger,
IL10N $l,
IClientService $clientService
IClientService $clientService,
) {
parent::__construct($appName, $request);
$this->config = $config;
@@ -73,11 +73,11 @@ class OAuthController extends Controller {
#[NoAdminRequired]
#[NoCSRFRequired]
public function initiateOAuth() {
$this->logger->info("initiateOAuth called");
$this->logger->info('initiateOAuth called');
$user = $this->userSession->getUser();
if (!$user) {
$this->logger->error("initiateOAuth: User not authenticated");
$this->logger->error('initiateOAuth: User not authenticated');
return new TemplateResponse(
'astroglobe',
'settings/error',
@@ -85,7 +85,7 @@ class OAuthController extends Controller {
);
}
$this->logger->info("initiateOAuth: User authenticated: " . $user->getUID());
$this->logger->info('initiateOAuth: User authenticated: ' . $user->getUID());
try {
// Get MCP server configuration
@@ -107,9 +107,9 @@ class OAuthController extends Controller {
$codeVerifier = bin2hex(random_bytes(32));
$codeChallenge = $this->base64UrlEncode(hash('sha256', $codeVerifier, true));
$this->logger->info("Using public client mode with PKCE");
$this->logger->info('Using public client mode with PKCE');
} else {
$this->logger->info("Using confidential client mode with client secret");
$this->logger->info('Using confidential client mode with client secret');
}
// Generate state for CSRF protection
@@ -129,7 +129,7 @@ class OAuthController extends Controller {
$codeChallenge
);
$this->logger->info("Initiating OAuth flow for user: " . $user->getUID());
$this->logger->info('Initiating OAuth flow for user: ' . $user->getUID());
return new RedirectResponse($authUrl);
} catch (\Exception $e) {
@@ -163,7 +163,7 @@ class OAuthController extends Controller {
string $code = '',
string $state = '',
?string $error = null,
?string $error_description = null
?string $error_description = null,
): RedirectResponse {
try {
// Check for errors from IdP
@@ -292,7 +292,7 @@ class OAuthController extends Controller {
private function buildAuthorizationUrl(
string $mcpServerUrl,
string $state,
?string $codeChallenge
?string $codeChallenge,
): string {
// First, query MCP server to discover which IdP it's configured to use
$this->logger->info('buildAuthorizationUrl: Starting', [
@@ -430,7 +430,7 @@ class OAuthController extends Controller {
private function exchangeCodeForToken(
string $mcpServerUrl,
string $code,
?string $codeVerifier
?string $codeVerifier,
): array {
// Query MCP server to discover which IdP it's configured to use
try {
@@ -496,11 +496,11 @@ class OAuthController extends Controller {
if (!empty($clientSecret)) {
// Confidential client: use client secret for authentication
$postData['client_secret'] = $clientSecret;
$this->logger->info("Using client secret for token exchange");
$this->logger->info('Using client secret for token exchange');
} elseif ($codeVerifier !== null) {
// Public client: use PKCE proof for authentication
$postData['code_verifier'] = $codeVerifier;
$this->logger->info("Using PKCE code verifier for token exchange");
$this->logger->info('Using PKCE code verifier for token exchange');
} else {
throw new \Exception('Neither client_secret nor code_verifier available for token exchange');
}
third_party/astroglobe/lib/Search/SemanticSearchProvider.php
Vendored
+2 -2
View File
@@ -247,8 +247,8 @@ class SemanticSearchProvider implements IProvider {
: $this->urlGenerator->linkToRouteAbsolute('files.view.index'),
'deck_card' => isset($result['board_id']) && $id
? $this->urlGenerator->linkToRoute('deck.page.index') .
"board/{$result['board_id']}/card/{$id}"
? $this->urlGenerator->linkToRoute('deck.page.index')
. "board/{$result['board_id']}/card/{$id}"
: $this->urlGenerator->linkToRoute('deck.page.index'),
'calendar', 'calendar_event' => $this->urlGenerator->linkToRoute('calendar.view.index'),
third_party/astroglobe/lib/Service/IdpTokenRefresher.php
Vendored
+1 -1
View File
@@ -25,7 +25,7 @@ class IdpTokenRefresher {
public function __construct(
IConfig $config,
IClientService $clientService,
LoggerInterface $logger
LoggerInterface $logger,
) {
$this->config = $config;
$this->httpClient = $clientService->newClient();
third_party/astroglobe/lib/Service/McpServerClient.php
Vendored
+7 -7
View File
@@ -24,7 +24,7 @@ class McpServerClient {
public function __construct(
IClientService $clientService,
IConfig $config,
LoggerInterface $logger
LoggerInterface $logger,
) {
$this->httpClient = $clientService->newClient();
$this->config = $config;
@@ -85,7 +85,7 @@ class McpServerClient {
public function getUserSession(string $userId, string $token): array {
try {
$response = $this->httpClient->get(
$this->baseUrl . "/api/v1/users/" . urlencode($userId) . "/session",
$this->baseUrl . '/api/v1/users/' . urlencode($userId) . '/session',
[
'headers' => [
'Authorization' => 'Bearer ' . $token
@@ -120,7 +120,7 @@ class McpServerClient {
public function revokeUserAccess(string $userId, string $token): array {
try {
$response = $this->httpClient->post(
$this->baseUrl . "/api/v1/users/" . urlencode($userId) . "/revoke",
$this->baseUrl . '/api/v1/users/' . urlencode($userId) . '/revoke',
[
'headers' => [
'Authorization' => 'Bearer ' . $token
@@ -203,7 +203,7 @@ class McpServerClient {
int $limit = 10,
bool $includePca = true,
?array $docTypes = null,
?string $token = null
?string $token = null,
): array {
try {
$requestBody = [
@@ -284,7 +284,7 @@ class McpServerClient {
int $offset = 0,
string $algorithm = 'hybrid',
string $fusion = 'rrf',
float $scoreThreshold = 0.0
float $scoreThreshold = 0.0,
): array {
try {
$response = $this->httpClient->post(
@@ -416,7 +416,7 @@ class McpServerClient {
string $event,
string $uri,
?array $eventFilter,
string $token
string $token,
): array {
try {
$requestBody = [
@@ -549,7 +549,7 @@ class McpServerClient {
string $docId,
int $start,
int $end,
string $token
string $token,
): array {
try {
$response = $this->httpClient->get(
third_party/astroglobe/lib/Service/McpTokenStorage.php
Vendored
+3 -3
View File
@@ -22,7 +22,7 @@ class McpTokenStorage {
public function __construct(
IConfig $config,
ICrypto $crypto,
LoggerInterface $logger
LoggerInterface $logger,
) {
$this->config = $config;
$this->crypto = $crypto;
@@ -43,7 +43,7 @@ class McpTokenStorage {
string $userId,
string $accessToken,
string $refreshToken,
int $expiresAt
int $expiresAt,
): void {
try {
$tokenData = [
@@ -158,7 +158,7 @@ class McpTokenStorage {
*
* @param string $userId User ID
* @param callable|null $refreshCallback Callback to refresh token if expired
* Should accept (refreshToken) and return new token data
* Should accept (refreshToken) and return new token data
* @return string|null Access token, or null if not available
*/
public function getAccessToken(string $userId, ?callable $refreshCallback = null): ?string {
third_party/astroglobe/lib/Service/WebhookPresets.php
Vendored
+11 -11
View File
@@ -12,24 +12,24 @@ namespace OCA\Astroglobe\Service;
*/
class WebhookPresets {
// File/Notes webhook events
public const FILE_EVENT_CREATED = "OCP\\Files\\Events\\Node\\NodeCreatedEvent";
public const FILE_EVENT_WRITTEN = "OCP\\Files\\Events\\Node\\NodeWrittenEvent";
public const FILE_EVENT_CREATED = 'OCP\\Files\\Events\\Node\\NodeCreatedEvent';
public const FILE_EVENT_WRITTEN = 'OCP\\Files\\Events\\Node\\NodeWrittenEvent';
// Use BeforeNodeDeletedEvent instead of NodeDeletedEvent to get node.id
// See: https://github.com/nextcloud/server/issues/56371
public const FILE_EVENT_DELETED = "OCP\\Files\\Events\\Node\\BeforeNodeDeletedEvent";
public const FILE_EVENT_DELETED = 'OCP\\Files\\Events\\Node\\BeforeNodeDeletedEvent';
// Calendar webhook events
public const CALENDAR_EVENT_CREATED = "OCP\\Calendar\\Events\\CalendarObjectCreatedEvent";
public const CALENDAR_EVENT_UPDATED = "OCP\\Calendar\\Events\\CalendarObjectUpdatedEvent";
public const CALENDAR_EVENT_DELETED = "OCP\\Calendar\\Events\\CalendarObjectDeletedEvent";
public const CALENDAR_EVENT_CREATED = 'OCP\\Calendar\\Events\\CalendarObjectCreatedEvent';
public const CALENDAR_EVENT_UPDATED = 'OCP\\Calendar\\Events\\CalendarObjectUpdatedEvent';
public const CALENDAR_EVENT_DELETED = 'OCP\\Calendar\\Events\\CalendarObjectDeletedEvent';
// Tables webhook events (Nextcloud 30+)
public const TABLES_EVENT_ROW_ADDED = "OCA\\Tables\\Event\\RowAddedEvent";
public const TABLES_EVENT_ROW_UPDATED = "OCA\\Tables\\Event\\RowUpdatedEvent";
public const TABLES_EVENT_ROW_DELETED = "OCA\\Tables\\Event\\RowDeletedEvent";
public const TABLES_EVENT_ROW_ADDED = 'OCA\\Tables\\Event\\RowAddedEvent';
public const TABLES_EVENT_ROW_UPDATED = 'OCA\\Tables\\Event\\RowUpdatedEvent';
public const TABLES_EVENT_ROW_DELETED = 'OCA\\Tables\\Event\\RowDeletedEvent';
// Forms webhook events (Nextcloud 30+)
public const FORMS_EVENT_FORM_SUBMITTED = "OCA\\Forms\\Events\\FormSubmittedEvent";
public const FORMS_EVENT_FORM_SUBMITTED = 'OCA\\Forms\\Events\\FormSubmittedEvent';
// NOTE: Deck and Contacts do NOT support webhooks
// Their event classes do not implement IWebhookCompatibleEvent interface.
@@ -163,7 +163,7 @@ class WebhookPresets {
}
return array_map(
fn($eventConfig) => $eventConfig['event'],
fn ($eventConfig) => $eventConfig['event'],
$preset['events']
);
}
third_party/astroglobe/lib/Settings/Admin.php
Vendored
+1 -1
View File
@@ -36,7 +36,7 @@ class Admin implements ISettings {
public function __construct(
McpServerClient $client,
IConfig $config,
IInitialState $initialState
IInitialState $initialState,
) {
$this->client = $client;
$this->config = $config;
third_party/astroglobe/lib/Settings/Personal.php
Vendored
+1 -1
View File
@@ -33,7 +33,7 @@ class Personal implements ISettings {
IUserSession $userSession,
IInitialState $initialState,
McpTokenStorage $tokenStorage,
IURLGenerator $urlGenerator
IURLGenerator $urlGenerator,
) {
$this->client = $client;
$this->userSession = $userSession;