No need for a separate api permissions page yet

sqlitebrowser · justinclift · May 31, 2021 · Jun 1, 2021 · Jun 2, 2021 · Jun 5, 2021
commit 24f056eeca920fa8dcbb37ccd9e8cde37188d792
diff --git a/webui/main.go b/webui/main.go
@@ -3330,7 +3330,6 @@ func main() {
 	// Our pages
 	http.Handle("/", gz.GzipHandler(logReq(mainHandler)))
 	http.Handle("/about", gz.GzipHandler(logReq(aboutPage)))
-	http.Handle("/apiperms", gz.GzipHandler(logReq(apiPermissionsPage)))
 	http.Handle("/branches/", gz.GzipHandler(logReq(branchesPage)))
 	http.Handle("/commits/", gz.GzipHandler(logReq(commitsPage)))
 	http.Handle("/compare/", gz.GzipHandler(logReq(comparePage)))

diff --git a/webui/pages.go b/webui/pages.go
@@ -4,7 +4,6 @@ import (
 	"fmt"
 	"log"
 	"net/http"
-	"net/url"
 	"strconv"
 	"strings"
 	"time"
@@ -39,72 +38,6 @@ func aboutPage(w http.ResponseWriter, r *http.Request) {
 	}
 }
 
-// Renders the "API Key permissions" page.
-func apiPermissionsPage(w http.ResponseWriter, r *http.Request) {
-	var pageData struct {
-		Auth0   com.Auth0Set
-		Meta    com.MetaInfo
-		KeyInfo com.APIKey
-	}
-
-	// Get all meta information
-	errCode, err := collectPageMetaInfo(r, &pageData.Meta, true, false)
-	if err != nil {
-		errorPage(w, r, errCode, err.Error())
-		return
-	}
-	pageData.Meta.Title = "What is DBHub.io?"
-
-	// Add Auth0 info to the page data
-	pageData.Auth0 = collectPageAuth0Info()
-
-	// Get the API key from the user provided data
-	a := r.PostFormValue("apikey")
-	apiKey, err := url.QueryUnescape(a)
-	if err != nil {
-		errorPage(w, r, http.StatusInternalServerError, err.Error())
-		return
-	}
-
-	// Validate the API key
-	err = com.CheckAPIKey(apiKey)
-	if err != nil {
-		errorPage(w, r, http.StatusBadRequest, err.Error())
-		return
-	}
-
-	// If no API key was provided, display an error instead of the page content
-	if apiKey == "" {
-		errorPage(w, r, http.StatusBadRequest, "No API key provided")
-		return
-	}
-
-	// Verify the API key belongs to the logged in user. eg don't allow looking at other people's API keys
-	keyOwner, err := com.GetAPIKeyUser(apiKey)
-	if err != nil {
-		errorPage(w, r, http.StatusInternalServerError, err.Error())
-		return
-	}
-	if keyOwner != pageData.Meta.LoggedInUser {
-		errorPage(w, r, http.StatusBadRequest, "Unknown API key")
-		return
-	}
-
-	// Retrieve the API key details
-	pageData.KeyInfo, err = com.GetAPIKey(apiKey)
-	if err != nil {
-		errorPage(w, r, http.StatusBadRequest, err.Error())
-		return
-	}
-
-	// Render the page
-	t := tmpl.Lookup("apipermsPage")
-	err = t.Execute(w, pageData)
-	if err != nil {
-		log.Printf("Error: %s", err)
-	}
-}
-
 // Render the branches page, which lists the branches for a database.
 func branchesPage(w http.ResponseWriter, r *http.Request) {
 	// Structure to hold page data

diff --git a/webui/templates/apiperms.html b/webui/templates/apiperms.html