8000 updated · wpcodevo/golang-mongodb-api@49f040d · GitHub
[go: up one dir, main page]
Skip to content

Commit 49f040d

Browse files
wpcodevowpcodevo
committed
updated
1 parent 430b9db commit 49f040d

File tree

5 files changed

+18
-107
lines changed

5 files changed

+18
-107
lines changed

‎cmd/client/main.go

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,30 +23,30 @@ func main() {
2323
defer conn.Close()
2424

2525
// Sign Up
26-
if 1 > 2 {
26+
if false {
2727
signUpUserClient := client.NewSignUpUserClient(conn)
2828
newUser := &pb.SignUpUserInput{
29-
Name: "Micheal Smith",
30-
Email: "michealmith@gmail.com",
29+
Name: "Jane Smith",
30+
Email: "janesmith@gmail.com",
3131
Password: "password123",
3232
PasswordConfirm: "password123",
3333
}
3434
signUpUserClient.SignUpUser(newUser)
3535
}
3636

3737
// Sign In
38-
if 2 > 1 {
38+
if true {
3939
signInUserClient := client.NewSignInUserClient(conn)
4040

4141
credentials := &pb.SignInUserInput{
42-
Email: "michealmith@gmail.com",
42+
Email: "janesmith@gmail.com",
4343
Password: "password123",
4444
}
4545
signInUserClient.SignInUser(credentials)
4646
}
4747

4848
// Get Me
49-
if 3 < 1 {
49+
if false {
5050

5151
getMeClient := client.NewGetMeClient(conn)
5252
id := &pb.GetMeRequest{

‎cmd/server/main.go

Lines changed: 3 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -99,15 +99,8 @@ func main() {
9999

100100
defer mongoclient.Disconnect(ctx)
101101

102-
// startGinServer(config)
103-
startGrpcServer(config)
104-
}
105-
106-
func allowedRoles() map[string][]string {
107-
const userServicePath = "/pb.UserService/"
108-
return map[string][]string{
109-
userServicePath + "GetMe": {"user"},
110-
}
102+
startGinServer(config)
103+
// startGrpcServer(config)
111104
}
112105

113106
func startGrpcServer(config config.Config) {
@@ -121,10 +114,7 @@ func startGrpcServer(config config.Config) {
121114
log.Fatal("cannot create grpc userServer: ", err)
122115
}
123116

124-
interceptor := services.NewAuthInterceptor(allowedRoles(), &config, userService)
125-
grpcServer := grpc.NewServer(
126-
grpc.UnaryInterceptor(interceptor.Unary()),
127-
)
117+
grpcServer := grpc.NewServer()
128118

129119
pb.RegisterAuthServiceServer(grpcServer, authServer)
130120
pb.RegisterUserServiceServer(grpcServer, userServer)

‎models/user.model.go

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -44,16 +44,16 @@ type DBResponse struct {
4444
}
4545

4646
type UpdateInput struct {
47-
Name string `json:"name" bson:"name" binding:"required"`
48-
Email string `json:"email" bson:"email" binding:"required"`
49-
Password string `json:"password" bson:"password" binding:"required,min=8"`
50-
Role string `json:"role" bson:"role"`
47+
Name string `json:"name,omitempty" bson:"name,omitempty"`
48+
Email string `json:"email,omitempty" bson:"email,omitempty"`
49+
Password string `json:"password,omitempty" bson:"password,omitempty"`
50+
Role string `json:"role,omitempty" bson:"role,omitempty"`
5151
VerificationCode string `json:"verificationCode,omitempty" bson:"verificationCode,omitempty"`
5252
ResetPasswordToken string `json:"resetPasswordToken,omitempty" bson:"resetPasswordToken,omitempty"`
5353
ResetPasswordAt time.Time `json:"resetPasswordAt,omitempty" bson:"resetPasswordAt,omitempty"`
54-
Verified bool `json:"verified" bson:"verified"`
55-
CreatedAt time.Time `json:"created_at" bson:"created_at"`
56-
UpdatedAt time.Time `json:"updated_at" bson:"updated_at"`
54+
Verified bool `json:"verified,omitempty" bson:"verified,omitempty"`
55+
CreatedAt time.Time `json:"created_at,omitempty" bson:"created_at,omitempty"`
56+
UpdatedAt time.Time `json:"updated_at,omitempty" bson:"updated_at,omitempty"`
5757
}
5858

5959
// 👈 UserResponse struct

‎services/auth_interceptor.service.go

Lines changed: 0 additions & 81 deletions
This file was deleted.

‎services/user.service.impl.go

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,8 @@ func (uc *UserServiceImpl) UpdateUserById(id string, data *models.UpdateInput) (
7070
return &models.DBResponse{}, err
7171
}
7272

73+
fmt.Println(data)
74+
7375
obId, _ := primitive.ObjectIDFromHex(id)
7476

7577
query := bson.D{{Key: "_id", Value: obId}}

0 commit comments

Comments
 (0)
0