MGMT-16766: Use client_id instead of clientId

[jhernand]

The clientId claim will be replaced by client_id from the SSO server in order to be compliant with the OAuth2 specification. During a transition period the old clientId will be preserved. This patch changes our code so that it first tries to use the newer and more correct client_id, and then if it doesn't exist it tries the older clientId.

In the future we should check if we are really using the value of this client_id claim at all. If we aren't then it would probably be good to remove the code completely.

Related: https://issues.redhat.com/browse/MGMT-16766
Related: https://datatracker.ietf.org/doc/html/rfc9068#section-2.2

List all the issues related to this PR

• New Feature
• Enhancement
• Bug fix
• Tests
• Documentation
• CI/CD

What environments does this code impact?

• Automation (CI, tools, etc)
• Cloud
• Operator Managed Deployments
• None

How was this code tested?

• assisted-test-infra environment
• dev-scripts environment
• Reviewer's test appreciated
• Waiting for CI to do a full test run
• Manual (Elaborate on how it was tested)
• No tests needed

Checklist

• Title and description added to both, commit and PR.
• Relevant issues have been associated (see CONTRIBUTING guide)
• This change does not require a documentation update (docstring, docs, README, etc)
• Does this change include unit-tests (note that code changes require unit-tests)

Reviewers Checklist

• Are the title and description (in both PR and commit) meaningful and clear?
• Is there a bug required (and linked) for this change?
• Should this PR be backported?

[openshift-ci]

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: jhernand

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

• OWNERS [jhernand]

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

[eifrach]

/lgtm

[codecov]

Codecov Report

Attention: Patch coverage is 50.00000% with 2 lines in your changes are missing coverage. Please review.

Project coverage is 68.44%. Comparing base (9823c09) to head (0403b7e).
Report is 5 commits behind head on master.

Additional details and impacted files

@@            Coverage Diff             @@
##           master    #6076      +/-   ##
==========================================
+ Coverage   68.40%   68.44%   +0.03%     
==========================================
  Files         239      239              
  Lines       35457    35575     +118     
==========================================
+ Hits        24256    24349      +93     
- Misses       9098     9123      +25     
  Partials     2103     2103              

Files	Coverage Δ
pkg/auth/auth_handler_test_utils.go	77.77% <100.00%> (ø)
pkg/auth/rhsso_authenticator.go	51.53% <33.33%> (-0.65%)	⬇️

... and 7 files with indirect coverage changes

[gamli75]

@jhernand please retitle the PR with MGMT-16766

[openshift-ci-robot]

@jhernand: This pull request references MGMT-16766 which is a valid jira issue.

Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the story to target the "4.16.0" version, but no target version was set.

In response to this:

The clientId claim will be replaced by client_id from the SSO server in order to be compliant with the OAuth2 specification. During a transition period the old clientId will be preserved. This patch changes our code so that it first tries to use the newer and more correct client_id, and then if it doesn't exist it tries the older clientId.

In the future we should check if we are really using the value of this client_id claim at all. If we aren't then it would probably be good to remove the code completely.

Related: https://issues.redhat.com/browse/MGMT-16766
Related: https://datatracker.ietf.org/doc/html/rfc9068#section-2.2

List all the issues related to this PR

• New Feature
• Enhancement
• Bug fix
• Tests
• Documentation
• CI/CD

What environments does this code impact?

• Automation (CI, tools, etc)
• Cloud
• Operator Managed Deployments
• None

How was this code tested?

• assisted-test-infra environment
• dev-scripts environment
• Reviewer's test appreciated
• Waiting for CI to do a full test run
• Manual (Elaborate on how it was tested)
• No tests needed

Checklist

• Title and description added to both, commit and PR.
• Relevant issues have been associated (see CONTRIBUTING guide)
• This change does not require a documentation update (docstring, docs, README, etc)
• Does this change include unit-tests (note that code changes require unit-tests)

Reviewers Checklist

• Are the title and description (in both PR and commit) meaningful and clear?
• Is there a bug required (and linked) for this change?
• Should this PR be backported?

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the openshift-eng/jira-lifecycle-plugin repository.

[jhernand]

@jhernand please retitle the PR with MGMT-16766

Done.

[openshift-ci-robot]

/retest-required

Remaining retests: 0 against base HEAD a2facc2 and 2 for PR HEAD 0403b7e in total

[openshift-ci]

@jhernand: all tests passed!

Full PR test history. Your PR dashboard.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository. I understand the commands that are listed here.

[openshift-bot]

[ART PR BUILD NOTIFIER]

This PR has been included in build ose-agent-installer-api-server-container-v4.16.0-202403122214.p0.g6f671e7.assembly.stream.el8 for distgit ose-agent-installer-api-server.
All builds following this will include this PR.