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

Conditional Access Session Control: support for AuthenticationType and FrequencyInterval in SignInFrequency #263

Merged
merged 2 commits into from
Oct 26, 2023
Merged

Conditional Access Session Control: support for AuthenticationType and FrequencyInterval in SignInFrequency #263

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
1b4ab19
Conditional Access Session Control: support for AuthenticationType an…
manicminer Oct 26, 2023
fcb2c29
Conditional Access Device Conditions: allow setting to `null`
manicminer Oct 26, 2023
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
32 changes: 26 additions & 6 deletions msgraph/conditionalaccesspolicy_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,10 +36,20 @@ func TestConditionalAccessPolicyClient(t *testing.T) {
IncludeApplications: &[]string{testAppId},
},
Users: &msgraph.ConditionalAccessUsers{
IncludeUsers: &[]string{"All"},
ExcludeUsers: &[]string{*testUser.ID(), "GuestsOrExternalUsers"},
ExcludeUsers: &[]string{*testUser.ID()},
IncludeGroups: &[]string{*testIncGroup.ID()},
ExcludeGroups: &[]string{*testExcGroup.ID()},
IncludeGuestsOrExternalUsers: &msgraph.ConditionalAccessGuestsOrExternalUsers{
GuestOrExternalUserTypes: &[]msgraph.ConditionalAccessGuestOrExternalUserType{
msgraph.ConditionalAccessGuestOrExternalUserTypeB2bCollaborationGuest,
msgraph.ConditionalAccessGuestOrExternalUserTypeB2bCollaborationMember,
msgraph.ConditionalAccessGuestOrExternalUserTypeB2bDirectConnectUser,
},
ExternalTenants: &msgraph.ConditionalAccessExternalTenants{
MembershipKind: utils.StringPtr(msgraph.ConditionalAccessExternalTenantsMembershipKindAll),
Members: nil,
},
},
},
Locations: &msgraph.ConditionalAccessLocations{
IncludeLocations: &[]string{"All"},
Expand All @@ -55,7 +65,9 @@ func TestConditionalAccessPolicyClient(t *testing.T) {
},
})

updatePolicy := msgraph.ConditionalAccessPolicy{
testConditionalAccessPolicysClient_Get(t, c, *policy.ID)

testConditionalAccessPolicysClient_Update(t, c, msgraph.ConditionalAccessPolicy{
ID: policy.ID,
DisplayName: utils.StringPtr(fmt.Sprintf("test-policy-updated-%s", c.RandomString)),
Conditions: &msgraph.ConditionalAccessConditionSet{
Expand All @@ -78,11 +90,19 @@ func TestConditionalAccessPolicyClient(t *testing.T) {
Operator: utils.StringPtr("OR"),
BuiltInControls: &[]string{"block"},
},
}
testConditionalAccessPolicysClient_Update(t, c, updatePolicy)
SessionControls: &msgraph.ConditionalAccessSessionControls{
SignInFrequency: &msgraph.SignInFrequencySessionControl{
AuthenticationType: utils.StringPtr(msgraph.ConditionalAccessAuthenticationTypePrimaryAndSecondaryAuthentication),
FrequencyInterval: utils.StringPtr(msgraph.ConditionalAccessFrequencyIntervalTimeBased),
IsEnabled: utils.BoolPtr(true),
Type: utils.StringPtr(msgraph.ConditionalAccessFrequencyTypeHours),
Value: utils.Int32Ptr(6),
},
},
})

testConditionalAccessPolicysClient_List(t, c)
testConditionalAccessPolicysClient_Get(t, c, *policy.ID)
testConditionalAccessPolicysClient_List(t, c)
testConditionalAccessPolicysClient_Delete(t, c, *policy.ID)

testGroup_Delete(t, c, testIncGroup)
Expand Down
11 changes: 6 additions & 5 deletions msgraph/models.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -628,7 +628,7 @@ type ConditionalAccessConditionSet struct {
Applications *ConditionalAccessApplications `json:"applications,omitempty"`
ClientApplications *ConditionalAccessClientApplications `json:"clientApplications,omitempty"`
ClientAppTypes *[]ConditionalAccessClientAppType `json:"clientAppTypes,omitempty"`
Devices *ConditionalAccessDevices `json:"devices,omitempty"`
Devices *ConditionalAccessDevices `json:"devices"`
DeviceStates *ConditionalAccessDeviceStates `json:"deviceStates,omitempty"`
Locations *ConditionalAccessLocations `json:"locations"`
Platforms *ConditionalAccessPlatforms `json:"platforms"`
Expand Down Expand Up @@ -711,7 +711,6 @@ type ConditionalAccessGuestsOrExternalUsers struct {
type ConditionalAccessExternalTenants struct {
MembershipKind *ConditionalAccessExternalTenantsMembershipKind `json:"membershipKind,omitempty"`
Members *[]string `json:"members,omitempty"`

}

func (c ConditionalAccessGuestsOrExternalUsers) MarshalJSON() ([]byte, error) {
Expand Down Expand Up @@ -1641,9 +1640,11 @@ type SignInActivity struct {
}

type SignInFrequencySessionControl struct {
IsEnabled *bool `json:"isEnabled,omitempty"`
Type *string `json:"type,omitempty"`
Value *int32 `json:"value,omitempty"`
AuthenticationType *ConditionalAccessAuthenticationType `json:"authenticationType,omitempty"`
FrequencyInterval *ConditionalAccessFrequencyInterval `json:"frequencyInterval,omitempty"`
IsEnabled *bool `json:"isEnabled,omitempty"`
Type *string `json:"type,omitempty"`
Value *int32 `json:"value,omitempty"`
}

type SignInReport struct {
Expand Down
23 changes: 23 additions & 0 deletions msgraph/valuetypes.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -319,6 +319,14 @@ const (
CredentialUsageSummaryPeriod1 CredentialUsageSummaryPeriod = "D1"
)

type ConditionalAccessAuthenticationType = string

const (
ConditionalAccessAuthenticationTypePrimaryAndSecondaryAuthentication ConditionalAccessAuthenticationType = "primaryAndSecondaryAuthentication"
ConditionalAccessAuthenticationTypeSecondaryAuthentication ConditionalAccessAuthenticationType = "secondaryAuthentication"
ConditionalAccessAuthenticationTypeUnknownFutureValue ConditionalAccessAuthenticationType = "unknownFutureValue"
)

type ConditionalAccessClientAppType = string

const (
Expand Down Expand Up @@ -372,6 +380,21 @@ const (
ConditionalAccessFilterModeInclude ConditionalAccessFilterMode = "include"
)

type ConditionalAccessFrequencyInterval = string

const (
ConditionalAccessFrequencyIntervalTimeBased ConditionalAccessFrequencyInterval = "timeBased"
ConditionalAccessFrequencyIntervalEveryTime ConditionalAccessFrequencyInterval = "everyTime"
ConditionalAccessFrequencyIntervalUnknownFutureValue ConditionalAccessFrequencyInterval = "unknownFutureValue"
)

type ConditionalAccessFrequencyType = string

const (
ConditionalAccessFrequencyTypeDays ConditionalAccessFrequencyType = "days"
ConditionalAccessFrequencyTypeHours ConditionalAccessFrequencyType = "hours"
)

type ConditionalAccessGrantControl = string

const (
Expand Down