- Become a sponsor
+ Support Our Mission
-
-
-
+
+
+
+
-
-
+
+
+
- Become a sponsor
- star
+ Learn more
+ diamond
diff --git a/frontend/src/page/upgrade.vue b/frontend/src/page/upgrade.vue
new file mode 100644
index 000000000..3beca0b4c
--- /dev/null
+++ b/frontend/src/page/upgrade.vue
@@ -0,0 +1,134 @@
+
+
+
@@ -77,12 +79,12 @@
+
+
+
+
+ Support Our Mission
+
+
+
+ diamond
+
+
+
+
+
+
+
+
+
+
+
+
+ Compare Features
+
+
+ Sign Up
+ navigate_next
+
+
+ Activate
+ navigate_next
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/go.mod b/go.mod
index a79c77810..991f511d6 100644
--- a/go.mod
+++ b/go.mod
@@ -81,7 +81,7 @@ require (
github.com/Azure/go-autorest/autorest/azure/cli v0.4.6 // indirect
github.com/aws/aws-sdk-go v1.44.115 // indirect
github.com/cloudflare/cloudflare-go v0.52.0 // indirect
- github.com/go-acme/lego/v4 v4.9.0
+ github.com/go-acme/lego/v4 v4.9.1
github.com/golang-jwt/jwt/v4 v4.4.2 // indirect
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
github.com/googleapis/enterprise-certificate-proxy v0.2.0 // indirect
diff --git a/go.sum b/go.sum
index 393aea421..bf311a3a4 100644
--- a/go.sum
+++ b/go.sum
@@ -382,8 +382,8 @@ github.com/gin-gonic/gin v1.7.4/go.mod h1:jD2toBW3GZUr5UMcdrwQA10I7RuaFOl/SGeDjX
github.com/gin-gonic/gin v1.8.1 h1:4+fr/el88TOO3ewCmQr8cx/CtZ/umlIRIs5M4NTNjf8=
github.com/gin-gonic/gin v1.8.1/go.mod h1:ji8BvRH1azfM+SYow9zQ6SZMvR8qOMZHmsCuWR9tTTk=
github.com/gliderlabs/ssh v0.2.2/go.mod h1:U7qILu1NlMHj9FlMhZLlkCdDnU1DBEAqr0aevW3Awn0=
-github.com/go-acme/lego/v4 v4.9.0 h1:8Hjj44IqRS7cigshMyFQ+0pIZvwgkG/+9A0UnNh7G8A=
-github.com/go-acme/lego/v4 v4.9.0/go.mod h1:g3JRUyWS3L/VObpp4bCxzJftKyf/Wba8QrSSnoiqjg4=
+github.com/go-acme/lego/v4 v4.9.1 h1:n9Z5MQwANeGSQKlVE3bEh9SDvAySK9oVYOKCGCESqQE=
+github.com/go-acme/lego/v4 v4.9.1/go.mod h1:g3JRUyWS3L/VObpp4bCxzJftKyf/Wba8QrSSnoiqjg4=
github.com/go-asn1-ber/asn1-ber v1.5.4 h1:vXT6d/FNDiELJnLb6hGNa309LMsrCoYFvpwHDF0+Y1A=
github.com/go-asn1-ber/asn1-ber v1.5.4/go.mod h1:hEBeB/ic+5LoWskz+yKT7vGhhPYkProFKoKdwZRWMe0=
github.com/go-chi/chi/v5 v5.0.0/go.mod h1:BBug9lr0cqtdAhsu6R4AAdvufI0/XBzAQSsUqJpoZOs=
diff --git a/internal/config/client_config.go b/internal/config/client_config.go
index 22d59f098..5b8d8ad5f 100644
--- a/internal/config/client_config.go
+++ b/internal/config/client_config.go
@@ -71,6 +71,7 @@ type ClientConfig struct {
Countries entity.Countries `json:"countries"`
People entity.People `json:"people"`
Thumbs ThumbSizes `json:"thumbs"`
+ Customer string `json:"customer"`
MapKey string `json:"mapKey"`
DownloadToken string `json:"downloadToken,omitempty"`
PreviewToken string `json:"previewToken,omitempty"`
@@ -355,6 +356,7 @@ func (c *Config) ClientShare() ClientConfig {
Colors: colors.All.List(),
Thumbs: Thumbs,
MapKey: c.Hub().MapKey(),
+ Customer: c.Hub().Customer(),
DownloadToken: c.DownloadToken(),
PreviewToken: c.PreviewToken(),
ManifestUri: c.ClientManifestUri(),
@@ -441,6 +443,7 @@ func (c *Config) ClientUser(withSettings bool) ClientConfig {
Colors: colors.All.List(),
Thumbs: Thumbs,
MapKey: c.Hub().MapKey(),
+ Customer: c.Hub().Customer(),
DownloadToken: c.DownloadToken(),
PreviewToken: c.PreviewToken(),
ManifestUri: c.ClientManifestUri(),
diff --git a/internal/config/config.go b/internal/config/config.go
index c21de8541..fd655fb6c 100644
--- a/internal/config/config.go
+++ b/internal/config/config.go
@@ -727,7 +727,7 @@ func (c *Config) UpdateHub() {
// ResyncHub renews backend api credentials for maps & places with an optional token.
func (c *Config) ResyncHub(token string) error {
- if err := c.hub.Resync(token); err != nil {
+ if err := c.hub.ReSync(token); err != nil {
log.Debugf("config: %s (refresh backend api tokens)", err)
if token != "" {
return i18n.Error(i18n.ErrAccountConnect)
diff --git a/internal/hub/config.go b/internal/hub/config.go
index 911a43639..2f14ecf9f 100644
--- a/internal/hub/config.go
+++ b/internal/hub/config.go
@@ -14,6 +14,7 @@ import (
"os"
"path/filepath"
"strings"
+ "sync"
"time"
"gopkg.in/yaml.v2"
@@ -31,16 +32,18 @@ const (
// Config represents backend api credentials for maps & geodata.
type Config struct {
- Version string `json:"version" yaml:"Version"`
- FileName string `json:"-" yaml:"-"`
- Key string `json:"key" yaml:"Key"`
- Secret string `json:"secret" yaml:"Secret"`
- Session string `json:"session" yaml:"Session"`
- Status string `json:"status" yaml:"Status"`
- Serial string `json:"serial" yaml:"Serial"`
- Env string `json:"-" yaml:"-"`
- UserAgent string `json:"-" yaml:"-"`
- PartnerID string `json:"-" yaml:"-"`
+ Version string `json:"version" yaml:"Version"`
+ FileName string `json:"-" yaml:"-"`
+ Key string `json:"key" yaml:"Key"`
+ Secret string `json:"secret" yaml:"Secret"`
+ Session string `json:"session" yaml:"Session"`
+ session *Session `json:"-" yaml:"-"`
+ sessionMu sync.Mutex `json:"-" yaml:"-"`
+ Status string `json:"status" yaml:"Status"`
+ Serial string `json:"serial" yaml:"Serial"`
+ Env string `json:"-" yaml:"-"`
+ UserAgent string `json:"-" yaml:"-"`
+ PartnerID string `json:"-" yaml:"-"`
}
// NewConfig creates a new backend api credentials instance.
@@ -61,13 +64,22 @@ func NewConfig(version, fileName, serial, env, userAgent, partnerId string) *Con
// MapKey returns the maps api key.
func (c *Config) MapKey() string {
- if sess, err := c.DecodeSession(); err != nil {
+ if sess, err := c.DecodeSession(true); err != nil {
return ""
} else {
return sess.MapKey
}
}
+// Customer returns the customer name.
+func (c *Config) Customer() string {
+ if sess, err := c.DecodeSession(true); err != nil {
+ return ""
+ } else {
+ return sess.Customer
+ }
+}
+
// Propagate updates backend api credentials in other packages.
func (c *Config) Propagate() {
places.Key = c.Key
@@ -99,15 +111,28 @@ func (c *Config) Sanitize() {
}
// DecodeSession decodes backend api session data.
-func (c *Config) DecodeSession() (Session, error) {
+func (c *Config) DecodeSession(cached bool) (Session, error) {
+ c.sessionMu.Lock()
+ defer c.sessionMu.Unlock()
+
c.Sanitize()
- result := Session{}
-
+ // No session?
if c.Session == "" {
- return result, fmt.Errorf("empty session")
+ c.session = nil
+ return Session{}, fmt.Errorf("empty session")
}
+ if cached && c.session != nil {
+ // Return cached session.
+ return *c.session, nil
+ } else {
+ // Clear session cache.
+ c.session = nil
+ }
+
+ result := Session{}
+
s, err := hex.DecodeString(c.Session)
if err != nil {
@@ -140,20 +165,27 @@ func (c *Config) DecodeSession() (Session, error) {
return result, err
}
+ // Cache session.
+ c.session = &result
+
return result, nil
}
// Update renews backend api credentials without a token.
func (c *Config) Update() error {
- return c.Resync("")
+ return c.ReSync("")
}
-// Resync renews backend api credentials with an optional token.
-func (c *Config) Resync(token string) (err error) {
+// ReSync renews backend api credentials with an optional token.
+func (c *Config) ReSync(token string) (err error) {
mutex.Lock()
defer mutex.Unlock()
- if err := os.MkdirAll(filepath.Dir(c.FileName), fs.ModeDir); err != nil {
+ // Clear session.
+ c.session = nil
+
+ // Make sure storage folder exists.
+ if err = os.MkdirAll(filepath.Dir(c.FileName), fs.ModeDir); err != nil {
return err
}
@@ -251,7 +283,7 @@ func (c *Config) Load() error {
c.Sanitize()
c.Propagate()
- if sess, err := c.DecodeSession(); err != nil {
+ if sess, err := c.DecodeSession(false); err != nil {
return err
} else if sess.Expired() {
return errors.New("session expired")
diff --git a/internal/hub/hub_test.go b/internal/hub/hub_test.go
index 5f61806d4..84dacb954 100644
--- a/internal/hub/hub_test.go
+++ b/internal/hub/hub_test.go
@@ -82,10 +82,12 @@ func TestConfig_Refresh(t *testing.T) {
assert.Len(t, c.Secret, 32)
assert.Equal(t, "0.0.0", c.Version)
- if sess, err := c.DecodeSession(); err != nil {
+ if sess, err := c.DecodeSession(false); err != nil {
t.Fatal(err)
} else if sess.Expired() {
t.Fatalf("session expired: %+v", sess)
+ } else {
+ t.Logf("(1) session: %#v", sess)
}
if err := c.Save(); err != nil {
@@ -104,18 +106,18 @@ func TestConfig_Refresh(t *testing.T) {
assert.Len(t, c.Secret, 32)
assert.Equal(t, "0.0.0", c.Version)
- if sess, err := c.DecodeSession(); err != nil {
+ if sess, err := c.DecodeSession(false); err != nil {
t.Fatal(err)
} else if sess.Expired() {
t.Fatal("session expired")
} else {
- t.Logf("api session: %+v", sess)
+ t.Logf("(2) session: %#v", sess)
}
if err := c.Save(); err != nil {
t.Fatal(err)
}
-
+ t.Logf("filename: %s", fileName)
assert.FileExists(t, fileName)
})
}
diff --git a/internal/hub/session.go b/internal/hub/session.go
index f0837e98e..079b9f456 100644
--- a/internal/hub/session.go
+++ b/internal/hub/session.go
@@ -5,6 +5,7 @@ import "time"
// Session represents backend api session data.
type Session struct {
MapKey string
+ Customer string `json:",omitempty"`
ExpiresAt string
}
+
+
+
Frequently Asked Questions
+
+
+
+
+
+
+