fixed data type struct and route name changed

Author: ZainulNiaz

services/master/middlewares/jwt.go

@@ -34,8 +34,10 @@ func authenticator(c *gin.Context) (interface{}, error) {
 	return user, nil
 }
 
+// This function doesn't authenticate. Authentication to be done in middleware before invoking this function.
+// This function only gets the user details.
 func authenticatorForGctl(c *gin.Context) (interface{}, error) {
-	auth := &types.Login{}
+	auth := &types.GCTLToken{}
 	if err := c.ShouldBind(auth); err != nil {
 		return nil, errMissingCredentials
 	}

services/master/routes.go

@@ -55,7 +55,7 @@ func NewService() http.Handler {
 		auth.PUT("/revoke", c.RevokeToken)
 	}
 
-	auth.POST("/gctltoken", m.AuthRequired(), m.LoginHandler)
+	auth.POST("/pat", m.AuthRequired(), m.LoginHandler)
 	router.GET("/instances", m.AuthRequired(), c.FetchAllInstancesByUser)
 	router.POST("/gctllogin", m.JWTGctl.MiddlewareFunc(), c.GctlLogin)
 

types/user.go

@@ -99,3 +99,12 @@ func (pw *PasswordUpdate) GetOldPassword() string {
 func (pw *PasswordUpdate) GetNewPassword() string {
 	return pw.NewPassword
 }
+
+type GCTLToken struct {
+	Email string `form:"email" json:"email" bson:"email" binding:"required"`
+	Token string `form:"token" json:"token" bson:"token" binding:"required"`
+}
+
+func (auth *GCTLToken) GetEmail() string {
+	return auth.Email
+}