call admin store with a proper key

Previously it was set to fixed strings, likely a test artefact.

Resolves #1499.
This commit is contained in:
Dmitry Verkhoturov
2022-09-28 16:04:19 -05:00
committed by Umputun
parent 4733ad8eb1
commit 372429a9f5
2 changed files with 3 additions and 3 deletions
+1 -1
View File
@@ -1107,7 +1107,7 @@ func (s *ServerCommand) getAuthenticator(ds *service.DataStore, avas avatar.Stor
SameSiteCookie: s.parseSameSite(s.Auth.SameSite),
SecureCookies: strings.HasPrefix(s.RemarkURL, "https://"),
SecretReader: token.SecretFunc(func(aud string) (string, error) { // get secret per site
return admns.Key("")
return admns.Key(aud)
}),
ClaimsUpd: token.ClaimsUpdFunc(func(c token.Claims) token.Claims { // set attributes, on new token or refresh
if c.User == nil {
+2 -2
View File
@@ -981,9 +981,9 @@ func (s *DataStore) prepVotes(c store.Comment, user store.User) store.Comment {
}
// get secret for given siteID
// Note: secret shared across sites, but some sites can be disabled.
// Note: siteID ignored for the default admin.Static store
func (s *DataStore) getSecret(siteID string) (secret string, err error) {
if secret, err = s.AdminStore.Key("any"); err != nil {
if secret, err = s.AdminStore.Key(siteID); err != nil {
return "", fmt.Errorf("can't get secret for site %s: %w", siteID, err)
}