From 42f05806907ae551815a70efed54aa45a229288f Mon Sep 17 00:00:00 2001
From: Anders Pitman <tapitman11@gmail.com>
Date: Thu, 30 Dec 2021 14:52:59 -0700
Subject: [PATCH] Move namdrop into separate library

---
 boringproxy.go | 15 ++++++---------
 go.mod         |  3 +++
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/boringproxy.go b/boringproxy.go
index 6b2789c..9d41fec 100644
--- a/boringproxy.go
+++ b/boringproxy.go
@@ -20,6 +20,8 @@ import (
 
 	"github.com/caddyserver/certmagic"
 	"github.com/mdp/qrterminal/v3"
+
+	"github.com/takingnames/namedrop-go"
 )
 
 type Config struct {
@@ -42,11 +44,6 @@ type Server struct {
 	httpListener *PassthroughListener
 }
 
-type NamedropTokenData struct {
-	Owner string `json:"owner"`
-	Scope string `json:"scope"`
-}
-
 func checkPublicAddress(host string, port int) error {
 
 	ln, err := net.Listen("tcp", fmt.Sprintf(":%d", port))
@@ -291,16 +288,16 @@ func Listen() {
 
 			accessToken := tok.AccessToken
 
-			resp, err := http.Get("https://takingnames.io/namedrop/token-data?access_token=" + accessToken)
+			tokenResp, err := http.Get("https://takingnames.io/namedrop/token-data?access_token=" + accessToken)
 			if err != nil {
 				w.WriteHeader(500)
 				io.WriteString(w, err.Error())
 				return
 			}
-			defer resp.Body.Close()
-			bodyJson, err := io.ReadAll(resp.Body)
+			defer tokenResp.Body.Close()
+			bodyJson, err := io.ReadAll(tokenResp.Body)
 
-			var namedropTokenData NamedropTokenData
+			var namedropTokenData namedrop.TokenData
 			err = json.Unmarshal(bodyJson, &namedropTokenData)
 			if err != nil {
 				w.WriteHeader(500)
diff --git a/go.mod b/go.mod
index e5b0317..c2cc6f1 100644
--- a/go.mod
+++ b/go.mod
@@ -2,10 +2,13 @@ module github.com/boringproxy/boringproxy
 
 go 1.17
 
+replace github.com/takingnames/namedrop-go => ../namedrop-go
+
 require (
 	github.com/caddyserver/certmagic v0.12.0
 	github.com/mdp/qrterminal/v3 v3.0.0
 	github.com/skip2/go-qrcode v0.0.0-20200617195104-da1b6568686e
+	github.com/takingnames/namedrop-go v0.0.0-00010101000000-000000000000
 	golang.org/x/crypto v0.0.0-20200728195943-123391ffb6de
 	golang.org/x/oauth2 v0.0.0-20211104180415-d3ed0bb246c8
 )