From 03c97b801ce55287eb25f21b48130a857a5f4a4a Mon Sep 17 00:00:00 2001
From: Ryan Mehri <ryan.mehri1@gmail.com>
Date: Tue, 12 May 2020 23:12:18 -0600
Subject: Remove duplication

---
 backend/cache/cache.go | 41 +++++++++++++----------------------------
 1 file changed, 13 insertions(+), 28 deletions(-)

diff --git a/backend/cache/cache.go b/backend/cache/cache.go
index 1bbec78..71007e5 100644
--- a/backend/cache/cache.go
+++ b/backend/cache/cache.go
@@ -28,45 +28,30 @@ func (c *Cache) Get(hash, userPassword string) (db.Paste, error) {
 	c.lock.RLock()
 
 	// check if hash in cache
-	v, ok := c.m[hash]
+	p, ok := c.m[hash]
 	c.lock.RUnlock()
 
-	if ok {
-		// validate password
-		passErr := checkPassword(v.Password, userPassword)
-		if passErr != nil {
-			return db.Paste{}, passErr
-		} else {
-			return v, nil
-		}
-	}
-
 	// if it doesnt, lookup from db
-	p, err := db.Lookup(hash)
-	if err != nil {
-		return p, PasteNotFound
-	}
+	if !ok {
+		var err error
 
-	// validate password
-	passErr := checkPassword(p.Password, userPassword)
-	if passErr != nil {
-		return db.Paste{}, passErr
-	}
+		p, err = db.Lookup(hash)
+		if err != nil {
+			return db.Paste{}, PasteNotFound
+		}
 
-	c.add(p)
-	return p, err
-}
+		c.add(p)
+	}
 
-func checkPassword(dbPassword, parsedPassword string) error {
 	// if there is a password, check the provided one against it
-	if dbPassword != "" {
+	if p.Password != "" {
 		// if passwords do not match, the user is unauthorized
-		if !hashing.PasswordsEqual(dbPassword, parsedPassword) {
-			return UserUnauthorized
+		if !hashing.PasswordsEqual(p.Password, userPassword) {
+			return db.Paste{}, UserUnauthorized
 		}
 	}
 
-	return nil
+	return p, nil
 }
 
 func (c *Cache) add(p db.Paste) {
-- 
cgit v1.2.3