fix: load uid key from manager config
This commit is contained in:
@@ -60,15 +60,15 @@ type adminInternalTenantDTO struct {
|
||||
UpdatedBy int64 `json:"updated_by"`
|
||||
}
|
||||
|
||||
func initAdminInternalAPI(raw json.RawMessage) error {
|
||||
func initAdminInternalAPI(raw json.RawMessage) (*adminInternalClient, error) {
|
||||
store.SetAdminInternalConfigProvider(nil)
|
||||
loginIPWhitelistProvider = nil
|
||||
if len(raw) == 0 || string(raw) == "null" {
|
||||
return nil
|
||||
return nil, nil
|
||||
}
|
||||
var cfg adminInternalAPIConfig
|
||||
if err := json.Unmarshal(raw, &cfg); err != nil {
|
||||
return err
|
||||
return nil, err
|
||||
}
|
||||
cfg.BaseURL = strings.TrimRight(strings.TrimSpace(cfg.BaseURL), "/")
|
||||
cfg.ServiceName = strings.TrimSpace(cfg.ServiceName)
|
||||
@@ -79,10 +79,10 @@ func initAdminInternalAPI(raw json.RawMessage) error {
|
||||
cfg.TimeoutMS = 3000
|
||||
}
|
||||
if !cfg.Enabled {
|
||||
return nil
|
||||
return nil, nil
|
||||
}
|
||||
if cfg.BaseURL == "" || strings.TrimSpace(cfg.Secret) == "" {
|
||||
return errors.New("admin_internal_api enabled but base_url or secret is empty")
|
||||
return nil, errors.New("admin_internal_api enabled but base_url or secret is empty")
|
||||
}
|
||||
client := &adminInternalClient{
|
||||
config: cfg,
|
||||
@@ -91,7 +91,7 @@ func initAdminInternalAPI(raw json.RawMessage) error {
|
||||
store.SetAdminInternalConfigProvider(client)
|
||||
loginIPWhitelistProvider = client
|
||||
logs.Info.Printf("Admin internal config client enabled: base_url=%s service=%s", cfg.BaseURL, cfg.ServiceName)
|
||||
return nil
|
||||
return client, nil
|
||||
}
|
||||
|
||||
func (c *adminInternalClient) GetTenantByCode(code string) (*types.Tenant, error) {
|
||||
|
||||
Reference in New Issue
Block a user