Wrapped up and tested access keys

bitcoin-sv · Feb 24, 2022 · cb4fa1f · cb4fa1f
1 parent 7b03135
commit cb4fa1f
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 5 deletions.
diff --git a/actions/accesskeys/get.go b/actions/accesskeys/get.go
@@ -17,18 +17,23 @@ func (a *Action) get(w http.ResponseWriter, req *http.Request, _ httprouter.Para
 
 	// Parse the params
 	params := apirouter.GetParams(req)
-	key := params.GetString("key")
+	id := params.GetString("id")
+
+	if id == "" {
+		apirouter.ReturnResponse(w, req, http.StatusExpectationFailed, bux.ErrMissingFieldID)
+		return
+	}
 
 	// Get an access key
 	accessKey, err := a.Services.Bux.GetAccessKey(
-		req.Context(), reqXPub, key,
+		req.Context(), reqXPub, id,
 	)
 	if err != nil {
 		apirouter.ReturnResponse(w, req, http.StatusExpectationFailed, err.Error())
 		return
 	}
 
-	if accessKey.XpubID == utils.Hash(reqXPub) {
+	if accessKey.XpubID != utils.Hash(reqXPub) {
 		apirouter.ReturnResponse(w, req, http.StatusForbidden, "unauthorized")
 		return
 	}

diff --git a/actions/accesskeys/revoke.go b/actions/accesskeys/revoke.go
@@ -15,13 +15,13 @@ func (a *Action) revoke(w http.ResponseWriter, req *http.Request, _ httprouter.P
 
 	// Parse the params
 	params := apirouter.GetParams(req)
-	key := params.GetString("key")
+	id := params.GetString("id")
 
 	// Create a new accessKey
 	accessKey, err := a.Services.Bux.RevokeAccessKey(
 		req.Context(),
 		reqXPub,
-		key,
+		id,
 	)
 	if err != nil {
 		apirouter.ReturnResponse(w, req, http.StatusUnprocessableEntity, err.Error())

diff --git a/actions/accesskeys/routes.go b/actions/accesskeys/routes.go
@@ -23,6 +23,7 @@ func RegisterRoutes(router *apirouter.Router, appConfig *config.AppConfig, servi
 
 	// V1 Requests
 	router.HTTPRouter.GET("/"+config.CurrentMajorVersion+"/access-key", router.Request(require.Wrap(action.get)))
+	router.HTTPRouter.GET("/"+config.CurrentMajorVersion+"/access-keys", router.Request(require.Wrap(action.list)))
 	router.HTTPRouter.POST("/"+config.CurrentMajorVersion+"/access-keys", router.Request(require.Wrap(action.create)))
 	router.HTTPRouter.DELETE("/"+config.CurrentMajorVersion+"/access-key", router.Request(require.Wrap(action.revoke)))
 }