UI overhaul, import fixes, fix user store

webcontroller/templates.go

@@ -14,20 +14,15 @@ import (
 	"time"
 
 	"fornaxian.tech/log"
-	"fornaxian.tech/pixeldrain_api_client/pixelapi"
 	"fornaxian.tech/util"
 )
 
 // TemplateData is a struct that every template expects when being rendered. In
 // the field Other you can pass your own template-specific variables.
 type TemplateData struct {
-	tpm           *TemplateManager
-	Authenticated bool
-	User          pixelapi.UserInfo
-	UserAgent     string
-	APIEndpoint   template.URL
-	PixelAPI      pixelapi.PixelAPI
-	Hostname      template.HTML
+	tpm         *TemplateManager
+	APIEndpoint template.URL
+	Hostname    template.HTML
 
 	// Only used on file viewer page
 	Title  string
@@ -37,56 +32,12 @@ type TemplateData struct {
 	URLQuery url.Values
 }
 
-func (wc *WebController) newTemplateData(w http.ResponseWriter, r *http.Request) (t *TemplateData) {
+func (wc *WebController) newTemplateData(r *http.Request) (t *TemplateData) {
 	t = &TemplateData{
-		tpm:           wc.templates,
-		Authenticated: false,
-		UserAgent:     r.UserAgent(),
-		APIEndpoint:   template.URL(wc.config.APIURLExternal),
-
-		// Use the user's IP address for making requests
-		PixelAPI: wc.api.RealIP(util.RemoteAddress(r)).RealAgent(r.UserAgent()),
-
-		Hostname: template.HTML(wc.hostname),
-		URLQuery: r.URL.Query(),
-	}
-
-	// If the user is authenticated we'll indentify him and put the user info
-	// into the templatedata. This is used for putting the username in the menu
-	// and stuff like that
-	if key, err := wc.getAPIKey(r); err == nil {
-		t.PixelAPI = t.PixelAPI.Login(key) // Use the user's API key for all requests
-		if t.User, err = t.PixelAPI.GetUser(); err != nil {
-			// This session key doesn't work, or the backend is down, user
-			// cannot be authenticated
-			log.Debug("Session check for key '%s' failed: %s", key, err)
-
-			if err.Error() == "authentication_required" || err.Error() == "authentication_failed" {
-				// Disable API authentication
-				t.PixelAPI = wc.api.RealIP(util.RemoteAddress(r)).RealAgent(r.UserAgent())
-
-				// Remove the authentication cookie
-				log.Debug("Deleting invalid API key")
-				http.SetCookie(w, &http.Cookie{
-					Name:    "pd_auth_key",
-					Value:   "",
-					Path:    "/",
-					Expires: time.Unix(0, 0),
-					Domain:  wc.config.SessionCookieDomain,
-				})
-				http.SetCookie(w, &http.Cookie{
-					Name:    "pd_auth_key",
-					Value:   "",
-					Path:    "/",
-					Expires: time.Unix(0, 0),
-					Domain:  ".nova.storage",
-				})
-			}
-			return t
-		}
-
-		// Authentication succeeded
-		t.Authenticated = true
+		tpm:         wc.templates,
+		APIEndpoint: template.URL(wc.config.APIURLExternal),
+		Hostname:    template.HTML(wc.hostname),
+		URLQuery:    r.URL.Query(),
 	}
 
 	return t