Skip to content
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.

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

Use type safe method to get secret and instanceid #35587

Closed
wants to merge 3 commits into from

Conversation

J0WI
Copy link
Contributor

@J0WI J0WI commented Dec 4, 2022

Summary

Getting rid off some more getSystemValue(), see ##35581 for context.

Checklist

@J0WI J0WI requested a review from CarlSchwan as a code owner December 4, 2022 15:43
@J0WI J0WI added the 3. to review Waiting for reviews label Dec 4, 2022
@szaimen szaimen added this to the Nextcloud 26 milestone Dec 4, 2022
@szaimen szaimen requested review from a team, ArtificialOwl and blizzz and removed request for a team December 4, 2022 15:49
Copy link
Member

@blizzz blizzz left a comment

Choose a reason for hiding this comment

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

CI needs #35580, but there might be some tests needing adjustments (didn't check)

@J0WI
Copy link
Contributor Author

J0WI commented Dec 5, 2022

still some failures in https://drone.nextcloud.com/nextcloud/server/26953/9/4 😕

apps/settings/lib/Mailer/NewUserMailHelper.php Outdated Show resolved Hide resolved
@szaimen
Copy link
Contributor

szaimen commented Dec 7, 2022

/rebase

@PVince81
Copy link
Member

@J0WI can you rebase? the bot can't rebase on forks

@PVince81 PVince81 added 4. to release Ready to be released and/or waiting for tests to finish and removed 3. to review Waiting for reviews labels Jan 11, 2023
@come-nc
Copy link
Contributor

come-nc commented Jan 12, 2023

Failed tests are worrying, cypress is failing and drone nodb has:

There was 1 error:
239	
240	1) Test\Security\VerificationToken\VerificationTokenTest::testTokenSuccess
241	OCP\Security\VerificationToken\InvalidTokenException: 
242	
243	/drone/src/lib/private/Security/VerificationToken/VerificationToken.php:71
244	/drone/src/lib/private/Security/VerificationToken/VerificationToken.php:91
245	/drone/src/tests/lib/Security/VerificationToken/VerificationTokenTest.php:290

@blizzz blizzz mentioned this pull request Feb 1, 2023
@skjnldsv skjnldsv mentioned this pull request Feb 23, 2023
@blizzz blizzz mentioned this pull request Mar 7, 2023
@blizzz blizzz modified the milestones: Nextcloud 26, Nextcloud 27 Mar 9, 2023
@szaimen szaimen enabled auto-merge April 17, 2023 13:42
@szaimen
Copy link
Contributor

szaimen commented Apr 25, 2023

@J0WI nodb failure seems to be related. Also can you please fix the conflicts? Thanks a lot! :)

@szaimen szaimen added 2. developing Work in progress and removed 4. to release Ready to be released and/or waiting for tests to finish labels Apr 25, 2023
@come-nc
Copy link
Contributor

come-nc commented Apr 27, 2023

There was 1 error:
227	
228	1) Test\Security\IdentityProof\ManagerTest::testGetSystemKeyFailure
229	PHPUnit\Framework\MockObject\IncompatibleReturnValueException: Method getSystemValueString may not return value of type NULL, its declared return type is "string"
230	
231	/drone/src/tests/lib/Security/IdentityProof/ManagerTest.php:233
314	There were 2 failures:
315	
316	1) Tests\Core\Data\LoginFlowV2ServiceUnitTest::testCreateTokens
317	Expectation failed for method name is "getSystemValue" when invoked 2 time(s).
318	Method was expected to be called 2 times, actually called 1 times.
319	
320	2) OCA\Settings\Tests\Mailer\NewUserMailHelperTest::testGenerateTemplateWithPasswordResetToken
321	Expectation failed for method name is "encrypt" when invoked 1 time(s)
322	Parameter 1 for invocation OCP\Security\ICrypto::encrypt('12345:MySuperLongSecureRandomToken', 'recipient@example.com'): string does not match expected value.
323	Failed asserting that two strings are equal.
324	--- Expected
325	+++ Actual
326	@@ @@
327	-'recipient@example.comMyInstanceWideSecret'
328	+'recipient@example.com'
329	
330	/drone/src/apps/settings/lib/Mailer/NewUserMailHelper.php:112
331	/drone/src/apps/settings/tests/Mailer/NewUserMailHelperTest.php:380

This was referenced May 3, 2023
@blizzz blizzz mentioned this pull request May 17, 2023
@blizzz blizzz modified the milestones: Nextcloud 27, Nextcloud 28 May 23, 2023
@skjnldsv skjnldsv mentioned this pull request Nov 1, 2023
This was referenced Nov 6, 2023
This was referenced Nov 14, 2023
@blizzz blizzz modified the milestones: Nextcloud 28, Nextcloud 29 Nov 23, 2023
This was referenced Mar 12, 2024
This was referenced Mar 20, 2024
@skjnldsv skjnldsv mentioned this pull request Mar 28, 2024
81 tasks
@skjnldsv skjnldsv modified the milestones: Nextcloud 29, Nextcloud 30 Mar 28, 2024
This was referenced Jul 30, 2024
This was referenced Aug 5, 2024
@skjnldsv skjnldsv mentioned this pull request Aug 13, 2024
@skjnldsv skjnldsv closed this Aug 14, 2024
auto-merge was automatically disabled August 14, 2024 10:17

Pull request was closed

@skjnldsv skjnldsv removed this from the Nextcloud 30 milestone Aug 14, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
2. developing Work in progress
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants