Skip to content

Commit

Permalink
Merge branch 'dev' into facebook-sample
Browse files Browse the repository at this point in the history
  • Loading branch information
shylasummers authored Jul 19, 2023
2 parents 2a519b4 + 4969f28 commit 13506c0
Show file tree
Hide file tree
Showing 5 changed files with 57 additions and 18 deletions.
48 changes: 40 additions & 8 deletions .github/policies/resourceManagement.yml
Original file line number Diff line number Diff line change
Expand Up @@ -59,24 +59,19 @@ configuration:
frequencies:
- weekday:
day: Monday
time: 8:0
time: 8:00
filters:
- isOpen
- isNotDraftPullRequest
- isPullRequest
- noActivitySince:
days: 7
days: 14
- isNotLabeledWith:
label: 'Needs: Attention :wave:'
actions:
- addReply:
reply: >-
Reminder: The next release is scheduled for next week and this PR appears to be stale :(
If changes have been requested please address feedback.
If this PR is still a work in progress please mark as draft.
Reminder: This PR appears to be stale. If this PR is still a work in progress please mark as draft.
- addLabel:
label: 'Needs: Attention :wave:'
eventResponderTasks:
Expand Down Expand Up @@ -228,5 +223,42 @@ configuration:
primary: True
secondary: False
description:
- if:
- payloadType: Issue_Comment
- isOpen
- activitySenderHasAssociation:
association: Member
- hasLabel:
label: 'Needs: Attention :wave:'
then:
- removeLabel:
label: 'Needs: Attention :wave:'
- addLabel:
label: 'Needs: Author Feedback'
description: "Removes the 'Needs: Attention :wave:' label and adds the 'Needs: Author Feedback' label when a team member comments on an issue"
- if:
- payloadType: Issue_Comment
- isOpen
- isActivitySender:
issueAuthor: true
- hasLabel:
label: 'Needs: Author Feedback'
then:
- removeLabel:
label: 'Needs: Author Feedback'
- addLabel:
label: 'Needs: Attention :wave:'
description: "Removes the 'Needs: Author Feedback' label and adds the 'Needs: Attention :wave:' label when the issue author comments on an issue"
- if:
- payloadType: Issue_Comment
- not: isOpen
- isActivitySender:
issueAuthor: true
then:
- addLabel:
label: 'Needs: Attention :wave:'
- reopenIssue
description: "If author comments on closed issue, reopen"

onFailure:
onSuccess:
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "prerelease",
"comment": "Update comments to address Policheck rules",
"packageName": "@azure/msal-common",
"email": "[email protected]",
"dependentChangeType": "patch"
}
8 changes: 4 additions & 4 deletions lib/msal-common/docs/authority.md
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ The correct authority URL that you need pass to MSAL is ultimately determined by

The authority domain for the global Azure AD instance is `login.microsoftonline.com`. This domain has several aliases (e.g. `login.microsoft.com`) published on the [discovery endpoint](https://login.microsoftonline.com/common/discovery/instance?api-version=1.1&authorization_endpoint=https://login.microsoftonline.com/common/oauth2/v2.0/authorize). For resiliency and performance, MSAL keeps a record of these in cache (see: [AuthorityMetadata.ts](../src/authority/AuthorityMetadata.ts)). MSAL trusts authority URLs with any of these aliases by default.

> :warning: The authority domain differs for national Azure deployments, such as Azure China. See [National clouds](https://docs.microsoft.com/azure/active-directory/develop/authentication-national-cloud) for more.
> :warning: The authority domain differs for national/regional Azure deployments, such as Azure China. See [National clouds](https://docs.microsoft.com/azure/active-directory/develop/authentication-national-cloud) for more.
The authority domain should be followed by a tenant identifier. The tenant identifier controls the [sign-in audience](https://docs.microsoft.com/azure/active-directory/develop/v2-supported-account-types) for your app (see also: [Tenancy in Azure AD](https://docs.microsoft.com/azure/active-directory/develop/single-and-multi-tenant-apps)). It can take one of the values below:

Expand Down Expand Up @@ -133,11 +133,11 @@ MSAL can be configured to acquire tokens from any OIDC-compliant IdP. See [initi

- You can obtain the authority URL required for your app via the **Endpoints** panel on the Azure portal [App Registration](https://aka.ms/appregistrations) experience.
- You can improve MSAL's performance during token acquisition by providing authority information out-of-band. See [Performance](./performance.md) for how to do so.
- When working with national clouds, consider using the [instance-aware](../../msal-browser/docs/instance-aware.md) flow, which indicates the particular instance the tokens are obtained from and Microsoft Graph hosts that they can be used with.
- When working with national/regional clouds, consider using the [instance-aware](../../msal-browser/docs/instance-aware.md) flow, which indicates the particular instance the tokens are obtained from and Microsoft Graph hosts that they can be used with.

## More information

- [OAuth 2.0 and OpenID Connect (OIDC) in the Microsoft identity platform](https://docs.microsoft.com/azure/active-directory/develop/active-directory-v2-protocols)
- [Microsoft identity platform and OpenID Connect protocol](https://docs.microsoft.com/azure/active-directory/develop/v2-protocols-oidc)
- [Use MSAL in a national cloud environment](https://docs.microsoft.com/azure/active-directory/develop/msal-national-cloud?tabs=javascript)
- [National Graph deployments](https://docs.microsoft.com/graph/deployments)
- [Use MSAL in a national/regional cloud environment](https://docs.microsoft.com/azure/active-directory/develop/msal-national-cloud?tabs=javascript)
- [National/Regional Graph deployments](https://docs.microsoft.com/graph/deployments)
4 changes: 2 additions & 2 deletions lib/msal-common/src/authority/AuthorityOptions.ts
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,10 @@ export const AzureCloudInstance = {
// Microsoft PPE
AzurePpe: "https://login.windows-ppe.net",

// Microsoft Chinese national cloud
// Microsoft Chinese national/regional cloud
AzureChina: "https://login.chinacloudapi.cn",

// Microsoft German national cloud ("Black Forest")
// Microsoft German national/regional cloud ("Black Forest")
AzureGermany: "https://login.microsoftonline.de",

// US Government cloud
Expand Down
8 changes: 4 additions & 4 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit 13506c0

Please sign in to comment.