updated

Author: wpcodevo

.air.toml

@@ -0,0 +1,36 @@
+root = "."
+testdata_dir = "testdata"
+tmp_dir = "tmp"
+
+[build]
+  bin = "./tmp/main"
+  cmd = "go build -o ./tmp/main ./cmd/server/main.go"
+  delay = 1000
+  exclude_dir = ["assets", "tmp", "vendor", "testdata"]
+  exclude_file = []
+  exclude_regex = ["_test.go"]
+  exclude_unchanged = false
+  follow_symlink = false
+  full_bin = ""
+  include_dir = []
+  include_ext = ["go", "tpl", "tmpl", "html"]
+  kill_delay = "0s"
+  log = "build-errors.log"
+  send_interrupt = false
+  stop_on_error = true
+
+[color]
+  app = ""
+  build = "yellow"
+  main = "magenta"
+  runner = "green"
+  watcher = "cyan"
+
+[log]
+  time = false
+
+[misc]
+  clean_on_exit = false
+
+[screen]
+  clear_on_rebuild = false

client/geMe_client.go

@@ -0,0 +1,35 @@
+package client
+
+import (
+	"context"
+	"fmt"
+	"log"
+	"time"
+
+	"github.com/wpcodevo/golang-mongodb/pb"
+	"google.golang.org/grpc"
+)
+
+type GetMeClient struct {
+	service pb.UserServiceClient
+}
+
+func NewGetMeClient(conn *grpc.ClientConn) *GetMeClient {
+	service := pb.NewUserServiceClient(conn)
+
+	return &GetMeClient{service}
+}
+
+func (getMeClient *GetMeClient) GetMeUser(credentials *pb.GetMeRequest) {
+
+	ctx, cancel := context.WithTimeout(context.Background(), time.Duration(time.Millisecond*5000))
+	defer cancel()
+
+	res, err := getMeClient.service.GetMe(ctx, credentials)
+
+	if err != nil {
+		log.Fatalf("GeMe: %v", err)
+	}
+
+	fmt.Println(res)
+}

client/main.go

@@ -0,0 +1,35 @@
+package client
+
+import (
+	"context"
+	"fmt"
+	"log"
+	"time"
+
+	"github.com/wpcodevo/golang-mongodb/pb"
+	"google.golang.org/grpc"
+)
+
+type SignInUserClient struct {
+	service pb.AuthServiceClient
+}
+
+func NewSignInUserClient(conn *grpc.ClientConn) *SignInUserClient {
+	service := pb.NewAuthServiceClient(conn)
+
+	return &SignInUserClient{service}
+}
+
+func (signInUserClient *SignInUserClient) SignInUser(credentials *pb.SignInUserInput) {
+
+	ctx, cancel := context.WithTimeout(context.Background(), time.Second)
+	defer cancel()
+
+	res, err := signInUserClient.service.SignInUser(ctx, credentials)
+
+	if err != nil {
+		log.Fatalf("SignInUser: %v", err)
+	}
+
+	fmt.Println(res)
+}

client/signin_client.go

@@ -0,0 +1,35 @@
+package client
+
+import (
+	"context"
+	"fmt"
+	"log"
+	"time"
+
+	"github.com/wpcodevo/golang-mongodb/pb"
+	"google.golang.org/grpc"
+)
+
+type SignUpUserClient struct {
+	service pb.AuthServiceClient
+}
+
+func NewSignUpUserClient(conn *grpc.ClientConn) *SignUpUserClient {
+	service := pb.NewAuthServiceClient(conn)
+
+	return &SignUpUserClient{service}
+}
+
+func (signUpUserClient *SignUpUserClient) SignUpUser(credentials *pb.SignUpUserInput) {
+
+	ctx, cancel := context.WithTimeout(context.Background(), time.Duration(time.Millisecond*5000))
+	defer cancel()
+
+	res, err := signUpUserClient.service.SignUpUser(ctx, credentials)
+
+	if err != nil {
+		log.Fatalf("SignUpUser: %v", err)
+	}
+
+	fmt.Println(res)
+}

client/signup_client.go

@@ -0,0 +1,59 @@
+package main
+
+import (
+	"log"
+
+	"github.com/wpcodevo/golang-mongodb/client"
+	"github.com/wpcodevo/golang-mongodb/pb"
+	"google.golang.org/grpc"
+	"google.golang.org/grpc/credentials/insecure"
+)
+
+const (
+	address = "0.0.0.0:8080"
+)
+
+func main() {
+	conn, err := grpc.Dial(address, grpc.WithTransportCredentials(insecure.NewCredentials()), grpc.WithBlock())
+
+	if err != nil {
+		log.Fatalf("failed to connect: %v", err)
+	}
+
+	defer conn.Close()
+
+	// Sign Up
+	if 1 > 2 {
+		signUpUserClient := client.NewSignUpUserClient(conn)
+		newUser := &pb.SignUpUserInput{
+			Name:            "Micheal Smith",
+			Email:           "michealmith@gmail.com",
+			Password:        "password123",
+			PasswordConfirm: "password123",
+		}
+		signUpUserClient.SignUpUser(newUser)
+	}
+
+	// Sign In
+	if 2 > 1 {
+		signInUserClient := client.NewSignInUserClient(conn)
+
+		credentials := &pb.SignInUserInput{
+			Email:    "michealmith@gmail.com",
+			Password: "password123",
+		}
+		signInUserClient.SignInUser(credentials)
+	}
+
+	// Get Me
+	if 3 < 1 {
+
+		getMeClient := client.NewGetMeClient(conn)
+		id := &pb.GetMeRequest{
+			Id: "628cffb91e50302d360c1a2c",
+		}
+		getMeClient.GetMeUser(id)
+
+	}
+
+}

cmd/client/main.go

@@ -99,18 +99,35 @@ func main() {
 
 	defer mongoclient.Disconnect(ctx)
 
-	// startGinServer(config)
-	startGrpcServer(config)
+	startGinServer(config)
+	// startGrpcServer(config)
+}
+
+func allowedRoles() map[string][]string {
+	const userServicePath = "/pb.UserService/"
+	return map[string][]string{
+		userServicePath + "GetMe": {"user"},
+	}
 }
 
 func startGrpcServer(config config.Config) {
-	server, err := gapi.NewGrpcServer(config, authService, userService, authCollection)
+	authServer, err := gapi.NewGrpcAuthServer(config, authService, userService, authCollection)
 	if err != nil {
-		log.Fatal("cannot create grpc server: ", err)
+		log.Fatal("cannot create grpc authServer: ", err)
 	}
 
-	grpcServer := grpc.NewServer()
-	pb.RegisterAuthServiceServer(grpcServer, server)
+	userServer, err := gapi.NewGrpcUserServer(config, userService, authCollection)
+	if err != nil {
+		log.Fatal("cannot create grpc userServer: ", err)
+	}
+
+	interceptor := services.NewAuthInterceptor(allowedRoles(), &config, userService)
+	grpcServer := grpc.NewServer(
+		grpc.UnaryInterceptor(interceptor.Unary()),
+	)
+
+	pb.RegisterAuthServiceServer(grpcServer, authServer)
+	pb.RegisterUserServiceServer(grpcServer, userServer)
 	reflection.Register(grpcServer)
 
 	listener, err := net.Listen("tcp", config.GrpcServerAddress)

main.go cmd/server/main.gomain.go renamed to cmd/server/main.go

@@ -63,8 +63,12 @@ func (ac *AuthController) SignUpUser(ctx *gin.Context) {
 
 	verificationCode := utils.Encode(code)
 
+	updateData := &models.UpdateInput{
+		VerificationCode: verificationCode,
+	}
+
 	// Update User in Database
-	ac.userService.UpdateUserById(newUser.ID.Hex(), "verificationCode", verificationCode)
+	ac.userService.UpdateUserById(newUser.ID.Hex(), updateData)
 
 	var firstName = newUser.Name
 

controllers/auth.controller.go

@@ -7,23 +7,23 @@ import (
 	"go.mongodb.org/mongo-driver/mongo"
 )
 
-type Server struct {
+type AuthServer struct {
 	pb.UnimplementedAuthServiceServer
 	config         config.Config
 	authService    services.AuthService
 	userService    services.UserService
 	userCollection *mongo.Collection
 }
 
-func NewGrpcServer(config config.Config, authService services.AuthService,
-	userService services.UserService, userCollection *mongo.Collection) (*Server, error) {
+func NewGrpcAuthServer(config config.Config, authService services.AuthService,
+	userService services.UserService, userCollection *mongo.Collection) (*AuthServer, error) {
 
-	server := &Server{
+	authServer := &AuthServer{
 		config:         config,
 		authService:    authService,
 		userService:    userService,
 		userCollection: userCollection,
 	}
 
-	return server, nil
+	return authServer, nil
 }

gapi/server.go gapi/auth-server.gogapi/server.go renamed to gapi/auth-server.go

@@ -0,0 +1,31 @@
+package gapi
+
+import (
+	"context"
+
+	"github.com/wpcodevo/golang-mongodb/pb"
+	"google.golang.org/grpc/codes"
+	"google.golang.org/grpc/status"
+	"google.golang.org/protobuf/types/known/timestamppb"
+)
+
+func (userServer *UserServer) GetMe(ctx context.Context, req *pb.GetMeRequest) (*pb.UserResponse, error) {
+	id := req.GetId()
+	user, err := userServer.userService.FindUserById(id)
+
+	if err != nil {
+		return nil, status.Errorf(codes.Unimplemented, err.Error())
+	}
+
+	res := &pb.UserResponse{
+		User: &pb.User{
+			Id:        user.ID.Hex(),
+			Name:      user.Name,
+			Email:     user.Email,
+			Role:      user.Role,
+			CreatedAt: timestamppb.New(user.CreatedAt),
+			UpdatedAt: timestamppb.New(user.UpdatedAt),
+		},
+	}
+	return res, nil
+}