Merge pull request #33 from gen-mind/develop

develop
gen-mind · Apr 16, 2024 · 0d1f61b · 0d1f61b
2 parents d77f4ad + 740bddf
commit 0d1f61b
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 36 deletions.
diff --git a/backend/api/handler/auth.go b/backend/api/handler/auth.go
@@ -7,7 +7,6 @@ import (
 	"cognix.ch/api/v2/core/parameters"
 	"cognix.ch/api/v2/core/security"
 	"cognix.ch/api/v2/core/server"
-	"cognix.ch/api/v2/core/storage"
 	"cognix.ch/api/v2/core/utils"
 	"encoding/base64"
 	"encoding/json"
@@ -21,19 +20,19 @@ type AuthHandler struct {
 	oauthClient oauth.Proxy
 	jwtService  security.JWTService
 	authBL      bll.AuthBL
-	storage     storage.Storage
+	//storage     storage.Storage
 }
 
 func NewAuthHandler(oauthClient oauth.Proxy,
 	jwtService security.JWTService,
 	authBL bll.AuthBL,
-	storage storage.Storage,
+	//storage storage.Storage,
 
 ) *AuthHandler {
 	return &AuthHandler{oauthClient: oauthClient,
 		jwtService: jwtService,
 		authBL:     authBL,
-		storage:    storage,
+		//storage:    storage,
 	}
 }
 
@@ -184,20 +183,20 @@ func (h *AuthHandler) Invite(c *gin.Context, identity *security.Identity) error
 // @Success 200 {object} string
 // @Router /auth/google/invite [get]
 func (h *AuthHandler) JoinToTenant(c *gin.Context) error {
-	param := c.Query("state")
-
-	key, err := base64.URLEncoding.DecodeString(param)
-	if err != nil {
-		return utils.InvalidInput.Wrap(err, "wrong state")
-	}
-	value, err := h.storage.Pull(string(key))
-
-	state := base64.URLEncoding.EncodeToString(value)
-
-	url, err := h.oauthClient.Login(c.Request.Context(), state)
-	if err != nil {
-		return err
-	}
-	c.Redirect(http.StatusFound, url)
+	//param := c.Query("state")
+	//
+	//key, err := base64.URLEncoding.DecodeString(param)
+	//if err != nil {
+	//	return utils.InvalidInput.Wrap(err, "wrong state")
+	//}
+	////value, err := h.storage.Pull(string(key))
+	//
+	//state := base64.URLEncoding.EncodeToString("value")
+	//
+	//url, err := h.oauthClient.Login(c.Request.Context(), state)
+	//if err != nil {
+	//	return err
+	//}
+	//c.Redirect(http.StatusFound, url)
 	return nil
 }
diff --git a/backend/api/module.go b/backend/api/module.go
@@ -26,7 +26,7 @@ var Module = fx.Options(
 		NewRouter,
 		newGoogleOauthProvider,
 		newJWTService,
-		newStorage,
+		//newStorage,
 		ai.NewBuilder,
 		server.NewAuthMiddleware,
 		handler.NewAuthHandler,

diff --git a/backend/core/bll/auth.go b/backend/core/bll/auth.go
@@ -6,11 +6,9 @@ import (
 	"cognix.ch/api/v2/core/parameters"
 	"cognix.ch/api/v2/core/repository"
 	"cognix.ch/api/v2/core/security"
-	"cognix.ch/api/v2/core/storage"
 	"cognix.ch/api/v2/core/utils"
 	"context"
 	"encoding/base64"
-	"encoding/json"
 	"fmt"
 	"github.com/google/uuid"
 )
@@ -26,16 +24,14 @@ type (
 	authBL struct {
 		userRepo    repository.UserRepository
 		redirectURL string
-		storage     storage.Storage
+		//storage     storage.Storage
 	}
 )
 
 func NewAuthBL(userRepo repository.UserRepository,
-	storage storage.Storage,
 	cfg *Config) AuthBL {
 	return &authBL{
 		userRepo:    userRepo,
-		storage:     storage,
 		redirectURL: cfg.RedirectURL,
 	}
 }
@@ -83,18 +79,18 @@ func (a *authBL) Invite(ctx context.Context, identity *security.Identity, param
 	if exists {
 		return "", utils.InvalidInput.New("user already registered.")
 	}
-	buf, err := json.Marshal(parameters.OAuthParam{Action: oauth.InviteState,
-		Role:     param.Role,
-		Email:    param.Email,
-		TenantID: identity.User.TenantID.String(),
-	})
-	if err != nil {
-		return "", utils.Internal.Wrap(err, "can not marshal payload")
-	}
+	//buf, err := json.Marshal(parameters.OAuthParam{Action: oauth.InviteState,
+	//	Role:     param.Role,
+	//	Email:    param.Email,
+	//	TenantID: identity.User.TenantID.String(),
+	//})
+	//if err != nil {
+	//	return "", utils.Internal.Wrap(err, "can not marshal payload")
+	//}
 	key := uuid.New()
-	if err = a.storage.Save(key.String(), buf); err != nil {
-		return "", err
-	}
+	//if err = a.storage.Save(key.String(), buf); err != nil {
+	//	return "", err
+	//}
 	state := base64.URLEncoding.EncodeToString([]byte(key.String()))
 
 	return fmt.Sprintf("%s/auth/google/invite?state=%s", a.redirectURL, state), nil