Skip to content

feat: first prototype of circles federation over OCM #3070

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

Draft
cristianscheid wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

feat: first prototype of circles federation over OCM #3070

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
7 changes: 7 additions & 0 deletions lib/AppInfo/Application.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,8 @@
use OCA\Circles\Listeners\GroupMemberRemoved;
use OCA\Circles\Listeners\NodeEventListener;
use OCA\Circles\Listeners\Notifications\RequestingMember as ListenerNotificationsRequestingMember;
use OCA\Circles\Listeners\OcmDiscoveryListener;
use OCA\Circles\Listeners\OcmEndpointRequestListener;
use OCA\Circles\Listeners\TeamFolderLifecycleListener;
use OCA\Circles\Listeners\UserCreated;
use OCA\Circles\Listeners\UserDeleted;
Expand Down Expand Up @@ -68,6 +70,8 @@
use OCP\INavigationManager;
use OCP\IURLGenerator;
use OCP\L10N\IFactory;
use OCP\OCM\Events\LocalOCMDiscoveryEvent;
use OCP\OCM\Events\OCMEndpointRequestEvent;
use OCP\Share\IManager as IShareManager;
use OCP\User\Events\UserChangedEvent;
use OCP\User\Events\UserCreatedEvent;
Expand All @@ -89,6 +93,7 @@ class Application extends App implements IBootstrap {
public const APP_SUBJECT = 'http://nextcloud.com/';
public const APP_REL = 'https://apps.nextcloud.com/apps/circles';
public const APP_API = '1';
public const OCM_CAPABILITY = 'circles-v1';

public const CLIENT_TIMEOUT = 3;

Expand Down Expand Up @@ -141,6 +146,8 @@ public function register(IRegistrationContext $context): void {

$context->registerSearchProvider(UnifiedSearchProvider::class);
$context->registerWellKnownHandler(WebfingerHandler::class);
$context->registerEventListener(LocalOCMDiscoveryEvent::class, OcmDiscoveryListener::class);
$context->registerEventListener(OCMEndpointRequestEvent::class, OcmEndpointRequestListener::class);

$context->registerDashboardWidget(TeamDashboardWidget::class);
$context->registerTeamResourceProvider(FileSharingTeamResourceProvider::class);
Expand Down
2 changes: 2 additions & 0 deletions lib/ConfigLexicon.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ class ConfigLexicon implements ILexicon {
public const USER_SINGLE_ID = 'userSingleId';
public const FEDERATED_TEAMS_ENABLED = 'federated_teams_enabled';
public const FEDERATED_TEAMS_FRONTAL = 'federated_teams_frontal';
public const FEDERATED_TEAMS_OCM = 'federated_teams_ocm';
public const TEAM_FOLDER_AUTO_CREATE = 'team_folder_auto_create';
public const TEAM_FOLDER_DEFAULT_QUOTA = 'team_folder_default_quota';
public const TEAM_FOLDER_GROUP_QUOTAS = 'team_folder_group_quotas';
Expand Down Expand Up @@ -57,6 +58,7 @@ public function getAppConfigs(): array {
return [
new Entry(key: self::FEDERATED_TEAMS_ENABLED, type: ValueType::BOOL, defaultRaw: false, definition: 'disable/enable Federated Teams', lazy: true),
new Entry(key: self::FEDERATED_TEAMS_FRONTAL, type: ValueType::STRING, defaultRaw: '', definition: 'domain name used to auth public request', lazy: true),
new Entry(key: self::FEDERATED_TEAMS_OCM, type: ValueType::BOOL, defaultRaw: false, definition: 'send requests to remote instances through their OCM endpoint when they support it', lazy: true),
new Entry(key: self::TEAM_FOLDER_AUTO_CREATE, type: ValueType::BOOL, defaultRaw: true, definition: 'whether Circles auto-creates team folders and allows UI/API upgrade (not exposed in admin UI)', lazy: true),
new Entry(key: self::TEAM_FOLDER_DEFAULT_QUOTA, type: ValueType::INT, defaultRaw: self::DEFAULT_QUOTA, definition: 'default quota in bytes for auto-created team folders (0 means unlimited)', lazy: true),
new Entry(key: self::TEAM_FOLDER_GROUP_QUOTAS, type: ValueType::ARRAY, defaultRaw: [], definition: 'quota overrides in bytes by Nextcloud group ID (0 means unlimited)', lazy: true),
Expand Down
Loading
Loading