Refactor license endpoints

Author: furkansenharputlu

README.md

@@ -38,4 +38,5 @@ In the **example** directory, you can access to a simple usage of the activation
 1. Run `go build -o f-cli ./cli`
 2. Generate `license.json` like [sample_license.json](https://github.com/furkansenharputlu/f-license/blob/master/sample_license.json)
 3. Run `./f-cli generate license.json`
-4. Run `./f-cli -h` to see other commands
+4. Run `./f-cli verify <license-token>`
+5. Run `./f-cli -h` to see other commands

api.go

@@ -77,17 +77,17 @@ func ChangeLicenseActiveness(w http.ResponseWriter, r *http.Request) {
 }
 
 func VerifyLicense(w http.ResponseWriter, r *http.Request) {
-	license := r.FormValue("license")
+	token := r.FormValue("token")
 
 	var l lcs.License
-	err := l.GetByToken(license)
+	err := l.GetByToken(token)
 	if err != nil {
 		logrus.WithError(err).Error("Error while getting license")
 		ReturnError(w, err.Error())
 		return
 	}
 
-	ok, err := l.IsLicenseValid(license)
+	ok, err := l.IsLicenseValid(token)
 	if err != nil {
 		ReturnResponse(w, http.StatusUnauthorized, map[string]interface{}{
 			"valid":   false,

lcs/license.go

@@ -152,13 +152,13 @@ func (l *License) Activate(id string, inactivate bool) error {
 	return nil
 }
 
-func (l *License) IsLicenseValid(license string) (bool, error) {
+func (l *License) IsLicenseValid(tokenString string) (bool, error) {
 
 	if !l.Active {
 		return false, fmt.Errorf("license inactivated")
 	}
 
-	token, err := jwt.Parse(license, func(token *jwt.Token) (interface{}, error) {
+	token, err := jwt.Parse(tokenString, func(token *jwt.Token) (interface{}, error) {
 		// Don't forget to validate the alg is what you expect:
 		if _, ok := token.Method.(*jwt.SigningMethodHMAC); !ok {
 			return nil, fmt.Errorf("unexpected signing method: %v", token.Header["alg"])

main.go

@@ -28,11 +28,11 @@ func main() {
 	// Endpoints called by product owners
 	adminRouter := r.PathPrefix("/admin").Subrouter()
 	adminRouter.Use(AuthenticationMiddleware)
-	adminRouter.HandleFunc("/generate", GenerateLicense).Methods(http.MethodPost)
-	adminRouter.HandleFunc("/{id}", GetLicense).Methods(http.MethodGet)
-	adminRouter.HandleFunc("/delete/{id}", DeleteLicense).Methods(http.MethodDelete)
-	adminRouter.HandleFunc("/activate/{id}", ChangeLicenseActiveness).Methods(http.MethodPut)
-	adminRouter.HandleFunc("/inactivate/{id}", ChangeLicenseActiveness).Methods(http.MethodPut)
+	adminRouter.HandleFunc("/licenses", GenerateLicense).Methods(http.MethodPost)
+	adminRouter.HandleFunc("/licenses/{id}", GetLicense).Methods(http.MethodGet)
+	adminRouter.HandleFunc("/licenses/{id}/activate", ChangeLicenseActiveness).Methods(http.MethodPut)
+	adminRouter.HandleFunc("/licenses/{id}/inactivate", ChangeLicenseActiveness).Methods(http.MethodPut)
+	adminRouter.HandleFunc("/licenses/{id}/delete", DeleteLicense).Methods(http.MethodDelete)
 
 	// Endpoints called by product instances having license
 	r.HandleFunc("/license/verify", VerifyLicense).Methods(http.MethodPost)

sample_license.json

@@ -3,5 +3,6 @@
   "claims": {
     "username": "Furkan",
     "address": "Istanbul, Turkey"
-  }
+  },
+  "active": true
 }