scottk/databunker
1
0
Fork 0
mirror of https://github.com/optim-enterprises-bv/databunker.git synced 2025-11-02 02:48:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix user xtoken tests

Browse Source
This commit is contained in:
root
2021-06-04 07:50:50 +00:00
parent d12f567568
commit f6c3c2ba50
3 changed files with 45 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
src/consent_test.go
View File

@@ -8,15 +8,15 @@ import (
uuid "github.com/hashicorp/go-uuid"
)
func helpAcceptConsent(mode string, address string, brief string, dataJSON string) (map[string]interface{}, error) {
url := "http://localhost:3000/v1/consent/" + mode + "/" + address + "/" + brief
func helpAcceptAgreement(mode string, address string, brief string, dataJSON string) (map[string]interface{}, error) {
url := "http://localhost:3000/v1/agreement/" + brief + "/" + mode + "/" + address
request := httptest.NewRequest("POST", url, strings.NewReader(dataJSON))
request.Header.Set("X-Bunker-Token", rootToken)
return helpServe(request)
}
func helpWithdrawConsent(mode string, address string, brief string) (map[string]interface{}, error) {
url := "http://localhost:3000/v1/consent/" + mode + "/" + address + "/" + brief
func helpWithdrawAgreement(mode string, address string, brief string) (map[string]interface{}, error) {
url := "http://localhost:3000/v1/agreement/" + brief + "/" + mode + "/" + address
request := httptest.NewRequest("DELETE", url, nil)
request.Header.Set("X-Bunker-Token", rootToken)
return helpServe(request)
@@ -50,6 +50,13 @@ func helpGetLBasis() (map[string]interface{}, error) {
return helpServe(request)
}
func helpCreateLBasis(brief string, dataJSON string) (map[string]interface{}, error) {
url := "http://localhost:3000/v1/lbasis/" + brief
request := httptest.NewRequest("POST", url, strings.NewReader(dataJSON))
request.Header.Set("X-Bunker-Token", rootToken)
return helpServe(request)
}
func TestCreateWithdrawConsent(t *testing.T) {
raw, _ := helpGetLBasis()
if _, ok := raw["status"]; !ok || raw["status"].(string) != "ok" {
@@ -63,11 +70,11 @@ func TestCreateWithdrawConsent(t *testing.T) {
t.Fatalf("Wrong number of user consents")
}
brief := "test1"
raw, _ = helpAcceptConsent("email", "moshe@moshe-int.com", "test0", `{"expiration":"10m","starttime":0}`)
raw, _ = helpAcceptAgreement("email", "moshe@moshe-int.com", "test0", `{"expiration":"10m","starttime":0}`)
if _, ok := raw["status"]; !ok || raw["status"].(string) != "ok" {
t.Fatalf("Failed to accept on consent")
}
raw, _ = helpAcceptConsent("phone", "12345678", "test0", "")
raw, _ = helpAcceptAgreement("phone", "12345678", "test0", "")
if _, ok := raw["status"]; !ok || raw["status"].(string) != "ok" {
t.Fatalf("Failed to accept on consent")
}
@@ -98,11 +105,11 @@ func TestCreateWithdrawConsent(t *testing.T) {
if _, ok := raw["status"]; !ok || raw["status"].(string) != "ok" {
t.Fatalf("Failed to get user consents")
}
raw, _ = helpAcceptConsent("token", userTOKEN, brief, "")
raw, _ = helpAcceptAgreement("token", userTOKEN, brief, "")
if _, ok := raw["status"]; !ok || raw["status"].(string) != "ok" {
t.Fatalf("Failed to accept on consent")
}
raw, _ = helpAcceptConsent("email", "moshe@moshe-int.com", "contract-accept", "")
raw, _ = helpAcceptAgreement("email", "moshe@moshe-int.com", "contract-accept", "")
if _, ok := raw["status"]; !ok || raw["status"].(string) != "ok" {
t.Fatalf("Failed to accept on consent: contract-accept")
}
@@ -118,11 +125,11 @@ func TestCreateWithdrawConsent(t *testing.T) {
if record["brief"].(string) != brief {
t.Fatalf("Wrong consent brief value")
}
raw, _ = helpWithdrawConsent("email", "moshe@moshe-int.com", brief)
raw, _ = helpWithdrawAgreement("email", "moshe@moshe-int.com", brief)
if _, ok := raw["status"]; !ok || raw["status"].(string) != "ok" {
t.Fatalf("Failed to withdraw consent")
}
raw, _ = helpWithdrawConsent("token", userTOKEN, brief)
raw, _ = helpWithdrawAgreement("token", userTOKEN, brief)
if _, ok := raw["status"]; !ok || raw["status"].(string) != "ok" {
t.Fatalf("Failed to withdraw consent")
}
@@ -207,7 +214,7 @@ func TestGetFakeUserConsents(t *testing.T) {
}
func TestAcceptConsentEmail(t *testing.T) {
raw, _ := helpAcceptConsent("email", "aaa@bb.com", "brief", "")
raw, _ := helpAcceptAgreement("email", "aaa@bb.com", "brief", "")
if _, ok := raw["status"]; !ok || raw["status"].(string) != "ok" {
t.Fatalf("Failed to accept consent")
}
@@ -215,27 +222,27 @@ func TestAcceptConsentEmail(t *testing.T) {
func TestAcceptConsentFakeUser(t *testing.T) {
userTOKEN, _ := uuid.GenerateUUID()
raw, _ := helpAcceptConsent("token", userTOKEN, "brief", "")
raw, _ := helpAcceptAgreement("token", userTOKEN, "brief", "")
if _, ok := raw["status"]; ok && raw["status"].(string) == "ok" {
t.Fatalf("Should fail to accept consent")
}
raw, _ = helpAcceptConsent("fakemode", "aaa@bb.com", "brief", "")
raw, _ = helpAcceptAgreement("fakemode", "aaa@bb.com", "brief", "")
if _, ok := raw["status"]; ok && raw["status"].(string) == "ok" {
t.Fatalf("Should fail to accept consent")
}
raw, _ = helpAcceptConsent("email", "aaa@bb.com", "br$ief", "")
raw, _ = helpAcceptAgreement("email", "aaa@bb.com", "br$ief", "")
if _, ok := raw["status"]; ok && raw["status"].(string) == "ok" {
t.Fatalf("Should fail to accept consent")
}
raw, _ = helpAcceptConsent("token", "faketoken", "brief", "")
raw, _ = helpAcceptAgreement("token", "faketoken", "brief", "")
if _, ok := raw["status"]; ok && raw["status"].(string) == "ok" {
t.Fatalf("Should fail to accept consent")
}
raw, _ = helpAcceptConsent("login", "blahblah", "brief", "")
raw, _ = helpAcceptAgreement("login", "blahblah", "brief", "")
if _, ok := raw["status"]; ok && raw["status"].(string) == "ok" {
t.Fatalf("Should fail to accept consent")
}
raw, _ = helpAcceptConsent("phone", "112234889966", "brief", "a=b")
raw, _ = helpAcceptAgreement("phone", "112234889966", "brief", "a=b")
if _, ok := raw["status"]; ok && raw["status"].(string) == "ok" {
t.Fatalf("Should fail to accept on consent")
}
@@ -243,23 +250,23 @@ func TestAcceptConsentFakeUser(t *testing.T) {
func TestWithdrawConsentBadUser(t *testing.T) {
userTOKEN, _ := uuid.GenerateUUID()
raw, _ := helpWithdrawConsent("token", userTOKEN, "brief")
raw, _ := helpWithdrawAgreement("token", userTOKEN, "brief")
if _, ok := raw["status"]; ok && raw["status"].(string) == "ok" {
t.Fatalf("Should fail to accept consent")
}
raw, _ = helpWithdrawConsent("token", "badtoken", "brief")
raw, _ = helpWithdrawAgreement("token", "badtoken", "brief")
if _, ok := raw["status"]; ok && raw["status"].(string) == "ok" {
t.Fatalf("Should fail to accept consent")
}
raw, _ = helpWithdrawConsent("fakemode", "aaa@bb.com", "brief")
raw, _ = helpWithdrawAgreement("fakemode", "aaa@bb.com", "brief")
if _, ok := raw["status"]; ok && raw["status"].(string) == "ok" {
t.Fatalf("Should fail to accept consent")
}
raw, _ = helpWithdrawConsent("login", "blahblah", "brief")
raw, _ = helpWithdrawAgreement("login", "blahblah", "brief")
if _, ok := raw["status"]; ok && raw["status"].(string) == "ok" {
t.Fatalf("Should fail to accept consent")
}
raw, _ = helpWithdrawConsent("email", "aaa@bb.com", "bri$ef")
raw, _ = helpWithdrawAgreement("email", "aaa@bb.com", "bri$ef")
if _, ok := raw["status"]; ok && raw["status"].(string) == "ok" {
t.Fatalf("Should fail to accept consent")
}

1
src/requests_api.go
View File

@@ -32,7 +32,6 @@ func (e mainEnv) getUserRequests(w http.ResponseWriter, r *http.Request, ps http
returnError(w, r, "internal error", 405, err, nil)
return
}
fmt.Printf("Total count of user requests: %d\n", counter)
w.Header().Set("Content-Type", "application/json; charset=utf-8")
w.WriteHeader(200)
str := fmt.Sprintf(`{"status":"ok","total":%d,"rows":%s}`, counter, resultJSON)

24
src/xtokens_test.go
View File

@@ -54,9 +54,16 @@ func helpCancelUserRequest(rtoken string) (map[string]interface{}, error) {
}
func TestUserLoginDelete(t *testing.T) {
raw, err := helpCreateLBasis("contract1", `{"basistype":"contract","usercontrol":false}`)
if err != nil {
t.Fatalf("error: %s", err)
}
if _, ok := raw["status"]; !ok || raw["status"].(string) != "ok" {
t.Fatalf("Failed to create lbasis")
}
email := "test@securitybunker.io"
jsonData := `{"email":"test@securitybunker.io","phone":"22346622","fname":"Yuli","lname":"Str","tz":"323xxxxx","password":"123456","address":"Y-d habanim 7","city":"Petah-Tiqva","btest":true,"numtest":123,"testnul":null}`
raw, err := helpCreateUser(jsonData)
raw, err = helpCreateUser(jsonData)
if err != nil {
t.Fatalf("error: %s", err)
}
@@ -91,16 +98,14 @@ func TestUserLoginDelete(t *testing.T) {
fmt.Printf("User login *** xtoken: %s\n", xtoken)
oldRootToken := rootToken
rootToken = xtoken
raw, _ = helpAcceptConsent("token", userTOKEN, "contract", "")
raw, _ = helpAcceptAgreement("token", userTOKEN, "contract1", "")
if _, ok := raw["status"]; !ok || raw["status"].(string) != "ok" {
t.Fatalf("Failed to accept on consent")
}
raw, _ = helpWithdrawConsent("token", userTOKEN, "contract")
raw, _ = helpWithdrawAgreement("token", userTOKEN, "contract1")
if _, ok := raw["status"]; !ok || raw["status"].(string) != "ok" {
t.Fatalf("Failed to accept on consent")
}
helpAcceptConsent("token", userTOKEN, "contract2", "")
helpWithdrawConsent("token", userTOKEN, "contract2")
raw, _ = helpChangeUser("token", userTOKEN, `{"login":null}`)
if _, ok := raw["status"]; !ok || raw["status"].(string) != "ok" {
t.Fatalf("Failed to update user")
@@ -141,7 +146,7 @@ func TestUserLoginDelete(t *testing.T) {
rootToken = oldRootToken
// get user requests
raw, _ = helpGetUserRequests()
if raw["total"].(float64) != 5 {
if raw["total"].(float64) != 4 {
t.Fatalf("Wrong number of user requests for admin to approve/reject/s\n")
}
records := raw["rows"].([]interface{})
@@ -164,7 +169,7 @@ func TestUserLoginDelete(t *testing.T) {
}
if action == "consent-withdraw" {
brief := records0["brief"].(string)
if brief == "contract" {
if brief == "contract1" {
helpApproveUserRequest(rtoken)
} else {
helpCancelUserRequest(rtoken)
@@ -180,7 +185,10 @@ func TestUserLoginDelete(t *testing.T) {
}
}
helpApproveUserRequest(rtoken0)
raw, _ = helpGetUserRequests()
if raw["total"].(float64) != 0 {
t.Fatalf("Wrong number of user requests for admin to approve/reject/s\n")
}
// user should be deleted now
raw10, _ := helpGetUserAppList(userTOKEN)
if len(raw10["apps"].([]interface{})) != 0 {