From 1e25527ab2e95804699d85ae8a88f4373740763b Mon Sep 17 00:00:00 2001
From: Anders Pitman <tapitman11@gmail.com>
Date: Sun, 11 Oct 2020 14:27:32 -0600
Subject: [PATCH] Rename sessions to tokens/tokenData

---
 api.go      |  6 +++---
 auth.go     |  4 ++--
 database.go | 24 ++++++++++++------------
 3 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/api.go b/api.go
index 40e50e5..5901512 100644
--- a/api.go
+++ b/api.go
@@ -62,9 +62,9 @@ func (a *Api) handleTunnels(w http.ResponseWriter, r *http.Request) {
 
 		w.Write([]byte(body))
 	case "POST":
-		a.validateSession(http.HandlerFunc(a.handleCreateTunnel)).ServeHTTP(w, r)
+		a.validateToken(http.HandlerFunc(a.handleCreateTunnel)).ServeHTTP(w, r)
 	case "DELETE":
-		a.validateSession(http.HandlerFunc(a.handleDeleteTunnel)).ServeHTTP(w, r)
+		a.validateToken(http.HandlerFunc(a.handleDeleteTunnel)).ServeHTTP(w, r)
 	default:
 		w.WriteHeader(405)
 		w.Write([]byte("Invalid method for /tunnels"))
@@ -117,7 +117,7 @@ func (a *Api) handleDeleteTunnel(w http.ResponseWriter, r *http.Request) {
 	}
 }
 
-func (a *Api) validateSession(h http.Handler) http.Handler {
+func (a *Api) validateToken(h http.Handler) http.Handler {
 
 	return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
 		token, err := extractToken("access_token", r)
diff --git a/auth.go b/auth.go
index 6cd9aa3..84a3c28 100644
--- a/auth.go
+++ b/auth.go
@@ -28,7 +28,7 @@ func NewAuth(db *Database) *Auth {
 }
 
 func (a *Auth) Authorized(token string) bool {
-	_, exists := a.db.GetSession(token)
+	_, exists := a.db.GetTokenData(token)
 
 	if exists {
 		return true
@@ -90,7 +90,7 @@ func (a *Auth) Verify(key string) (string, error) {
 		return "", errors.New("Error generating key")
 	}
 
-	a.db.SetSession(token, Session{Id: request.Email})
+	a.db.SetTokenData(token, TokenData{Id: request.Email})
 
 	return token, nil
 }
diff --git a/database.go b/database.go
index 264ad01..6b2501c 100644
--- a/database.go
+++ b/database.go
@@ -8,12 +8,12 @@ import (
 )
 
 type Database struct {
-	Sessions map[string]Session `json:"sessions"`
-	Tunnels  map[string]Tunnel  `json:"tunnels"`
-	mutex    *sync.Mutex
+	Tokens  map[string]TokenData `json:"tokens"`
+	Tunnels map[string]Tunnel    `json:"tunnels"`
+	mutex   *sync.Mutex
 }
 
-type Session struct {
+type TokenData struct {
 	Id string `json:"id"`
 }
 
@@ -44,8 +44,8 @@ func NewDatabase() (*Database, error) {
 		db = &Database{}
 	}
 
-	if db.Sessions == nil {
-		db.Sessions = make(map[string]Session)
+	if db.Tokens == nil {
+		db.Tokens = make(map[string]TokenData)
 	}
 
 	if db.Tunnels == nil {
@@ -61,24 +61,24 @@ func NewDatabase() (*Database, error) {
 	return db, nil
 }
 
-func (d *Database) GetSession(token string) (Session, bool) {
+func (d *Database) GetTokenData(token string) (TokenData, bool) {
 	d.mutex.Lock()
 	defer d.mutex.Unlock()
 
-	sesh, exists := d.Sessions[token]
+	tokenData, exists := d.Tokens[token]
 
 	if !exists {
-		return Session{}, false
+		return TokenData{}, false
 	}
 
-	return sesh, true
+	return tokenData, true
 }
 
-func (d *Database) SetSession(token string, sesh Session) {
+func (d *Database) SetTokenData(token string, tokenData TokenData) {
 	d.mutex.Lock()
 	defer d.mutex.Unlock()
 
-	d.Sessions[token] = sesh
+	d.Tokens[token] = tokenData
 	d.persist()
 }