From 7756a50d64afd25d49bcbe22a9c47eeaadf9afbc Mon Sep 17 00:00:00 2001
From: Harvey Kandola <harvey@documize.com>
Date: Mon, 31 Jul 2017 13:40:01 +0100
Subject: [PATCH] removed rogue pkg reference!

---
 core/api/endpoint/keycloak.go      |  3 +--
 core/api/endpoint/user_endpoint.go | 17 +++++++++++++++--
 2 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/core/api/endpoint/keycloak.go b/core/api/endpoint/keycloak.go
index 445e5e3b..7f8f41a1 100644
--- a/core/api/endpoint/keycloak.go
+++ b/core/api/endpoint/keycloak.go
@@ -20,7 +20,6 @@ import (
 	"io/ioutil"
 	"net/http"
 	"net/url"
-	"obiwan/utility"
 	"sort"
 	"strconv"
 	"strings"
@@ -82,7 +81,7 @@ func AuthenticateKeycloak(w http.ResponseWriter, r *http.Request) {
 	}
 
 	// Decode and prepare RSA Public Key used by keycloak to sign JWT.
-	pkb, err := utility.DecodeBase64([]byte(ac.PublicKey))
+	pkb, err := decodeBase64([]byte(ac.PublicKey))
 	if err != nil {
 		writeBadRequestError(w, method, "Unable to base64 decode Keycloak Public Key")
 		return
diff --git a/core/api/endpoint/user_endpoint.go b/core/api/endpoint/user_endpoint.go
index 406e32a6..373ab805 100644
--- a/core/api/endpoint/user_endpoint.go
+++ b/core/api/endpoint/user_endpoint.go
@@ -13,12 +13,12 @@ package endpoint
 
 import (
 	"database/sql"
+	"encoding/base64"
 	"encoding/json"
 	"fmt"
 	"io/ioutil"
 	"net/http"
 	"net/url"
-	"obiwan/utility"
 	"strconv"
 	"strings"
 
@@ -192,7 +192,7 @@ func AddUser(w http.ResponseWriter, r *http.Request) {
 	if addUser && addAccount {
 		size := len(requestedPassword)
 		auth := fmt.Sprintf("%s:%s:%s", p.Context.AppURL, userModel.Email, requestedPassword[:size])
-		encrypted := utility.EncodeBase64([]byte(auth))
+		encrypted := encodeBase64([]byte(auth))
 
 		url := fmt.Sprintf("%s/%s", p.Context.GetAppURL("auth/sso"), url.QueryEscape(string(encrypted)))
 		go mail.InviteNewUser(userModel.Email, inviter.Fullname(), url, userModel.Email, requestedPassword)
@@ -764,3 +764,16 @@ func writeUsers(w http.ResponseWriter, u []entity.User) {
 
 	writeSuccessBytes(w, j)
 }
+
+func encodeBase64(b []byte) []byte {
+	return []byte(base64.StdEncoding.EncodeToString(b))
+}
+
+
+func decodeBase64(b []byte) ([]byte, error) {
+	data, err := base64.StdEncoding.DecodeString(string(b))
+	if err != nil {
+		return nil, err
+	}
+	return data, nil
+}
\ No newline at end of file