From ae560556400142860bfd4942f0824625296e3e7d Mon Sep 17 00:00:00 2001
From: Prad Nukala <prad@sonr.io>
Date: Wed, 2 Oct 2024 02:13:25 -0400
Subject: [PATCH] refactor: move Motr API to state package

---
 .../manifest.go => hway/server/handlers/search.go} |  0
 .../wellknown.go => hway/server/handlers/sync.go}  |  0
 cmd/hway/server/handlers/txns.go                   |  1 +
 cmd/hway/server/handlers/wss.go                    |  1 +
 cmd/motr/motr.go                                   | 14 +++++++-------
 cmd/motr/{handlers => state}/auth.go               |  2 +-
 cmd/motr/state/manifest.go                         |  1 +
 cmd/motr/{handlers => state}/openid.go             |  2 +-
 cmd/motr/state/wellknown.go                        |  1 +
 deploy/release/hway.Dockerfile                     |  3 +++
 deploy/release/motr.Dockerfile                     |  3 ---
 11 files changed, 16 insertions(+), 12 deletions(-)
 rename cmd/{motr/handlers/manifest.go => hway/server/handlers/search.go} (100%)
 rename cmd/{motr/handlers/wellknown.go => hway/server/handlers/sync.go} (100%)
 create mode 100644 cmd/hway/server/handlers/txns.go
 create mode 100644 cmd/hway/server/handlers/wss.go
 rename cmd/motr/{handlers => state}/auth.go (98%)
 create mode 100644 cmd/motr/state/manifest.go
 rename cmd/motr/{handlers => state}/openid.go (96%)
 create mode 100644 cmd/motr/state/wellknown.go
 create mode 100644 deploy/release/hway.Dockerfile
 delete mode 100644 deploy/release/motr.Dockerfile

diff --git a/cmd/motr/handlers/manifest.go b/cmd/hway/server/handlers/search.go
similarity index 100%
rename from cmd/motr/handlers/manifest.go
rename to cmd/hway/server/handlers/search.go
diff --git a/cmd/motr/handlers/wellknown.go b/cmd/hway/server/handlers/sync.go
similarity index 100%
rename from cmd/motr/handlers/wellknown.go
rename to cmd/hway/server/handlers/sync.go
diff --git a/cmd/hway/server/handlers/txns.go b/cmd/hway/server/handlers/txns.go
new file mode 100644
index 000000000..5ac8282f4
--- /dev/null
+++ b/cmd/hway/server/handlers/txns.go
@@ -0,0 +1 @@
+package handlers
diff --git a/cmd/hway/server/handlers/wss.go b/cmd/hway/server/handlers/wss.go
new file mode 100644
index 000000000..5ac8282f4
--- /dev/null
+++ b/cmd/hway/server/handlers/wss.go
@@ -0,0 +1 @@
+package handlers
diff --git a/cmd/motr/motr.go b/cmd/motr/motr.go
index d4f8169c4..42bfbc180 100644
--- a/cmd/motr/motr.go
+++ b/cmd/motr/motr.go
@@ -15,7 +15,7 @@ import (
 	"github.com/labstack/echo/v4"
 	promise "github.com/nlepage/go-js-promise"
 
-	"github.com/onsonr/sonr/cmd/motr/handlers"
+	"github.com/onsonr/sonr/cmd/motr/state"
 	"github.com/onsonr/sonr/internal/session"
 	"github.com/onsonr/sonr/pkg/nebula/pages"
 )
@@ -30,13 +30,13 @@ func main() {
 
 func registerState(e *echo.Echo) {
 	g := e.Group("state")
-	g.POST("/login/:identifier", handlers.HandleCredentialAssertion)
+	g.POST("/login/:identifier", state.HandleCredentialAssertion)
 	//	g.GET("/discovery", state.GetDiscovery)
-	g.GET("/jwks", handlers.GetJWKS)
-	g.GET("/token", handlers.GetToken)
-	g.POST("/:origin/grant/:subject", handlers.GrantAuthorization)
-	g.POST("/register/:subject", handlers.HandleCredentialCreation)
-	g.POST("/register/:subject/check", handlers.CheckSubjectIsValid)
+	g.GET("/jwks", state.GetJWKS)
+	g.GET("/token", state.GetToken)
+	g.POST("/:origin/grant/:subject", state.GrantAuthorization)
+	g.POST("/register/:subject", state.HandleCredentialCreation)
+	g.POST("/register/:subject/check", state.CheckSubjectIsValid)
 }
 
 func registerViews(e *echo.Echo) {
diff --git a/cmd/motr/handlers/auth.go b/cmd/motr/state/auth.go
similarity index 98%
rename from cmd/motr/handlers/auth.go
rename to cmd/motr/state/auth.go
index 0037f8245..8765d4c5a 100644
--- a/cmd/motr/handlers/auth.go
+++ b/cmd/motr/state/auth.go
@@ -1,4 +1,4 @@
-package handlers
+package state
 
 import (
 	"encoding/json"
diff --git a/cmd/motr/state/manifest.go b/cmd/motr/state/manifest.go
new file mode 100644
index 000000000..7bf2df5b4
--- /dev/null
+++ b/cmd/motr/state/manifest.go
@@ -0,0 +1 @@
+package state
diff --git a/cmd/motr/handlers/openid.go b/cmd/motr/state/openid.go
similarity index 96%
rename from cmd/motr/handlers/openid.go
rename to cmd/motr/state/openid.go
index 0f7c8417e..1797220f6 100644
--- a/cmd/motr/handlers/openid.go
+++ b/cmd/motr/state/openid.go
@@ -1,4 +1,4 @@
-package handlers
+package state
 
 import (
 	"github.com/labstack/echo/v4"
diff --git a/cmd/motr/state/wellknown.go b/cmd/motr/state/wellknown.go
new file mode 100644
index 000000000..7bf2df5b4
--- /dev/null
+++ b/cmd/motr/state/wellknown.go
@@ -0,0 +1 @@
+package state
diff --git a/deploy/release/hway.Dockerfile b/deploy/release/hway.Dockerfile
new file mode 100644
index 000000000..d23a0120d
--- /dev/null
+++ b/deploy/release/hway.Dockerfile
@@ -0,0 +1,3 @@
+FROM scratch
+ENTRYPOINT ["/hway"]
+COPY hway /
diff --git a/deploy/release/motr.Dockerfile b/deploy/release/motr.Dockerfile
deleted file mode 100644
index bfa719f95..000000000
--- a/deploy/release/motr.Dockerfile
+++ /dev/null
@@ -1,3 +0,0 @@
-FROM scratch
-ENTRYPOINT ["/motr"]
-COPY motr /