Compare commits

..

2 Commits

Author SHA1 Message Date
d7232a53ef
use the bearer token 2024-11-13 16:16:32 +03:00
047bf0e12e
updated the env example 2024-11-13 16:15:37 +03:00
3 changed files with 29 additions and 29 deletions

View File

@ -2,6 +2,9 @@
PORT=7123 PORT=7123
HOST=127.0.0.1 HOST=127.0.0.1
#AfricasTalking USSD POST endpoint
AT_ENDPOINT=/ussd/africastalking
#PostgreSQL #PostgreSQL
DB_HOST=localhost DB_HOST=localhost
DB_USER=postgres DB_USER=postgres
@ -12,10 +15,7 @@ DB_SSLMODE=disable
DB_TIMEZONE=Africa/Nairobi DB_TIMEZONE=Africa/Nairobi
#External API Calls #External API Calls
CREATE_ACCOUNT_URL=http://localhost:5003/api/v2/account/create CUSTODIAL_URL_BASE=http://localhost:5003
TRACK_STATUS_URL=https://custodial.sarafu.africa/api/track/ CUSTODIAL_BEARER_TOKEN=eyJeSIsInRcCI6IkpXVCJ.yJwdWJsaWNLZXkiOiIwrrrrrr
BALANCE_URL=https://custodial.sarafu.africa/api/account/status/ DATA_URL_BASE=http://localhost:5006
TRACK_URL=http://localhost:5003/api/v2/account/status DATA_BEARER_TOKEN=eyJeSIsIRcCI6IXVCJ.yJwdWJsaLZXkiOiIwrrrrrr
#AfricasTalking USSD POST endpoint
AT_ENDPOINT=/ussd/africastalking

View File

@ -19,8 +19,8 @@ const (
var ( var (
custodialURLBase string custodialURLBase string
dataURLBase string dataURLBase string
CustodialAPIKey string CustodialBearerToken string
DataAPIKey string DataBearerToken string
) )
var ( var (
@ -38,8 +38,8 @@ func setBase() error {
custodialURLBase = initializers.GetEnv("CUSTODIAL_URL_BASE", "http://localhost:5003") custodialURLBase = initializers.GetEnv("CUSTODIAL_URL_BASE", "http://localhost:5003")
dataURLBase = initializers.GetEnv("DATA_URL_BASE", "http://localhost:5006") dataURLBase = initializers.GetEnv("DATA_URL_BASE", "http://localhost:5006")
CustodialAPIKey = initializers.GetEnv("CUSTODIAL_API_KEY", "xd") CustodialBearerToken = initializers.GetEnv("CUSTODIAL_BEARER_TOKEN", "")
DataAPIKey = initializers.GetEnv("DATA_API_KEY", "xd") DataBearerToken = initializers.GetEnv("DATA_BEARER_TOKEN", "")
_, err = url.JoinPath(custodialURLBase, "/foo") _, err = url.JoinPath(custodialURLBase, "/foo")
if err != nil { if err != nil {

View File

@ -209,13 +209,13 @@ func doRequest(ctx context.Context, req *http.Request, rcpt any) (*api.OKRespons
} }
func doCustodialRequest(ctx context.Context, req *http.Request, rcpt any) (*api.OKResponse, error) { func doCustodialRequest(ctx context.Context, req *http.Request, rcpt any) (*api.OKResponse, error) {
req.Header.Set("X-GE-KEY", config.CustodialAPIKey) req.Header.Set("Authorization", "Bearer "+config.CustodialBearerToken)
logRequestDetails(req) logRequestDetails(req)
return doRequest(ctx, req, rcpt) return doRequest(ctx, req, rcpt)
} }
func doDataRequest(ctx context.Context, req *http.Request, rcpt any) (*api.OKResponse, error) { func doDataRequest(ctx context.Context, req *http.Request, rcpt any) (*api.OKResponse, error) {
req.Header.Set("X-GE-KEY", config.DataAPIKey) req.Header.Set("Authorization", "Bearer "+config.DataBearerToken)
logRequestDetails(req) logRequestDetails(req)
return doRequest(ctx, req, rcpt) return doRequest(ctx, req, rcpt)
} }