Skip to content

Commit

Permalink
azuread_application_registration: remove post-create patch, support `…
Browse files Browse the repository at this point in the history 
…implicit_access_token_issuance_enabled` and `implicit_id_token_issuance_enabled`
  • Loading branch information
@manicminer
manicminer committed Oct 18, 2023
1 parent aa54277 commit acc8314
Show file tree
Hide file tree
Showing 2 changed files with 55 additions and 41 deletions.
92 changes: 52 additions & 40 deletions internal/services/applications/application_registration_resource.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ import (

"github.com/hashicorp/go-azure-helpers/lang/pointer"
"github.com/hashicorp/go-azure-sdk/sdk/odata"
"github.com/hashicorp/go-uuid"
"github.com/hashicorp/terraform-provider-azuread/internal/helpers"
"github.com/hashicorp/terraform-provider-azuread/internal/sdk"
"github.com/hashicorp/terraform-provider-azuread/internal/services/applications/parse"
Expand All @@ -23,21 +22,23 @@ import (
)

type ApplicationRegistrationModel struct {
ClientId string `tfschema:"client_id"`
Description string `tfschema:"description"`
DisabledByMicrosoft string `tfschema:"disabled_by_microsoft"`
DisplayName string `tfschema:"display_name"`
HomepageUrl string `tfschema:"homepage_url"`
LogoutUrl string `tfschema:"logout_url"`
MarketingUrl string `tfschema:"marketing_url"`
Notes string `tfschema:"notes"`
PrivacyStatementUrl string `tfschema:"privacy_statement_url"`
PublisherDomain string `tfschema:"publisher_domain"`
RequestedAccessTokenVersion int `tfschema:"requested_access_token_version"`
ServiceManagementReference string `tfschema:"service_management_reference"`
SignInAudience string `tfschema:"sign_in_audience"`
SupportUrl string `tfschema:"support_url"`
TermsOfServiceUrl string `tfschema:"terms_of_service_url"`
ClientId string `tfschema:"client_id"`
Description string `tfschema:"description"`
DisabledByMicrosoft string `tfschema:"disabled_by_microsoft"`
DisplayName string `tfschema:"display_name"`
HomepageUrl string `tfschema:"homepage_url"`
ImplicitAccessTokenIssuanceEnabled bool `tfschema:"implicit_access_token_issuance_enabled"`
ImplicitIdTokenIssuanceEnabled bool `tfschema:"implicit_id_token_issuance_enabled"`
LogoutUrl string `tfschema:"logout_url"`
MarketingUrl string `tfschema:"marketing_url"`
Notes string `tfschema:"notes"`
PrivacyStatementUrl string `tfschema:"privacy_statement_url"`
PublisherDomain string `tfschema:"publisher_domain"`
RequestedAccessTokenVersion int `tfschema:"requested_access_token_version"`
ServiceManagementReference string `tfschema:"service_management_reference"`
SignInAudience string `tfschema:"sign_in_audience"`
SupportUrl string `tfschema:"support_url"`
TermsOfServiceUrl string `tfschema:"terms_of_service_url"`
}

type ApplicationRegistrationResource struct{}
Expand Down Expand Up @@ -79,6 +80,18 @@ func (r ApplicationRegistrationResource) Arguments() map[string]*pluginsdk.Schem
ValidateFunc: validation.IsHttpOrHttpsUrl,
},

"implicit_access_token_issuance_enabled": {
Description: "Whether this application can request an access token using OAuth implicit flow",
Type: pluginsdk.TypeBool,
Optional: true,
},

"implicit_id_token_issuance_enabled": {
Description: "Whether this application can request an ID token using OAuth implicit flow",
Type: pluginsdk.TypeBool,
Optional: true,
},

"logout_url": {
Description: "URL of the logout page for the application, where the session is cleared for single sign-out",
Type: pluginsdk.TypeString,
Expand Down Expand Up @@ -217,6 +230,11 @@ func (r ApplicationRegistrationResource) Create() sdk.ResourceFunc {
Web: &msgraph.ApplicationWeb{
HomePageUrl: tf.NullableString(model.HomepageUrl),
LogoutUrl: tf.NullableString(model.LogoutUrl),

ImplicitGrantSettings: &msgraph.ImplicitGrantSettings{
EnableAccessTokenIssuance: pointer.To(model.ImplicitAccessTokenIssuanceEnabled),
EnableIdTokenIssuance: pointer.To(model.ImplicitIdTokenIssuanceEnabled),
},
},
}

Expand All @@ -232,29 +250,6 @@ func (r ApplicationRegistrationResource) Create() sdk.ResourceFunc {
id := parse.NewApplicationID(*result.ID())
metadata.SetID(id)

// Attempt to patch the newly created application and set the display name, which will tell us whether it exists yet, then set it back to the desired value.
// The SDK handles retries for us here in the event of 404, 429 or 5xx, then returns after giving up.
uuid, err := uuid.GenerateUUID()
if err != nil {
return fmt.Errorf("failed to generate a UUID: %v", err)
}
tempDisplayName := fmt.Sprintf("TERRAFORM_UPDATE_%s", uuid)
for _, displayNameToSet := range []string{tempDisplayName, model.DisplayName} {
// Consistency-related retries are handled by the SDK
status, err := client.Update(ctx, msgraph.Application{
DirectoryObject: msgraph.DirectoryObject{
Id: &id.ApplicationId,
},
DisplayName: utils.String(displayNameToSet),
})
if err != nil {
if status == http.StatusNotFound {
return fmt.Errorf("timed out whilst waiting for new %s to be replicated in Azure AD", id)
}
return fmt.Errorf("failed to patch %s after creating: %+v", id, err)
}
}

return nil
},
}
Expand Down Expand Up @@ -309,6 +304,11 @@ func (r ApplicationRegistrationResource) Read() sdk.ResourceFunc {
if web := result.Web; web != nil {
state.HomepageUrl = string(pointer.From(web.HomePageUrl))
state.LogoutUrl = string(pointer.From(web.LogoutUrl))

if implicitGrant := web.ImplicitGrantSettings; implicitGrant != nil {
state.ImplicitAccessTokenIssuanceEnabled = pointer.From(implicitGrant.EnableAccessTokenIssuance)
state.ImplicitIdTokenIssuanceEnabled = pointer.From(implicitGrant.EnableIdTokenIssuance)
}
}

if result.DisabledByMicrosoftStatus != nil {
Expand Down Expand Up @@ -389,7 +389,7 @@ func (r ApplicationRegistrationResource) Update() sdk.ResourceFunc {
}
}

if rd.HasChange("homepage_url") || rd.HasChange("logout_url") {
if rd.HasChange("implicit_access_token_issuance_enabled") || rd.HasChange("homepage_url") || rd.HasChange("implicit_id_token_issuance_enabled") || rd.HasChange("logout_url") {
properties.Web = &msgraph.ApplicationWeb{}

if rd.HasChange("homepage_url") {
Expand All @@ -399,6 +399,18 @@ func (r ApplicationRegistrationResource) Update() sdk.ResourceFunc {
if rd.HasChange("logout_url") {
properties.Web.LogoutUrl = tf.NullableString(model.LogoutUrl)
}

if rd.HasChange("implicit_access_token_issuance_enabled") || rd.HasChange("implicit_id_token_issuance_enabled") {
properties.Web.ImplicitGrantSettings = &msgraph.ImplicitGrantSettings{}

if rd.HasChange("implicit_access_token_issuance_enabled") {
properties.Web.ImplicitGrantSettings.EnableAccessTokenIssuance = pointer.To(model.ImplicitAccessTokenIssuanceEnabled)
}

if rd.HasChange("implicit_id_token_issuance_enabled") {
properties.Web.ImplicitGrantSettings.EnableIdTokenIssuance = pointer.To(model.ImplicitIdTokenIssuanceEnabled)
}
}
}

_, err = client.Update(ctx, properties)
Expand Down
4 changes: 3 additions & 1 deletion internal/services/applications/application_registration_resource_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,9 @@ resource "azuread_application_registration" "test" {
display_name = "acctest-AppRegistration-complete-%[1]d"
sign_in_audience = "AzureADandPersonalMicrosoftAccount"
requested_access_token_version = 2
requested_access_token_version = 2
implicit_access_token_issuance_enabled = true
implicit_id_token_issuance_enabled = true
description = "Acceptance testing application"
notes = "Testing application"
Expand Down

0 comments on commit acc8314

Please sign in to comment.