updated

Author: wpcodevo

cmd/client/main.go

@@ -23,30 +23,30 @@ func main() {
 	defer conn.Close()
 
 	// Sign Up
-	if 1 > 2 {
+	if false {
 		signUpUserClient := client.NewSignUpUserClient(conn)
 		newUser := &pb.SignUpUserInput{
-			Name:            "Micheal Smith",
-			Email:           "michealmith@gmail.com",
+			Name:            "Jane Smith",
+			Email:           "janesmith@gmail.com",
 			Password:        "password123",
 			PasswordConfirm: "password123",
 		}
 		signUpUserClient.SignUpUser(newUser)
 	}
 
 	// Sign In
-	if 2 > 1 {
+	if true {
 		signInUserClient := client.NewSignInUserClient(conn)
 
 		credentials := &pb.SignInUserInput{
-			Email:    "michealmith@gmail.com",
+			Email:    "janesmith@gmail.com",
 			Password: "password123",
 		}
 		signInUserClient.SignInUser(credentials)
 	}
 
 	// Get Me
-	if 3 < 1 {
+	if false {
 
 		getMeClient := client.NewGetMeClient(conn)
 		id := &pb.GetMeRequest{

cmd/server/main.go

@@ -99,15 +99,8 @@ func main() {
 
 	defer mongoclient.Disconnect(ctx)
 
-	// startGinServer(config)
-	startGrpcServer(config)
-}
-
-func allowedRoles() map[string][]string {
-	const userServicePath = "/pb.UserService/"
-	return map[string][]string{
-		userServicePath + "GetMe": {"user"},
-	}
+	startGinServer(config)
+	// startGrpcServer(config)
 }
 
 func startGrpcServer(config config.Config) {
@@ -121,10 +114,7 @@ func startGrpcServer(config config.Config) {
 		log.Fatal("cannot create grpc userServer: ", err)
 	}
 
-	interceptor := services.NewAuthInterceptor(allowedRoles(), &config, userService)
-	grpcServer := grpc.NewServer(
-		grpc.UnaryInterceptor(interceptor.Unary()),
-	)
+	grpcServer := grpc.NewServer()
 
 	pb.RegisterAuthServiceServer(grpcServer, authServer)
 	pb.RegisterUserServiceServer(grpcServer, userServer)

models/user.model.go

@@ -44,16 +44,16 @@ type DBResponse struct {
 }
 
 type UpdateInput struct {
-	Name               string    `json:"name" bson:"name" binding:"required"`
-	Email              string    `json:"email" bson:"email" binding:"required"`
-	Password           string    `json:"password" bson:"password" binding:"required,min=8"`
-	Role               string    `json:"role" bson:"role"`
+	Name               string    `json:"name,omitempty" bson:"name,omitempty"`
+	Email              string    `json:"email,omitempty" bson:"email,omitempty"`
+	Password           string    `json:"password,omitempty" bson:"password,omitempty"`
+	Role               string    `json:"role,omitempty" bson:"role,omitempty"`
 	VerificationCode   string    `json:"verificationCode,omitempty" bson:"verificationCode,omitempty"`
 	ResetPasswordToken string    `json:"resetPasswordToken,omitempty" bson:"resetPasswordToken,omitempty"`
 	ResetPasswordAt    time.Time `json:"resetPasswordAt,omitempty" bson:"resetPasswordAt,omitempty"`
-	Verified           bool      `json:"verified" bson:"verified"`
-	CreatedAt          time.Time `json:"created_at" bson:"created_at"`
-	UpdatedAt          time.Time `json:"updated_at" bson:"updated_at"`
+	Verified           bool      `json:"verified,omitempty" bson:"verified,omitempty"`
+	CreatedAt          time.Time `json:"created_at,omitempty" bson:"created_at,omitempty"`
+	UpdatedAt          time.Time `json:"updated_at,omitempty" bson:"updated_at,omitempty"`
 }
 
 // 👈 UserResponse struct

services/auth_interceptor.service.go

@@ -70,6 +70,8 @@ func (uc *UserServiceImpl) UpdateUserById(id string, data *models.UpdateInput) (
 		return &models.DBResponse{}, err
 	}
 
+	fmt.Println(data)
+
 	obId, _ := primitive.ObjectIDFromHex(id)
 
 	query := bson.D{{Key: "_id", Value: obId}}