Fix #408: Reorganise folder structure to flat hierarchy

Signed-off-by: George J Padayatti <[email protected]>
decentralised-dataexchange · Oct 31, 2023 · 1963ab4 · 1963ab4
1 parent 11aaa06
commit 1963ab4
Show file tree

Hide file tree

Showing 47 changed files with 84 additions and 18 deletions.
diff --git a/...handler/v2/apikey/config_create_apikey.go → .../v2/config/apikey/config_create_apikey.go b/...handler/v2/apikey/config_create_apikey.go → .../v2/config/apikey/config_create_apikey.go
diff --git a/...handler/v2/apikey/config_delete_apikey.go → .../v2/config/apikey/config_delete_apikey.go b/...handler/v2/apikey/config_delete_apikey.go → .../v2/config/apikey/config_delete_apikey.go
diff --git a/.../handler/v2/apikey/config_list_apikeys.go → ...r/v2/config/apikey/config_list_apikeys.go b/.../handler/v2/apikey/config_list_apikeys.go → ...r/v2/config/apikey/config_list_apikeys.go
diff --git a/...handler/v2/apikey/config_update_apikey.go → .../v2/config/apikey/config_update_apikey.go b/...handler/v2/apikey/config_update_apikey.go → .../v2/config/apikey/config_update_apikey.go
diff --git a/...aagreement/config_create_dataagreement.go → ...aagreement/config_create_dataagreement.go b/...aagreement/config_create_dataagreement.go → ...aagreement/config_create_dataagreement.go
diff --git a/...aagreement/config_delete_dataagreement.go → ...aagreement/config_delete_dataagreement.go b/...aagreement/config_delete_dataagreement.go → ...aagreement/config_delete_dataagreement.go
diff --git a/...nt/config_list_dataagreement_revisions.go → ...nt/config_list_dataagreement_revisions.go b/...nt/config_list_dataagreement_revisions.go → ...nt/config_list_dataagreement_revisions.go
diff --git a/...taagreement/config_list_dataagreements.go → ...taagreement/config_list_dataagreements.go b/...taagreement/config_list_dataagreements.go → ...taagreement/config_list_dataagreements.go
diff --git a/..._list_dataattributes_for_dataagreement.go → ..._list_dataattributes_for_dataagreement.go b/..._list_dataattributes_for_dataagreement.go → ..._list_dataattributes_for_dataagreement.go
diff --git a/...ataagreement/config_read_dataagreement.go → ...ataagreement/config_read_dataagreement.go b/...ataagreement/config_read_dataagreement.go → ...ataagreement/config_read_dataagreement.go
diff --git a/...aagreement/config_update_dataagreement.go → ...aagreement/config_update_dataagreement.go b/...aagreement/config_update_dataagreement.go → ...aagreement/config_update_dataagreement.go
diff --git a/...taattribute/config_list_dataattributes.go → ...taattribute/config_list_dataattributes.go b/...taattribute/config_list_dataattributes.go → ...taattribute/config_list_dataattributes.go
diff --git a/...aattribute/config_update_dataattribute.go → ...aattribute/config_update_dataattribute.go b/...aattribute/config_update_dataattribute.go → ...aattribute/config_update_dataattribute.go
diff --git a/internal/handler/v2/idp/config_create_idp.go → ...andler/v2/config/idp/config_create_idp.go b/internal/handler/v2/idp/config_create_idp.go → ...andler/v2/config/idp/config_create_idp.go
diff --git a/internal/handler/v2/idp/config_delete_idp.go → ...andler/v2/config/idp/config_delete_idp.go b/internal/handler/v2/idp/config_delete_idp.go → ...andler/v2/config/idp/config_delete_idp.go
diff --git a/internal/handler/v2/idp/config_get_idp.go → ...l/handler/v2/config/idp/config_get_idp.go b/internal/handler/v2/idp/config_get_idp.go → ...l/handler/v2/config/idp/config_get_idp.go
diff --git a/internal/handler/v2/idp/config_list_idps.go → ...handler/v2/config/idp/config_list_idps.go b/internal/handler/v2/idp/config_list_idps.go → ...handler/v2/config/idp/config_list_idps.go
diff --git a/internal/handler/v2/idp/config_update_idp.go → ...andler/v2/config/idp/config_update_idp.go b/internal/handler/v2/idp/config_update_idp.go → ...andler/v2/config/idp/config_update_idp.go
diff --git a/...v2/individual/config_create_individual.go → ...ig/individual/config_create_individual.go b/...v2/individual/config_create_individual.go → ...ig/individual/config_create_individual.go
diff --git a/...dual/config_create_individuals_in_bulk.go → ...dual/config_create_individuals_in_bulk.go b/...dual/config_create_individuals_in_bulk.go → ...dual/config_create_individuals_in_bulk.go
diff --git a/...ndler/v2/individual/config_delete_user.go → ...2/config/individual/config_delete_user.go b/...ndler/v2/individual/config_delete_user.go → ...2/config/individual/config_delete_user.go
diff --git a/.../v2/individual/config_list_individuals.go → ...fig/individual/config_list_individuals.go b/.../v2/individual/config_list_individuals.go → ...fig/individual/config_list_individuals.go
diff --git a/...r/v2/individual/config_read_individual.go → ...nfig/individual/config_read_individual.go b/...r/v2/individual/config_read_individual.go → ...nfig/individual/config_read_individual.go
diff --git a/...v2/individual/config_update_individual.go → ...ig/individual/config_update_individual.go b/...v2/individual/config_update_individual.go → ...ig/individual/config_update_individual.go
diff --git a/...handler/v2/policy/config_create_policy.go → .../v2/config/policy/config_create_policy.go b/...handler/v2/policy/config_create_policy.go → .../v2/config/policy/config_create_policy.go
diff --git a/...handler/v2/policy/config_delete_policy.go → .../v2/config/policy/config_delete_policy.go b/...handler/v2/policy/config_delete_policy.go → .../v2/config/policy/config_delete_policy.go
diff --git a/...handler/v2/policy/config_list_policies.go → .../v2/config/policy/config_list_policies.go b/...handler/v2/policy/config_list_policies.go → .../v2/config/policy/config_list_policies.go
diff --git a/...v2/policy/config_list_policy_revisions.go → ...ig/policy/config_list_policy_revisions.go b/...v2/policy/config_list_policy_revisions.go → ...ig/policy/config_list_policy_revisions.go
diff --git a/...l/handler/v2/policy/config_read_policy.go → ...er/v2/config/policy/config_read_policy.go b/...l/handler/v2/policy/config_read_policy.go → ...er/v2/config/policy/config_read_policy.go
diff --git a/...handler/v2/policy/config_update_policy.go → .../v2/config/policy/config_update_policy.go b/...handler/v2/policy/config_update_policy.go → .../v2/config/policy/config_update_policy.go
diff --git a/...ashboard/config_read_privacy_dashboard.go → ...ashboard/config_read_privacy_dashboard.go b/...ashboard/config_read_privacy_dashboard.go → ...ashboard/config_read_privacy_dashboard.go
diff --git a/...ndler/v2/webhook/config_create_webhook.go → ...2/config/webhook/config_create_webhook.go b/...ndler/v2/webhook/config_create_webhook.go → ...2/config/webhook/config_create_webhook.go
diff --git a/...ndler/v2/webhook/config_delete_webhook.go → ...2/config/webhook/config_delete_webhook.go b/...ndler/v2/webhook/config_delete_webhook.go → ...2/config/webhook/config_delete_webhook.go
diff --git a/.../config_list_recent_webhook_deliveries.go → .../config_list_recent_webhook_deliveries.go b/.../config_list_recent_webhook_deliveries.go → .../config_list_recent_webhook_deliveries.go
diff --git a/...ebhook/config_list_webhook_event_types.go → ...ebhook/config_list_webhook_event_types.go b/...ebhook/config_list_webhook_event_types.go → ...ebhook/config_list_webhook_event_types.go
diff --git a/...nfig_list_webhook_payload_contenttypes.go → ...nfig_list_webhook_payload_contenttypes.go b/...nfig_list_webhook_payload_contenttypes.go → ...nfig_list_webhook_payload_contenttypes.go
diff --git a/...andler/v2/webhook/config_list_webhooks.go → ...v2/config/webhook/config_list_webhooks.go b/...andler/v2/webhook/config_list_webhooks.go → ...v2/config/webhook/config_list_webhooks.go
diff --git a/...handler/v2/webhook/config_ping_webhook.go → .../v2/config/webhook/config_ping_webhook.go b/...handler/v2/webhook/config_ping_webhook.go → .../v2/config/webhook/config_ping_webhook.go
diff --git a/...handler/v2/webhook/config_read_webhook.go → .../v2/config/webhook/config_read_webhook.go b/...handler/v2/webhook/config_read_webhook.go → .../v2/config/webhook/config_read_webhook.go
diff --git a/...2/webhook/config_read_webhook_delivery.go → ...g/webhook/config_read_webhook_delivery.go b/...2/webhook/config_read_webhook_delivery.go → ...g/webhook/config_read_webhook_delivery.go
diff --git a/...edeliver_webhook_payload_by_deliveryid.go → ...edeliver_webhook_payload_by_deliveryid.go b/...edeliver_webhook_payload_by_deliveryid.go → ...edeliver_webhook_payload_by_deliveryid.go
diff --git a/...ndler/v2/webhook/config_update_webhook.go → ...2/config/webhook/config_update_webhook.go b/...ndler/v2/webhook/config_update_webhook.go → ...2/config/webhook/config_update_webhook.go
diff --git a/...2/individual/service_create_individual.go → ...e/individual/service_create_individual.go b/...2/individual/service_create_individual.go → ...e/individual/service_create_individual.go
@@ -1,19 +1,30 @@
 package individual
 
 import (
+	"context"
 	"encoding/json"
 	"fmt"
 	"io"
 	"log"
 	"net/http"
 
+	"github.com/Nerzal/gocloak/v13"
 	"github.com/asaskevich/govalidator"
 	"github.com/bb-consent/api/internal/common"
 	"github.com/bb-consent/api/internal/config"
+	"github.com/bb-consent/api/internal/iam"
 	"github.com/bb-consent/api/internal/individual"
 	"go.mongodb.org/mongo-driver/bson/primitive"
 )
 
+type iamIndividualRegisterReq struct {
+	Username        string   `json:"username"`
+	Firstname       string   `json:"firstName"`
+	Email           string   `json:"email"`
+	Enabled         bool     `json:"enabled"`
+	RequiredActions []string `json:"requiredActions"`
+}
+
 func createIamRegisterRequestFromAddRequestBody(requestBody addServiceIndividualReq, iamRegReq iamIndividualRegisterReq) iamIndividualRegisterReq {
 
 	iamRegReq.Username = requestBody.Individual.Email
@@ -43,6 +54,22 @@ type addServiceIndividualResp struct {
 	Individual individual.Individual `json:"individual"`
 }
 
+// registerUser Registers a new user
+func registerUser(iamRegReq iamIndividualRegisterReq, adminToken string, client *gocloak.GoCloak) (string, error) {
+	user := gocloak.User{
+		FirstName: &iamRegReq.Firstname,
+		Email:     &iamRegReq.Email,
+		Enabled:   gocloak.BoolP(true),
+		Username:  &iamRegReq.Email,
+	}
+
+	iamId, err := client.CreateUser(context.Background(), adminToken, iam.IamConfig.Realm, user)
+	if err != nil {
+		return "", err
+	}
+	return iamId, err
+}
+
 // ServiceCreateIndividual
 func ServiceCreateIndividual(w http.ResponseWriter, r *http.Request) {
 	// Headers
@@ -66,7 +93,7 @@ func ServiceCreateIndividual(w http.ResponseWriter, r *http.Request) {
 
 	iamRegReq = createIamRegisterRequestFromAddRequestBody(individualReq, iamRegReq)
 
-	client := getClient()
+	client := iam.GetClient()
 
 	t, err := getAdminToken(client)
 	if err != nil {

diff --git a/...v2/individual/service_list_individuals.go → ...ce/individual/service_list_individuals.go b/...v2/individual/service_list_individuals.go → ...ce/individual/service_list_individuals.go
diff --git a/.../v2/individual/service_read_individual.go → ...ice/individual/service_read_individual.go b/.../v2/individual/service_read_individual.go → ...ice/individual/service_read_individual.go
diff --git a/...2/individual/service_update_individual.go → ...e/individual/service_update_individual.go b/...2/individual/service_update_individual.go → ...e/individual/service_update_individual.go
@@ -1,18 +1,28 @@
 package individual
 
 import (
+	"context"
 	"encoding/json"
 	"fmt"
 	"io"
+	"log"
 	"net/http"
 
+	"github.com/Nerzal/gocloak/v13"
 	"github.com/asaskevich/govalidator"
 	"github.com/bb-consent/api/internal/common"
 	"github.com/bb-consent/api/internal/config"
+	"github.com/bb-consent/api/internal/iam"
 	"github.com/bb-consent/api/internal/individual"
 	"github.com/gorilla/mux"
 )
 
+type iamIndividualUpdateReq struct {
+	Username  string `json:"username"`
+	Firstname string `json:"firstName"`
+	Email     string `json:"email"`
+}
+
 func updateIamUpdateRequestFromUpdateRequestBody(requestBody updateServiceIndividualReq) iamIndividualUpdateReq {
 	var iamIndividualReq iamIndividualUpdateReq
 
@@ -23,6 +33,34 @@ func updateIamUpdateRequestFromUpdateRequestBody(requestBody updateServiceIndivi
 	return iamIndividualReq
 }
 
+func getAdminToken(client *gocloak.GoCloak) (*gocloak.JWT, error) {
+	t, err := iam.GetToken(iam.IamConfig.AdminUser, iam.IamConfig.AdminPassword, "master", client)
+	return t, err
+}
+
+// updateIamIndividual Update user info on IAM server end.
+func updateIamIndividual(iamUpdateReq iamIndividualUpdateReq, iamID string) error {
+	client := iam.GetClient()
+
+	t, err := getAdminToken(client)
+	if err != nil {
+		log.Printf("Failed to get admin token, user: %v update err:%v", iamUpdateReq.Firstname, err)
+		return err
+	}
+	user, err := client.GetUserByID(context.Background(), t.AccessToken, iam.IamConfig.Realm, iamID)
+	if err != nil {
+		return err
+	}
+	user.FirstName = gocloak.StringP(iamUpdateReq.Firstname)
+	user.Username = gocloak.StringP(iamUpdateReq.Username)
+	user.Email = gocloak.StringP(iamUpdateReq.Email)
+	u := *user
+
+	err = client.UpdateUser(context.Background(), t.AccessToken, iam.IamConfig.Realm, u)
+
+	return err
+}
+
 func updateIndividualFromUpdateIndividualServiceRequestBody(requestBody updateServiceIndividualReq, tobeUpdatedIndividual individual.Individual) individual.Individual {
 	tobeUpdatedIndividual.ExternalId = requestBody.Individual.ExternalId
 	tobeUpdatedIndividual.ExternalIdType = requestBody.Individual.ExternalIdType

diff --git a/internal/http_path/v2/routes.go b/internal/http_path/v2/routes.go
@@ -1,17 +1,18 @@
 package http_path
 
 import (
-	apiKeyHandler "github.com/bb-consent/api/internal/handler/v2/apikey"
 	auditHandler "github.com/bb-consent/api/internal/handler/v2/audit"
-	dataAgreementHandler "github.com/bb-consent/api/internal/handler/v2/dataagreement"
-	dataAttributeHandler "github.com/bb-consent/api/internal/handler/v2/dataattribute"
-	idpHandler "github.com/bb-consent/api/internal/handler/v2/idp"
-	individualHandler "github.com/bb-consent/api/internal/handler/v2/individual"
+	apiKeyHandler "github.com/bb-consent/api/internal/handler/v2/config/apikey"
+	dataAgreementHandler "github.com/bb-consent/api/internal/handler/v2/config/dataagreement"
+	dataAttributeHandler "github.com/bb-consent/api/internal/handler/v2/config/dataattribute"
+	idpHandler "github.com/bb-consent/api/internal/handler/v2/config/idp"
+	configIndividualHandler "github.com/bb-consent/api/internal/handler/v2/config/individual"
+	policyHandler "github.com/bb-consent/api/internal/handler/v2/config/policy"
+	privacyDashboardHandler "github.com/bb-consent/api/internal/handler/v2/config/privacy_dashboard"
+	webhookHandler "github.com/bb-consent/api/internal/handler/v2/config/webhook"
 	onboardHandler "github.com/bb-consent/api/internal/handler/v2/onboard"
-	policyHandler "github.com/bb-consent/api/internal/handler/v2/policy"
-	privacyDashboardHandler "github.com/bb-consent/api/internal/handler/v2/privacy_dashboard"
 	serviceHandler "github.com/bb-consent/api/internal/handler/v2/service"
-	webhookHandler "github.com/bb-consent/api/internal/handler/v2/webhook"
+	serviceIndividualHandler "github.com/bb-consent/api/internal/handler/v2/service/individual"
 	m "github.com/bb-consent/api/internal/middleware"
 	"github.com/casbin/casbin/v2"
 	"github.com/gorilla/mux"
@@ -61,18 +62,18 @@ func SetRoutes(r *mux.Router, e *casbin.Enforcer) {
 	r.Handle(ConfigListIdentityProviders, m.Chain(idpHandler.ConfigListIdps, m.Logger(), m.Authorize(e), m.Authenticate(), m.AddContentType())).Methods("GET")
 
 	// Individual related api(s)
-	r.Handle(ConfigReadIndividual, m.Chain(individualHandler.ConfigReadIndividual, m.Logger(), m.Authorize(e), m.SetApplicationMode(), m.Authenticate(), m.AddContentType())).Methods("GET")
-	r.Handle(ConfigCreateIndividual, m.Chain(individualHandler.ConfigCreateIndividual, m.Logger(), m.Authorize(e), m.SetApplicationMode(), m.Authenticate(), m.AddContentType())).Methods("POST")
-	r.Handle(ConfigUpdateIndividual, m.Chain(individualHandler.ConfigUpdateIndividual, m.Logger(), m.Authorize(e), m.SetApplicationMode(), m.Authenticate(), m.AddContentType())).Methods("PUT")
-	r.Handle(ConfigListIndividuals, m.Chain(individualHandler.ConfigListIndividuals, m.Logger(), m.Authorize(e), m.SetApplicationMode(), m.Authenticate(), m.AddContentType())).Methods("GET")
+	r.Handle(ConfigReadIndividual, m.Chain(configIndividualHandler.ConfigReadIndividual, m.Logger(), m.Authorize(e), m.SetApplicationMode(), m.Authenticate(), m.AddContentType())).Methods("GET")
+	r.Handle(ConfigCreateIndividual, m.Chain(configIndividualHandler.ConfigCreateIndividual, m.Logger(), m.Authorize(e), m.SetApplicationMode(), m.Authenticate(), m.AddContentType())).Methods("POST")
+	r.Handle(ConfigUpdateIndividual, m.Chain(configIndividualHandler.ConfigUpdateIndividual, m.Logger(), m.Authorize(e), m.SetApplicationMode(), m.Authenticate(), m.AddContentType())).Methods("PUT")
+	r.Handle(ConfigListIndividuals, m.Chain(configIndividualHandler.ConfigListIndividuals, m.Logger(), m.Authorize(e), m.SetApplicationMode(), m.Authenticate(), m.AddContentType())).Methods("GET")
 
 	// Api key related api(s)
 	r.Handle(ConfigCreateApiKey, m.Chain(apiKeyHandler.ConfigCreateApiKey, m.Logger(), m.Authorize(e), m.SetApplicationMode(), m.Authenticate(), m.AddContentType())).Methods("POST")
 	r.Handle(ConfigDeleteApiKey, m.Chain(apiKeyHandler.ConfigDeleteApiKey, m.Logger(), m.Authorize(e), m.SetApplicationMode(), m.Authenticate(), m.AddContentType())).Methods("DELETE")
 	r.Handle(ConfigUpdateApiKey, m.Chain(apiKeyHandler.ConfigUpdateApiKey, m.Logger(), m.Authorize(e), m.SetApplicationMode(), m.Authenticate(), m.AddContentType())).Methods("PUT")
 	r.Handle(ConfigListApiKey, m.Chain(apiKeyHandler.ConfigListApiKey, m.Logger(), m.Authorize(e), m.SetApplicationMode(), m.Authenticate(), m.AddContentType())).Methods("GET")
 
-	r.Handle(ConfigCreateIndividualsInBulk, m.Chain(individualHandler.ConfigCreateIndividualsInBulk, m.Logger(), m.Authorize(e), m.SetApplicationMode(), m.Authenticate(), m.AddContentType())).Methods("POST")
+	r.Handle(ConfigCreateIndividualsInBulk, m.Chain(configIndividualHandler.ConfigCreateIndividualsInBulk, m.Logger(), m.Authorize(e), m.SetApplicationMode(), m.Authenticate(), m.AddContentType())).Methods("POST")
 
 	r.Handle(ConfigReadPrivacyDashboard, m.Chain(privacyDashboardHandler.ConfigReadPrivacyDashboard, m.Logger(), m.Authorize(e), m.SetApplicationMode(), m.Authenticate(), m.AddContentType())).Methods("GET")
 
@@ -117,10 +118,10 @@ func SetRoutes(r *mux.Router, e *casbin.Enforcer) {
 	r.Handle(ServiceReadOrganisationCoverImage, m.Chain(serviceHandler.ServiceReadOrganisationCoverImage, m.Logger(), m.Authorize(e), m.SetApplicationMode(), m.Authenticate(), m.AddContentType())).Methods("GET")
 
 	// Individual related api(s)
-	r.Handle(ServiceReadIndividual, m.Chain(individualHandler.ServiceReadIndividual, m.Logger(), m.Authorize(e), m.SetApplicationMode(), m.Authenticate(), m.AddContentType())).Methods("GET")
-	r.Handle(ServiceCreateIndividual, m.Chain(individualHandler.ServiceCreateIndividual, m.Logger(), m.Authorize(e), m.SetApplicationMode(), m.Authenticate(), m.AddContentType())).Methods("POST")
-	r.Handle(ServiceUpdateIndividual, m.Chain(individualHandler.ServiceUpdateIndividual, m.Logger(), m.Authorize(e), m.SetApplicationMode(), m.Authenticate(), m.AddContentType())).Methods("PUT")
-	r.Handle(ServiceListIndividuals, m.Chain(individualHandler.ServiceListIndividuals, m.Logger(), m.Authorize(e), m.SetApplicationMode(), m.Authenticate(), m.AddContentType())).Methods("GET")
+	r.Handle(ServiceReadIndividual, m.Chain(serviceIndividualHandler.ServiceReadIndividual, m.Logger(), m.Authorize(e), m.SetApplicationMode(), m.Authenticate(), m.AddContentType())).Methods("GET")
+	r.Handle(ServiceCreateIndividual, m.Chain(serviceIndividualHandler.ServiceCreateIndividual, m.Logger(), m.Authorize(e), m.SetApplicationMode(), m.Authenticate(), m.AddContentType())).Methods("POST")
+	r.Handle(ServiceUpdateIndividual, m.Chain(serviceIndividualHandler.ServiceUpdateIndividual, m.Logger(), m.Authorize(e), m.SetApplicationMode(), m.Authenticate(), m.AddContentType())).Methods("PUT")
+	r.Handle(ServiceListIndividuals, m.Chain(serviceIndividualHandler.ServiceListIndividuals, m.Logger(), m.Authorize(e), m.SetApplicationMode(), m.Authenticate(), m.AddContentType())).Methods("GET")
 
 	// Audit api(s)