use the bearer token

.env.example

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

config/config.go

@@ -7,30 +7,30 @@ import (
 )
 
 const (
-	createAccountPath = "/api/v2/account/create"
-	trackStatusPath = "/api/track"
-	balancePathPrefix = "/api/account"
-	trackPath = "/api/v2/account/status"
-	voucherHoldingsPathPrefix = "/api/v1/holdings"
+	createAccountPath          = "/api/v2/account/create"
+	trackStatusPath            = "/api/track"
+	balancePathPrefix          = "/api/account"
+	trackPath                  = "/api/v2/account/status"
+	voucherHoldingsPathPrefix  = "/api/v1/holdings"
 	voucherTransfersPathPrefix = "/api/v1/transfers/last10"
-	voucherDataPathPrefix = "/api/v1/token"
+	voucherDataPathPrefix      = "/api/v1/token"
 )
 
 var (
-	custodialURLBase string
-	dataURLBase string
-	CustodialAPIKey string
-	DataAPIKey string
+	custodialURLBase     string
+	dataURLBase          string
+	CustodialBearerToken string
+	DataBearerToken      string
 )
 
 var (
-	CreateAccountURL string
-	TrackStatusURL   string
-	BalanceURL	string
-	TrackURL         string
-	VoucherHoldingsURL	string
-	VoucherTransfersURL	string
-	VoucherDataURL	string
+	CreateAccountURL    string
+	TrackStatusURL      string
+	BalanceURL          string
+	TrackURL            string
+	VoucherHoldingsURL  string
+	VoucherTransfersURL string
+	VoucherDataURL      string
 )
 
 func setBase() error {
@@ -38,8 +38,8 @@ func setBase() error {
 
 	custodialURLBase = initializers.GetEnv("CUSTODIAL_URL_BASE", "http://localhost:5003")
 	dataURLBase = initializers.GetEnv("DATA_URL_BASE", "http://localhost:5006")
-	CustodialAPIKey = initializers.GetEnv("CUSTODIAL_API_KEY", "xd")
-	DataAPIKey = initializers.GetEnv("DATA_API_KEY", "xd")
+	CustodialBearerToken = initializers.GetEnv("CUSTODIAL_BEARER_TOKEN", "")
+	DataBearerToken = initializers.GetEnv("DATA_BEARER_TOKEN", "")
 
 	_, err = url.JoinPath(custodialURLBase, "/foo")
 	if err != nil {
@@ -58,7 +58,7 @@ func LoadConfig() error {
 	if err != nil {
 		return err
 	}
-	CreateAccountURL, _  = url.JoinPath(custodialURLBase, createAccountPath)
+	CreateAccountURL, _ = url.JoinPath(custodialURLBase, createAccountPath)
 	TrackStatusURL, _ = url.JoinPath(custodialURLBase, trackStatusPath)
 	BalanceURL, _ = url.JoinPath(custodialURLBase, balancePathPrefix)
 	TrackURL, _ = url.JoinPath(custodialURLBase, trackPath)

remote/accountservice.go

@@ -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) {
-	req.Header.Set("X-GE-KEY", config.CustodialAPIKey)
+	req.Header.Set("Authorization", "Bearer "+config.CustodialBearerToken)
 	logRequestDetails(req)
 	return doRequest(ctx, req, rcpt)
 }
 
 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)
 	return doRequest(ctx, req, rcpt)
 }