Skip to content

[stable35] revert #2454 #3037

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

Merged
cristianscheid merged 1 commit into from
Oct 14, 2026
Merged

[stable35] revert #2454 #3037

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
3 changes: 0 additions & 3 deletions appinfo/info.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,9 +47,6 @@ Those groups of people can then be used by any other app for sharing purpose.
<step>OCA\Circles\Migration\Migration</step>
<step>OCA\Circles\Migration\SyncGroupCircles</step>
</post-migration>
<live-migration>
<step>OCA\Circles\Migration\RemoveShareTokens</step>
</live-migration>
</repair-steps>

<commands>
Expand Down
2 changes: 0 additions & 2 deletions lib/ConfigLexicon.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@ 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 REMOVE_SHARE_TOKENS_DONE = 'remove_share_tokens_done';
public const TEAM_FOLDER_AUTO_CREATE = 'team_folder_auto_create';
public const TEAM_FOLDER_DEFAULT_QUOTA = 'team_folder_default_quota';

Expand Down Expand Up @@ -56,7 +55,6 @@ 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::REMOVE_SHARE_TOKENS_DONE, type: ValueType::BOOL, defaultRaw: false, definition: 'whether the remove share tokens repair step has already been executed', 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: 0, definition: 'default quota in bytes for auto-created team folders (0 means unlimited)', lazy: true),
// OIDC
Expand Down
58 changes: 0 additions & 58 deletions lib/Migration/RemoveShareTokens.php
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion lib/Model/ShareWrapper.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,7 @@ public function setToken(string $token): self {
}

public function getToken(): string {
return $this->shareToken?->getToken() ?? '';
return $this->token;
}

public function setStatus(int $status): self {
Expand Down
1 change: 1 addition & 0 deletions lib/ShareByCircleProvider.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,6 +144,7 @@ public function create(IShare $share): IShare {
->add(DataProbe::INITIATOR, [DataProbe::BASED_ON]);

$circle = $this->circleService->probeCircle($share->getSharedWith(), $circleProbe, $dataProbe);
$share->setToken($this->token(15));
$share->setMailSend(true);
$owner = $circle->getInitiator();
$this->shareWrapperService->save($share);
Expand Down
Loading