[CLOUDTRUST-3370] Allow consent configuration in social AND corporate

cloudtrust · Jul 22, 2021 · 483d36e · 483d36e
1 parent ccf22f2
commit 483d36e
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 19 deletions.
diff --git a/configuration/dto.go b/configuration/dto.go
@@ -39,14 +39,15 @@ type RealmConfiguration struct {
 
 // RealmAdminConfiguration struct
 type RealmAdminConfiguration struct {
-	Mode                *string                   `json:"mode"`
-	AvailableChecks     map[string]bool           `json:"available-checks,omitempty"`
-	Accreditations      []RealmAdminAccreditation `json:"accreditations,omitempty"`
-	SelfRegisterEnabled *bool                     `json:"self_register_enabled"`
-	Theme               *string                   `json:"theme,omitempty"`
-	NeedVerifiedContact *bool                     `json:"need_verified_contact,omitempty"`
-	ConsentRequired     *bool                     `json:"consent_required,omitempty"`
-	ShowGlnEditing      *bool                     `json:"show_gln_editing,omitempty"`
+	Mode                     *string                   `json:"mode"`
+	AvailableChecks          map[string]bool           `json:"available-checks,omitempty"`
+	Accreditations           []RealmAdminAccreditation `json:"accreditations,omitempty"`
+	SelfRegisterEnabled      *bool                     `json:"self_register_enabled"`
+	Theme                    *string                   `json:"theme,omitempty"`
+	NeedVerifiedContact      *bool                     `json:"need_verified_contact,omitempty"`
+	ConsentRequiredSocial    *bool                     `json:"consent_required,omitempty"`
+	ConsentRequiredCorporate *bool                     `json:"consent_required_corp,omitempty"`
+	ShowGlnEditing           *bool                     `json:"show_gln_editing,omitempty"`
 }
 
 // RealmAdminAccreditation struct

diff --git a/http/handlers.go b/http/handlers.go
@@ -33,7 +33,7 @@ type GenericResponse struct {
 // WriteResponse writes a response for a mime content type
 func (r *GenericResponse) WriteResponse(w http.ResponseWriter) {
 	if r.Headers == nil {
-		r.Headers = make(map[string]string, 0)
+		r.Headers = make(map[string]string)
 	}
 	// Headers
 	if r.MimeContent != nil {
@@ -113,11 +113,10 @@ func DecodeRequestWithHeaders(_ context.Context, req *http.Request, pathParams m
 		}
 	}
 
-	if headers != nil {
-		for _, headerKey := range headers {
-			request[headerKey] = req.Header.Get(headerKey)
-		}
+	for _, headerKey := range headers {
+		request[headerKey] = req.Header.Get(headerKey)
 	}
+
 	return request, nil
 }
 

diff --git a/http/handlers_test.go b/http/handlers_test.go
@@ -113,8 +113,7 @@ func TestHTTPManagementHandler(t *testing.T) {
 	var mockCtrl = gomock.NewController(t)
 	defer mockCtrl.Finish()
 
-	var e endpoint.Endpoint
-	e = func(ctx context.Context, req interface{}) (interface{}, error) {
+	var e = func(ctx context.Context, req interface{}) (interface{}, error) {
 		var m = req.(map[string]string)
 		res := fmt.Sprint(len(m))
 		if v, err := m["pathParameter1"]; err {

diff --git a/http/rights_test.go b/http/rights_test.go
@@ -22,10 +22,10 @@ func TestMakeRightsHandler(t *testing.T) {
 	mockAuthManager := mock.NewAuthorizationManager(mockCtrl)
 
 	var rights = map[string]map[string]map[string]map[string]struct{}{
-		"toe_administrator": map[string]map[string]map[string]struct{}{
-			"GetUsers": map[string]map[string]struct{}{
-				"master": map[string]struct{}{
-					"*": struct{}{},
+		"toe_administrator": {
+			"GetUsers": {
+				"master": {
+					"*": {},
 				},
 			},
 		},