fix: move the check for Authenticator to login handler. (#69)

auth_jwt.go

@@ -130,10 +130,6 @@ func (mw *GinJWTMiddleware) MiddlewareInit() error {
 		return errors.New("realm is required")
 	}
 
-	if mw.Authenticator == nil {
-		return errors.New("authenticator is required")
-	}
-
 	if mw.Key == nil {
 		return errors.New("secret key is required")
 	}
@@ -193,6 +189,11 @@ func (mw *GinJWTMiddleware) LoginHandler(c *gin.Context) {
 		return
 	}
 
+	if mw.Authenticator == nil {
+		mw.unauthorized(c, http.StatusInternalServerError, "Missing define authenticator func")
+		return
+	}
+
 	userID, ok := mw.Authenticator(loginVals.Username, loginVals.Password, c)
 
 	if !ok {

auth_jwt_test.go

@@ -54,21 +54,6 @@ func TestMissingRealm(t *testing.T) {
 	assert.Equal(t, "realm is required", err.Error())
 }
 
-func TestMissingAuthenticator(t *testing.T) {
-
-	authMiddleware := &GinJWTMiddleware{
-		Realm:      "test zone",
-		Key:        key,
-		Timeout:    time.Hour,
-		MaxRefresh: time.Hour * 24,
-	}
-
-	err := authMiddleware.MiddlewareInit()
-
-	assert.Error(t, err)
-	assert.Equal(t, "authenticator is required", err.Error())
-}
-
 func TestMissingKey(t *testing.T) {
 
 	authMiddleware := &GinJWTMiddleware{
@@ -169,6 +154,32 @@ func TestInternalServerError(t *testing.T) {
 		})
 }
 
+func TestMissingAuthenticatorForLoginHandler(t *testing.T) {
+
+	authMiddleware := &GinJWTMiddleware{
+		Realm:      "test zone",
+		Key:        key,
+		Timeout:    time.Hour,
+		MaxRefresh: time.Hour * 24,
+	}
+
+	handler := ginHandler(authMiddleware)
+	r := gofight.New()
+
+	r.POST("/login").
+		SetJSON(gofight.D{
+			"username": "admin",
+			"password": "admin",
+		}).
+		Run(handler, func(r gofight.HTTPResponse, rq gofight.HTTPRequest) {
+			data := []byte(r.Body.String())
+			message, _ := jsonparser.GetString(data, "message")
+
+			assert.Equal(t, "Missing define authenticator func", message)
+			assert.Equal(t, http.StatusInternalServerError, r.Code)
+		})
+}
+
 func TestLoginHandler(t *testing.T) {
 
 	// the middleware to test