From f4c31d6eb68f03a8ccdd1d85918329fe2af3981a Mon Sep 17 00:00:00 2001 From: trkhoi Date: Mon, 20 Nov 2023 13:47:12 +0700 Subject: [PATCH] fix: add auth query profile --- pkg/entities/user.go | 4 ++-- pkg/entities/vault.go | 4 ++-- pkg/entities/wallet.go | 4 ++-- pkg/service/mochiprofile/mochiprofile.go | 4 ++-- pkg/service/mochiprofile/service.go | 2 +- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/pkg/entities/user.go b/pkg/entities/user.go index 90a262bb..b8bad465 100644 --- a/pkg/entities/user.go +++ b/pkg/entities/user.go @@ -234,7 +234,7 @@ func (e *Entity) GetTopUsers(req request.GetTopUsersRequest) (*response.TopUser, item := &leaderboard[i] if item.User == nil { - profile, err := e.svc.MochiProfile.GetByID(item.ProfileID) + profile, err := e.svc.MochiProfile.GetByID(item.ProfileID, e.cfg.MochiBotSecret) if err != nil { return } @@ -544,7 +544,7 @@ func (e *Entity) GetUserBalance(profileId string) (*response.UserBalanceResponse } // get all onchain account - profile, err := e.svc.MochiProfile.GetByID(profileId) + profile, err := e.svc.MochiProfile.GetByID(profileId, e.cfg.MochiBotSecret) if err != nil { e.log.Fields(logger.Fields{"profileId": profileId}).Error(err, "[entity.GetUserBalance] - e.svc.MochiProfile.GetByID failed") return nil, err diff --git a/pkg/entities/vault.go b/pkg/entities/vault.go index 39a8f3b2..4eb0c0fb 100644 --- a/pkg/entities/vault.go +++ b/pkg/entities/vault.go @@ -70,7 +70,7 @@ func (e *Entity) CreateVault(req *request.CreateVaultRequest) (*model.Vault, err } userDiscordID := "" - profile, err := e.svc.MochiProfile.GetByID(req.VaultCreator) + profile, err := e.svc.MochiProfile.GetByID(req.VaultCreator, e.cfg.MochiBotSecret) if err != nil { e.log.Fields(logger.Fields{"req": req}).Errorf(err, "[entity.GetVaults] svc.MochiProfile.GetByID() failed") return nil, err @@ -229,7 +229,7 @@ func (e *Entity) CreateConfigThreshold(req *request.CreateConfigThresholdRequest func (e *Entity) AddTreasurerToVault(req *request.AddTreasurerToVaultRequest) (*model.VaultTreasurer, error) { userDiscordID := "" - profile, err := e.svc.MochiProfile.GetByID(req.UserProfileID) + profile, err := e.svc.MochiProfile.GetByID(req.UserProfileID, "") if err != nil { e.log.Fields(logger.Fields{"req": req}).Errorf(err, "[entity.GetVaults] svc.MochiProfile.GetByID() failed") return nil, err diff --git a/pkg/entities/wallet.go b/pkg/entities/wallet.go index dc52ad37..595ca910 100644 --- a/pkg/entities/wallet.go +++ b/pkg/entities/wallet.go @@ -1059,7 +1059,7 @@ func (e *Entity) SumarizeBinanceAsset(req request.BinanceRequest) (*response.Wal } func (e *Entity) GetBinanceAssets(req request.GetBinanceAssetsRequest) (*response.GetBinanceAsset, error) { - profile, err := e.svc.MochiProfile.GetByID(req.Id) + profile, err := e.svc.MochiProfile.GetByID(req.Id, e.cfg.MochiBotSecret) if err != nil { e.log.Fields(logger.Fields{"req": req}).Error(err, "[entities.GetBinanceAssets] Failed to get profile") return nil, err @@ -1479,7 +1479,7 @@ func (e *Entity) parseSkymavisInternalTxnsData(data *response.WalletTransactionD } func (e *Entity) GetBinanceFuturePosition(req request.GetBinanceFutureRequest) ([]response.BinanceFuturePositionInformation, error) { - profile, err := e.svc.MochiProfile.GetByID(req.Id) + profile, err := e.svc.MochiProfile.GetByID(req.Id, e.cfg.MochiBotSecret) if err != nil { e.log.Fields(logger.Fields{"req": req}).Error(err, "[entities.GetBinanceFuturePosition] Failed to get profile") return nil, err diff --git a/pkg/service/mochiprofile/mochiprofile.go b/pkg/service/mochiprofile/mochiprofile.go index a5c3eaf1..0a872eef 100644 --- a/pkg/service/mochiprofile/mochiprofile.go +++ b/pkg/service/mochiprofile/mochiprofile.go @@ -168,14 +168,14 @@ func (m *MochiProfile) CreateProfileApiKey(profileAccessToken string) (*ProfileA return &res.Data, nil } -func (m *MochiProfile) GetByID(profileID string) (*GetProfileResponse, error) { +func (m *MochiProfile) GetByID(profileID, authorization string) (*GetProfileResponse, error) { url := fmt.Sprintf("%s/api/v1/profiles/%s", m.config.MochiProfileServerHost, profileID) res := GetProfileResponse{} req := util.SendRequestQuery{ URL: url, ParseForm: &res, - Headers: map[string]string{"Content-Type": "application/json"}, + Headers: map[string]string{"Content-Type": "application/json", "Authorization": "Bearer " + authorization}, } statusCode, err := util.SendRequest(req) if err != nil || statusCode != http.StatusOK { diff --git a/pkg/service/mochiprofile/service.go b/pkg/service/mochiprofile/service.go index 09058b67..75854db3 100644 --- a/pkg/service/mochiprofile/service.go +++ b/pkg/service/mochiprofile/service.go @@ -4,7 +4,7 @@ type Service interface { GetByDiscordID(discordID string, noFetchAmount bool) (*GetProfileResponse, error) GetApiKeyByProfileID(profileID string) (*ProfileApiKeyResponse, error) CreateProfileApiKey(profileAccessToken string) (*ProfileApiKeyResponse, error) - GetByID(profileID string) (*GetProfileResponse, error) + GetByID(profileID, authorization string) (*GetProfileResponse, error) GetByIds(profileIds []string) ([]GetProfileResponse, error) GetByDiscordIds(discordIds []string) ([]GetProfileResponse, error) GetAllEvmAccount() ([]*EvmAssociatedAccount, error)