Skip to content

Commit 4af08e2

Browse files
author
Prad N
committed
feat: introduce server package and refactor app initialization
1 parent a95aa47 commit 4af08e2

18 files changed

+217
-97
lines changed

‎app/app.go

+6-25
Original file line numberDiff line numberDiff line change
@@ -3,35 +3,16 @@
33
package app
44

55
import (
6-
"github.com/labstack/echo/v4"
7-
echomiddleware "github.com/labstack/echo/v4/middleware"
8-
"github.com/onsonr/motr/app/context"
6+
"github.com/onsonr/motr/app/handlers"
97
"github.com/onsonr/motr/app/routes"
8+
"github.com/onsonr/motr/pkg/context"
109
"github.com/onsonr/motr/pkg/models"
10+
"github.com/onsonr/motr/pkg/server"
1111
)
1212

13-
type Vault = *echo.Echo
14-
1513
// New returns a new Vault instance
16-
func New(config *context.Config, dbq *models.Queries) (Vault, error) {
17-
e := echo.New()
18-
// Override default behaviors
19-
e.IPExtractor = echo.ExtractIPDirect()
20-
e.HTTPErrorHandler = handleError()
21-
22-
// Built-in middleware
23-
e.Use(echomiddleware.Logger())
24-
e.Use(echomiddleware.Recover())
25-
e.Use(context.WASMMiddleware)
26-
routes.RegisterRoutes(e)
14+
func New(config *context.Config, dbq *models.Queries) (*server.Server, error) {
15+
e := server.New(config, handlers.GlobalErrorHandler())
16+
routes.RegisterRoutes(e.Echo)
2717
return e, nil
2818
}
29-
30-
func handleError() echo.HTTPErrorHandler {
31-
return func(err error, c echo.Context) {
32-
if he, ok := err.(*echo.HTTPError); ok {
33-
// Log the error if needed
34-
c.Logger().Errorf("Error: %v", he.Message)
35-
}
36-
}
37-
}

‎app/blocks/authorize/types.go

+19
Original file line numberDiff line numberDiff line change
@@ -1 +1,20 @@
11
package auth
2+
3+
type PermissionRule struct {
4+
Capability string
5+
Resource string
6+
}
7+
8+
type ServiceInfo struct {
9+
Name string
10+
URL string
11+
Logo string
12+
Permissions []*PermissionRule
13+
}
14+
15+
type UserInfo struct {
16+
Handle string
17+
Logo string
18+
Address string
19+
CID string
20+
}

‎app/blocks/errors/types.go

+8
Original file line numberDiff line numberDiff line change
@@ -1 +1,9 @@
1+
//go:build js && wasm
2+
// +build js,wasm
3+
14
package errors
5+
6+
type Error struct {
7+
Code int
8+
Message string
9+
}

‎app/blocks/login/types.go

+6
Original file line numberDiff line numberDiff line change
@@ -1 +1,7 @@
11
package claim
2+
3+
type LoginOptions struct {
4+
Name string
5+
Address string
6+
CID string
7+
}

‎app/blocks/register/types.go

+6
Original file line numberDiff line numberDiff line change
@@ -1 +1,7 @@
11
package register
2+
3+
type RegisterOptions struct {
4+
Name string
5+
Address string
6+
CID string
7+
}

‎app/blocks/search/types.go

+10
Original file line numberDiff line numberDiff line change
@@ -1 +1,11 @@
11
package search
2+
3+
type SearchResult struct {
4+
Name string
5+
URL string
6+
Type string
7+
}
8+
9+
type SearchInput struct {
10+
Query string
11+
}

‎app/blocks/wallet/types.go

+33
Original file line numberDiff line numberDiff line change
@@ -1 +1,34 @@
11
package wallet
2+
3+
type Account struct {
4+
ID string
5+
Label string
6+
Address string
7+
Networks []string
8+
Assets []string
9+
BIP44 string
10+
}
11+
12+
type Asset struct {
13+
ID string
14+
Name string
15+
Symbol string
16+
Balance string
17+
Logo string
18+
}
19+
20+
type Network struct {
21+
ID string
22+
Name string
23+
ChainID string
24+
BlockHeight string
25+
Logo string
26+
RPC string
27+
API string
28+
}
29+
30+
type Wallet struct {
31+
Accounts []*Account
32+
Networks []*Network
33+
Assets []*Asset
34+
}

‎app/handlers/authorize_handler.go

+3-9
Original file line numberDiff line numberDiff line change
@@ -20,20 +20,14 @@ import "github.com/labstack/echo/v4"
2020
// ║░░░░░░░░░░░░░░░░░░░░░░║
2121
// ╚══════════════════════╝
2222

23-
// ViewAuthorizeInitial renders the login page with default state
24-
func ViewAuthorizeInitial(c echo.Context) error {
23+
// InitialAuthorizeView renders the login page with default state
24+
func InitialAuthorizeView(c echo.Context) error {
2525
// TODO: Implement
2626
return nil
2727
}
2828

2929
// HandleAuthorizeInitial is the api handler which returns CredentialAssertionOptions
30-
func HandleAuthorizeGrant(c echo.Context) error {
31-
// TODO: Implement
32-
return nil
33-
}
34-
35-
// HandleAuthorizeDeny is the api handler which receives the user's CredentialAssertionResponse
36-
func HandleAuthorizeDeny(c echo.Context) error {
30+
func HandleAuthorizationSubmit(c echo.Context) error {
3731
// TODO: Implement
3832
return nil
3933
}

‎app/handlers/error_handler.go

-34
This file was deleted.

‎app/handlers/redirect_handler.go ‎app/handlers/index_handler.go

+26-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,13 @@
1+
//go:build js && wasm
2+
// +build js,wasm
3+
14
package handlers
25

3-
import "github.com/labstack/echo/v4"
6+
import (
7+
"github.com/labstack/echo/v4"
8+
"github.com/onsonr/motr/app/blocks/errors"
9+
"github.com/onsonr/motr/pkg/render"
10+
)
411

512
//
613
// █████████████████████████████████████████████████████████████
@@ -18,6 +25,22 @@ import "github.com/labstack/echo/v4"
1825
// ██╚════════════╝█████████████████╚════════════╝██████████████
1926
// █████████████████████████████████████████████████████████████
2027

28+
// GlobalErrorHandler handles all errors
29+
func GlobalErrorHandler() echo.HTTPErrorHandler {
30+
return func(err error, c echo.Context) {
31+
if he, ok := err.(*echo.HTTPError); ok {
32+
c.Logger().Errorf("Error: %v", he.Message)
33+
}
34+
switch err.(type) {
35+
case *echo.HTTPError:
36+
code := err.(*echo.HTTPError).Code
37+
render.EchoTempl(c, errors.View(code))
38+
default:
39+
render.EchoTempl(c, errors.View(500))
40+
}
41+
}
42+
}
43+
2144
// RedirectServiceCallback handles the authentication state and redirectes to the service's Callback URL
2245
func RedirectServiceCallback(c echo.Context) error {
2346
// TODO: Implement
@@ -30,7 +53,7 @@ func RedirectUserProfile(c echo.Context) error {
3053
return nil
3154
}
3255

33-
// ViewMintedVaultSuccess renders the register page with the user's information
34-
func ViewMintedVaultSuccess(c echo.Context) error {
56+
// ShowMintSuccess renders a Modal with the user's new Vault information
57+
func ShowMintSuccess(c echo.Context) error {
3558
return nil
3659
}

‎app/handlers/info_handler.go

-1
This file was deleted.

‎app/handlers/login_handler.go

+8-8
Original file line numberDiff line numberDiff line change
@@ -20,26 +20,26 @@ import "github.com/labstack/echo/v4"
2020
// ║░░░░░░░░░░░░░░░░░░░░░░║
2121
// ╚══════════════════════╝
2222

23-
// ViewLoginInitial renders the login page with default state
24-
func ViewLoginInitial(c echo.Context) error {
23+
// InitialLoginView renders the login page with default state
24+
func InitialLoginView(c echo.Context) error {
2525
// TODO: Implement
2626
return nil
2727
}
2828

29-
// HandleLoginInitial is the api handler which returns CredentialAssertionOptions
30-
func HandleLoginStart(c echo.Context) error {
29+
// GetLoginOptions returns the allowed Credentials and the CredentialAssertionOptions
30+
func GetLoginOptions(c echo.Context) error {
3131
// TODO: Implement
3232
return nil
3333
}
3434

35-
// ViewLoginUser renders the login page with the user's information
36-
func ViewLoginUser(c echo.Context) error {
35+
// LoginUserView renders the login page with the user's information
36+
func LoginUserView(c echo.Context) error {
3737
// TODO: Implement
3838
return nil
3939
}
4040

41-
// HandleLoginSubmit is the api handler which receives the user's CredentialAssertionResponse
42-
func HandleLoginSubmit(c echo.Context) error {
41+
// HandleAssertionSubmit is the api handler which receives the user's CredentialAssertionResponse
42+
func HandleAssertionSubmit(c echo.Context) error {
4343
// TODO: Implement
4444
return nil
4545
}

‎app/handlers/register_handler.go

+7-7
Original file line numberDiff line numberDiff line change
@@ -20,22 +20,22 @@ import "github.com/labstack/echo/v4"
2020
// ║░░░░░░░░░░░░░░░░░░░░░░║
2121
// ╚══════════════════════╝
2222

23-
// ViewRegisterInitial renders the register page with default state
24-
func ViewRegisterInitial(c echo.Context) error {
23+
// InitialRegistrationView renders the register page with default state
24+
func InitialRegistrationView(c echo.Context) error {
2525
return nil
2626
}
2727

2828
// HandleRegisterInitial is the api handler which returns CredentialAssertionOptions
29-
func HandleRegisterStart(c echo.Context) error {
29+
func GetRegistrationOptions(c echo.Context) error {
3030
return nil
3131
}
3232

33-
// ViewRegisterUser renders the register page with the user's information
34-
func ViewRegisterUser(c echo.Context) error {
33+
// RegisterUserView renders the register page with the user's information
34+
func RegisterUserView(c echo.Context) error {
3535
return nil
3636
}
3737

38-
// HandleRegisterSubmit is the api handler which receives the user's CredentialAssertionResponse
39-
func HandleRegisterSubmit(c echo.Context) error {
38+
// HandleAttestationSubmit is the api handler which receives the user's CredentialAssertionResponse
39+
func HandleAttestationSubmit(c echo.Context) error {
4040
return nil
4141
}

‎app/routes/routes.go

+52-10
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,66 @@
1+
//go:build js && wasm
2+
// +build js,wasm
3+
14
package routes
25

36
import (
47
"github.com/labstack/echo/v4"
58
"github.com/onsonr/motr/app/handlers"
69
)
710

11+
// RegisterRoutes registers all the routes for the application
812
func RegisterRoutes(e *echo.Echo) {
913
// Authorization Routes
10-
e.GET("/authorize", handlers.ViewAuthorizeInitial)
11-
e.POST("/authorize/:service/grant", handlers.HandleAuthorizeGrant)
12-
e.POST("/authorize/:service/deny", handlers.HandleAuthorizeDeny)
14+
e.GET("/authorize", handlers.InitialAuthorizeView)
15+
e.POST("/authorize/:service", handlers.HandleAuthorizationSubmit)
1316

1417
// Login Routes
15-
e.GET("/login", handlers.ViewLoginInitial)
16-
e.GET("/login/:handle", handlers.ViewLoginUser)
17-
e.POST("/login/:handle/submit", handlers.HandleLoginSubmit)
18+
e.GET("/login", handlers.InitialLoginView)
19+
e.GET("/login/:handle", handlers.LoginUserView)
20+
e.POST("/login/:handle/submit", handlers.HandleAssertionSubmit)
1821

1922
// Register Routes
20-
e.GET("/register", handlers.ViewRegisterInitial)
21-
e.GET("/register/:handle", handlers.ViewRegisterUser)
22-
e.POST("/register/:handle/submit", handlers.HandleRegisterSubmit)
23-
e.GET("/register/:handle/success", handlers.ViewMintedVaultSuccess)
23+
e.GET("/register", handlers.InitialRegistrationView)
24+
e.GET("/register/:handle", handlers.RegisterUserView)
25+
e.POST("/register/:handle/submit", handlers.HandleAttestationSubmit)
26+
e.GET("/register/:handle/success", handlers.ShowMintSuccess)
27+
}
28+
29+
// NewAuthorizeGroup creates a new group for the Authorize route
30+
func NewAuthorizeGroup(g *echo.Group) {
31+
g.GET("/", handlers.InitialAuthorizeView)
32+
g.POST("/:service", handlers.HandleAuthorizationSubmit)
33+
}
34+
35+
// NewLoginGroup creates a new group for the Login route
36+
func NewLoginGroup(g *echo.Group) {
37+
g.GET("/", handlers.InitialAuthorizeView)
38+
g.POST("/:service", handlers.HandleAuthorizationSubmit)
39+
}
40+
41+
// NewRegisterGroup creates a new group for the Register route
42+
func NewRegisterGroup(g *echo.Group) {
43+
g.GET("/", handlers.InitialRegistrationView)
44+
g.POST("/:handle", handlers.GetRegistrationOptions)
45+
g.GET("/:handle", handlers.RegisterUserView)
46+
g.POST("/:handle/submit", handlers.HandleAttestationSubmit)
47+
g.GET("/:handle/success", handlers.ShowMintSuccess)
48+
}
49+
50+
// NewSearchGroup creates a new group for the Search route
51+
func NewSearchGroup(g *echo.Group) {
52+
g.GET("/", handlers.InitialRegistrationView)
53+
g.POST("/:handle", handlers.GetRegistrationOptions)
54+
g.GET("/:handle", handlers.RegisterUserView)
55+
g.POST("/:handle/submit", handlers.HandleAttestationSubmit)
56+
g.GET("/:handle/success", handlers.ShowMintSuccess)
57+
}
58+
59+
// NewWalletGroup creates a new group for the Wallet route
60+
func NewWalletGroup(g *echo.Group) {
61+
g.GET("/", handlers.InitialRegistrationView)
62+
g.POST("/:handle", handlers.GetRegistrationOptions)
63+
g.GET("/:handle", handlers.RegisterUserView)
64+
g.POST("/:handle/submit", handlers.HandleAttestationSubmit)
65+
g.GET("/:handle/success", handlers.ShowMintSuccess)
2466
}

‎app/context/settings.go ‎pkg/context/settings.go

File renamed without changes.

‎app/context/wasm.go ‎pkg/context/wasm.go

File renamed without changes.

‎pkg/render/render.go

+3
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
//go:build js && wasm
2+
// +build js,wasm
3+
14
package render
25

36
import (

0 commit comments

Comments
 (0)