Merge pull request #91 from RedHatInsights/master

Current master into security-compliance
RedHatInsights · Jun 29, 2023 · 43ccced · 43ccced
2 parents 832f2d3 + 6c31651
commit 43ccced
Show file tree

Hide file tree

Showing 4 changed files with 39 additions and 3 deletions.
diff --git a/internal/config/config.go b/internal/config/config.go
@@ -102,7 +102,7 @@ func Get() *MbopConfig {
 		Debug:                  debug,
 
 		KeyCloakUserServiceHost:    fetchWithDefault("KEYCLOAK_USER_SERVICE_HOST", "localhost"),
-		KeyCloakUserServicePort:    fetchWithDefault("KEYCLOAK_USER_SERVICE_PORT", ":8000"),
+		KeyCloakUserServicePort:    fetchWithDefault("KEYCLOAK_USER_SERVICE_PORT", ":8443"),
 		KeyCloakUserServiceScheme:  fetchWithDefault("KEYCLOAK_USER_SERVICE_SCHEME", "http"),
 		KeyCloakUserServiceTimeout: userServiceTimeout,
 		KeyCloakTimeout:            keyCloakTimeout,

diff --git a/internal/handlers/accounts_v3_usersBy_handler.go b/internal/handlers/accounts_v3_usersBy_handler.go
@@ -144,7 +144,7 @@ func AccountsV3UsersByHandler(w http.ResponseWriter, r *http.Request) {
 			}
 		}
 
-		sendJSON(w, usersToV3Response(u.Users))
+		sendJSON(w, u.Users)
 	default:
 		// mbop server instance injected somewhere
 		// pass right through to the current handler

diff --git a/internal/service/keycloak-user-service/user_service.go b/internal/service/keycloak-user-service/user_service.go
@@ -128,8 +128,12 @@ func createV3UsersRequestURL(orgID string, q models.UserV3Query) (*url.URL, erro
 	}
 	queryParams := url.Query()
 
+	// default ordering
+	queryParams.Add("order", "username")
+	queryParams.Add("direction", "asc")
+
 	if q.SortOrder != "" {
-		queryParams.Add("direction", q.SortOrder)
+		queryParams.Set("direction", q.SortOrder)
 	}
 
 	queryParams.Add("org_id", orgID)

diff --git a/internal/service/mailer/helpers.go b/internal/service/mailer/helpers.go
@@ -8,6 +8,8 @@ import (
 	"github.com/redhatinsights/mbop/internal/config"
 	l "github.com/redhatinsights/mbop/internal/logger"
 	"github.com/redhatinsights/mbop/internal/models"
+	"github.com/redhatinsights/mbop/internal/service/keycloak"
+	keycloakuserservice "github.com/redhatinsights/mbop/internal/service/keycloak-user-service"
 	"github.com/redhatinsights/mbop/internal/service/ocm"
 	"golang.org/x/exp/maps"
 )
@@ -60,6 +62,36 @@ func LookupEmailsForUsernames(ctx context.Context, email *models.Email) error {
 		for _, user := range users.Users {
 			toLookup[user.Username] = user.Email
 		}
+	case "keycloak":
+		keycloakClient := keycloak.NewKeyCloakClient()
+		err := keycloakClient.InitKeycloakConnection()
+		if err != nil {
+			return err
+		}
+
+		token, err := keycloakClient.GetAccessToken()
+		if err != nil {
+			return err
+		}
+
+		userServiceClient, err := keycloakuserservice.NewKeyCloakUserServiceClient()
+		if err != nil {
+			return err
+		}
+
+		err = userServiceClient.InitKeycloakUserServiceConnection()
+		if err != nil {
+			return err
+		}
+
+		u, err := userServiceClient.GetUsers(token, models.UserBody{Users: maps.Keys(toLookup)}, models.UserV1Query{})
+		if err != nil {
+			return err
+		}
+
+		for _, user := range u.Users {
+			toLookup[user.Username] = user.Email
+		}
 	case "mock":
 		for k := range toLookup {
 			toLookup[k] = k + "@mocked.biz"