Merge pull request #26 from silaselisha/develop

dynamic qrcode gen

Author: silaselisha

README.md

@@ -26,14 +26,15 @@ Go-daraja is an open-source project facilitating seamless integration of Safaric
         cd duka-letu
         go mod init github.com/user-github-name/project-name
     ```
-
+    ```cmd
+       cp example/.env .env
+    ```
 3. Install go-daraja package
 
     ```go
        go get github.com/silaselisha/go-daraja
     ```
 
-
     ``` go
         import (
             "log"
@@ -46,19 +47,15 @@ Go-daraja is an open-source project facilitating seamless integration of Safaric
             if err != nil {
                 log.Panic(err)
             }
-            // generate an access token
-            auth, err := client.ClientAuth()
-            if err != nil {
-                log.Panic(err)
-            }
+   
             // invoke STK/NI Push
-            buff, err := client.NIPush("test STK push", "0708374149", 1, auth.AccessToken)
+            res, err := client.NIPush("test STK push", "0708374149", 1)
             if err != nil {
                 log.Panic(err)
             }
-            log.Print(string(buff))
+            log.Printf("%+v\n", res)
         }
     ```
 
 **Note**:
-Majority of the services provided by daraja API require the client to be authenticated before invoking them. With go-daraja a simplified interface `Daraja` shall provide the user with all necessary services such as `ClientAuth`, primarily used to generate an `access-token`. 
+Majority of the services provided by daraja API require the client to be authenticated before invoking them. With go-daraja a simplified interface `Daraja` shall provide the user with all necessary services. 

example/.env

@@ -11,4 +11,5 @@ DARAJA_ACCOUNT_REF=CompanyXLTD
 DARAJA_INITIATOR_NAME=testapi
 DARAJA_INITIATOR_PASSWORD=BSafaricom999!*!
 DARAJA_BUSINESS_CONSUMR_PARTY_A=600984
+DARAJA_CREDIT_PARTY_IDENTIFIER=373132
 DARAJA_BUSINESS_EXPRESS_CHECKOUT_SHORT_CODE=7318002

example/example.go

@@ -49,20 +49,21 @@ func dukaHandler(w http.ResponseWriter, r *http.Request) {
 			return
 		}
 
-		auth, err := darajaClient.ClientAuth()
+		res, err := darajaClient.NIPush(duka.Description, duka.PhoneNumber, amount)
 		if err != nil {
 			w.WriteHeader(http.StatusInternalServerError)
 			w.Write([]byte(err.Error()))
 			return
 		}
 
-		res, err := darajaClient.NIPush(duka.Description, duka.PhoneNumber, amount, auth.AccessToken)
+		buff, err := json.Marshal(res)
 		if err != nil {
 			w.WriteHeader(http.StatusInternalServerError)
 			w.Write([]byte(err.Error()))
 			return
 		}
-		_, err = w.Write(res)
+
+		_, err = w.Write(buff)
 		if err != nil {
 			w.WriteHeader(http.StatusInternalServerError)
 			w.Write([]byte(err.Error()))

internal/auth/auth.go

@@ -0,0 +1,15 @@
+package auth
+
+import (
+	"encoding/base64"
+	"fmt"
+)
+
+func GenAuthorizationToken(consumerKey, consumerSecret string) string {
+	// combine both consumer key & secret
+	// base64 encode it to come up with a Authorization token
+	key := []byte(fmt.Sprintf("%s:%s", consumerKey, consumerSecret))
+	token := base64.URLEncoding.EncodeToString(key)
+
+	return token
+}

internal/auth/auth_test.go

@@ -0,0 +1,17 @@
+package auth
+
+import (
+	"fmt"
+	"testing"
+
+	"github.com/stretchr/testify/require"
+)
+
+func TestAuthGen(t *testing.T) {
+	consumerKey := "AinW3mPD40202e78JRxqacXGU0YF3laj"
+	consumerSecret := "gMsGecybWqGDpCDL"
+
+	token := GenAuthorizationToken(consumerKey, consumerSecret)
+	require.NotEmpty(t, token)
+	fmt.Print(token)
+}

internal/builder/builder.go

@@ -0,0 +1,41 @@
+package builder
+
+import (
+	"errors"
+	"fmt"
+	"regexp"
+	"time"
+)
+
+func BaseUrlBuilder(environment string) string {
+	// build the base URL based on the code running environment
+	// for non existing environments use the default base URL
+	var baseURL string
+
+	switch environment {
+	case "sandbox":
+		baseURL = "https://sandbox.safaricom.co.ke"
+	case "production":
+		baseURL = "https://sandbox.safaricom.co.ke"
+	default:
+		baseURL = "https://sandbox.safaricom.co.ke"
+	}
+	return baseURL
+}
+
+func PhoneNumberFormatter(phoneNumber string) (string, error) {
+	// format the phoneNumber to 2547XXXXXXXX
+	re := regexp.MustCompile(`^(07|01)\d{8}$`)
+	if !re.MatchString(phoneNumber) {
+		err := errors.New("invalid phone number")
+		return "", err
+	}
+
+	return fmt.Sprintf("%s%s", "254", phoneNumber[1:]), nil
+}
+
+func GenTimestamp() string {
+	// YYYYMMDDHHmmss
+	timestamp := time.Now()
+	return fmt.Sprintf("%d%02d%02d%02d%02d%02d", timestamp.Year(), timestamp.Month(), timestamp.Day(), timestamp.Hour(), timestamp.Minute(), timestamp.Second())
+}

util/util_test.go internal/builder/builder_test.goutil/util_test.go renamed to internal/builder/builder_test.go

@@ -1,67 +1,57 @@
-package util
+package builder
 
 import (
-	"fmt"
 	"testing"
 
 	"github.com/stretchr/testify/require"
 )
 
-func TestAuthGenUtil(t *testing.T) {
-	consumerKey := "AinW3mPD40202e78JRxqacXGU0YF3laj"
-	consumerSecret := "gMsGecybWqGDpCDL"
-
-	token := GenAuthorizationToken(consumerKey, consumerSecret)
-	require.NotEmpty(t, token)
-	fmt.Print(token)
-}
-
-func TestGenTimestamp(t *testing.T) {
-	timestamp := GenTimestamp()
-	require.NotNil(t, timestamp)
-	require.Equal(t, 14, len(timestamp))
-}
-
-func TestGenSecurityCred(t *testing.T) {
-	cred, err := GenSecurityCred(&Configs{DarajaEnvironment: "sandbox"}, "./../pkg")
-	require.NoError(t, err)
-	require.NotNil(t, cred)
-	fmt.Println(cred)
-}
-
-func TestLoadConfigs(t *testing.T) {
+func TestPhoneNumberFormat(t *testing.T) {
 	testCases := []struct {
-		name  string
-		path  string
-		check func(t *testing.T, envs *Configs, err error)
+		name        string
+		phoneNumber string
+		check       func(t *testing.T, phoneNumber string, err error)
 	}{
 		{
-			name: "invalid env path",
-			path: "200",
-			check: func(t *testing.T, envs *Configs, err error) {
-				require.Error(t, err)
-				require.Empty(t, envs)
+			name:        "07 valid phone number",
+			phoneNumber: "0721024268",
+			check: func(t *testing.T, phoneNumber string, err error) {
+				require.NoError(t, err)
+				require.Equal(t, "254721024268", phoneNumber)
 			},
 		},
 		{
-			name: "valid env path",
-			path: "./../example",
-			check: func(t *testing.T, envs *Configs, err error) {
-				fmt.Println(envs)
+			name:        "01 valid phone number",
+			phoneNumber: "0121024268",
+			check: func(t *testing.T, phoneNumber string, err error) {
 				require.NoError(t, err)
-				require.NotEmpty(t, envs)
+				require.Equal(t, "254121024268", phoneNumber)
+			},
+		},
+		{
+			name:        "invalid phone number",
+			phoneNumber: "072102426",
+			check: func(t *testing.T, phoneNumber string, err error) {
+				require.Error(t, err)
+				require.Empty(t, phoneNumber)
 			},
 		},
 	}
 
 	for _, test := range testCases {
 		t.Run(test.name, func(t *testing.T) {
-			envs, err := LoadConfigs(test.path)
-			test.check(t, envs, err)
+			phoneNumber, err := PhoneNumberFormatter(test.phoneNumber)
+			test.check(t, phoneNumber, err)
 		})
 	}
 }
 
+func TestGenTimestamp(t *testing.T) {
+	timestamp := GenTimestamp()
+	require.NotNil(t, timestamp)
+	require.Equal(t, 14, len(timestamp))
+}
+
 func TestBaseURL(t *testing.T) {
 	testCases := []struct {
 		name        string
@@ -101,43 +91,3 @@ func TestBaseURL(t *testing.T) {
 		})
 	}
 }
-
-func TestPhoneNumberFormat(t *testing.T) {
-	testCases := []struct {
-		name        string
-		phoneNumber string
-		check       func(t *testing.T, phoneNumber string, err error)
-	}{
-		{
-			name:        "07 valid phone number",
-			phoneNumber: "0721024268",
-			check: func(t *testing.T, phoneNumber string, err error) {
-				require.NoError(t, err)
-				require.Equal(t, "254721024268", phoneNumber)
-			},
-		},
-		{
-			name:        "01 valid phone number",
-			phoneNumber: "0121024268",
-			check: func(t *testing.T, phoneNumber string, err error) {
-				require.NoError(t, err)
-				require.Equal(t, "254121024268", phoneNumber)
-			},
-		},
-		{
-			name:        "invalid phone number",
-			phoneNumber: "072102426",
-			check: func(t *testing.T, phoneNumber string, err error) {
-				require.Error(t, err)
-				require.Empty(t, phoneNumber)
-			},
-		},
-	}
-
-	for _, test := range testCases {
-		t.Run(test.name, func(t *testing.T) {
-			phoneNumber, err := PhoneNumberFormatter(test.phoneNumber)
-			test.check(t, phoneNumber, err)
-		})
-	}
-}

internal/config/config.go

@@ -0,0 +1,41 @@
+package config
+
+import (
+	"github.com/spf13/viper"
+)
+
+type Configs struct {
+	DarajaEnvironment                      string `mapstructure:"DARAJA_ENVIRONMENT"`
+	DarajaConsumerKey                      string `mapstructure:"DARAJA_CONSUMER_KEY"`
+	DarajaConsumerSecret                   string `mapstructure:"DARAJA_CONSUMER_SECRET"`
+	DarajaBusinessShortCode                string `mapstructure:"DARAJA_BUSINESS_SHORT_CODE"`
+	DarajaPassKey                          string `mapstructure:"DARAJA_PASS_KEY"`
+	DarajaTransactionType                  string `mapstructure:"DARAJA_TRANSACTION_TYPE"`
+	DarajaCallBackURL                      string `mapstructure:"DARAJA_CALL_BACK_URL"`
+	DarajaPartyA                           string `mapstructure:"DARAJA_PARTY_A"`
+	DarajaPartyB                           string `mapstructure:"DARAJA_PARTY_B"`
+	DarajaAccountRef                       string `mapstructure:"DARAJA_ACCOUNT_REF"`
+	DarajaInitiatorName                    string `mapstructure:"DARAJA_INITIATOR_NAME"`
+	DarajaInitiatorPassword                string `mapstructure:"DARAJA_INITIATOR_PASSWORD"`
+	DarajaBusinessConsumerPartyA           string `mapstructure:"DARAJA_BUSINESS_CONSUMR_PARTY_A"`
+	DarajaCPI                              string `mapstructure:"DARAJA_CREDIT_PARTY_IDENTIFIER"`
+	DarajaBusinessExpressCheckoutShortCode string `mapstructure:"DARAJA_BUSINESS_EXPRESS_CHECKOUT_SHORT_CODE"`
+}
+
+func LoadConfigs(path string) (envs *Configs, err error) {
+	viper.SetConfigType("env")
+	viper.AddConfigPath(path)
+	viper.SetConfigName(".env")
+
+	viper.AutomaticEnv()
+	err = viper.ReadInConfig()
+	if err != nil {
+		return
+	}
+
+	err = viper.Unmarshal(&envs)
+	if err != nil {
+		return
+	}
+	return
+}

internal/config/config_test.go

@@ -0,0 +1,41 @@
+package config
+
+import (
+	"fmt"
+	"testing"
+
+	"github.com/stretchr/testify/require"
+)
+
+func TestLoadConfigs(t *testing.T) {
+	testCases := []struct {
+		name  string
+		path  string
+		check func(t *testing.T, envs *Configs, err error)
+	}{
+		{
+			name: "invalid env path",
+			path: "200",
+			check: func(t *testing.T, envs *Configs, err error) {
+				require.Error(t, err)
+				require.Empty(t, envs)
+			},
+		},
+		{
+			name: "valid env path",
+			path: "./../../example",
+			check: func(t *testing.T, envs *Configs, err error) {
+				fmt.Println(envs)
+				require.NoError(t, err)
+				require.NotEmpty(t, envs)
+			},
+		},
+	}
+
+	for _, test := range testCases {
+		t.Run(test.name, func(t *testing.T) {
+			envs, err := LoadConfigs(test.path)
+			test.check(t, envs, err)
+		})
+	}
+}