Merge pull request #4 from cikupin/feature/add-user

Feature/add-user-data

Author: cikupin

README.md

@@ -7,7 +7,10 @@ _**Note** : This a modified version version of [EddyTravels/smooch](https://gith
 ## Additional Feature
 
 - Token expiration & its checking.
+- Pre-create app user and link app user to specified channel functionality.
+- Send message in whatsapp HSM format.
 - Renew token functionality whenever token is expired.
+- Support smooch basic auth and JWT auth.
 - Redis support as a centralized storage to store JWT token for supporting autoscaling environment. Use redigo as redis library.
 
 ## Tips
@@ -22,6 +25,32 @@ $ go get -u github.com/kitabisa/smooch
 
 ## Example
 
+Using basic authentication :
+
+
+```
+import (
+	"os"
+
+	"github.com/kitabisa/smooch"
+)
+
+func main() {
+    smoochClient, err := smooch.New(smooch.Options{
+        Auth:         smooch.AuthBasic,
+        AppID:        os.Getenv("SMOOCH_APP_ID"),
+        KeyID:        os.Getenv("SMOOCH_KEY_ID"),
+        Secret:       os.Getenv("SMOOCH_SECRET"),
+    })
+
+    if err != nil {
+        panic(err)
+    }
+}
+```
+
+Using JWT authentication :
+
 ```
 import (
 	"os"
@@ -31,6 +60,7 @@ import (
 
 func main() {
     smoochClient, err := smooch.New(smooch.Options{
+        Auth:         smooch.AuthJWT,
         AppID:        os.Getenv("SMOOCH_APP_ID"),
         KeyID:        os.Getenv("SMOOCH_KEY_ID"),
         Secret:       os.Getenv("SMOOCH_SECRET"),

error.go

@@ -6,6 +6,12 @@ import (
 	"net/http"
 )
 
+// ResponseData defines data for every response
+type ResponseData struct {
+	HTTPCode int
+	Flag     string
+}
+
 type SmoochError struct {
 	message string
 	code    int
@@ -19,11 +25,11 @@ func (e *SmoochError) Error() string {
 	return e.message
 }
 
-func checkSmoochError(r *http.Response) error {
+func checkSmoochError(r *http.Response) (*ResponseData, error) {
 	var errorPayload ErrorPayload
 	decodeErr := json.NewDecoder(r.Body).Decode(&errorPayload)
 	if decodeErr != nil {
-		return decodeErr
+		return nil, decodeErr
 	}
 
 	err := &SmoochError{
@@ -35,5 +41,9 @@ func checkSmoochError(r *http.Response) error {
 		code: r.StatusCode,
 	}
 
-	return err
+	respData := &ResponseData{
+		HTTPCode: r.StatusCode,
+		Flag:     errorPayload.Details.Code,
+	}
+	return respData, err
 }

error_test.go

@@ -27,7 +27,7 @@ func TestCheckSmoochError(t *testing.T) {
 		Body:       r,
 	}
 
-	err := checkSmoochError(response)
+	_, err := checkSmoochError(response)
 	assert.Error(t, err)
 	assert.EqualError(t, err, "StatusCode: 401 Code: unauthorized Message: Authorization is required")
 }