From f691914eab2ed2959d9018ab3b9b7d6e5070a95e Mon Sep 17 00:00:00 2001 From: Roland Osborne Date: Thu, 13 Jan 2022 13:14:30 -0800 Subject: [PATCH] updating routes with api additions --- net/server/internal/routers.go | 37 ++++++++++++++++++++++------- net/server/internal/store/schema.go | 1 + net/server/main.go | 2 +- 3 files changed, 31 insertions(+), 9 deletions(-) diff --git a/net/server/internal/routers.go b/net/server/internal/routers.go index 0134d10b..d438e546 100644 --- a/net/server/internal/routers.go +++ b/net/server/internal/routers.go @@ -28,13 +28,13 @@ type Routes []Route func NewRouter() *mux.Router { - // populate context - _configured = getBoolConfigValue(CONFIG_CONFIGURED, false); - _adminUsername = getStrConfigValue(CONFIG_USERNAME, ""); - _adminPassword = getBinConfigValue(CONFIG_PASSWORD, nil); - _nodeDomain = getStrConfigValue(CONFIG_DOMAIN, ""); - _publicLimit = getNumConfigValue(CONFIG_PUBLICLIMIT, 0); - _accountStorage = getNumConfigValue(CONFIG_STORAGE, 0); + // populate context + _configured = getBoolConfigValue(CONFIG_CONFIGURED, false); + _adminUsername = getStrConfigValue(CONFIG_USERNAME, ""); + _adminPassword = getBinConfigValue(CONFIG_PASSWORD, nil); + _nodeDomain = getStrConfigValue(CONFIG_DOMAIN, ""); + _publicLimit = getNumConfigValue(CONFIG_PUBLICLIMIT, 0); + _accountStorage = getNumConfigValue(CONFIG_STORAGE, 0); router := mux.NewRouter().StrictSlash(true) for _, route := range routes { @@ -99,6 +99,13 @@ var routes = Routes{ GetAccountApps, }, + Route{ + "GetAccountAsset", + strings.ToUpper("Get"), + "/account/assets/{assetId}", + GetAccountAsset, + }, + Route{ "GetAccountDid", strings.ToUpper("Get"), @@ -148,6 +155,13 @@ var routes = Routes{ GetPublicClaimable, }, + Route{ + "RemoveAccount", + strings.ToUpper("Delete"), + "/account/profile", + RemoveAccount, + }, + Route{ "RemoveAccountApp", strings.ToUpper("Delete"), @@ -176,6 +190,13 @@ var routes = Routes{ SetAccountExport, }, + Route{ + "SetAccountNode", + strings.ToUpper("Put"), + "/account/node", + SetAccountNode, + }, + Route{ "AddNodeAccount", strings.ToUpper("Post"), @@ -247,7 +268,7 @@ var routes = Routes{ }, Route{ - "Authenticate", + "Authorize", strings.ToUpper("Put"), "/authorize", Authorize, diff --git a/net/server/internal/store/schema.go b/net/server/internal/store/schema.go index 43d9ac97..93d6ab20 100644 --- a/net/server/internal/store/schema.go +++ b/net/server/internal/store/schema.go @@ -12,6 +12,7 @@ func AutoMigrate(db *gorm.DB) { db.AutoMigrate(&Card{}); db.AutoMigrate(&CardGroup{}); db.AutoMigrate(&LabelGroup{}); + db.AutoMigrate(&Asset{}); db.AutoMigrate(&Article{}); db.AutoMigrate(&ArticleAsset{}); db.AutoMigrate(&ArticleTag{}); diff --git a/net/server/main.go b/net/server/main.go index 6faccc6b..9e992f9e 100644 --- a/net/server/main.go +++ b/net/server/main.go @@ -13,7 +13,7 @@ import ( "log" "net/http" app "databag/internal" - store "databag/internal/store" + "databag/internal/store" ) func main() {