mirror of
https://github.com/zitadel/zitadel.git
synced 2025-07-15 19:28:35 +00:00
2691dae2b6
# Which Problems Are Solved This PR *partially* addresses #9450 . Specifically, it implements the resource based API for the apps. APIs for app keys ARE not part of this PR. # How the Problems Are Solved - `CreateApplication`, `PatchApplication` (update) and `RegenerateClientSecret` endpoints are now unique for all app types: API, SAML and OIDC apps. - All new endpoints have integration tests - All new endpoints are using permission checks V2 # Additional Changes - The `ListApplications` endpoint allows to do sorting (see protobuf for details) and filtering by app type (see protobuf). - SAML and OIDC update endpoint can now receive requests for partial updates # Additional Context Partially addresses #9450
78 lines
2.1 KiB
Go
78 lines
2.1 KiB
Go
package convert
|
|
|
|
import (
|
|
"github.com/muhlemmer/gu"
|
|
|
|
"github.com/zitadel/zitadel/internal/domain"
|
|
"github.com/zitadel/zitadel/internal/eventstore/v1/models"
|
|
"github.com/zitadel/zitadel/internal/query"
|
|
app "github.com/zitadel/zitadel/pkg/grpc/app/v2beta"
|
|
)
|
|
|
|
func CreateSAMLAppRequestToDomain(name, projectID string, req *app.CreateSAMLApplicationRequest) (*domain.SAMLApp, error) {
|
|
loginVersion, loginBaseURI, err := loginVersionToDomain(req.GetLoginVersion())
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
return &domain.SAMLApp{
|
|
ObjectRoot: models.ObjectRoot{
|
|
AggregateID: projectID,
|
|
},
|
|
AppName: name,
|
|
Metadata: req.GetMetadataXml(),
|
|
MetadataURL: gu.Ptr(req.GetMetadataUrl()),
|
|
LoginVersion: loginVersion,
|
|
LoginBaseURI: loginBaseURI,
|
|
}, nil
|
|
}
|
|
|
|
func UpdateSAMLAppConfigRequestToDomain(appID, projectID string, app *app.UpdateSAMLApplicationConfigurationRequest) (*domain.SAMLApp, error) {
|
|
loginVersion, loginBaseURI, err := loginVersionToDomain(app.GetLoginVersion())
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
metasXML, metasURL := metasToDomain(app.GetMetadata())
|
|
return &domain.SAMLApp{
|
|
ObjectRoot: models.ObjectRoot{
|
|
AggregateID: projectID,
|
|
},
|
|
AppID: appID,
|
|
Metadata: metasXML,
|
|
MetadataURL: metasURL,
|
|
LoginVersion: loginVersion,
|
|
LoginBaseURI: loginBaseURI,
|
|
}, nil
|
|
}
|
|
|
|
func metasToDomain(metas app.MetaType) ([]byte, *string) {
|
|
switch t := metas.(type) {
|
|
case *app.UpdateSAMLApplicationConfigurationRequest_MetadataXml:
|
|
return t.MetadataXml, nil
|
|
case *app.UpdateSAMLApplicationConfigurationRequest_MetadataUrl:
|
|
return nil, &t.MetadataUrl
|
|
case nil:
|
|
return nil, nil
|
|
default:
|
|
return nil, nil
|
|
}
|
|
}
|
|
|
|
func appSAMLConfigToPb(samlApp *query.SAMLApp) app.ApplicationConfig {
|
|
if samlApp == nil {
|
|
return &app.Application_SamlConfig{
|
|
SamlConfig: &app.SAMLConfig{
|
|
Metadata: &app.SAMLConfig_MetadataXml{},
|
|
LoginVersion: &app.LoginVersion{},
|
|
},
|
|
}
|
|
}
|
|
|
|
return &app.Application_SamlConfig{
|
|
SamlConfig: &app.SAMLConfig{
|
|
Metadata: &app.SAMLConfig_MetadataXml{MetadataXml: samlApp.Metadata},
|
|
LoginVersion: loginVersionToPb(samlApp.LoginVersion, samlApp.LoginBaseURI),
|
|
},
|
|
}
|
|
}
|