Skip to content

fix: Load OIDC prompt from the right value - #12597

Merged
modSpike merged 1 commit into
masterfrom
fix/oidc-prompt-loading
Jul 28, 2026
Merged

fix: Load OIDC prompt from the right value#12597
modSpike merged 1 commit into
masterfrom
fix/oidc-prompt-loading

Conversation

@erikjv

@erikjv erikjv commented Jul 20, 2026

Copy link
Copy Markdown
Contributor

Also adds a test for Linux to read the values from an actual file.

@erikjv
erikjv requested a review from modSpike July 20, 2026 13:05
@erikjv
erikjv requested a review from a team as a code owner July 20, 2026 13:05
@update-docs

update-docs Bot commented Jul 20, 2026

Copy link
Copy Markdown

Thanks for opening this pull request! The maintainers of this repository would appreciate it if you would create a changelog item based on your changes.

@erikjv
erikjv force-pushed the fix/oidc-prompt-loading branch from 6fbedcc to f1cf2ea Compare July 20, 2026 14:12

@modSpike modSpike 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.

see comments

Comment thread src/libsync/config/appconfig.cpp Outdated
const quint16 val = static_cast<quint16>(p.trimmed().toUInt(&ok));
if (ok) {
ports.append(val);
const qint64 val = static_cast<quint16>(p.trimmed().toLongLong(&ok));

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 am confused about the mix of quint16 against qint64 - presumably the idea is to filter out "huge" values but my first thought is "why not use toushort?"

if the type mixing is necessary please add a comment to explain the logic

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

Done, used ushort.

Comment thread test/testappconfig.cpp
@tylerpieper

Copy link
Copy Markdown

I was just working on a PR for this. this is breaking entra ODIC. thanks for working on it.

Also adds a test for Linux to read the values from an actual file.
@erikjv
erikjv force-pushed the fix/oidc-prompt-loading branch from f1cf2ea to 61cc210 Compare July 28, 2026 12:45
@erikjv
erikjv requested a review from modSpike July 28, 2026 12:46
@modSpike
modSpike merged commit fb1c873 into master Jul 28, 2026
8 checks passed
@modSpike
modSpike deleted the fix/oidc-prompt-loading branch July 28, 2026 13:47
DeepDiver1975 pushed a commit that referenced this pull request Jul 29, 2026
Also adds a test for Linux to read the values from an actual file.

(cherry picked from commit fb1c873)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants