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

fix: enable defining oid as oidc subject_source #4270

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion selfservice/strategy/oidc/provider_config.go
Original file line number Diff line number Diff line change
Expand Up @@ -70,9 +70,10 @@ type Configuration struct {
Tenant string `json:"microsoft_tenant"`

// SubjectSource is a flag which controls from which endpoint the subject identifier is taken by microsoft provider.
// Can be either `userinfo` or `me`.
// Can be either `userinfo` or `me` or `oid`.
// If the value is `userinfo` then the subject identifier is taken from sub field of userinfo standard endpoint response.
// If the value is `me` then the `id` field of https://graph.microsoft.com/v1.0/me response is taken as subject.
// If the value is `oid` then the the oid (Object ID) is taken to identify users across different services.
// The default is `userinfo`.
SubjectSource string `json:"subject_source"`

Expand Down
2 changes: 1 addition & 1 deletion test/e2e/shared/config.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -271,7 +271,7 @@ export type AzureADTenant = string
/**
* Controls which source the subject identifier is taken from by microsoft provider. If set to `userinfo` (the default) then the identifier is taken from the `sub` field of OIDC ID token or data received from `/userinfo` standard OIDC endpoint. If set to `me` then the `id` field of data structure received from `https://graph.microsoft.com/v1.0/me` is taken as an identifier.
*/
export type MicrosoftSubjectSource = "userinfo" | "me"
export type MicrosoftSubjectSource = "userinfo" | "me" | "oid"
/**
* Apple Developer Team ID needed for generating a JWT token for client secret
*/
Expand Down
Loading