feat: Use id from https://graph.microsoft.com/v1.0/me as oidc subject. #2153

splaunov · 2022-01-17T14:40:47Z

Use id from https://graph.microsoft.com/v1.0/me as a subject identifier instead of userinfo sub field.

Related issue(s)

#2150

Checklist

I have read the contributing guidelines.
I have referenced an issue containing the design document if my change
introduces a new feature.
I am following the
contributing code guidelines.
I have read the security policy.
I confirm that this pull request does not address a security
vulnerability. If this pull request addresses a security. vulnerability, I
confirm that I got green light (please contact
security@ory.sh) from the maintainers to push
the changes.
I have added tests that prove my fix is effective or that my feature
works.
I have added or changed the documentation.

Further Comments

splaunov · 2022-01-17T14:43:22Z

Please give your feedback.
Not tested these changes yet.

aeneasr

Thank you! I've got a question

aeneasr · 2022-01-18T13:54:54Z

selfservice/strategy/oidc/provider_microsoft.go

+			return nil, errors.WithStack(herodot.ErrInternalServerError.WithReasonf("%s", err))
+		}
+
+		claims.Subject = user.Id


Is the value from the me endpoint different than the one from the userinfo endpoint?

Yes, they are different. Have checked this with my own account.

Could you share what their formats look like? And is there no way to get this other ID from the userinfo endpoint?

Using an access token with scope [User.Read openid profile email] I receive

from /userinfo

{
"sub": "AAAAAAAAAAAAAAAAAAAAAENMusLqo_f5vKwPzixWdNS",
"email": "some@mail.domain",
"picture": "https://graph.microsoft.com/v1.0/me/photo/$value"
}

from /me

{
"@odata.context": "https://graph.microsoft.com/v1.0/$metadata#users/$entity",
"displayName": "",
"surname": null,
"givenName": null,
"id": "7wt4391vs271486n",
"userPrincipalName": "some@mail.domain",
"businessPhones": [],
"jobTitle": null,
"mail": null,
"mobilePhone": null,
"officeLocation": null,
"preferredLanguage": null
}

Thank you, this helps!

aeneasr · 2022-01-31T17:02:41Z

selfservice/strategy/oidc/provider_microsoft.go

+		client := o.Client(ctx, exchange)
+
+		u, err := url.Parse("https://graph.microsoft.com/v1.0/me")


Note to self: this is not using the resilient client

selfservice/strategy/oidc/provider_microsoft.go

aeneasr · 2022-01-31T17:09:09Z

I tried pushing some changes required for merging the PR to your fork & branch, but it appears that I am not allowed to do so 😕

% git push ...
ERROR: Permission to push denied to aeneasr.
fatal: could not read from the remote repository.

Please make sure that you have the correct access rights
and the repository exists.

But the good news is, giving access is easy! ☺️ All you need to do is enable write access for maintainers. Thank you! 😄

If the repository belongs to an organization, please add me for the project as a collaborator!

splaunov · 2022-02-02T09:35:41Z

I have invited you as a collaborator to the forked repo.

aeneasr · 2022-02-03T15:31:27Z

Thank you! Could you please also update the docs section ( https://www.ory.sh/kratos/docs/next/guides/sign-in-with-github-google-facebook-linkedin#microsoft ) and include how and when to use this feature?

aeneasr · 2022-03-23T08:22:18Z

Ping @splaunov could you please add a section in https://www.ory.sh/docs/kratos/guides/sign-in-with-github-google-facebook-linkedin#microsoft documenting the use of this feature? :)

splaunov · 2022-03-23T08:25:23Z

Yes, sorry for delay. Will do it end of week.

aeneasr · 2022-03-23T09:15:21Z

great, thank you for the update!

splaunov · 2022-03-25T13:43:33Z

Docs PR: ory/docs#706

codecov · 2022-03-25T14:05:54Z

Codecov Report

Merging #2153 (a059b6e) into master (4348b86) will decrease coverage by 0.11%.
The diff coverage is 0.00%.

@@            Coverage Diff             @@
##           master    #2153      +/-   ##
==========================================
- Coverage   76.65%   76.54%   -0.12%     
==========================================
  Files         318      318              
  Lines       17272    17297      +25     
==========================================
  Hits        13240    13240              
- Misses       3098     3123      +25     
  Partials      934      934

Impacted Files	Coverage Δ
selfservice/strategy/oidc/provider_config.go	`37.20% <ø> (ø)`
selfservice/strategy/oidc/provider_microsoft.go	`0.00% <0.00%> (ø)`

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 794c2fd...a059b6e. Read the comment docs.

…ovider config

…crosoft (#2347) Adds the ability to read the OIDC subject ID from the `https://graph.microsoft.com/v1.0/me` endpoint. This introduces a new field `subject_source` to the OIDC configuration. Closes #2153 Co-authored-by: splaunov <splaunov@gmail.com>

…crosoft (ory#2347) Adds the ability to read the OIDC subject ID from the `https://graph.microsoft.com/v1.0/me` endpoint. This introduces a new field `subject_source` to the OIDC configuration. Closes ory#2153 Co-authored-by: splaunov <splaunov@gmail.com>

mooijtech · 2022-04-19T10:10:10Z

Hello,

I am getting the following error when adding subject_source to my OIDC configuration:

FATA[2022-04-19T12:07:45+02:00] Unable to instantiate configuration.          
audience=application error=map[message:I[#/selfservice/methods/oidc/config/providers/0] S[#/properties/selfservice/properties/methods/properties/oidc/properties/config/properties/providers/items/$ref] doesn't validate with "#/definitions/selfServiceOIDCProvider"
  I[#/selfservice/methods/oidc/config/providers/0] S[#/definitions/selfServiceOIDCProvider/additionalProperties] additionalProperties "subject_source" not allowed] service_name=Ory Kratos service_version=v0.9.0-alpha.3

Maybe the definitions have not been updated correctly?
I will try look into this.

My configuration looks like this:

selfservice:
  default_browser_return_url: http://localhost:3000/
  allowed_return_urls:
    - http://localhost:3000/

  methods:
    password:
      enabled: true
    oidc:
      enabled: true
      config:
        providers:
          - id: outlook
            provider: microsoft
            mapper_url: MAPPER_URL
            client_id: CLIENT_ID
            client_secret: CLIENT_SECRET
            scope:
              - User.Read
              - https://graph.microsoft.com/User.Read
            microsoft_tenant: common
            subject_source: me
            issuer_url: https://login.microsoftonline.com/common
            auth_url: https://login.microsoftonline.com/common/oauth2/v2.0/authorize
            token_url: https://login.microsoftonline.com/common/oauth2/v2.0/token
            requested_claims:
              me:
                userPrincipalName:
                  essential: true

EDIT: Looks like this pull request isn't in v0.9.0-alpha.3

splaunov · 2022-04-19T11:49:29Z

EDIT: Looks like this pull request isn't in v0.9.0-alpha.3

Correct. To test it right now you should build from head of master.

…crosoft (ory#2347) Adds the ability to read the OIDC subject ID from the `https://graph.microsoft.com/v1.0/me` endpoint. This introduces a new field `subject_source` to the OIDC configuration. Closes ory#2153 Co-authored-by: splaunov <splaunov@gmail.com>

splaunov requested review from aeneasr and zepatrik as code owners January 17, 2022 14:40

aeneasr reviewed Jan 18, 2022

View reviewed changes

splaunov force-pushed the microsoft-me-login branch from e9db8d5 to b6a2591 Compare January 23, 2022 16:49

aeneasr reviewed Jan 31, 2022

View reviewed changes

splaunov force-pushed the microsoft-me-login branch from b6a2591 to 78de615 Compare February 1, 2022 12:43

splaunov force-pushed the microsoft-me-login branch 2 times, most recently from 88456e0 to 0fbd346 Compare March 5, 2022 06:52

splaunov requested a review from aeneasr March 28, 2022 07:50

splaunov and others added 3 commits March 28, 2022 14:33

feat: Use id from https://graph.microsoft.com/v1.0/me as oidc subject.

a91bf73

Update selfservice/strategy/oidc/provider_microsoft.go

adea4a4

chore: edit description of subject_source parameter in microsoft pr…

a059b6e

…ovider config

aeneasr force-pushed the microsoft-me-login branch from b1bd18f to a059b6e Compare March 28, 2022 12:33

aeneasr mentioned this pull request Mar 28, 2022

feat: read subject id from https://graph.microsoft.com/v1.0/me for microsoft #2347

Merged

aeneasr self-assigned this Mar 28, 2022

aeneasr closed this in #2347 Mar 28, 2022

CreMindES mentioned this pull request Aug 8, 2022

fix: missing user.read scope for https://graph.microsoft.com/v1.0/me. ory/docs#944

Closed

6 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

feat: Use id from https://graph.microsoft.com/v1.0/me as oidc subject. #2153

feat: Use id from https://graph.microsoft.com/v1.0/me as oidc subject. #2153

splaunov commented Jan 17, 2022

splaunov commented Jan 17, 2022 •

edited

Loading

aeneasr left a comment

aeneasr Jan 18, 2022

splaunov Jan 18, 2022

aeneasr Jan 18, 2022

splaunov Jan 18, 2022

aeneasr Jan 31, 2022

aeneasr Jan 31, 2022

aeneasr commented Jan 31, 2022

splaunov commented Feb 2, 2022

aeneasr commented Feb 3, 2022

aeneasr commented Mar 23, 2022

splaunov commented Mar 23, 2022

aeneasr commented Mar 23, 2022

splaunov commented Mar 25, 2022

codecov bot commented Mar 25, 2022 •

edited

Loading

mooijtech commented Apr 19, 2022 •

edited

Loading

splaunov commented Apr 19, 2022

		client := o.Client(ctx, exchange)

		u, err := url.Parse("https://graph.microsoft.com/v1.0/me")

feat: Use id from https://graph.microsoft.com/v1.0/me as oidc subject. #2153

feat: Use id from https://graph.microsoft.com/v1.0/me as oidc subject. #2153

Conversation

splaunov commented Jan 17, 2022

Related issue(s)

Checklist

Further Comments

splaunov commented Jan 17, 2022 • edited Loading

aeneasr left a comment

Choose a reason for hiding this comment

aeneasr Jan 18, 2022

Choose a reason for hiding this comment

splaunov Jan 18, 2022

Choose a reason for hiding this comment

aeneasr Jan 18, 2022

Choose a reason for hiding this comment

splaunov Jan 18, 2022

Choose a reason for hiding this comment

aeneasr Jan 31, 2022

Choose a reason for hiding this comment

aeneasr Jan 31, 2022

Choose a reason for hiding this comment

aeneasr commented Jan 31, 2022

splaunov commented Feb 2, 2022

aeneasr commented Feb 3, 2022

aeneasr commented Mar 23, 2022

splaunov commented Mar 23, 2022

aeneasr commented Mar 23, 2022

splaunov commented Mar 25, 2022

codecov bot commented Mar 25, 2022 • edited Loading

Codecov Report

mooijtech commented Apr 19, 2022 • edited Loading

splaunov commented Apr 19, 2022

splaunov commented Jan 17, 2022 •

edited

Loading

codecov bot commented Mar 25, 2022 •

edited

Loading

mooijtech commented Apr 19, 2022 •

edited

Loading