Skip to content

Commit 0cef941

Browse files
committed
fix: missing secret store
1 parent d1a1a9f commit 0cef941

File tree

3 files changed

+13
-5
lines changed

3 files changed

+13
-5
lines changed

api/api_impl/server.go

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@ import (
66
"net"
77
"net/http"
88

9+
"github.com/jiaozifs/jiaozifs/auth/crypt"
10+
911
"github.com/MadAppGang/httplog"
1012
"github.com/rs/cors"
1113

@@ -32,7 +34,7 @@ var log = logging.Logger("rpc")
3234

3335
const APIV1Prefix = "/api/v1"
3436

35-
func SetupAPI(lc fx.Lifecycle, apiConfig *config.APIConfig, sessionStore sessions.Store, repo models.IRepo, controller APIController) error {
37+
func SetupAPI(lc fx.Lifecycle, apiConfig *config.APIConfig, secretStore crypt.SecretStore, sessionStore sessions.Store, repo models.IRepo, controller APIController) error {
3638
swagger, err := api.GetSwagger()
3739
if err != nil {
3840
return err
@@ -64,7 +66,7 @@ func SetupAPI(lc fx.Lifecycle, apiConfig *config.APIConfig, sessionStore session
6466
},
6567
SilenceServersWarning: true,
6668
}),
67-
auth.Middleware(swagger, nil, nil, repo.UserRepo(), sessionStore),
69+
auth.Middleware(swagger, nil, secretStore, repo.UserRepo(), sessionStore),
6870
)
6971

7072
raw, err := api.RawSpec()

auth/session_store.go

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,10 @@ import (
66
"github.com/jiaozifs/jiaozifs/config"
77
)
88

9-
func NewSessionStore(authConfig *config.AuthConfig) sessions.Store {
10-
sstore := crypt.NewSecretStore(authConfig.SecretKey)
11-
return sessions.NewCookieStore(sstore.SharedSecret())
9+
func NewSessionStore(secretStrore crypt.SecretStore) sessions.Store {
10+
return sessions.NewCookieStore(secretStrore.SharedSecret())
11+
}
12+
13+
func NewSectetStore(authConfig *config.AuthConfig) crypt.SecretStore {
14+
return crypt.NewSecretStore(authConfig.SecretKey)
1215
}

cmd/daemon.go

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@ package cmd
33
import (
44
"context"
55

6+
"github.com/jiaozifs/jiaozifs/auth/crypt"
7+
68
"github.com/jiaozifs/jiaozifs/version"
79

810
"github.com/gorilla/sessions"
@@ -65,6 +67,7 @@ var daemonCmd = &cobra.Command{
6567

6668
fx_opt.Override(fx_opt.NextInvoke(), migrations.MigrateDatabase),
6769
//api
70+
fx_opt.Override(new(crypt.SecretStore), auth.NewSectetStore),
6871
fx_opt.Override(new(sessions.Store), auth.NewSessionStore),
6972
fx_opt.Override(fx_opt.NextInvoke(), apiImpl.SetupAPI),
7073
)

0 commit comments

Comments
 (0)