Skip to content
This repository was archived by the owner on Jun 25, 2023. It is now read-only.

Commit 8ebf8d0

Browse files
authored
Merge pull request #38 from Azure-Samples/dev
Merging dev to main
2 parents 7302487 + c00ce7b commit 8ebf8d0

27 files changed

Lines changed: 290 additions & 16164 deletions

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ const appSettings = {
7070
unauthorized: "/unauthorized" // unauthorized access attempts will be redirected to this route
7171
frontChannelLogout: "/sso_logout" // front-channel logout path or the full URI configured on Azure AD
7272
},
73-
remoteResources: {
73+
protectedResources: {
7474
graphAPI: {
7575
endpoint: "https://graph.microsoft.com/v1.0/me", // Microsoft Graph API
7676
scopes: ["user.read"]

demo/App/app.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,8 @@ app.use(session({
4242

4343
app.set('trust proxy', 1) // trust first proxy
4444

45-
// async building the wrapper as fetching credentials from key vault
46-
const msid = await new MsIdExpress.WebAppAuthClientBuilder(appSettings).build();
45+
// building the identity-express-wrapper
46+
const msid = new MsIdExpress.WebAppAuthClientBuilder(appSettings).build();
4747

4848
app.use(msid.initialize());
4949

dist/client/BaseAuthClient.d.ts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,10 @@
11
import { Logger } from "@azure/msal-common";
22
import { ConfidentialClientApplication, Configuration, CryptoProvider } from "@azure/msal-node";
3-
import { TokenValidator } from "../crypto/TokenValidator";
43
import { AppSettings } from "../config/AppSettings";
54
export declare abstract class BaseAuthClient {
65
appSettings: AppSettings;
76
protected msalConfig: Configuration;
87
protected msalClient: ConfidentialClientApplication;
9-
protected tokenValidator: TokenValidator;
108
protected cryptoProvider: CryptoProvider;
119
protected logger: Logger;
1210
protected constructor(appSettings: AppSettings, msalConfig: Configuration);

dist/client/webapi/MsalWebApiAuthClient.d.ts

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import { RequestHandler, Router } from "express";
22
import { Configuration } from "@azure/msal-node";
33
import { BaseAuthClient } from "../BaseAuthClient";
44
import { AppSettings } from "../../config/AppSettings";
5-
import { InitializationOptions, TokenRequestOptions, GuardOptions } from "../MiddlewareOptions";
5+
import { InitializationOptions, TokenRequestOptions } from "../MiddlewareOptions";
66
/**
77
* A simple wrapper around MSAL Node ConfidentialClientApplication object.
88
* It offers a collection of middleware and utility methods that automate
@@ -29,9 +29,7 @@ export declare class MsalWebApiAuthClient extends BaseAuthClient {
2929
getTokenOnBehalf(options: TokenRequestOptions): RequestHandler;
3030
/**
3131
* Receives access token in req authorization header
32-
* and validates it using the jwt.verify
33-
* @param {GuardOptions} options: options to modify this middleware
3432
* @returns {RequestHandler}
3533
*/
36-
isAuthorized(options?: GuardOptions): RequestHandler;
34+
isAuthorized(): RequestHandler;
3735
}

dist/crypto/AuthToken.d.ts

Lines changed: 0 additions & 31 deletions
This file was deleted.

dist/crypto/TokenValidator.d.ts

Lines changed: 0 additions & 57 deletions
This file was deleted.

dist/index.d.ts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,6 @@ export { WebApiAuthClientBuilder } from "./client/webapi/WebApiAuthClientBuilder
33
export { MsalWebAppAuthClient } from "./client/webapp/MsalWebAppAuthClient";
44
export { AppServiceWebAppAuthClient } from "./client/webapp/AppServiceWebAppAuthClient";
55
export { MsalWebApiAuthClient } from "./client/webapi/MsalWebApiAuthClient";
6-
export { AuthToken } from "./crypto/AuthToken";
7-
export { TokenValidator } from "./crypto/TokenValidator";
86
export { AppSettings } from "./config/AppSettings";
97
export { ConfigHelper } from "./config/ConfigHelper";
108
export { MsalConfiguration } from "./config/MsalConfiguration";

0 commit comments

Comments
 (0)