egommerce/identity-service
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Cleaned up plugins.go

Browse Source
This commit is contained in:
PB
2025-10-21 18:47:01 +02:00
parent a6b70410f5
commit 9ceea35b08
3 changed files with 5 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/internal/app/plugins.go
View File

@@ -16,7 +16,6 @@ type (
) )
func CachePlugin(cArr map[string]string) Plugin { func CachePlugin(cArr map[string]string) Plugin {
// fmt.Println(cArr["cacheAddr"], cArr["cacheUsername"], cArr["cachePassword"])
return Plugin{ return Plugin{
name: "cache", name: "cache",
fn: func() any { // FIXME: return type fn: func() any { // FIXME: return type
@@ -45,24 +44,3 @@ func DatabasePlugin(cArr map[string]string) Plugin {
}, },
} }
} }
// func EventbusPlugin(cArr map[string]string) Plugin {
// return Plugin{
// name: "eventbus",
// fn: func() any { // FIXME: return type
// conn, err := amqp.Dial(cArr["eventBusURL"])
// if err != nil {
// log.Fatalf("Failed to connect to the EventBus: %s. Err: %v\n", cArr["eventBusURL"], err)
// os.Exit(1) // TODO: retry in background...
// }
// chn, err := conn.Channel()
// if err != nil {
// log.Fatalf("Failed to open new EventBus channel. Err: %v\n", err)
// os.Exit(1) // TODO: retry in background...
// }
// return chn
// },
// }
// }

7
src/internal/server/config.go
View File

@@ -16,8 +16,6 @@ const (
defCacheUsername = "default" defCacheUsername = "default"
defCachePassword = "12345678" defCachePassword = "12345678"
defDbURL = "postgres://postgres:12345678@db-postgres:5432/egommerce" defDbURL = "postgres://postgres:12345678@db-postgres:5432/egommerce"
defEventBusURL = "amqp://guest:guest@api-eventbus:5672"
defKVNmspc = "dev.egommerce/service/identity"
defNetAddr = ":443" defNetAddr = ":443"
defMongoDbURL = "mongodb://mongodb:12345678@mongo-db:27017" defMongoDbURL = "mongodb://mongodb:12345678@mongo-db:27017"
defPathPrefix = "/identity" defPathPrefix = "/identity"
@@ -57,8 +55,6 @@ func NewConfig(name string) *Config {
c.CacheUsername = cnf.GetEnv("API_CACHE_USERNAME", defCacheUsername) c.CacheUsername = cnf.GetEnv("API_CACHE_USERNAME", defCacheUsername)
c.CachePassword = cnf.GetEnv("API_CACHE_PASSWORD", defCachePassword) c.CachePassword = cnf.GetEnv("API_CACHE_PASSWORD", defCachePassword)
c.DbURL = cnf.GetEnv("API_DATABASE_URL", defDbURL) c.DbURL = cnf.GetEnv("API_DATABASE_URL", defDbURL)
c.EventBusExchange = defEbEventsExchange
c.EventBusURL = cnf.GetEnv("API_EVENTBUS_URL", defEventBusURL)
c.PathPrefix = cnf.GetEnv("APP_PATH_PREFIX", defPathPrefix) c.PathPrefix = cnf.GetEnv("APP_PATH_PREFIX", defPathPrefix)
return c return c
@@ -71,9 +67,6 @@ func (c *Config) GetAppFullName() string {
func (c *Config) GetIP() string { func (c *Config) GetIP() string {
host, _ := os.Hostname() host, _ := os.Hostname()
ips, _ := net.LookupIP(host) ips, _ := net.LookupIP(host)
// for _, ip := range ips {
// return ip.String()
// }
return ips[0].String() return ips[0].String()
} }

10
src/internal/service/jwt.go
View File

@@ -6,7 +6,7 @@ import (
"strconv" "strconv"
"time" "time"
baseCnf "git.ego.freeddns.org/egommerce/go-api-pkg/config" cnf "git.ego.freeddns.org/egommerce/go-api-pkg/config"
"github.com/golang-jwt/jwt" "github.com/golang-jwt/jwt"
) )
@@ -21,17 +21,17 @@ var (
var jwtSrv *JWT var jwtSrv *JWT
func init() { func init() {
expAccessTokenTime, _ := strconv.Atoi(baseCnf.GetEnv("JWT_ACCESS_TOKEN_EXPIRE_TIME", "5")) expAccessTokenTime, _ := strconv.Atoi(cnf.GetEnv("JWT_ACCESS_TOKEN_EXPIRE_TIME", "5"))
accessTokenExpireTime = time.Duration(int(time.Hour) * expAccessTokenTime) // hours accessTokenExpireTime = time.Duration(int(time.Hour) * expAccessTokenTime) // hours
expRefreshTokenTime, _ := strconv.Atoi(baseCnf.GetEnv("JWT_REFRESH_TOKEN_EXPIRE_TIME", "7")) expRefreshTokenTime, _ := strconv.Atoi(cnf.GetEnv("JWT_REFRESH_TOKEN_EXPIRE_TIME", "7"))
refreshTokenExpireTime = time.Duration(int(time.Hour*24) * expRefreshTokenTime) // days refreshTokenExpireTime = time.Duration(int(time.Hour*24) * expRefreshTokenTime) // days
jwtSrv = NewJWTService( jwtSrv = NewJWTService(
accessTokenExpireTime, accessTokenExpireTime,
[]byte(baseCnf.GetEnv("JWT_ACCESS_TOKEN_SECRET_KEY", "FallbackAccessTokenSecret")), []byte(cnf.GetEnv("JWT_ACCESS_TOKEN_SECRET_KEY", "FallbackAccessTokenSecret")),
refreshTokenExpireTime, refreshTokenExpireTime,
[]byte(baseCnf.GetEnv("JWT_REFRESH_TOKEN_SECRET_KEY", "FallbackRefreshTokenSecret")), []byte(cnf.GetEnv("JWT_REFRESH_TOKEN_SECRET_KEY", "FallbackRefreshTokenSecret")),
) )
} }