Add company namespace on register #692

deepfence · Dec 12, 2022 · 6ccfa1c · 6ccfa1c
1 parent bd29c0d
commit 6ccfa1c
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 9 deletions.
diff --git a/deepfence_server/handler/user.go b/deepfence_server/handler/user.go
@@ -3,15 +3,16 @@ package handler
 import (
 	"context"
 	"errors"
+	"net/http"
+	"reflect"
+
 	"github.com/deepfence/ThreatMapper/deepfence_server/model"
 	"github.com/deepfence/ThreatMapper/deepfence_utils/directory"
 	"github.com/deepfence/ThreatMapper/deepfence_utils/log"
 	postgresql_db "github.com/deepfence/ThreatMapper/deepfence_utils/postgresql/postgresql-db"
 	"github.com/deepfence/ThreatMapper/deepfence_utils/utils"
 	"github.com/go-chi/jwtauth/v5"
 	httpext "github.com/go-playground/pkg/v5/net/http"
-	"net/http"
-	"reflect"
 )
 
 const (
@@ -63,7 +64,8 @@ func (h *Handler) RegisterUser(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 	emailDomain, _ := utils.GetEmailDomain(registerRequest.Email)
-	c := model.Company{Name: registerRequest.Company, EmailDomain: emailDomain}
+	//TODO: SaaS namespace
+	c := model.Company{Name: registerRequest.Company, EmailDomain: emailDomain, Namespace: "default"}
 	company, err := c.Create(ctx, pgClient)
 	if err != nil {
 		httpext.JSON(w, http.StatusInternalServerError, model.Response{Success: false, Message: err.Error()})

diff --git a/deepfence_server/model/user.go b/deepfence_server/model/user.go
@@ -89,10 +89,11 @@ type Company struct {
 	ID          int32  `json:"id"`
 	Name        string `json:"name"`
 	EmailDomain string `json:"email_domain"`
+	Namespace   string `json:"namespace"`
 }
 
 func (c *Company) Create(ctx context.Context, pgClient *postgresqlDb.Queries) (*postgresqlDb.Company, error) {
-	company, err := pgClient.CreateCompany(ctx, postgresqlDb.CreateCompanyParams{Name: c.Name, EmailDomain: c.EmailDomain})
+	company, err := pgClient.CreateCompany(ctx, postgresqlDb.CreateCompanyParams{Name: c.Name, EmailDomain: c.EmailDomain, Namespace: c.Namespace})
 	if err != nil {
 		return nil, err
 	}

diff --git a/deepfence_utils/postgresql/postgresql-db/queries.sql.go b/deepfence_utils/postgresql/postgresql-db/queries.sql.go
diff --git a/deepfence_utils/postgresql/queries.sql b/deepfence_utils/postgresql/queries.sql
@@ -1,6 +1,6 @@
 -- name: CreateCompany :one
-INSERT INTO company (name, email_domain)
-VALUES ($1, $2)
+INSERT INTO company (name, email_domain, namespace)
+VALUES ($1, $2, $3)
 RETURNING *;
 
 -- name: CountCompanies :one