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.

Sign up for GitHub

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

Jump to bottom

feat: Support Single Tenant authentication through BotFramework-Emulator #4643

Merged
merged 6 commits into from
Apr 16, 2024
Merged

feat: Support Single Tenant authentication through BotFramework-Emulator #4643

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
e9cb69a
use dynamic creation of issuer with tenant id
JhontSouth Mar 14, 2024
0108ac2
include documentation and tid validation
JhontSouth Mar 18, 2024
982564e
use valid token issuer Url template
JhontSouth Apr 3, 2024
bd424f1
format lint issues
JhontSouth Apr 3, 2024
1864431
use auth constants to get payload values
JhontSouth Apr 4, 2024
d53c68c
fix lint issues
JhontSouth Apr 4, 2024
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
5 changes: 5 additions & 0 deletions libraries/botframework-connector/src/auth/authenticationConstants.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -172,6 +172,11 @@ export namespace AuthenticationConstants {
*/
export const ServiceUrlClaim = 'serviceurl';

/**
* Tenant ID claim name. As used in Microsoft AAD tokens.
*/
export const TenantIdClaim = 'tid';

/**
* AppId used for creating skill claims when there is no appId and password configured.
*/
Expand Down
19 changes: 18 additions & 1 deletion libraries/botframework-connector/src/auth/emulatorValidation.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,12 +69,29 @@ export namespace EmulatorValidation {
}

// Is there an Issuer?
const issuer: string = token.payload.iss;
const issuer: string = token.payload[AuthenticationConstants.IssuerClaim];
if (!issuer) {
// No Issuer, means it's not from the Emulator.
return false;
}

//Validation to manage the issuer object as a string.
if (Array.isArray(ToBotFromBotOrEmulatorTokenValidationParameters.issuer)) {
const tenantId = token?.payload[AuthenticationConstants.TenantIdClaim] ?? '';

//Validate if there is an existing issuer with the same tid value.
if (
tenantId != '' &&
ToBotFromBotOrEmulatorTokenValidationParameters.issuer.find((issuer) => issuer.includes(tenantId)) ==
null
) {
//If the issuer doesn't exist, this is added using the Emulator token issuer structure.
//This allows use of the SingleTenant authentication through Emulator.
const newIssuer = AuthenticationConstants.ValidTokenIssuerUrlTemplateV1 + `${tenantId}/`;
ToBotFromBotOrEmulatorTokenValidationParameters.issuer.push(newIssuer);
}
}

// Is the token issues by a source we consider to be the emulator?
if (
ToBotFromEmulatorTokenValidationParameters.issuer &&
Expand Down
Loading