From 57f09d04d34f8fc52136aee704c14ff0ba882f1f Mon Sep 17 00:00:00 2001 From: John-Lin Date: Wed, 22 Aug 2018 17:53:44 +0800 Subject: [PATCH] remove uuid and jwt --- src/entity/user.go | 2 -- src/server/backend/jwt.go | 4 ++-- src/server/backend/user.go | 4 ++-- src/server/handler_network.go | 4 ++-- src/server/handler_pod.go | 4 ++-- src/server/handler_service.go | 4 ++-- src/server/handler_user.go | 7 +------ src/server/handler_volume.go | 4 ++-- 8 files changed, 13 insertions(+), 20 deletions(-) diff --git a/src/entity/user.go b/src/entity/user.go index 40887c44..028c9ddb 100644 --- a/src/entity/user.go +++ b/src/entity/user.go @@ -26,8 +26,6 @@ type LoginCredential struct { // User is the structure for user info type User struct { ID bson.ObjectId `bson:"_id,omitempty" json:"id" validate:"-"` - UUID string `bson:"uuid" json:"uuid" validate:"required,uuid4"` - JWT string `bson:"jwt" json:"jwt" validate:"-"` LoginCredential LoginCredential `bson:"loginCredential" json:"loginCredential" validate:"required"` DisplayName string `bson:"displayName" json:"displayName" validate:"required"` Role string `bson:"role" json:"role" validate:"required,eq=root|eq=user|eq=guest"` diff --git a/src/server/backend/jwt.go b/src/server/backend/jwt.go index f32ec378..d4fae131 100644 --- a/src/server/backend/jwt.go +++ b/src/server/backend/jwt.go @@ -7,7 +7,7 @@ import ( ) // GenerateToken is for generating token -func GenerateToken(userUUID string, role string) (string, error) { +func GenerateToken(userID string, role string) (string, error) { token := jwt.New(jwt.SigningMethodHS256) token.Claims = jwt.MapClaims{ // issuer of the claim @@ -17,7 +17,7 @@ func GenerateToken(userUUID string, role string) (string, error) { // user role "role": role, // the subject of this token. This is the user associated with the relevant action - "sub": userUUID, + "sub": userID, } return token.SignedString([]byte(SecretKey)) } diff --git a/src/server/backend/user.go b/src/server/backend/user.go index ba5c468f..9ab92ce1 100644 --- a/src/server/backend/user.go +++ b/src/server/backend/user.go @@ -6,11 +6,11 @@ import ( "gopkg.in/mgo.v2/bson" ) -func FindUserByUUID(session *mongo.Session, uuid string) (entity.User, error) { +func FindUserByID(session *mongo.Session, ID bson.ObjectId) (entity.User, error) { var user entity.User if err := session.FindOne( entity.UserCollectionName, - bson.M{"uuid": uuid}, + bson.M{"_id": ID}, &user, ); err != nil { return entity.User{}, err diff --git a/src/server/handler_network.go b/src/server/handler_network.go index 5dae4638..67646ef1 100644 --- a/src/server/handler_network.go +++ b/src/server/handler_network.go @@ -21,7 +21,7 @@ import ( func createNetworkHandler(ctx *web.Context) { sp, req, resp := ctx.ServiceProvider, ctx.Request, ctx.Response - uuid, ok := req.Attribute("UserID").(string) + mgoID, ok := req.Attribute("UserID").(string) if !ok { response.Unauthorized(req.Request, resp.ResponseWriter, fmt.Errorf("Unauthorized: User ID is empty")) return @@ -63,7 +63,7 @@ func createNetworkHandler(ctx *web.Context) { network.ID = bson.NewObjectId() network.CreatedAt = timeutils.Now() // create by who - user, err := backend.FindUserByUUID(session, uuid) + user, err := backend.FindUserByID(session, bson.ObjectId(mgoID)) if err != nil { switch err { case mgo.ErrNotFound: diff --git a/src/server/handler_pod.go b/src/server/handler_pod.go index 325df65b..cf71a5b8 100644 --- a/src/server/handler_pod.go +++ b/src/server/handler_pod.go @@ -21,7 +21,7 @@ import ( func createPodHandler(ctx *web.Context) { sp, req, resp := ctx.ServiceProvider, ctx.Request, ctx.Response - uuid, ok := req.Attribute("UserID").(string) + mgoID, ok := req.Attribute("UserID").(string) if !ok { response.Unauthorized(req.Request, resp.ResponseWriter, fmt.Errorf("Unauthorized: User ID is empty")) return @@ -62,7 +62,7 @@ func createPodHandler(ctx *web.Context) { return } // create by who - user, err := backend.FindUserByUUID(session, uuid) + user, err := backend.FindUserByID(session, bson.ObjectId(mgoID)) if err != nil { switch err { case mgo.ErrNotFound: diff --git a/src/server/handler_service.go b/src/server/handler_service.go index 2272a487..bf586a72 100644 --- a/src/server/handler_service.go +++ b/src/server/handler_service.go @@ -21,7 +21,7 @@ import ( func createServiceHandler(ctx *web.Context) { sp, req, resp := ctx.ServiceProvider, ctx.Request, ctx.Response - uuid, ok := req.Attribute("UserID").(string) + mgoID, ok := req.Attribute("UserID").(string) if !ok { response.Unauthorized(req.Request, resp.ResponseWriter, fmt.Errorf("Unauthorized: User ID is empty")) return @@ -58,7 +58,7 @@ func createServiceHandler(ctx *web.Context) { return } // create by who - user, err := backend.FindUserByUUID(session, uuid) + user, err := backend.FindUserByID(session, bson.ObjectId(mgoID)) if err != nil { switch err { case mgo.ErrNotFound: diff --git a/src/server/handler_user.go b/src/server/handler_user.go index 37f09e9e..39901fe9 100644 --- a/src/server/handler_user.go +++ b/src/server/handler_user.go @@ -14,7 +14,6 @@ import ( "github.com/linkernetworks/vortex/src/server/backend" "github.com/linkernetworks/vortex/src/web" - "github.com/satori/go.uuid" mgo "gopkg.in/mgo.v2" "gopkg.in/mgo.v2/bson" ) @@ -28,8 +27,6 @@ func signUpUserHandler(ctx *web.Context) { return } - user.UUID = uuid.Must(uuid.NewV4()).String() - encryptedPassword, err := backend.HashPassword(user.LoginCredential.Password) if err != nil { response.BadRequest(req.Request, resp.ResponseWriter, err) @@ -105,7 +102,7 @@ func signInUserHandler(ctx *web.Context) { } // Passed - tokenString, err := backend.GenerateToken(authenticatedUser.UUID, authenticatedUser.Role) + tokenString, err := backend.GenerateToken(authenticatedUser.ID.Hex(), authenticatedUser.Role) if err != nil { response.InternalServerError(req.Request, resp.ResponseWriter, err) return @@ -126,8 +123,6 @@ func createUserHandler(ctx *web.Context) { return } - user.UUID = uuid.Must(uuid.NewV4()).String() - encryptedPassword, err := backend.HashPassword(user.LoginCredential.Password) if err != nil { response.BadRequest(req.Request, resp.ResponseWriter, err) diff --git a/src/server/handler_volume.go b/src/server/handler_volume.go index b9360e99..87a105d5 100644 --- a/src/server/handler_volume.go +++ b/src/server/handler_volume.go @@ -21,7 +21,7 @@ import ( func createVolume(ctx *web.Context) { sp, req, resp := ctx.ServiceProvider, ctx.Request, ctx.Response - uuid, ok := req.Attribute("UserID").(string) + mgoID, ok := req.Attribute("UserID").(string) if !ok { response.Unauthorized(req.Request, resp.ResponseWriter, fmt.Errorf("Unauthorized: User ID is empty")) return @@ -57,7 +57,7 @@ func createVolume(ctx *web.Context) { } } // create by who - user, err := backend.FindUserByUUID(session, uuid) + user, err := backend.FindUserByID(session, bson.ObjectId(mgoID)) if err != nil { switch err { case mgo.ErrNotFound: