@@ -36,15 +36,22 @@ protected override async Task<AuthenticationTicket> CreateTicketAsync(
3636 [ NotNull ] AuthenticationProperties properties ,
3737 [ NotNull ] OAuthTokenResponse tokens )
3838 {
39- var contextId = await ProcessIdTokenAndGetContactIdentifierAsync ( tokens , properties , identity ) ;
39+ ( string tenantId , string webApiUrl ) = await ProcessIdTokenAndGetContactIdentifierAsync ( tokens , properties , identity ) ;
4040
41- if ( string . IsNullOrEmpty ( contextId ) )
41+ if ( string . IsNullOrEmpty ( tenantId ) )
4242 {
4343 throw new InvalidOperationException ( "An error occurred trying to obtain the context identifier from the current user's identity claims." ) ;
4444 }
4545
46- // Add contextId to the Options.UserInformationEndpoint (https://sod.superoffice.com/{0}/api/v1/user/currentPrincipal).
47- var userInfoEndpoint = string . Format ( CultureInfo . InvariantCulture , Options . UserInformationEndpoint , contextId ) ;
46+ if ( string . IsNullOrEmpty ( webApiUrl ) )
47+ {
48+ throw new InvalidOperationException ( "An error occurred trying to obtain the WebApi URL from the current user's identity claims." ) ;
49+ }
50+
51+ // UserInfo endpoint must support multiple subdomains, i.e. sod, sod1, online, online1, online2, ...
52+ // - subdomain only becomes known from id token
53+ // Example WebApi Url https://sod.superoffice.com/Cust12345/api/
54+ var userInfoEndpoint = string . Format ( CultureInfo . InvariantCulture , SuperOfficeAuthenticationConstants . FormatStrings . UserInfoEndpoint , webApiUrl ) ;
4855
4956 // Get the SuperOffice user principal.
5057 using var request = new HttpRequestMessage ( HttpMethod . Get , userInfoEndpoint ) ;
@@ -69,7 +76,7 @@ protected override async Task<AuthenticationTicket> CreateTicketAsync(
6976 return new AuthenticationTicket ( context . Principal ! , context . Properties , Scheme . Name ) ;
7077 }
7178
72- private async Task < string > ProcessIdTokenAndGetContactIdentifierAsync (
79+ private async Task < ( string TenantId , string WebApiUrl ) > ProcessIdTokenAndGetContactIdentifierAsync (
7380 [ NotNull ] OAuthTokenResponse tokens ,
7481 [ NotNull ] AuthenticationProperties properties ,
7582 [ NotNull ] ClaimsIdentity identity )
@@ -85,6 +92,7 @@ private async Task<string> ProcessIdTokenAndGetContactIdentifierAsync(
8592 var tokenValidationResult = await ValidateAsync ( idToken , Options . TokenValidationParameters . Clone ( ) ) ;
8693
8794 var contextIdentifier = string . Empty ;
95+ var webApiUrl = string . Empty ;
8896
8997 foreach ( var claim in tokenValidationResult . ClaimsIdentity . Claims )
9098 {
@@ -93,6 +101,11 @@ private async Task<string> ProcessIdTokenAndGetContactIdentifierAsync(
93101 contextIdentifier = claim . Value ;
94102 }
95103
104+ if ( claim . Type == SuperOfficeAuthenticationConstants . ClaimNames . WebApiUrl )
105+ {
106+ webApiUrl = claim . Value ;
107+ }
108+
96109 if ( claim . Type == SuperOfficeAuthenticationConstants . ClaimNames . SubjectIdentifier )
97110 {
98111 identity . AddClaim ( new Claim ( ClaimTypes . NameIdentifier , claim . Value ) ) ;
@@ -109,7 +122,7 @@ private async Task<string> ProcessIdTokenAndGetContactIdentifierAsync(
109122 }
110123 }
111124
112- return contextIdentifier ;
125+ return ( contextIdentifier , webApiUrl ) ;
113126 }
114127
115128 /// <summary>
0 commit comments