Skip to content

[master] invalidate existing tokens when deleting an oauth client - #36033

Merged
come-nc merged 7 commits into
masterfrom
invalidateTokensWhenDeletingOAuthClientMaster
Mar 15, 2023
Merged

[master] invalidate existing tokens when deleting an oauth client#36033
come-nc merged 7 commits into
masterfrom
invalidateTokensWhenDeletingOAuthClientMaster

Conversation

@individual-it

@individual-itindividual-it commented Jan 6, 2023

Copy link
Copy Markdown
Contributor

forward port of #35094 to master

@individual-itindividual-it self-assigned this Jan 6, 2023
@individual-itindividual-it mentioned this pull request Jan 6, 2023
Merged
@szaimenszaimen added this to the Nextcloud 24.0.10 milestone Jan 6, 2023
@szaimenszaimen added the 3. to review Waiting for reviews label Jan 6, 2023
@szaimenszaimen changed the title invalidate existing tokens when deleting an oauth client[master] invalidate existing tokens when deleting an oauth clientJan 6, 2023
nickvergessen
nickvergessen reviewed Jan 9, 2023
View reviewed changes
Comment threadapps/oauth2/tests/Controller/SettingsControllerTest.php Outdated
@nickvergessen

nickvergessen commented Jan 9, 2023

Copy link
Copy Markdown
Member

The new interface should be referenced in #34692

@individual-it

individual-it commented Jan 9, 2023

Copy link
Copy Markdown
ContributorAuthor

The new interface should be referenced in #34692

@nickvergessen I've just updated #34692

@nickvergessennickvergessen mentioned this pull request Jan 9, 2023
Closed
@blizzzblizzz mentioned this pull request Feb 1, 2023
Merged
@blizzz

blizzz commented Feb 7, 2023

Copy link
Copy Markdown
Member

conflicts

@individual-it
individual-itforce-pushed the invalidateTokensWhenDeletingOAuthClientMaster branch from b952807 to 4366decCompareFebruary 8, 2023 11:03
@individual-it

individual-it commented Feb 8, 2023

Copy link
Copy Markdown
ContributorAuthor

@blizzz conflicts solved

@skjnldsvskjnldsv mentioned this pull request Feb 23, 2023
Merged
@blizzzblizzz mentioned this pull request Mar 7, 2023
Merged
@blizzzblizzz modified the milestones: Nextcloud 26, Nextcloud 27Mar 9, 2023
@individual-it@come-nc
invalidate existing tokens when deleting an oauth client
21be557
Signed-off-by: Artur Neumann <artur@jankaritech.com>
@individual-it@come-nc
public interface to invalidate tokens of user
f634bad
Signed-off-by: Artur Neumann <artur@jankaritech.com>
@individual-it@come-nc
adjust SettingsController tests
707e69b
Signed-off-by: Artur Neumann <artur@jankaritech.com>
@individual-it@come-nc
unit tests for Manager::invalidateTokensOfUser
37cfcca
Signed-off-by: Artur Neumann <artur@jankaritech.com>
@individual-it@come-nc
added@SInCEtag
565fad8
Signed-off-by: Artur Neumann <artur@jankaritech.com>
@individual-it@come-nc
autoloaderchecker
e9f5e79
Signed-off-by: Artur Neumann <artur@jankaritech.com>
@individual-it@come-nc
move mocks into private variables
e97540b
Signed-off-by: Artur Neumann <artur@jankaritech.com>
@come-nc
come-ncforce-pushed the invalidateTokensWhenDeletingOAuthClientMaster branch from 4366dec to e97540bCompareMarch 14, 2023 16:19
@nickvergessen
nickvergessen removed their request for review March 14, 2023 16:20
come-nc
come-nc approved these changes Mar 14, 2023
View reviewed changes

@come-nccome-nc left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I rebased on master and cleaned up the composer diff to make the diff readable.

@nickvergessen It’s not clear what to do with the OCP part, because it was merged in stable24 and not the other branches, what do we put in the @since? Should I leave 24.0.8 or should I put 26.0.1 or something?

@come-nccome-nc mentioned this pull request Mar 14, 2023
Closed
@nickvergessen

nickvergessen commented Mar 14, 2023

Copy link
Copy Markdown
Member

Should I leave 24.0.8 or should I put 26.0.1 or something?

Multiple since are supported, so we could have 24.0.x (.8 if it gets merged and backported in time), 25.0.y and 26.0.z or just either of them. Since apps can not require maintenance versions at the moment, they have to do defensive programming anyway, so not too much of an issue.

@come-nc
come-nc merged commit 8568c11 into masterMar 15, 2023
@come-nc
come-nc deleted the invalidateTokensWhenDeletingOAuthClientMaster branch March 15, 2023 10:09
@come-nc

come-nc commented Mar 15, 2023

Copy link
Copy Markdown
Contributor

/backport to stable25

@come-nc

come-nc commented Mar 15, 2023

Copy link
Copy Markdown
Contributor

/backport to stable26

@backportbot-nextcloudbackportbot-nextcloudBot mentioned this pull request Mar 15, 2023
Merged
@backportbot-nextcloudbackportbot-nextcloudBot mentioned this pull request Mar 15, 2023
Merged
1 task
@individual-itindividual-it mentioned this pull request Apr 17, 2023
Merged
4 tasks
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@nickvergessennickvergessennickvergessen left review comments
@julien-ncjulien-ncjulien-nc approved these changes
@come-nccome-nccome-nc approved these changes
@ChristophWurstChristophWurstAwaiting requested review from ChristophWurst
@miaulalalamiaulalalaAwaiting requested review from miaulalala

Assignees

@individual-itindividual-it

Labels

3. to reviewWaiting for reviewsfeature: authentication

Projects

None yet

Milestone

Nextcloud 27

Development

Successfully merging this pull request may close these issues.

7 participants

@individual-it@nickvergessen@blizzz@come-nc@julien-nc@joshtrichards@szaimen