Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
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
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "patch",
"comment": "Standalone functions in PCA #7810",
"packageName": "@azure/msal-browser",
"email": "[email protected]",
"dependentChangeType": "patch"
}
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,10 @@ import { AuthenticationResult } from "../../../response/AuthenticationResult.js"
import { ClearCacheRequest } from "../../../request/ClearCacheRequest.js";
import { ApiId } from "../../../utils/BrowserConstants.js";
import { getCurrentUri } from "../../../utils/BrowserUtils.js";
import {
clearCacheOnLogout,
initializeServerTelemetryManager,
} from "../../../interaction_client/BaseInteractionClient.js";

export class CustomAuthSilentCacheClient extends CustomAuthInteractionClientBase {
/**
Expand All @@ -37,8 +41,13 @@ export class CustomAuthSilentCacheClient extends CustomAuthInteractionClientBase
override async acquireToken(
silentRequest: CommonSilentFlowRequest
): Promise<AuthenticationResult> {
const telemetryManager = this.initializeServerTelemetryManager(
PublicApiId.ACCOUNT_GET_ACCESS_TOKEN
const telemetryManager = initializeServerTelemetryManager(
PublicApiId.ACCOUNT_GET_ACCESS_TOKEN,
this.config.auth.clientId,
this.correlationId,
this.browserStorage,
this.logger,
silentRequest.forceRefresh
);
const clientConfig = this.getCustomAuthClientConfiguration(
telemetryManager,
Expand Down Expand Up @@ -110,7 +119,13 @@ export class CustomAuthSilentCacheClient extends CustomAuthInteractionClientBase
"Start to clear the cache",
logoutRequest?.correlationId
);
await this.clearCacheOnLogout(validLogoutRequest?.account);
await clearCacheOnLogout(
this.browserStorage,
this.browserCrypto,
this.logger,
this.correlationId,
validLogoutRequest?.account
);
this.logger.verbose("Cache cleared", logoutRequest?.correlationId);

const postLogoutRedirectUri = this.config.auth.postLogoutRedirectUri;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ import {
ResetPasswordPasswordRequiredResult,
} from "./result/ResetPasswordActionResult.js";
import { ensureArgumentIsNotEmptyString } from "../../core/utils/ArgumentValidator.js";
import { initializeServerTelemetryManager } from "../../../interaction_client/BaseInteractionClient.js";

export class ResetPasswordClient extends CustomAuthInteractionClientBase {
/**
Expand All @@ -45,7 +46,13 @@ export class ResetPasswordClient extends CustomAuthInteractionClientBase {
): Promise<ResetPasswordCodeRequiredResult> {
const correlationId = parameters.correlationId;
const apiId = PublicApiId.PASSWORD_RESET_START;
const telemetryManager = this.initializeServerTelemetryManager(apiId);
const telemetryManager = initializeServerTelemetryManager(
apiId,
this.config.auth.clientId,
this.correlationId,
this.browserStorage,
this.logger
);

const startRequest: ResetPasswordStartRequest = {
challenge_type: this.getChallengeTypes(parameters.challengeType),
Expand Down Expand Up @@ -93,7 +100,13 @@ export class ResetPasswordClient extends CustomAuthInteractionClientBase {
);

const apiId = PublicApiId.PASSWORD_RESET_SUBMIT_CODE;
const telemetryManager = this.initializeServerTelemetryManager(apiId);
const telemetryManager = initializeServerTelemetryManager(
apiId,
this.config.auth.clientId,
this.correlationId,
this.browserStorage,
this.logger
);

const continueRequest: ResetPasswordContinueRequest = {
continuation_token: parameters.continuationToken,
Expand Down Expand Up @@ -132,7 +145,13 @@ export class ResetPasswordClient extends CustomAuthInteractionClientBase {
parameters: ResetPasswordResendCodeParams
): Promise<ResetPasswordCodeRequiredResult> {
const apiId = PublicApiId.PASSWORD_RESET_RESEND_CODE;
const telemetryManager = this.initializeServerTelemetryManager(apiId);
const telemetryManager = initializeServerTelemetryManager(
apiId,
this.config.auth.clientId,
this.correlationId,
this.browserStorage,
this.logger
);

const challengeRequest: ResetPasswordChallengeRequest = {
continuation_token: parameters.continuationToken,
Expand Down Expand Up @@ -161,7 +180,13 @@ export class ResetPasswordClient extends CustomAuthInteractionClientBase {
);

const apiId = PublicApiId.PASSWORD_RESET_SUBMIT_PASSWORD;
const telemetryManager = this.initializeServerTelemetryManager(apiId);
const telemetryManager = initializeServerTelemetryManager(
apiId,
this.config.auth.clientId,
this.correlationId,
this.browserStorage,
this.logger
);

const submitRequest: ResetPasswordSubmitRequest = {
continuation_token: parameters.continuationToken,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@ import { EventHandler } from "../../../event/EventHandler.js";
import { INavigationClient } from "../../../navigation/INavigationClient.js";
import { AuthenticationResult } from "../../../response/AuthenticationResult.js";
import { ensureArgumentIsNotEmptyString } from "../../core/utils/ArgumentValidator.js";
import { initializeServerTelemetryManager } from "../../../interaction_client/BaseInteractionClient.js";

export class SignInClient extends CustomAuthInteractionClientBase {
private readonly tokenResponseHandler: ResponseHandler;
Expand Down Expand Up @@ -103,7 +104,13 @@ export class SignInClient extends CustomAuthInteractionClientBase {
const apiId = !parameters.password
? PublicApiId.SIGN_IN_WITH_CODE_START
: PublicApiId.SIGN_IN_WITH_PASSWORD_START;
const telemetryManager = this.initializeServerTelemetryManager(apiId);
const telemetryManager = initializeServerTelemetryManager(
apiId,
this.config.auth.clientId,
this.correlationId,
this.browserStorage,
this.logger
);

this.logger.verbose(
"Calling initiate endpoint for sign in.",
Expand Down Expand Up @@ -144,7 +151,13 @@ export class SignInClient extends CustomAuthInteractionClientBase {
parameters: SignInResendCodeParams
): Promise<SignInCodeSendResult> {
const apiId = PublicApiId.SIGN_IN_RESEND_CODE;
const telemetryManager = this.initializeServerTelemetryManager(apiId);
const telemetryManager = initializeServerTelemetryManager(
apiId,
this.config.auth.clientId,
this.correlationId,
this.browserStorage,
this.logger
);

const challengeReq: SignInChallengeRequest = {
challenge_type: this.getChallengeTypes(parameters.challengeType),
Expand Down Expand Up @@ -186,7 +199,13 @@ export class SignInClient extends CustomAuthInteractionClientBase {
);

const apiId = PublicApiId.SIGN_IN_SUBMIT_CODE;
const telemetryManager = this.initializeServerTelemetryManager(apiId);
const telemetryManager = initializeServerTelemetryManager(
apiId,
this.config.auth.clientId,
this.correlationId,
this.browserStorage,
this.logger
);
const scopes = this.getScopes(parameters.scopes);

const request: SignInOobTokenRequest = {
Expand Down Expand Up @@ -224,7 +243,13 @@ export class SignInClient extends CustomAuthInteractionClientBase {
);

const apiId = PublicApiId.SIGN_IN_SUBMIT_PASSWORD;
const telemetryManager = this.initializeServerTelemetryManager(apiId);
const telemetryManager = initializeServerTelemetryManager(
apiId,
this.config.auth.clientId,
this.correlationId,
this.browserStorage,
this.logger
);
const scopes = this.getScopes(parameters.scopes);

const request: SignInPasswordTokenRequest = {
Expand Down Expand Up @@ -259,7 +284,13 @@ export class SignInClient extends CustomAuthInteractionClientBase {
parameters.signInScenario,
parameters.correlationId
);
const telemetryManager = this.initializeServerTelemetryManager(apiId);
const telemetryManager = initializeServerTelemetryManager(
apiId,
this.config.auth.clientId,
this.correlationId,
this.browserStorage,
this.logger
);
const scopes = this.getScopes(parameters.scopes);

// Create token request.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@ import {
} from "../../core/network_client/custom_auth_api/types/ApiRequestTypes.js";
import { SignUpContinueResponse } from "../../core/network_client/custom_auth_api/types/ApiResponseTypes.js";
import { ServerTelemetryManager } from "@azure/msal-common/browser";
import { initializeServerTelemetryManager } from "../../../interaction_client/BaseInteractionClient.js";

export class SignUpClient extends CustomAuthInteractionClientBase {
/**
Expand All @@ -56,7 +57,13 @@ export class SignUpClient extends CustomAuthInteractionClientBase {
const apiId = !parameters.password
? PublicApiId.SIGN_UP_START
: PublicApiId.SIGN_UP_WITH_PASSWORD_START;
const telemetryManager = this.initializeServerTelemetryManager(apiId);
const telemetryManager = initializeServerTelemetryManager(
apiId,
this.config.auth.clientId,
this.correlationId,
this.browserStorage,
this.logger
);

const startRequest: SignUpStartRequest = {
username: parameters.username,
Expand Down Expand Up @@ -104,7 +111,13 @@ export class SignUpClient extends CustomAuthInteractionClientBase {
| SignUpAttributesRequiredResult
> {
const apiId = PublicApiId.SIGN_UP_SUBMIT_CODE;
const telemetryManager = this.initializeServerTelemetryManager(apiId);
const telemetryManager = initializeServerTelemetryManager(
apiId,
this.config.auth.clientId,
this.correlationId,
this.browserStorage,
this.logger
);

const requestSubmitCode: SignUpContinueWithOobRequest = {
continuation_token: parameters.continuationToken,
Expand Down Expand Up @@ -148,7 +161,13 @@ export class SignUpClient extends CustomAuthInteractionClientBase {
| SignUpAttributesRequiredResult
> {
const apiId = PublicApiId.SIGN_UP_SUBMIT_PASSWORD;
const telemetryManager = this.initializeServerTelemetryManager(apiId);
const telemetryManager = initializeServerTelemetryManager(
apiId,
this.config.auth.clientId,
this.correlationId,
this.browserStorage,
this.logger
);

const requestSubmitPwd: SignUpContinueWithPasswordRequest = {
continuation_token: parameter.continuationToken,
Expand Down Expand Up @@ -192,7 +211,13 @@ export class SignUpClient extends CustomAuthInteractionClientBase {
| SignUpCodeRequiredResult
> {
const apiId = PublicApiId.SIGN_UP_SUBMIT_ATTRIBUTES;
const telemetryManager = this.initializeServerTelemetryManager(apiId);
const telemetryManager = initializeServerTelemetryManager(
apiId,
this.config.auth.clientId,
this.correlationId,
this.browserStorage,
this.logger
);
const reqWithAttr: SignUpContinueWithAttributesRequest = {
continuation_token: parameter.continuationToken,
attributes: parameter.attributes,
Expand Down Expand Up @@ -235,7 +260,13 @@ export class SignUpClient extends CustomAuthInteractionClientBase {
parameters: SignUpResendCodeParams
): Promise<SignUpCodeRequiredResult> {
const apiId = PublicApiId.SIGN_UP_RESEND_CODE;
const telemetryManager = this.initializeServerTelemetryManager(apiId);
const telemetryManager = initializeServerTelemetryManager(
apiId,
this.config.auth.clientId,
this.correlationId,
this.browserStorage,
this.logger
);

const challengeRequest: SignUpChallengeRequest = {
continuation_token: parameters.continuationToken ?? "",
Expand Down
Loading
Loading