@azure/msal-common 16.5.0 → 16.5.2
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/account/AccountInfo.d.ts +3 -1
- package/dist/account/AccountInfo.d.ts.map +1 -1
- package/dist/account/AccountInfo.mjs +3 -2
- package/dist/account/AccountInfo.mjs.map +1 -1
- package/dist/account/AuthToken.mjs +1 -1
- package/dist/account/CcsCredential.mjs +1 -1
- package/dist/account/ClientInfo.mjs +1 -1
- package/dist/account/TokenClaims.mjs +1 -1
- package/dist/authority/Authority.mjs +1 -1
- package/dist/authority/AuthorityFactory.mjs +1 -1
- package/dist/authority/AuthorityMetadata.mjs +1 -1
- package/dist/authority/AuthorityOptions.mjs +1 -1
- package/dist/authority/AuthorityType.mjs +1 -1
- package/dist/authority/CloudInstanceDiscoveryErrorResponse.mjs +1 -1
- package/dist/authority/CloudInstanceDiscoveryResponse.mjs +1 -1
- package/dist/authority/OpenIdConfigResponse.mjs +1 -1
- package/dist/authority/ProtocolMode.mjs +1 -1
- package/dist/authority/RegionDiscovery.mjs +1 -1
- package/dist/cache/CacheManager.d.ts +20 -13
- package/dist/cache/CacheManager.d.ts.map +1 -1
- package/dist/cache/CacheManager.mjs +46 -16
- package/dist/cache/CacheManager.mjs.map +1 -1
- package/dist/cache/persistence/TokenCacheContext.mjs +1 -1
- package/dist/cache/utils/AccountEntityUtils.mjs +1 -1
- package/dist/cache/utils/CacheHelpers.mjs +1 -1
- package/dist/cache/utils/CacheTypes.d.ts +1 -1
- package/dist/cache/utils/CacheTypes.d.ts.map +1 -1
- package/dist/client/AuthorizationCodeClient.mjs +1 -1
- package/dist/client/RefreshTokenClient.mjs +1 -1
- package/dist/client/SilentFlowClient.mjs +1 -1
- package/dist/config/ClientConfiguration.mjs +1 -1
- package/dist/constants/AADServerParamKeys.mjs +1 -1
- package/dist/crypto/ICrypto.mjs +1 -1
- package/dist/crypto/JoseHeader.mjs +1 -1
- package/dist/crypto/PopTokenGenerator.mjs +1 -1
- package/dist/error/AuthError.mjs +1 -1
- package/dist/error/AuthErrorCodes.mjs +1 -1
- package/dist/error/CacheError.mjs +1 -1
- package/dist/error/CacheErrorCodes.mjs +1 -1
- package/dist/error/ClientAuthError.mjs +1 -1
- package/dist/error/ClientAuthErrorCodes.mjs +1 -1
- package/dist/error/ClientConfigurationError.mjs +1 -1
- package/dist/error/ClientConfigurationErrorCodes.mjs +1 -1
- package/dist/error/InteractionRequiredAuthError.mjs +1 -1
- package/dist/error/InteractionRequiredAuthErrorCodes.mjs +1 -1
- package/dist/error/JoseHeaderError.mjs +1 -1
- package/dist/error/JoseHeaderErrorCodes.mjs +1 -1
- package/dist/error/NetworkError.mjs +1 -1
- package/dist/error/PlatformBrokerError.mjs +1 -1
- package/dist/error/ServerError.mjs +1 -1
- package/dist/index-node.mjs +1 -1
- package/dist/index.mjs +1 -1
- package/dist/logger/Logger.mjs +1 -1
- package/dist/network/INetworkModule.mjs +1 -1
- package/dist/network/RequestThumbprint.mjs +1 -1
- package/dist/network/ThrottlingUtils.mjs +1 -1
- package/dist/packageMetadata.d.ts +1 -1
- package/dist/packageMetadata.mjs +2 -2
- package/dist/protocol/Authorize.mjs +1 -1
- package/dist/protocol/Token.mjs +1 -1
- package/dist/request/AuthenticationHeaderParser.mjs +1 -1
- package/dist/request/BaseAuthRequest.mjs +1 -1
- package/dist/request/RequestParameterBuilder.mjs +1 -1
- package/dist/request/ScopeSet.mjs +1 -1
- package/dist/response/ResponseHandler.mjs +1 -1
- package/dist/telemetry/performance/PerformanceClient.mjs +1 -1
- package/dist/telemetry/performance/PerformanceEvent.mjs +1 -1
- package/dist/telemetry/performance/PerformanceEvents.mjs +1 -1
- package/dist/telemetry/performance/StubPerformanceClient.mjs +1 -1
- package/dist/telemetry/server/ServerTelemetryManager.mjs +1 -1
- package/dist/url/UrlString.mjs +1 -1
- package/dist/utils/ClientAssertionUtils.mjs +1 -1
- package/dist/utils/Constants.mjs +1 -1
- package/dist/utils/FunctionWrappers.mjs +1 -1
- package/dist/utils/ProtocolUtils.mjs +1 -1
- package/dist/utils/StringUtils.mjs +1 -1
- package/dist/utils/TimeUtils.mjs +1 -1
- package/dist/utils/UrlUtils.mjs +1 -1
- package/dist-browser/account/AccountInfo.d.ts +3 -1
- package/dist-browser/account/AccountInfo.d.ts.map +1 -1
- package/dist-browser/account/AccountInfo.mjs +3 -2
- package/dist-browser/account/AccountInfo.mjs.map +1 -1
- package/dist-browser/account/AuthToken.mjs +1 -1
- package/dist-browser/account/CcsCredential.mjs +1 -1
- package/dist-browser/account/ClientInfo.mjs +1 -1
- package/dist-browser/account/TokenClaims.mjs +1 -1
- package/dist-browser/authority/Authority.mjs +1 -1
- package/dist-browser/authority/AuthorityFactory.mjs +1 -1
- package/dist-browser/authority/AuthorityMetadata.mjs +1 -1
- package/dist-browser/authority/AuthorityOptions.mjs +1 -1
- package/dist-browser/authority/AuthorityType.mjs +1 -1
- package/dist-browser/authority/CloudInstanceDiscoveryErrorResponse.mjs +1 -1
- package/dist-browser/authority/CloudInstanceDiscoveryResponse.mjs +1 -1
- package/dist-browser/authority/OpenIdConfigResponse.mjs +1 -1
- package/dist-browser/authority/ProtocolMode.mjs +1 -1
- package/dist-browser/authority/RegionDiscovery.mjs +1 -1
- package/dist-browser/cache/CacheManager.d.ts +20 -13
- package/dist-browser/cache/CacheManager.d.ts.map +1 -1
- package/dist-browser/cache/CacheManager.mjs +46 -16
- package/dist-browser/cache/CacheManager.mjs.map +1 -1
- package/dist-browser/cache/persistence/TokenCacheContext.mjs +1 -1
- package/dist-browser/cache/utils/AccountEntityUtils.mjs +1 -1
- package/dist-browser/cache/utils/CacheHelpers.mjs +1 -1
- package/dist-browser/cache/utils/CacheTypes.d.ts +1 -1
- package/dist-browser/cache/utils/CacheTypes.d.ts.map +1 -1
- package/dist-browser/client/AuthorizationCodeClient.mjs +1 -1
- package/dist-browser/client/RefreshTokenClient.mjs +1 -1
- package/dist-browser/client/SilentFlowClient.mjs +1 -1
- package/dist-browser/config/ClientConfiguration.mjs +1 -1
- package/dist-browser/constants/AADServerParamKeys.mjs +1 -1
- package/dist-browser/crypto/ICrypto.mjs +1 -1
- package/dist-browser/crypto/JoseHeader.mjs +1 -1
- package/dist-browser/crypto/PopTokenGenerator.mjs +1 -1
- package/dist-browser/error/AuthError.mjs +1 -1
- package/dist-browser/error/AuthErrorCodes.mjs +1 -1
- package/dist-browser/error/CacheError.mjs +1 -1
- package/dist-browser/error/CacheErrorCodes.mjs +1 -1
- package/dist-browser/error/ClientAuthError.mjs +1 -1
- package/dist-browser/error/ClientAuthErrorCodes.mjs +1 -1
- package/dist-browser/error/ClientConfigurationError.mjs +1 -1
- package/dist-browser/error/ClientConfigurationErrorCodes.mjs +1 -1
- package/dist-browser/error/InteractionRequiredAuthError.mjs +1 -1
- package/dist-browser/error/InteractionRequiredAuthErrorCodes.mjs +1 -1
- package/dist-browser/error/JoseHeaderError.mjs +1 -1
- package/dist-browser/error/JoseHeaderErrorCodes.mjs +1 -1
- package/dist-browser/error/NetworkError.mjs +1 -1
- package/dist-browser/error/PlatformBrokerError.mjs +1 -1
- package/dist-browser/error/ServerError.mjs +1 -1
- package/dist-browser/index-browser.mjs +1 -1
- package/dist-browser/index.mjs +1 -1
- package/dist-browser/log-strings-mapping.json +2 -2
- package/dist-browser/logger/Logger.mjs +1 -1
- package/dist-browser/network/INetworkModule.mjs +1 -1
- package/dist-browser/network/RequestThumbprint.mjs +1 -1
- package/dist-browser/network/ThrottlingUtils.mjs +1 -1
- package/dist-browser/packageMetadata.d.ts +1 -1
- package/dist-browser/packageMetadata.mjs +2 -2
- package/dist-browser/protocol/Authorize.mjs +1 -1
- package/dist-browser/protocol/Token.mjs +1 -1
- package/dist-browser/request/AuthenticationHeaderParser.mjs +1 -1
- package/dist-browser/request/BaseAuthRequest.mjs +1 -1
- package/dist-browser/request/RequestParameterBuilder.mjs +1 -1
- package/dist-browser/request/ScopeSet.mjs +1 -1
- package/dist-browser/response/ResponseHandler.mjs +1 -1
- package/dist-browser/telemetry/performance/PerformanceClient.mjs +1 -1
- package/dist-browser/telemetry/performance/PerformanceEvent.mjs +1 -1
- package/dist-browser/telemetry/performance/PerformanceEvents.mjs +1 -1
- package/dist-browser/telemetry/performance/StubPerformanceClient.mjs +1 -1
- package/dist-browser/telemetry/server/ServerTelemetryManager.mjs +1 -1
- package/dist-browser/url/UrlString.mjs +1 -1
- package/dist-browser/utils/ClientAssertionUtils.mjs +1 -1
- package/dist-browser/utils/Constants.mjs +1 -1
- package/dist-browser/utils/FunctionWrappers.mjs +1 -1
- package/dist-browser/utils/ProtocolUtils.mjs +1 -1
- package/dist-browser/utils/StringUtils.mjs +1 -1
- package/dist-browser/utils/TimeUtils.mjs +1 -1
- package/dist-browser/utils/UrlUtils.mjs +1 -1
- package/lib/index-browser.cjs +2 -2
- package/lib/{index-node-Du5Fgpah.js → index-node-ByMjZ1FK.js} +45 -14
- package/lib/index-node-ByMjZ1FK.js.map +1 -0
- package/lib/index-node.cjs +2 -2
- package/lib/index.cjs +2 -2
- package/lib/types/account/AccountInfo.d.ts +3 -1
- package/lib/types/account/AccountInfo.d.ts.map +1 -1
- package/lib/types/cache/CacheManager.d.ts +20 -13
- package/lib/types/cache/CacheManager.d.ts.map +1 -1
- package/lib/types/cache/utils/CacheTypes.d.ts +1 -1
- package/lib/types/cache/utils/CacheTypes.d.ts.map +1 -1
- package/lib/types/packageMetadata.d.ts +1 -1
- package/package.json +1 -1
- package/src/account/AccountInfo.ts +5 -2
- package/src/cache/CacheManager.ts +101 -44
- package/src/cache/utils/CacheTypes.ts +1 -0
- package/src/packageMetadata.ts +1 -1
- package/lib/index-node-Du5Fgpah.js.map +0 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"CacheManager.d.ts","sourceRoot":"","sources":["../../../src/cache/CacheManager.ts"],"names":[],"mappings":"AAKA,OAAO,EACH,
|
|
1
|
+
{"version":3,"file":"CacheManager.d.ts","sourceRoot":"","sources":["../../../src/cache/CacheManager.ts"],"names":[],"mappings":"AAKA,OAAO,EACH,WAAW,EAGd,MAAM,2BAA2B,CAAC;AAInC,OAAO,EAAE,sBAAsB,EAAE,MAAM,kCAAkC,CAAC;AAC1E,OAAO,EAAE,OAAO,EAAE,MAAM,sBAAsB,CAAC;AAO/C,OAAO,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAC;AAE7C,OAAO,EAAE,eAAe,EAAE,MAAM,+BAA+B,CAAC;AAEhE,OAAO,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAC;AAC1D,OAAO,EAAE,kBAAkB,EAAE,MAAM,gDAAgD,CAAC;AAEpF,OAAO,EAAE,iBAAiB,EAAE,MAAM,iCAAiC,CAAC;AACpE,OAAO,EAAE,aAAa,EAAE,MAAM,6BAA6B,CAAC;AAC5D,OAAO,EAAE,iBAAiB,EAAE,MAAM,iCAAiC,CAAC;AACpE,OAAO,EAAE,uBAAuB,EAAE,MAAM,uCAAuC,CAAC;AAChF,OAAO,EAAE,WAAW,EAAE,MAAM,2BAA2B,CAAC;AACxD,OAAO,EAAE,gBAAgB,EAAE,MAAM,gCAAgC,CAAC;AAClE,OAAO,EAAE,aAAa,EAAE,MAAM,6BAA6B,CAAC;AAC5D,OAAO,EAAE,kBAAkB,EAAE,MAAM,kCAAkC,CAAC;AACtE,OAAO,EAAE,qBAAqB,EAAE,MAAM,qCAAqC,CAAC;AAC5E,OAAO,EAAE,gBAAgB,EAAE,MAAM,gCAAgC,CAAC;AAClE,OAAO,EAAE,aAAa,EAAE,MAAM,8BAA8B,CAAC;AAE7D,OAAO,EACH,aAAa,EACb,gBAAgB,EAChB,iBAAiB,EACjB,gBAAgB,EAEhB,SAAS,EACT,mBAAmB,EACtB,MAAM,uBAAuB,CAAC;AAE/B;;;GAGG;AACH,8BAAsB,YAAa,YAAW,aAAa;IACvD,SAAS,CAAC,QAAQ,EAAE,MAAM,CAAC;IAC3B,SAAS,CAAC,UAAU,EAAE,OAAO,CAAC;IAE9B,OAAO,CAAC,YAAY,CAAS;IAC7B,OAAO,CAAC,sBAAsB,CAAC,CAAyB;IACxD,SAAS,CAAC,iBAAiB,EAAE,kBAAkB,CAAC;gBAG5C,QAAQ,EAAE,MAAM,EAChB,UAAU,EAAE,OAAO,EACnB,MAAM,EAAE,MAAM,EACd,iBAAiB,EAAE,kBAAkB,EACrC,sBAAsB,CAAC,EAAE,sBAAsB;IASnD;;;OAGG;IACH,QAAQ,CAAC,UAAU,CACf,UAAU,EAAE,MAAM,EAClB,aAAa,EAAE,MAAM,GACtB,aAAa,GAAG,IAAI;IAEvB;;;;OAIG;IACH,QAAQ,CAAC,UAAU,CACf,OAAO,EAAE,aAAa,EACtB,aAAa,EAAE,MAAM,EACrB,IAAI,EAAE,OAAO,EACb,KAAK,EAAE,MAAM,GACd,OAAO,CAAC,IAAI,CAAC;IAEhB;;;OAGG;IACH,QAAQ,CAAC,oBAAoB,CACzB,UAAU,EAAE,MAAM,EAClB,aAAa,EAAE,MAAM,GACtB,aAAa,GAAG,IAAI;IAEvB;;;;OAIG;IACH,QAAQ,CAAC,oBAAoB,CACzB,OAAO,EAAE,aAAa,EACtB,aAAa,EAAE,MAAM,EACrB,IAAI,EAAE,OAAO,GACd,OAAO,CAAC,IAAI,CAAC;IAEhB;;;OAGG;IACH,QAAQ,CAAC,wBAAwB,CAC7B,cAAc,EAAE,MAAM,EACtB,aAAa,EAAE,MAAM,GACtB,iBAAiB,GAAG,IAAI;IAE3B;;;;OAIG;IACH,QAAQ,CAAC,wBAAwB,CAC7B,WAAW,EAAE,iBAAiB,EAC9B,aAAa,EAAE,MAAM,EACrB,IAAI,EAAE,OAAO,GACd,OAAO,CAAC,IAAI,CAAC;IAEhB;;;OAGG;IACH,QAAQ,CAAC,yBAAyB,CAC9B,eAAe,EAAE,MAAM,EACvB,aAAa,EAAE,MAAM,GACtB,kBAAkB,GAAG,IAAI;IAE5B;;;;OAIG;IACH,QAAQ,CAAC,yBAAyB,CAC9B,YAAY,EAAE,kBAAkB,EAChC,aAAa,EAAE,MAAM,EACrB,IAAI,EAAE,OAAO,GACd,OAAO,CAAC,IAAI,CAAC;IAEhB;;;;OAIG;IACH,QAAQ,CAAC,cAAc,CACnB,cAAc,EAAE,MAAM,EACtB,aAAa,EAAE,MAAM,GACtB,iBAAiB,GAAG,IAAI;IAE3B;;;OAGG;IACH,QAAQ,CAAC,cAAc,CACnB,WAAW,EAAE,iBAAiB,EAC9B,aAAa,EAAE,MAAM,GACtB,IAAI;IAEP;;;;OAIG;IACH,QAAQ,CAAC,kBAAkB,CACvB,kBAAkB,EAAE,MAAM,EAC1B,aAAa,EAAE,MAAM,GACtB,qBAAqB,GAAG,IAAI;IAE/B;;;;;OAKG;IACH,QAAQ,CAAC,kBAAkB,CACvB,kBAAkB,EAAE,MAAM,EAC1B,eAAe,EAAE,qBAAqB,EACtC,aAAa,EAAE,MAAM,GACtB,IAAI;IAEP;;;;OAIG;IACH,QAAQ,CAAC,oBAAoB,CACzB,GAAG,EAAE,MAAM,EACX,aAAa,EAAE,MAAM,GACtB,uBAAuB,GAAG,IAAI;IAEjC;;OAEG;IACH,QAAQ,CAAC,wBAAwB,IAAI,KAAK,CAAC,MAAM,CAAC;IAElD;;;;;OAKG;IACH,QAAQ,CAAC,oBAAoB,CACzB,GAAG,EAAE,MAAM,EACX,KAAK,EAAE,uBAAuB,EAC9B,aAAa,EAAE,MAAM,GACtB,IAAI;IAEP;;;;OAIG;IACH,QAAQ,CAAC,kBAAkB,CACvB,kBAAkB,EAAE,MAAM,EAC1B,aAAa,EAAE,MAAM,GACtB,gBAAgB,GAAG,IAAI;IAE1B;;;;OAIG;IACH,QAAQ,CAAC,kBAAkB,CACvB,kBAAkB,EAAE,MAAM,EAC1B,eAAe,EAAE,gBAAgB,EACjC,aAAa,EAAE,MAAM,GACtB,IAAI;IAEP;;;OAGG;IACH,QAAQ,CAAC,UAAU,CAAC,GAAG,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM,GAAG,IAAI;IAE7D;;OAEG;IACH,QAAQ,CAAC,OAAO,IAAI,MAAM,EAAE;IAE5B;;OAEG;IACH,QAAQ,CAAC,cAAc,IAAI,MAAM,EAAE;IAEnC;;OAEG;IACH,QAAQ,CAAC,YAAY,IAAI,SAAS;IAElC;;;OAGG;IACH,QAAQ,CAAC,qBAAqB,CAAC,UAAU,EAAE,gBAAgB,GAAG,MAAM;IAEpE;;;OAGG;IACH,QAAQ,CAAC,kBAAkB,CAAC,OAAO,EAAE,WAAW,GAAG,MAAM;IAEzD;;;;OAIG;IACH,cAAc,CACV,aAAa,2BAAoB,EACjC,aAAa,EAAE,MAAM,GACtB,WAAW,EAAE;IAQhB;;OAEG;IACH,wBAAwB,CACpB,aAAa,EAAE,aAAa,EAC5B,aAAa,EAAE,MAAM,GACtB,WAAW,GAAG,IAAI;IA8BrB;;;;OAIG;IACH,kBAAkB,CACd,aAAa,EAAE,aAAa,EAC5B,aAAa,EAAE,MAAM,GACtB,WAAW,GAAG,IAAI;IAYrB;;;;;;OAMG;IACH,OAAO,CAAC,mBAAmB;IAe3B,OAAO,CAAC,8BAA8B;IAwDtC,OAAO,CAAC,kCAAkC;IA0C1C,OAAO,CAAC,0BAA0B;IAgElC,OAAO,CAAC,qCAAqC;IA0D7C;;;;;OAKG;IACG,eAAe,CACjB,WAAW,EAAE,WAAW,EACxB,aAAa,EAAE,MAAM,EACrB,IAAI,EAAE,OAAO,EACb,KAAK,EAAE,MAAM,EACb,YAAY,CAAC,EAAE,YAAY,GAC5B,OAAO,CAAC,IAAI,CAAC;IA+DhB;;;OAGG;YACW,eAAe;IA8C7B;;;;OAIG;IACH,qBAAqB,CACjB,aAAa,EAAE,aAAa,EAC5B,aAAa,EAAE,MAAM,GACtB,aAAa,EAAE;IAsFlB;;;;;;OAMG;IACH,uBAAuB,CACnB,MAAM,EAAE,mBAAmB,EAC3B,MAAM,EAAE,gBAAgB,EACxB,aAAa,EAAE,MAAM,GACtB,OAAO;IA4EV;;;;OAIG;IACH,wBAAwB,CACpB,MAAM,EAAE,iBAAiB,EACzB,aAAa,EAAE,MAAM,GACtB,gBAAgB;IAyCnB;;;;OAIG;IACH,2BAA2B,CACvB,IAAI,EAAE,MAAM,EACZ,aAAa,EAAE,MAAM,GACtB,uBAAuB,GAAG,IAAI;IA8BjC;;OAEG;IACH,iBAAiB,CAAC,aAAa,EAAE,MAAM,GAAG,IAAI;IAO9C;;;OAGG;IACH,aAAa,CAAC,OAAO,EAAE,WAAW,EAAE,aAAa,EAAE,MAAM,GAAG,IAAI;IAkBhE;;;OAGG;IACH,oBAAoB,CAAC,OAAO,EAAE,WAAW,EAAE,aAAa,EAAE,MAAM,GAAG,IAAI;IAsBvE;;;;OAIG;IACH,iBAAiB,CAAC,GAAG,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM,GAAG,IAAI;IAwC3D;;OAEG;IACH,iBAAiB,CAAC,aAAa,EAAE,MAAM,GAAG,OAAO;IAWjD;;;;;;;OAOG;IACH,UAAU,CACN,OAAO,EAAE,WAAW,EACpB,aAAa,EAAE,MAAM,EACrB,SAAS,CAAC,EAAE,SAAS,EACrB,WAAW,CAAC,EAAE,MAAM,GACrB,aAAa,GAAG,IAAI;IAgFvB;;;;OAIG;IACH,mBAAmB,CACf,MAAM,EAAE,gBAAgB,EACxB,aAAa,EAAE,MAAM,EACrB,SAAS,CAAC,EAAE,SAAS,GACtB,GAAG,CAAC,MAAM,EAAE,aAAa,CAAC;IA6B7B;;;;;OAKG;IACH,uBAAuB,CACnB,QAAQ,EAAE,MAAM,EAChB,MAAM,EAAE,gBAAgB,GACzB,OAAO;IAmBV;;;OAGG;IACH,aAAa,CAAC,GAAG,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM,GAAG,IAAI;IAIvD;;;OAGG;IACH,kBAAkB,CAAC,GAAG,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM,GAAG,IAAI;IAI5D;;;;;;OAMG;IACH,cAAc,CACV,OAAO,EAAE,WAAW,EACpB,OAAO,EAAE,eAAe,EACxB,SAAS,CAAC,EAAE,SAAS,EACrB,WAAW,CAAC,EAAE,MAAM,GACrB,iBAAiB,GAAG,IAAI;IA6F3B;;;;;;OAMG;IACH,2BAA2B,CACvB,QAAQ,EAAE,MAAM,EAChB,MAAM,EAAE,gBAAgB,EACxB,uBAAuB,EAAE,OAAO,GACjC,OAAO;IA0CV;;;;OAIG;IACH,uBAAuB,CACnB,MAAM,EAAE,gBAAgB,EACxB,aAAa,EAAE,MAAM,GACtB,iBAAiB,EAAE;IAwBtB;;;;;;;OAOG;IACH,eAAe,CACX,OAAO,EAAE,WAAW,EACpB,QAAQ,EAAE,OAAO,EACjB,aAAa,EAAE,MAAM,EACrB,SAAS,CAAC,EAAE,SAAS,GACtB,kBAAkB,GAAG,IAAI;IAgE5B;;;;OAIG;IACH,4BAA4B,CACxB,QAAQ,EAAE,MAAM,EAChB,MAAM,EAAE,gBAAgB,GACzB,OAAO;IA4BV;;OAEG;IACH,wBAAwB,CACpB,WAAW,EAAE,MAAM,EACnB,aAAa,EAAE,MAAM,GACtB,iBAAiB,GAAG,IAAI;IA0B3B;;;;OAIG;IACH,iBAAiB,CAAC,WAAW,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM,GAAG,OAAO;IAUtE;;;;OAIG;IACH,OAAO,CAAC,kBAAkB;IAU1B;;;;;OAKG;IACH,OAAO,CAAC,kCAAkC;IAQ1C,OAAO,CAAC,oCAAoC;IAO5C;;;;;OAKG;IACH,OAAO,CAAC,SAAS;IAIjB;;;;;OAKG;IACH,OAAO,CAAC,aAAa;IAWrB;;;;;OAKG;IACH,OAAO,CAAC,+BAA+B;IAWvC;;;;OAIG;IACH,OAAO,CAAC,sBAAsB;IAU9B;;;;OAIG;IACH,OAAO,CAAC,gBAAgB;IAkCxB;;;;OAIG;IACH,OAAO,CAAC,mBAAmB;IAU3B;;;;OAIG;IACH,OAAO,CAAC,aAAa;IAOrB;;;;OAIG;IACH,OAAO,CAAC,aAAa;IAOrB;;;;OAIG;IACH,OAAO,CAAC,UAAU;IAOlB;;;;;OAKG;IACH,OAAO,CAAC,oBAAoB;IAS5B;;;;;;;;OAQG;IACH,OAAO,CAAC,6BAA6B;IAwBrC;;;;;OAKG;IACH,OAAO,CAAC,QAAQ;IAIhB,OAAO,CAAC,kBAAkB;IAU1B;;;;OAIG;IACH,OAAO,CAAC,WAAW;IAenB;;;;OAIG;IACH,OAAO,CAAC,cAAc;IAOtB;;;;OAIG;IACH,OAAO,CAAC,UAAU;IAIlB;;;OAGG;IACH,OAAO,CAAC,aAAa;IAIrB;;;OAGG;IACH,SAAS,CAAC,mBAAmB,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO;IAInD;;OAEG;IACH,iCAAiC,CAAC,SAAS,EAAE,MAAM,GAAG,MAAM;IAI5D;;;;OAIG;IACH,MAAM,CAAC,QAAQ,CAAC,CAAC,EAAE,GAAG,EAAE,CAAC,EAAE,IAAI,EAAE,MAAM,GAAG,CAAC;CAM9C;AAED,gBAAgB;AAChB,qBAAa,mBAAoB,SAAQ,YAAY;IAC3C,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;IAGjC,UAAU,IAAI,aAAa;IAGrB,oBAAoB,IAAI,OAAO,CAAC,IAAI,CAAC;IAG3C,oBAAoB,IAAI,aAAa;IAG/B,wBAAwB,IAAI,OAAO,CAAC,IAAI,CAAC;IAG/C,wBAAwB,IAAI,iBAAiB;IAGvC,yBAAyB,IAAI,OAAO,CAAC,IAAI,CAAC;IAGhD,yBAAyB,IAAI,kBAAkB;IAG/C,cAAc,IAAI,IAAI;IAGtB,cAAc,IAAI,iBAAiB;IAGnC,kBAAkB,IAAI,IAAI;IAG1B,kBAAkB,IAAI,qBAAqB;IAG3C,oBAAoB,IAAI,IAAI;IAG5B,oBAAoB,IAAI,uBAAuB,GAAG,IAAI;IAGtD,wBAAwB,IAAI,KAAK,CAAC,MAAM,CAAC;IAGzC,kBAAkB,IAAI,IAAI;IAG1B,kBAAkB,IAAI,gBAAgB;IAGtC,UAAU,IAAI,OAAO;IAGrB,OAAO,IAAI,MAAM,EAAE;IAGnB,cAAc,IAAI,MAAM,EAAE;IAG1B,YAAY,IAAI,SAAS;IAGzB,qBAAqB,IAAI,MAAM;IAG/B,kBAAkB,IAAI,MAAM;CAG/B"}
|
|
@@ -38,7 +38,7 @@ export type AccountFilter = Omit<Partial<AccountInfo>, "idToken" | "idTokenClaim
|
|
|
38
38
|
sid?: string;
|
|
39
39
|
isHomeTenant?: boolean;
|
|
40
40
|
};
|
|
41
|
-
export type TenantProfileFilter = Pick<AccountFilter, "localAccountId" | "loginHint" | "name" | "sid" | "isHomeTenant" | "username">;
|
|
41
|
+
export type TenantProfileFilter = Pick<AccountFilter, "localAccountId" | "loginHint" | "name" | "sid" | "isHomeTenant" | "username" | "upn">;
|
|
42
42
|
/**
|
|
43
43
|
* Credential: <home_account_id*>-<environment>-<credential_type>-<client_id>-<realm*>-<target*>-<scheme*>
|
|
44
44
|
*/
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"CacheTypes.d.ts","sourceRoot":"","sources":["../../../../src/cache/utils/CacheTypes.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,aAAa,EAAE,MAAM,8BAA8B,CAAC;AAC7D,OAAO,EAAE,aAAa,EAAE,MAAM,8BAA8B,CAAC;AAC7D,OAAO,EAAE,iBAAiB,EAAE,MAAM,kCAAkC,CAAC;AACrE,OAAO,EAAE,kBAAkB,EAAE,MAAM,mCAAmC,CAAC;AACvE,OAAO,EAAE,iBAAiB,EAAE,MAAM,kCAAkC,CAAC;AACrE,OAAO,EAAE,qBAAqB,EAAE,MAAM,sCAAsC,CAAC;AAC7E,OAAO,EAAE,gBAAgB,EAAE,MAAM,iCAAiC,CAAC;AACnE,OAAO,EAAE,uBAAuB,EAAE,MAAM,wCAAwC,CAAC;AACjF,OAAO,EAAE,oBAAoB,EAAE,MAAM,0BAA0B,CAAC;AAChE,OAAO,EAAE,QAAQ,EAAE,MAAM,2BAA2B,CAAC;AACrD,OAAO,EAAE,WAAW,EAAE,MAAM,8BAA8B,CAAC;AAE3D,gBAAgB;AAChB,MAAM,MAAM,YAAY,GAAG,MAAM,CAAC,MAAM,EAAE,aAAa,CAAC,CAAC;AACzD,gBAAgB;AAChB,MAAM,MAAM,YAAY,GAAG,MAAM,CAAC,MAAM,EAAE,aAAa,CAAC,CAAC;AACzD,gBAAgB;AAChB,MAAM,MAAM,gBAAgB,GAAG,MAAM,CAAC,MAAM,EAAE,iBAAiB,CAAC,CAAC;AACjE,gBAAgB;AAChB,MAAM,MAAM,iBAAiB,GAAG,MAAM,CAAC,MAAM,EAAE,kBAAkB,CAAC,CAAC;AACnE,gBAAgB;AAChB,MAAM,MAAM,gBAAgB,GAAG,MAAM,CAAC,MAAM,EAAE,iBAAiB,CAAC,CAAC;AAEjE;;;GAGG;AACH,MAAM,MAAM,cAAc,GACpB,aAAa,GACb,aAAa,GACb,iBAAiB,GACjB,kBAAkB,GAClB,iBAAiB,GACjB,uBAAuB,GACvB,qBAAqB,GACrB,gBAAgB,GAChB,MAAM,CAAC;AAEb;;;GAGG;AACH,MAAM,MAAM,mBAAmB,GACzB,aAAa,GACb,iBAAiB,GACjB,kBAAkB,CAAC;AAEzB;;GAEG;AACH,MAAM,MAAM,aAAa,GAAG,IAAI,CAC5B,OAAO,CAAC,WAAW,CAAC,EACpB,SAAS,GAAG,eAAe,CAC9B,GAAG;IACA,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,YAAY,CAAC,EAAE,OAAO,CAAC;CAC1B,CAAC;AAEF,MAAM,MAAM,mBAAmB,GAAG,IAAI,CAClC,aAAa,EACX,gBAAgB,GAChB,WAAW,GACX,MAAM,GACN,KAAK,GACL,cAAc,GACd,UAAU,
|
|
1
|
+
{"version":3,"file":"CacheTypes.d.ts","sourceRoot":"","sources":["../../../../src/cache/utils/CacheTypes.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -13,6 +13,7 @@ export type DataBoundary = "EU" | "None";
|
|
|
13
13
|
* - environment - Entity which issued the token represented by the domain of the issuer (e.g. login.microsoftonline.com)
|
|
14
14
|
* - tenantId - Full tenant or organizational id that this account belongs to
|
|
15
15
|
* - username - preferred_username claim of the id_token that represents this account
|
|
16
|
+
* - upn - The user's UPN used to populate the account username in cases where preferred_username is not present in the ID token claims.
|
|
16
17
|
* - localAccountId - Local, tenant-specific account identifer for this account object, usually used in legacy cases
|
|
17
18
|
* - name - Full name for the account, including given name and family name
|
|
18
19
|
* - idToken - raw ID token
|
|
@@ -29,6 +30,7 @@ export type AccountInfo = {
|
|
|
29
30
|
localAccountId: string;
|
|
30
31
|
loginHint?: string;
|
|
31
32
|
name?: string;
|
|
33
|
+
upn?: string;
|
|
32
34
|
idToken?: string;
|
|
33
35
|
idTokenClaims?: TokenClaims & {
|
|
34
36
|
[key: string]:
|
|
@@ -50,7 +52,7 @@ export type AccountInfo = {
|
|
|
50
52
|
*/
|
|
51
53
|
export type TenantProfile = Pick<
|
|
52
54
|
AccountInfo,
|
|
53
|
-
"tenantId" | "localAccountId" | "name" | "username" | "loginHint"
|
|
55
|
+
"tenantId" | "localAccountId" | "name" | "username" | "loginHint" | "upn"
|
|
54
56
|
> & {
|
|
55
57
|
/**
|
|
56
58
|
* - isHomeTenant - True if this is the home tenant profile of the account, false if it's a guest tenant profile
|
|
@@ -123,6 +125,7 @@ export function buildTenantProfile(
|
|
|
123
125
|
username: preferred_username || upn || "",
|
|
124
126
|
loginHint: login_hint,
|
|
125
127
|
isHomeTenant: tenantIdMatchesHomeTenant(tenantId, homeAccountId),
|
|
128
|
+
upn: upn,
|
|
126
129
|
};
|
|
127
130
|
} else {
|
|
128
131
|
return {
|
|
@@ -156,7 +159,7 @@ export function updateAccountTenantProfileData(
|
|
|
156
159
|
|
|
157
160
|
// ID token claims override passed in account info and tenant profile
|
|
158
161
|
if (idTokenClaims) {
|
|
159
|
-
// Ignore isHomeTenant
|
|
162
|
+
// Ignore isHomeTenant which is a utility property of tenant profile but not required in base account info
|
|
160
163
|
// eslint-disable-next-line @typescript-eslint/no-unused-vars
|
|
161
164
|
const { isHomeTenant, ...claimsSourcedTenantProfile } =
|
|
162
165
|
buildTenantProfile(
|
|
@@ -3,50 +3,50 @@
|
|
|
3
3
|
* Licensed under the MIT License.
|
|
4
4
|
*/
|
|
5
5
|
|
|
6
|
-
import {
|
|
7
|
-
AccountFilter,
|
|
8
|
-
CredentialFilter,
|
|
9
|
-
ValidCredentialType,
|
|
10
|
-
AppMetadataFilter,
|
|
11
|
-
AppMetadataCache,
|
|
12
|
-
TokenKeys,
|
|
13
|
-
TenantProfileFilter,
|
|
14
|
-
} from "./utils/CacheTypes.js";
|
|
15
|
-
import { CacheRecord } from "./entities/CacheRecord.js";
|
|
16
|
-
import * as Constants from "../utils/Constants.js";
|
|
17
|
-
import { CredentialEntity } from "./entities/CredentialEntity.js";
|
|
18
|
-
import { ScopeSet } from "../request/ScopeSet.js";
|
|
19
|
-
import { AccountEntity } from "./entities/AccountEntity.js";
|
|
20
|
-
import { AccessTokenEntity } from "./entities/AccessTokenEntity.js";
|
|
21
|
-
import { IdTokenEntity } from "./entities/IdTokenEntity.js";
|
|
22
|
-
import { RefreshTokenEntity } from "./entities/RefreshTokenEntity.js";
|
|
23
|
-
import { ICacheManager } from "./interface/ICacheManager.js";
|
|
24
|
-
import {
|
|
25
|
-
createClientAuthError,
|
|
26
|
-
ClientAuthErrorCodes,
|
|
27
|
-
} from "../error/ClientAuthError.js";
|
|
28
6
|
import {
|
|
29
7
|
AccountInfo,
|
|
30
8
|
TenantProfile,
|
|
31
9
|
updateAccountTenantProfileData,
|
|
32
10
|
} from "../account/AccountInfo.js";
|
|
33
|
-
import { AppMetadataEntity } from "./entities/AppMetadataEntity.js";
|
|
34
|
-
import { ServerTelemetryEntity } from "./entities/ServerTelemetryEntity.js";
|
|
35
|
-
import { ThrottlingEntity } from "./entities/ThrottlingEntity.js";
|
|
36
11
|
import { extractTokenClaims } from "../account/AuthToken.js";
|
|
12
|
+
import { TokenClaims } from "../account/TokenClaims.js";
|
|
13
|
+
import { getAliasesFromStaticSources } from "../authority/AuthorityMetadata.js";
|
|
14
|
+
import { StaticAuthorityOptions } from "../authority/AuthorityOptions.js";
|
|
37
15
|
import { ICrypto } from "../crypto/ICrypto.js";
|
|
38
|
-
import {
|
|
39
|
-
import {
|
|
16
|
+
import { AuthError } from "../error/AuthError.js";
|
|
17
|
+
import { createCacheError } from "../error/CacheError.js";
|
|
18
|
+
import {
|
|
19
|
+
ClientAuthErrorCodes,
|
|
20
|
+
createClientAuthError,
|
|
21
|
+
} from "../error/ClientAuthError.js";
|
|
40
22
|
import { Logger } from "../logger/Logger.js";
|
|
41
23
|
import { name, version } from "../packageMetadata.js";
|
|
24
|
+
import { BaseAuthRequest } from "../request/BaseAuthRequest.js";
|
|
25
|
+
import { ScopeSet } from "../request/ScopeSet.js";
|
|
42
26
|
import { StoreInCache } from "../request/StoreInCache.js";
|
|
43
|
-
import { getAliasesFromStaticSources } from "../authority/AuthorityMetadata.js";
|
|
44
|
-
import { StaticAuthorityOptions } from "../authority/AuthorityOptions.js";
|
|
45
|
-
import { TokenClaims } from "../account/TokenClaims.js";
|
|
46
27
|
import { IPerformanceClient } from "../telemetry/performance/IPerformanceClient.js";
|
|
47
|
-
import
|
|
28
|
+
import * as Constants from "../utils/Constants.js";
|
|
29
|
+
import { AccessTokenEntity } from "./entities/AccessTokenEntity.js";
|
|
30
|
+
import { AccountEntity } from "./entities/AccountEntity.js";
|
|
31
|
+
import { AppMetadataEntity } from "./entities/AppMetadataEntity.js";
|
|
32
|
+
import { AuthorityMetadataEntity } from "./entities/AuthorityMetadataEntity.js";
|
|
33
|
+
import { CacheRecord } from "./entities/CacheRecord.js";
|
|
34
|
+
import { CredentialEntity } from "./entities/CredentialEntity.js";
|
|
35
|
+
import { IdTokenEntity } from "./entities/IdTokenEntity.js";
|
|
36
|
+
import { RefreshTokenEntity } from "./entities/RefreshTokenEntity.js";
|
|
37
|
+
import { ServerTelemetryEntity } from "./entities/ServerTelemetryEntity.js";
|
|
38
|
+
import { ThrottlingEntity } from "./entities/ThrottlingEntity.js";
|
|
39
|
+
import { ICacheManager } from "./interface/ICacheManager.js";
|
|
48
40
|
import * as AccountEntityUtils from "./utils/AccountEntityUtils.js";
|
|
49
|
-
import {
|
|
41
|
+
import {
|
|
42
|
+
AccountFilter,
|
|
43
|
+
AppMetadataCache,
|
|
44
|
+
AppMetadataFilter,
|
|
45
|
+
CredentialFilter,
|
|
46
|
+
TenantProfileFilter,
|
|
47
|
+
TokenKeys,
|
|
48
|
+
ValidCredentialType,
|
|
49
|
+
} from "./utils/CacheTypes.js";
|
|
50
50
|
|
|
51
51
|
/**
|
|
52
52
|
* Interface class which implement cache storage functions used by MSAL to perform validity checks, and store tokens.
|
|
@@ -315,8 +315,10 @@ export abstract class CacheManager implements ICacheManager {
|
|
|
315
315
|
const allAccounts = this.getAllAccounts(accountFilter, correlationId);
|
|
316
316
|
if (allAccounts.length > 1) {
|
|
317
317
|
// If one or more accounts are found, prioritize accounts that have an ID token
|
|
318
|
-
const sortedAccounts = allAccounts.sort((
|
|
319
|
-
|
|
318
|
+
const sortedAccounts = allAccounts.sort((a, b) => {
|
|
319
|
+
const aHasClaims = a.idTokenClaims ? 1 : 0;
|
|
320
|
+
const bHasClaims = b.idTokenClaims ? 1 : 0;
|
|
321
|
+
return bHasClaims - aHasClaims;
|
|
320
322
|
});
|
|
321
323
|
return sortedAccounts[0];
|
|
322
324
|
} else if (allAccounts.length === 1) {
|
|
@@ -495,6 +497,39 @@ export abstract class CacheManager implements ICacheManager {
|
|
|
495
497
|
return false;
|
|
496
498
|
}
|
|
497
499
|
|
|
500
|
+
if (
|
|
501
|
+
!!tenantProfileFilter.username &&
|
|
502
|
+
!(
|
|
503
|
+
this.matchUsername(
|
|
504
|
+
tenantProfile.username,
|
|
505
|
+
tenantProfileFilter.username
|
|
506
|
+
) ||
|
|
507
|
+
!this.matchUsername(
|
|
508
|
+
tenantProfile.upn,
|
|
509
|
+
tenantProfileFilter.username
|
|
510
|
+
)
|
|
511
|
+
)
|
|
512
|
+
) {
|
|
513
|
+
return false;
|
|
514
|
+
}
|
|
515
|
+
|
|
516
|
+
if (
|
|
517
|
+
!!tenantProfileFilter.loginHint &&
|
|
518
|
+
!this.matchLoginHintWithTenantProfile(
|
|
519
|
+
tenantProfile,
|
|
520
|
+
tenantProfileFilter.loginHint
|
|
521
|
+
)
|
|
522
|
+
) {
|
|
523
|
+
return false;
|
|
524
|
+
}
|
|
525
|
+
|
|
526
|
+
if (
|
|
527
|
+
!!tenantProfileFilter.upn &&
|
|
528
|
+
!(tenantProfile.upn === tenantProfileFilter.upn)
|
|
529
|
+
) {
|
|
530
|
+
return false;
|
|
531
|
+
}
|
|
532
|
+
|
|
498
533
|
return true;
|
|
499
534
|
}
|
|
500
535
|
|
|
@@ -529,6 +564,10 @@ export abstract class CacheManager implements ICacheManager {
|
|
|
529
564
|
!this.matchUsername(
|
|
530
565
|
idTokenClaims.preferred_username,
|
|
531
566
|
tenantProfileFilter.username
|
|
567
|
+
) &&
|
|
568
|
+
!this.matchUsername(
|
|
569
|
+
idTokenClaims.upn,
|
|
570
|
+
tenantProfileFilter.username
|
|
532
571
|
)
|
|
533
572
|
) {
|
|
534
573
|
return false;
|
|
@@ -707,13 +746,6 @@ export abstract class CacheManager implements ICacheManager {
|
|
|
707
746
|
return;
|
|
708
747
|
}
|
|
709
748
|
|
|
710
|
-
if (
|
|
711
|
-
!!accountFilter.username &&
|
|
712
|
-
!this.matchUsername(entity.username, accountFilter.username)
|
|
713
|
-
) {
|
|
714
|
-
return;
|
|
715
|
-
}
|
|
716
|
-
|
|
717
749
|
if (
|
|
718
750
|
!!accountFilter.environment &&
|
|
719
751
|
!this.matchEnvironment(
|
|
@@ -753,6 +785,9 @@ export abstract class CacheManager implements ICacheManager {
|
|
|
753
785
|
const tenantProfileFilter: TenantProfileFilter = {
|
|
754
786
|
localAccountId: accountFilter?.localAccountId,
|
|
755
787
|
name: accountFilter?.name,
|
|
788
|
+
username: accountFilter?.username,
|
|
789
|
+
loginHint: accountFilter?.loginHint,
|
|
790
|
+
upn: accountFilter?.upn,
|
|
756
791
|
};
|
|
757
792
|
|
|
758
793
|
const matchingTenantProfiles = entity.tenantProfiles?.filter(
|
|
@@ -1125,13 +1160,13 @@ export abstract class CacheManager implements ICacheManager {
|
|
|
1125
1160
|
"CacheManager:getIdToken - Multiple ID tokens found for account but none match account entity tenant id, returning first result",
|
|
1126
1161
|
correlationId
|
|
1127
1162
|
);
|
|
1128
|
-
return idTokenMap.values().next().value;
|
|
1163
|
+
return idTokenMap.values().next().value ?? null;
|
|
1129
1164
|
} else if (numHomeIdTokens === 1) {
|
|
1130
1165
|
this.commonLogger.info(
|
|
1131
1166
|
"CacheManager:getIdToken - Multiple ID tokens found for account, defaulting to home tenant profile",
|
|
1132
1167
|
correlationId
|
|
1133
1168
|
);
|
|
1134
|
-
return homeIdTokenMap.values().next().value;
|
|
1169
|
+
return homeIdTokenMap.values().next().value ?? null;
|
|
1135
1170
|
} else {
|
|
1136
1171
|
// Multiple ID tokens for home tenant profile, remove all and return null
|
|
1137
1172
|
tokensToBeRemoved = homeIdTokenMap;
|
|
@@ -1156,7 +1191,7 @@ export abstract class CacheManager implements ICacheManager {
|
|
|
1156
1191
|
"CacheManager:getIdToken - Returning ID token",
|
|
1157
1192
|
correlationId
|
|
1158
1193
|
);
|
|
1159
|
-
return idTokenMap.values().next().value;
|
|
1194
|
+
return idTokenMap.values().next().value ?? null;
|
|
1160
1195
|
}
|
|
1161
1196
|
|
|
1162
1197
|
/**
|
|
@@ -1654,6 +1689,23 @@ export abstract class CacheManager implements ICacheManager {
|
|
|
1654
1689
|
);
|
|
1655
1690
|
}
|
|
1656
1691
|
|
|
1692
|
+
/**
|
|
1693
|
+
* helper to match loginhints
|
|
1694
|
+
* @param entity
|
|
1695
|
+
* @param loginHint
|
|
1696
|
+
* @returns
|
|
1697
|
+
*/
|
|
1698
|
+
private matchLoginHintWithTenantProfile(
|
|
1699
|
+
tenantProfile: TenantProfile,
|
|
1700
|
+
loginHintFilter: string
|
|
1701
|
+
): boolean {
|
|
1702
|
+
return (
|
|
1703
|
+
tenantProfile.loginHint === loginHintFilter ||
|
|
1704
|
+
tenantProfile.username === loginHintFilter ||
|
|
1705
|
+
tenantProfile.upn === loginHintFilter
|
|
1706
|
+
);
|
|
1707
|
+
}
|
|
1708
|
+
|
|
1657
1709
|
/**
|
|
1658
1710
|
* helper to match assertion
|
|
1659
1711
|
* @param value
|
|
@@ -1799,6 +1851,11 @@ export abstract class CacheManager implements ICacheManager {
|
|
|
1799
1851
|
return true;
|
|
1800
1852
|
}
|
|
1801
1853
|
|
|
1854
|
+
// check login hint against list of emails in token claims
|
|
1855
|
+
if (tokenClaims.emails && tokenClaims.emails.includes(loginHint)) {
|
|
1856
|
+
return true;
|
|
1857
|
+
}
|
|
1858
|
+
|
|
1802
1859
|
return false;
|
|
1803
1860
|
}
|
|
1804
1861
|
|
package/src/packageMetadata.ts
CHANGED