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

Add additional logging for NAA initialization #7064

Merged
merged 2 commits into from
Apr 30, 2024
Merged

Add additional logging for NAA initialization #7064

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8dfacae
add additional logging for NAA initialization
codexeon Apr 27, 2024
f78051c
Change files
codexeon Apr 27, 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
7 changes: 7 additions & 0 deletions change/@azure-msal-browser-ab395da1-96b3-4e3e-aba4-97816697bd09.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "patch",
"comment": "Add additional logging for Nested App Auth initialization errors (#7064)",
"packageName": "@azure/msal-browser",
"email": "[email protected]",
"dependentChangeType": "patch"
}
5 changes: 1 addition & 4 deletions lib/msal-browser/src/controllers/ControllerFactory.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,10 +29,7 @@ export async function createController(

await Promise.all(operatingContexts);

if (
teamsApp.isAvailable() &&
teamsApp.getConfig().auth.supportsNestedAppAuth
) {
if (teamsApp.isAvailable()) {
const controller = await import("./NestedAppAuthController");
return controller.NestedAppAuthController.createController(teamsApp);
} else if (standard.isAvailable()) {
Expand Down
22 changes: 14 additions & 8 deletions lib/msal-browser/src/operatingcontext/TeamsAppOperatingContext.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,11 @@ export class TeamsAppOperatingContext extends BaseOperatingContext {
* TODO: Add implementation to check for presence of inject Nested App Auth Bridge JavaScript interface
*
*/

if (!this.getConfig().auth.supportsNestedAppAuth) {
return false;
}

try {
if (typeof window !== "undefined") {
const bridgeProxy: IBridgeProxy = await BridgeProxy.create();
Expand All @@ -74,18 +79,19 @@ export class TeamsAppOperatingContext extends BaseOperatingContext {
this.activeAccount =
await bridgeProxy.getActiveAccount();
}
} catch (e) {
this.activeAccount = undefined;
} catch {
// Ignore errors
}
this.bridgeProxy = bridgeProxy;
this.available = bridgeProxy !== undefined;
} else {
this.available = false;
}
} catch (e) {
this.available = false;
} finally {
return this.available;
} catch (ex) {
this.logger.infoPii(
`Could not initialize Nested App Auth bridge (${ex})`
);
}

this.logger.info(`Nested App Auth Bridge available: ${this.available}`);
return this.available;
}
}
Loading