From 140447732636fdc6dcab304439233218b0cdcde2 Mon Sep 17 00:00:00 2001
From: justin-slowik <justin.slowik@thermofisher.com>
Date: Tue, 2 Jun 2020 14:39:30 -0400
Subject: [PATCH] Updates based on dexidp pr

Signed-off-by: justin-slowik <justin.slowik@thermofisher.com>
---
 server/templates.go                | 1 +
 storage/conformance/conformance.go | 4 ++--
 storage/sql/migrate.go             | 2 +-
 storage/storage.go                 | 5 +++--
 4 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/server/templates.go b/server/templates.go
index dd2678ea..6681b851 100644
--- a/server/templates.go
+++ b/server/templates.go
@@ -31,6 +31,7 @@ var requiredTmpls = []string{
 	tmplOOB,
 	tmplError,
 	tmplDevice,
+	tmplDeviceSuccess,
 }
 
 type templates struct {
diff --git a/storage/conformance/conformance.go b/storage/conformance/conformance.go
index 224e1bfa..0b73ce15 100644
--- a/storage/conformance/conformance.go
+++ b/storage/conformance/conformance.go
@@ -1027,9 +1027,9 @@ func testDeviceTokenCRUD(t *testing.T, s storage.Storage) {
 
 	//Validate expected result set
 	if got.Status != "complete" {
-		t.Fatalf("update failed, wanted token status=%#v got %#v", "complete", got.Status)
+		t.Fatalf("update failed, wanted token status=%v got %v", "complete", got.Status)
 	}
 	if got.Token != "token data" {
-		t.Fatalf("update failed, wanted token =%#v got %#v", "token data", got.Token)
+		t.Fatalf("update failed, wanted token =%v got %v", "token data", got.Token)
 	}
 }
diff --git a/storage/sql/migrate.go b/storage/sql/migrate.go
index 43230581..73934b1b 100644
--- a/storage/sql/migrate.go
+++ b/storage/sql/migrate.go
@@ -243,7 +243,7 @@ var migrations = []migration{
 			create table device_token (
 				device_code text not null primary key,
 				status text not null,
-				token text,
+				token bytea,
 				expiry timestamptz not null,
 				last_request timestamptz not null,
                 poll_interval integer not null
diff --git a/storage/storage.go b/storage/storage.go
index 2134678e..d11305e2 100644
--- a/storage/storage.go
+++ b/storage/storage.go
@@ -39,7 +39,7 @@ func NewID() string {
 }
 
 func newSecureID(len int) string {
-	buff := make([]byte, len) // 128 bit random ID.
+	buff := make([]byte, len) // random ID.
 	if _, err := io.ReadFull(rand.Reader, buff); err != nil {
 		panic(err)
 	}
@@ -122,7 +122,8 @@ type Storage interface {
 	UpdateConnector(id string, updater func(c Connector) (Connector, error)) error
 	UpdateDeviceToken(deviceCode string, updater func(t DeviceToken) (DeviceToken, error)) error
 
-	// GarbageCollect deletes all expired AuthCodes,AuthRequests, DeviceRequests, and DeviceTokens.
+	// GarbageCollect deletes all expired AuthCodes,
+	// AuthRequests, DeviceRequests, and DeviceTokens.
 	GarbageCollect(now time.Time) (GCResult, error)
 }