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.

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

Jump to bottom

fix(oauth): instance name encoding on oauth app in admin #49804

Open
wants to merge 46 commits into
base: master
Choose a base branch
from
Open

fix(oauth): instance name encoding on oauth app in admin #49804

wants to merge 46 commits into from
+57 −44

Conversation

byt3sage
Copy link

Summary

  • This PR aims to resolve the issue with the encoding of the instance name when shown in the OAuth settings in Nextcloud admin.
  • This is my first PR for Nextcloud (and hopefully the first of many) so I'm keen for any feedback if this approach doesn't follow what it should.
  • I've removed instance name from the translate function. My reasoning for this is the instance name will already be in the users own language and this avoids the issue of the translate function escaping special characters.

TODO

  • Remove instance name binding from the translate function and use string interpolation instead.
  • Update translation files to ensure the string prior to the instance name is still translated.

Screenshots

Before
image

After
image

Checklist

@byt3sage byt3sage mentioned this pull request Dec 11, 2024
Open
8 tasks
@kesselb
Copy link
Contributor

kesselb commented Dec 12, 2024

Thanks for your pull request 👍

Please revert the changes to the language files. The files are synced automatically from Transifex. It's enough to change the source.

@byt3sage
Copy link
Author

@kesselb Ah that makes sense! I've reverted these back now.

byt3sage and others added 23 commits December 13, 2024 09:14
@byt3sage
Merge branch 'master' of github.com:byt3sage/server into bug/oauth-in…
4c57f0b 
…stance-name-decoding-39956
@byt3sage
Merge branch 'bug/oauth-instance-name-decoding-39956' of github.com:b…
8bfe048 
…yt3sage/server into bug/oauth-instance-name-decoding-39956
@byt3sage
Merge branch 'master' into bug/oauth-instance-name-decoding-39956
ce6e450
@byt3sage
Merge branch 'bug/oauth-instance-name-decoding-39956' of github.com:b…
4cd8a48 
…yt3sage/server into bug/oauth-instance-name-decoding-39956

Signed-off-by: byt3sage <[email protected]>
@byt3sage
Merge branch 'bug/oauth-instance-name-decoding-39956' of github.com:b…
7a9eb28 
…yt3sage/server into bug/oauth-instance-name-decoding-39956
@byt3sage
chore: formatting
d766b71 
Signed-off-by: byt3sage <[email protected]>
@byt3sage
chore: reverted language files
f259cbc 
Signed-off-by: byt3sage <[email protected]>
@Koc @byt3sage
fix: Fix ServiceWorker scope when Nextcloud installed in subfolder
4f8eec1 
Signed-off-by: Kostiantyn Miakshyn <[email protected]>
Signed-off-by: byt3sage <[email protected]>
@nextcloud-command @byt3sage
chore(assets): Recompile assets
6ce16a9 
Signed-off-by: nextcloud-command <[email protected]>
Signed-off-by: byt3sage <[email protected]>
@icewind1991 @byt3sage
chore: cleanup leftover debug statement
f4993a6 
Signed-off-by: Robin Appelman <[email protected]>
Signed-off-by: byt3sage <[email protected]>
@skjnldsv @byt3sage
fix(files): throttle favorite with max 5 simultaneous requests
ab6bd5e 
Signed-off-by: skjnldsv <[email protected]>
Signed-off-by: byt3sage <[email protected]>
@nextcloud-command @byt3sage
chore(assets): Recompile assets
7d2508a 
Signed-off-by: nextcloud-command <[email protected]>
Signed-off-by: byt3sage <[email protected]>
@nfebe @byt3sage
fix(files_sharing): Correct property enforced property names
810a5bc 
Signed-off-by: nfebe <[email protected]>
Signed-off-by: byt3sage <[email protected]>
@nextcloud-command @byt3sage
chore(assets): Recompile assets
1ac6a3a 
Signed-off-by: nextcloud-command <[email protected]>
Signed-off-by: byt3sage <[email protected]>
@nextcloud-bot @byt3sage
Fix(l10n): Update translations from Transifex
f37a39c 
Signed-off-by: Nextcloud bot <[email protected]>
Signed-off-by: byt3sage <[email protected]>
@skjnldsv @byt3sage
fix(files_sharing): also submit new share on password submit
0f464f8 
Signed-off-by: skjnldsv <[email protected]>
Signed-off-by: byt3sage <[email protected]>
@nextcloud-command @byt3sage
chore(assets): Recompile assets
9687bb8 
Signed-off-by: nextcloud-command <[email protected]>
Signed-off-by: byt3sage <[email protected]>
@grnd-alt @byt3sage
fix(dav): add activity logging for favorites in dav
1690451 
Signed-off-by: grnd-alt <[email protected]>
Signed-off-by: byt3sage <[email protected]>
@grnd-alt @byt3sage
refactor(tags): move favorite event dispatching to tags.php
9e18dbd 
Signed-off-by: grnd-alt <[email protected]>
Signed-off-by: byt3sage <[email protected]>
@grnd-alt @byt3sage
fix(tests): remove redundant unit test for activity
0443c66 
Signed-off-by: grnd-alt <[email protected]>
Signed-off-by: byt3sage <[email protected]>
@come-nc @byt3sage
fix(files_sharing): Do not wrap password policy exception into a gene…
931eb36 
…ric one

Let the controller access the HintException and show the error to the user.

Signed-off-by: Côme Chilliet <[email protected]>
Signed-off-by: byt3sage <[email protected]>
@come-nc @byt3sage
fix(shares): Wrap exceptions from password validation to set code to 400
a230b74 
This fixes a regression that bad password returned 403 instead of 400
 because of previous changes.

Signed-off-by: Côme Chilliet <[email protected]>
Signed-off-by: byt3sage <[email protected]>
@come-nc @byt3sage
fix(tests): Adapt ManagerTest to change in Exception class used
fe8c429 
Signed-off-by: Côme Chilliet <[email protected]>
Signed-off-by: byt3sage <[email protected]>
icewind1991 and others added 19 commits December 13, 2024 09:19
@icewind1991 @byt3sage
fix: don't recalculate folder size in Cache::delete if the entry didn…
4db03fc 
…'t exist

Signed-off-by: Robin Appelman <[email protected]>
Signed-off-by: byt3sage <[email protected]>
@Pytal @byt3sage
feat(files): Right-align list actions
01bb204 
Signed-off-by: Christopher Ng <[email protected]>
Signed-off-by: byt3sage <[email protected]>
@Pytal @byt3sage
feat(trashbin): Allow emptying trash
699abbb 
Signed-off-by: Christopher Ng <[email protected]>
Signed-off-by: byt3sage <[email protected]>
@skjnldsv @byt3sage
fix(files_trashbin): update @nextcloud/files and adjust api + l10n fix
2eb7c31 
Signed-off-by: skjnldsv <[email protected]>
Signed-off-by: byt3sage <[email protected]>
@skjnldsv @byt3sage
fix(files): protect filelist actions with try...catch
affe220 
Signed-off-by: skjnldsv <[email protected]>
Signed-off-by: byt3sage <[email protected]>
@skjnldsv @byt3sage
feat(files_trashbin): add cypress tests
8f01172 
Signed-off-by: skjnldsv <[email protected]>
Signed-off-by: byt3sage <[email protected]>
@skjnldsv @byt3sage
perf(files_trashbin): use empty trashbin endpoint instead of batch de…
89d71d7 
…lete requests

Signed-off-by: skjnldsv <[email protected]>
Signed-off-by: byt3sage <[email protected]>
@skjnldsv @byt3sage
feat(files_trashbin): improve wordings
6790fe7 
Signed-off-by: skjnldsv <[email protected]>
Signed-off-by: byt3sage <[email protected]>
@Pytal @byt3sage
fix(trashbin): Fix infinitely loading empty trash action on close
c77f57f 
Signed-off-by: Christopher Ng <[email protected]>
Signed-off-by: byt3sage <[email protected]>
@Pytal @byt3sage
chore: compile assets
b73b62c 
Signed-off-by: Christopher Ng <[email protected]>
Signed-off-by: byt3sage <[email protected]>
@Pytal @byt3sage
chore(psalm): Update baseline
53905e7 
Signed-off-by: Christopher Ng <[email protected]>
Signed-off-by: byt3sage <[email protected]>
@icewind1991 @byt3sage
fix: handle calling select on partitioned queries with an array of co…
a6e54da 
…lumns

Signed-off-by: Robin Appelman <[email protected]>
Signed-off-by: byt3sage <[email protected]>
@icewind1991 @byt3sage
fix: improve logic for ensuring join columns are selected for partiti…
0a58000 
…oned queries

Signed-off-by: Robin Appelman <[email protected]>
Signed-off-by: byt3sage <[email protected]>
@kesselb @byt3sage
feat(dashboard): wish happy birthday
a37e715 
Signed-off-by: Daniel Kesselberg <[email protected]>
Signed-off-by: byt3sage <[email protected]>
@dependabot @byt3sage
chore(deps): bump nanoid from 3.3.7 to 3.3.8
ab6e5b0 
Bumps [nanoid](https://github.com/ai/nanoid) from 3.3.7 to 3.3.8.
- [Release notes](https://github.com/ai/nanoid/releases)
- [Changelog](https://github.com/ai/nanoid/blob/main/CHANGELOG.md)
- [Commits](ai/nanoid@3.3.7...3.3.8)

---
updated-dependencies:
- dependency-name: nanoid
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <[email protected]>
Signed-off-by: byt3sage <[email protected]>
@nextcloud-command @byt3sage
chore(assets): Recompile assets
9eb8ab4 
Signed-off-by: nextcloud-command <[email protected]>
Signed-off-by: byt3sage <[email protected]>
@nextcloud-bot @byt3sage
Fix(l10n): Update translations from Transifex
0c49e36 
Signed-off-by: Nextcloud bot <[email protected]>
Signed-off-by: byt3sage <[email protected]>
@byt3sage
Merge branch 'bug/oauth-instance-name-decoding-39956' of github.com:b…
77ca4f5 
…yt3sage/server into bug/oauth-instance-name-decoding-39956
@byt3sage
Merge branch 'master' into bug/oauth-instance-name-decoding-39956
c9ffff9
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

[Bug]: Instance name not decoded in the "OAuth 2.0-Clients" config menu