.env.example

@@ -2,9 +2,6 @@
 PORT=7123
 HOST=127.0.0.1
 
-#AfricasTalking USSD POST endpoint
-AT_ENDPOINT=/ussd/africastalking
-
 #PostgreSQL
 DB_HOST=localhost
 DB_USER=postgres
@@ -15,7 +12,10 @@ DB_SSLMODE=disable
 DB_TIMEZONE=Africa/Nairobi
 
 #External API Calls
-CUSTODIAL_URL_BASE=http://localhost:5003
-CUSTODIAL_BEARER_TOKEN=eyJeSIsInRcCI6IkpXVCJ.yJwdWJsaWNLZXkiOiIwrrrrrr
-DATA_URL_BASE=http://localhost:5006
-DATA_BEARER_TOKEN=eyJeSIsIRcCI6IXVCJ.yJwdWJsaLZXkiOiIwrrrrrr
+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

config/config.go

@@ -19,8 +19,8 @@ const (
 var (
 	custodialURLBase string
 	dataURLBase string
-	CustodialBearerToken string
-	DataBearerToken      string
+	CustodialAPIKey string
+	DataAPIKey string
 )
 
 var (
@@ -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")
-	CustodialBearerToken = initializers.GetEnv("CUSTODIAL_BEARER_TOKEN", "")
-	DataBearerToken = initializers.GetEnv("DATA_BEARER_TOKEN", "")
+	CustodialAPIKey = initializers.GetEnv("CUSTODIAL_API_KEY", "xd")
+	DataAPIKey = initializers.GetEnv("DATA_API_KEY", "xd")
 
 	_, err = url.JoinPath(custodialURLBase, "/foo")
 	if err != nil {

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("Authorization", "Bearer "+config.CustodialBearerToken)
+	req.Header.Set("X-GE-KEY", config.CustodialAPIKey)
 	logRequestDetails(req)
 	return doRequest(ctx, req, rcpt)
 }
 
 func doDataRequest(ctx context.Context, req *http.Request, rcpt any) (*api.OKResponse, error) {
-	req.Header.Set("Authorization", "Bearer "+config.DataBearerToken)
+	req.Header.Set("X-GE-KEY", config.DataAPIKey)
 	logRequestDetails(req)
 	return doRequest(ctx, req, rcpt)
 }