Improvements to serving UI from the API service.

pkg/controller/controller.go

@@ -136,8 +136,6 @@ func (c *Controller) RegisterRoutes(app *iris.Application) {
 		})
 	}
 
-	app.Get("/health", c.getHealth)
-
 	app.Use(func(ctx iris.Context) {
 		log := c.log.WithFields(logrus.Fields{
 			"requestId": ctx.GetHeader("X-Request-Id"),
@@ -149,6 +147,8 @@ func (c *Controller) RegisterRoutes(app *iris.Application) {
 	})
 
 	app.PartyFunc(APIPath, func(p router.Party) {
+		p.Get("/health", c.getHealth)
+
 		p.Use(c.loggingMiddleware)
 		p.OnAnyErrorCode(func(ctx iris.Context) {
 			if err := ctx.GetErr(); err != nil {

pkg/internal/cmd/controllers_ui.go

@@ -6,14 +6,16 @@ import (
 	"github.com/go-pg/pg/v10"
 	"github.com/gomodule/redigo/redis"
 	"github.com/monetr/rest-api/pkg/application"
+	"github.com/monetr/rest-api/pkg/billing"
 	"github.com/monetr/rest-api/pkg/config"
 	"github.com/monetr/rest-api/pkg/controller"
 	"github.com/monetr/rest-api/pkg/internal/plaid_helper"
+	"github.com/monetr/rest-api/pkg/internal/stripe_helper"
 	"github.com/monetr/rest-api/pkg/jobs"
 	"github.com/monetr/rest-api/pkg/metrics"
+	"github.com/monetr/rest-api/pkg/secrets"
 	"github.com/monetr/rest-api/pkg/ui"
 	"github.com/sirupsen/logrus"
-	stripe_client "github.com/stripe/stripe-go/v72/client"
 )
 
 func getControllers(
@@ -23,7 +25,7 @@ func getControllers(
 	job jobs.JobManager,
 	plaidClient plaid_helper.Client,
 	stats *metrics.Stats,
-	stripeClient *stripe_client.API,
+	stripe stripe_helper.Stripe,
 	cache *redis.Pool,
 	plaidSecrets secrets.PlaidSecretsProvider,
 	basicPaywall billing.BasicPayWall,
@@ -36,7 +38,7 @@ func getControllers(
 			job,
 			plaidClient,
 			stats,
-			stripeClient,
+			stripe,
 			cache,
 			plaidSecrets,
 			basicPaywall,

pkg/ui/ui_server.go

@@ -3,7 +3,6 @@
 package ui
 
 import (
-	"fmt"
 	"github.com/kataras/iris/v12"
 	"github.com/kataras/iris/v12/context"
 	"github.com/kataras/iris/v12/core/router"
@@ -26,24 +25,25 @@ func NewUIController() *UIController {
 
 func (c *UIController) RegisterRoutes(app *iris.Application) {
 	app.PartyFunc("/", func(p router.Party) {
-		p.Any("/api", func(ctx *context.Context) {
+		p.Any("/api/*", func(ctx *context.Context) {
 			ctx.Next()
 			ctx.StatusCode(http.StatusNotFound)
 			return
 		})
 
-		routes := p.HandleDir("/", http.FS(builtUi), iris.DirOptions{
-			IndexName: "index.html",
-		})
-		fmt.Sprint(routes)
-
 		p.Get("/config.json", func(ctx *context.Context) {
 			ctx.JSONP(map[string]interface{}{
 				"apiUrl": "/api",
 			})
 		})
 
-		p.Get("/*", func(ctx *context.Context) {
+		fileHandler := iris.FileServer(http.FS(builtUi), iris.DirOptions{
+			IndexName: "index.html",
+			SPA:       true,
+		})
+
+		app.Get("/*", func(ctx iris.Context) {
+			fileHandler(ctx)
 		})
 	})
 }