Skip to content

Remove namespace from identity manager, network map, and group manager calls #862

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jun 20, 2022
Merged

Remove namespace from identity manager, network map, and group manager calls #862

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d001e7b
Remove namespace from identity manager calls
awrichar Jun 14, 2022
40e5c70
Remove namespace from network map and group manager calls
awrichar Jun 14, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion internal/apiserver/route_get_groups.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ var getGroups = &ffapi.Route{
Extensions: &coreExtensions{
FilterFactory: database.GroupQueryFactory,
CoreJSONHandler: func(r *ffapi.APIRequest, cr *coreRequest) (output interface{}, err error) {
return filterResult(cr.or.PrivateMessaging().GetGroupsNS(cr.ctx, extractNamespace(r.PP), cr.filter))
return filterResult(cr.or.PrivateMessaging().GetGroups(cr.ctx, cr.filter))
},
},
}
2 changes: 1 addition & 1 deletion internal/apiserver/route_get_groups_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ func TestGetGroups(t *testing.T) {

mpm := &privatemessagingmocks.Manager{}
o.On("PrivateMessaging").Return(mpm)
mpm.On("GetGroupsNS", mock.Anything, "mynamespace", mock.Anything).
mpm.On("GetGroups", mock.Anything, mock.Anything).
Return([]*core.Group{}, nil, nil)
r.ServeHTTP(res, req)

Expand Down
4 changes: 2 additions & 2 deletions internal/apiserver/route_get_identities.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,9 +42,9 @@ var getIdentities = &ffapi.Route{
FilterFactory: database.IdentityQueryFactory,
CoreJSONHandler: func(r *ffapi.APIRequest, cr *coreRequest) (output interface{}, err error) {
if strings.EqualFold(r.QP["fetchverifiers"], "true") {
return filterResult(cr.or.NetworkMap().GetIdentitiesWithVerifiers(cr.ctx, extractNamespace(r.PP), cr.filter))
return filterResult(cr.or.NetworkMap().GetIdentitiesWithVerifiers(cr.ctx, cr.filter))
}
return filterResult(cr.or.NetworkMap().GetIdentities(cr.ctx, extractNamespace(r.PP), cr.filter))
return filterResult(cr.or.NetworkMap().GetIdentities(cr.ctx, cr.filter))
},
},
}
4 changes: 2 additions & 2 deletions internal/apiserver/route_get_identities_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ func TestGetIdentities(t *testing.T) {
req.Header.Set("Content-Type", "application/json; charset=utf-8")
res := httptest.NewRecorder()

mnm.On("GetIdentities", mock.Anything, "ns1", mock.Anything).Return([]*core.Identity{}, nil, nil)
mnm.On("GetIdentities", mock.Anything, mock.Anything).Return([]*core.Identity{}, nil, nil)
r.ServeHTTP(res, req)

assert.Equal(t, 200, res.Result().StatusCode)
Expand All @@ -48,7 +48,7 @@ func TestGetIdentitiesWithVerifiers(t *testing.T) {
req.Header.Set("Content-Type", "application/json; charset=utf-8")
res := httptest.NewRecorder()

mnm.On("GetIdentitiesWithVerifiers", mock.Anything, "ns1", mock.Anything).Return([]*core.IdentityWithVerifiers{}, nil, nil)
mnm.On("GetIdentitiesWithVerifiers", mock.Anything, mock.Anything).Return([]*core.IdentityWithVerifiers{}, nil, nil)
r.ServeHTTP(res, req)

assert.Equal(t, 200, res.Result().StatusCode)
Expand Down
4 changes: 2 additions & 2 deletions internal/apiserver/route_get_identity_by_did.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,9 +42,9 @@ var getIdentityByDID = &ffapi.Route{
Extensions: &coreExtensions{
CoreJSONHandler: func(r *ffapi.APIRequest, cr *coreRequest) (output interface{}, err error) {
if strings.EqualFold(r.QP["fetchverifiers"], "true") {
return cr.or.NetworkMap().GetIdentityByDIDWithVerifiers(cr.ctx, extractNamespace(r.PP), r.PP["did"])
return cr.or.NetworkMap().GetIdentityByDIDWithVerifiers(cr.ctx, r.PP["did"])
}
return cr.or.NetworkMap().GetIdentityByDID(cr.ctx, extractNamespace(r.PP), r.PP["did"])
return cr.or.NetworkMap().GetIdentityByDID(cr.ctx, r.PP["did"])
},
},
}
4 changes: 2 additions & 2 deletions internal/apiserver/route_get_identity_by_did_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ func TestGetIdentityByDID(t *testing.T) {
req.Header.Set("Content-Type", "application/json; charset=utf-8")
res := httptest.NewRecorder()

nmn.On("GetIdentityByDID", mock.Anything, "default", "did:firefly:org/org_1").
nmn.On("GetIdentityByDID", mock.Anything, "did:firefly:org/org_1").
Return(&core.Identity{}, nil)
r.ServeHTTP(res, req)

Expand All @@ -49,7 +49,7 @@ func TestGetIdentityByDIDWithVerifiers(t *testing.T) {
req.Header.Set("Content-Type", "application/json; charset=utf-8")
res := httptest.NewRecorder()

nmn.On("GetIdentityByDIDWithVerifiers", mock.Anything, "default", "did:firefly:org/org_1").
nmn.On("GetIdentityByDIDWithVerifiers", mock.Anything, "did:firefly:org/org_1").
Return(&core.IdentityWithVerifiers{}, nil)
r.ServeHTTP(res, req)

Expand Down
4 changes: 2 additions & 2 deletions internal/apiserver/route_get_identity_by_id.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,9 +42,9 @@ var getIdentityByID = &ffapi.Route{
Extensions: &coreExtensions{
CoreJSONHandler: func(r *ffapi.APIRequest, cr *coreRequest) (output interface{}, err error) {
if strings.EqualFold(r.QP["fetchverifiers"], "true") {
return cr.or.NetworkMap().GetIdentityByIDWithVerifiers(cr.ctx, extractNamespace(r.PP), r.PP["iid"])
return cr.or.NetworkMap().GetIdentityByIDWithVerifiers(cr.ctx, r.PP["iid"])
}
return cr.or.NetworkMap().GetIdentityByID(cr.ctx, extractNamespace(r.PP), r.PP["iid"])
return cr.or.NetworkMap().GetIdentityByID(cr.ctx, r.PP["iid"])
},
},
}
4 changes: 2 additions & 2 deletions internal/apiserver/route_get_identity_by_id_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ func TestGetIdentityByID(t *testing.T) {
req.Header.Set("Content-Type", "application/json; charset=utf-8")
res := httptest.NewRecorder()

mnm.On("GetIdentityByID", mock.Anything, "ns1", "id1").Return(&core.Identity{}, nil, nil)
mnm.On("GetIdentityByID", mock.Anything, "id1").Return(&core.Identity{}, nil, nil)
r.ServeHTTP(res, req)

assert.Equal(t, 200, res.Result().StatusCode)
Expand All @@ -48,7 +48,7 @@ func TestGetIdentityByIDWithVerifiers(t *testing.T) {
req.Header.Set("Content-Type", "application/json; charset=utf-8")
res := httptest.NewRecorder()

mnm.On("GetIdentityByIDWithVerifiers", mock.Anything, "ns1", "id1").Return(&core.IdentityWithVerifiers{}, nil, nil)
mnm.On("GetIdentityByIDWithVerifiers", mock.Anything, "id1").Return(&core.IdentityWithVerifiers{}, nil, nil)
r.ServeHTTP(res, req)

assert.Equal(t, 200, res.Result().StatusCode)
Expand Down
2 changes: 1 addition & 1 deletion internal/apiserver/route_get_identity_did.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ var getIdentityDID = &ffapi.Route{
JSONOutputCodes: []int{http.StatusOK},
Extensions: &coreExtensions{
CoreJSONHandler: func(r *ffapi.APIRequest, cr *coreRequest) (output interface{}, err error) {
return cr.or.NetworkMap().GetDIDDocForIndentityByID(cr.ctx, extractNamespace(r.PP), r.PP["iid"])
return cr.or.NetworkMap().GetDIDDocForIndentityByID(cr.ctx, r.PP["iid"])
},
},
}
2 changes: 1 addition & 1 deletion internal/apiserver/route_get_identity_did_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ func TestGetIdentityDID(t *testing.T) {
req.Header.Set("Content-Type", "application/json; charset=utf-8")
res := httptest.NewRecorder()

mnm.On("GetDIDDocForIndentityByID", mock.Anything, "ns1", "id1").Return(&networkmap.DIDDocument{}, nil, nil)
mnm.On("GetDIDDocForIndentityByID", mock.Anything, "id1").Return(&networkmap.DIDDocument{}, nil, nil)
r.ServeHTTP(res, req)

assert.Equal(t, 200, res.Result().StatusCode)
Expand Down
2 changes: 1 addition & 1 deletion internal/apiserver/route_get_identity_verifiers.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ var getIdentityVerifiers = &ffapi.Route{
Extensions: &coreExtensions{
FilterFactory: database.VerifierQueryFactory,
CoreJSONHandler: func(r *ffapi.APIRequest, cr *coreRequest) (output interface{}, err error) {
return filterResult(cr.or.NetworkMap().GetIdentityVerifiers(cr.ctx, extractNamespace(r.PP), r.PP["iid"], cr.filter))
return filterResult(cr.or.NetworkMap().GetIdentityVerifiers(cr.ctx, r.PP["iid"], cr.filter))
},
},
}
2 changes: 1 addition & 1 deletion internal/apiserver/route_get_identity_verifiers_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ func TestGetIdentityVerifiers(t *testing.T) {
req.Header.Set("Content-Type", "application/json; charset=utf-8")
res := httptest.NewRecorder()

mnm.On("GetIdentityVerifiers", mock.Anything, "ns1", "id1", mock.Anything).Return([]*core.Verifier{}, nil, nil)
mnm.On("GetIdentityVerifiers", mock.Anything, "id1", mock.Anything).Return([]*core.Verifier{}, nil, nil)
r.ServeHTTP(res, req)

assert.Equal(t, 200, res.Result().StatusCode)
Expand Down
4 changes: 2 additions & 2 deletions internal/apiserver/route_get_net_did.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,9 +43,9 @@ var getNetworkIdentityByDID = &ffapi.Route{
Extensions: &coreExtensions{
CoreJSONHandler: func(r *ffapi.APIRequest, cr *coreRequest) (output interface{}, err error) {
if strings.EqualFold(r.QP["fetchverifiers"], "true") {
return cr.or.NetworkMap().GetIdentityByDIDWithVerifiers(cr.ctx, extractNamespace(r.PP), r.PP["did"])
return cr.or.NetworkMap().GetIdentityByDIDWithVerifiers(cr.ctx, r.PP["did"])
}
return cr.or.NetworkMap().GetIdentityByDID(cr.ctx, extractNamespace(r.PP), r.PP["did"])
return cr.or.NetworkMap().GetIdentityByDID(cr.ctx, r.PP["did"])
},
},
}
4 changes: 2 additions & 2 deletions internal/apiserver/route_get_net_did_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ func TestGetNetIdentityByDID(t *testing.T) {
req.Header.Set("Content-Type", "application/json; charset=utf-8")
res := httptest.NewRecorder()

nmn.On("GetIdentityByDID", mock.Anything, "default", "did:firefly:org/org_1").
nmn.On("GetIdentityByDID", mock.Anything, "did:firefly:org/org_1").
Return(&core.Identity{}, nil)
r.ServeHTTP(res, req)

Expand All @@ -49,7 +49,7 @@ func TestGetNetIdentityByDIDWithVerifiers(t *testing.T) {
req.Header.Set("Content-Type", "application/json; charset=utf-8")
res := httptest.NewRecorder()

nmn.On("GetIdentityByDIDWithVerifiers", mock.Anything, "default", "did:firefly:org/org_1").
nmn.On("GetIdentityByDIDWithVerifiers", mock.Anything, "did:firefly:org/org_1").
Return(&core.IdentityWithVerifiers{}, nil)
r.ServeHTTP(res, req)

Expand Down
2 changes: 1 addition & 1 deletion internal/apiserver/route_get_net_diddoc.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ var getNetworkDIDDocByDID = &ffapi.Route{
JSONOutputCodes: []int{http.StatusOK},
Extensions: &coreExtensions{
CoreJSONHandler: func(r *ffapi.APIRequest, cr *coreRequest) (output interface{}, err error) {
return cr.or.NetworkMap().GetDIDDocForIndentityByDID(cr.ctx, extractNamespace(r.PP), r.PP["did"])
return cr.or.NetworkMap().GetDIDDocForIndentityByDID(cr.ctx, r.PP["did"])
},
},
}
2 changes: 1 addition & 1 deletion internal/apiserver/route_get_net_diddoc_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ func TestGetDIDDocByDID(t *testing.T) {
req.Header.Set("Content-Type", "application/json; charset=utf-8")
res := httptest.NewRecorder()

nmn.On("GetDIDDocForIndentityByDID", mock.Anything, "default", "did:firefly:org/org_1").
nmn.On("GetDIDDocForIndentityByDID", mock.Anything, "did:firefly:org/org_1").
Return(&networkmap.DIDDocument{}, nil)
r.ServeHTTP(res, req)

Expand Down
4 changes: 2 additions & 2 deletions internal/apiserver/route_get_net_identities.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,9 +42,9 @@ var getNetworkIdentities = &ffapi.Route{
FilterFactory: database.IdentityQueryFactory,
CoreJSONHandler: func(r *ffapi.APIRequest, cr *coreRequest) (output interface{}, err error) {
if strings.EqualFold(r.QP["fetchverifiers"], "true") {
return filterResult(cr.or.NetworkMap().GetIdentitiesWithVerifiers(cr.ctx, extractNamespace(r.PP), cr.filter))
return filterResult(cr.or.NetworkMap().GetIdentitiesWithVerifiers(cr.ctx, cr.filter))
}
return filterResult(cr.or.NetworkMap().GetIdentities(cr.ctx, extractNamespace(r.PP), cr.filter))
return filterResult(cr.or.NetworkMap().GetIdentities(cr.ctx, cr.filter))
},
},
}
4 changes: 2 additions & 2 deletions internal/apiserver/route_get_net_identities_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ func TestGetNetIdentities(t *testing.T) {
req.Header.Set("Content-Type", "application/json; charset=utf-8")
res := httptest.NewRecorder()

mnm.On("GetIdentities", mock.Anything, "default", mock.Anything).Return([]*core.Identity{}, nil, nil)
mnm.On("GetIdentities", mock.Anything, mock.Anything).Return([]*core.Identity{}, nil, nil)
r.ServeHTTP(res, req)

assert.Equal(t, 200, res.Result().StatusCode)
Expand All @@ -48,7 +48,7 @@ func TestGetNetIdentitiesWithVerifiers(t *testing.T) {
req.Header.Set("Content-Type", "application/json; charset=utf-8")
res := httptest.NewRecorder()

mnm.On("GetIdentitiesWithVerifiers", mock.Anything, "default", mock.Anything).Return([]*core.IdentityWithVerifiers{}, nil, nil)
mnm.On("GetIdentitiesWithVerifiers", mock.Anything, mock.Anything).Return([]*core.IdentityWithVerifiers{}, nil, nil)
r.ServeHTTP(res, req)

assert.Equal(t, 200, res.Result().StatusCode)
Expand Down
2 changes: 1 addition & 1 deletion internal/apiserver/route_get_net_node.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ var getNetworkNode = &ffapi.Route{
JSONOutputCodes: []int{http.StatusOK},
Extensions: &coreExtensions{
CoreJSONHandler: func(r *ffapi.APIRequest, cr *coreRequest) (output interface{}, err error) {
output, err = cr.or.NetworkMap().GetNodeByNameOrID(cr.ctx, extractNamespace(r.PP), r.PP["nameOrId"])
output, err = cr.or.NetworkMap().GetNodeByNameOrID(cr.ctx, r.PP["nameOrId"])
return output, err
},
},
Expand Down
2 changes: 1 addition & 1 deletion internal/apiserver/route_get_net_node_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ func TestGetNode(t *testing.T) {
req.Header.Set("Content-Type", "application/json; charset=utf-8")
res := httptest.NewRecorder()

nmn.On("GetNodeByNameOrID", mock.Anything, "default", "node12345").
nmn.On("GetNodeByNameOrID", mock.Anything, "node12345").
Return(&core.Identity{}, nil)
r.ServeHTTP(res, req)

Expand Down
2 changes: 1 addition & 1 deletion internal/apiserver/route_get_net_nodes.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ var getNetworkNodes = &ffapi.Route{
Extensions: &coreExtensions{
FilterFactory: database.IdentityQueryFactory,
CoreJSONHandler: func(r *ffapi.APIRequest, cr *coreRequest) (output interface{}, err error) {
return filterResult(cr.or.NetworkMap().GetNodes(cr.ctx, extractNamespace(r.PP), cr.filter))
return filterResult(cr.or.NetworkMap().GetNodes(cr.ctx, cr.filter))
},
},
}
2 changes: 1 addition & 1 deletion internal/apiserver/route_get_net_nodes_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ func TestGetNodess(t *testing.T) {
req.Header.Set("Content-Type", "application/json; charset=utf-8")
res := httptest.NewRecorder()

mnm.On("GetNodes", mock.Anything, "default", mock.Anything).
mnm.On("GetNodes", mock.Anything, mock.Anything).
Return([]*core.Identity{}, nil, nil)
r.ServeHTTP(res, req)

Expand Down
2 changes: 1 addition & 1 deletion internal/apiserver/route_get_net_org.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ var getNetworkOrg = &ffapi.Route{
JSONOutputCodes: []int{http.StatusOK},
Extensions: &coreExtensions{
CoreJSONHandler: func(r *ffapi.APIRequest, cr *coreRequest) (output interface{}, err error) {
output, err = cr.or.NetworkMap().GetOrganizationByNameOrID(cr.ctx, extractNamespace(r.PP), r.PP["nameOrId"])
output, err = cr.or.NetworkMap().GetOrganizationByNameOrID(cr.ctx, r.PP["nameOrId"])
return output, err
},
},
Expand Down
2 changes: 1 addition & 1 deletion internal/apiserver/route_get_net_org_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ func TestGetOrg(t *testing.T) {
req.Header.Set("Content-Type", "application/json; charset=utf-8")
res := httptest.NewRecorder()

nmn.On("GetOrganizationByNameOrID", mock.Anything, "default", "org12345").
nmn.On("GetOrganizationByNameOrID", mock.Anything, "org12345").
Return(&core.Identity{}, nil)
r.ServeHTTP(res, req)

Expand Down
2 changes: 1 addition & 1 deletion internal/apiserver/route_get_net_orgs.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ var getNetworkOrgs = &ffapi.Route{
Extensions: &coreExtensions{
FilterFactory: database.IdentityQueryFactory,
CoreJSONHandler: func(r *ffapi.APIRequest, cr *coreRequest) (output interface{}, err error) {
return filterResult(cr.or.NetworkMap().GetOrganizations(cr.ctx, extractNamespace(r.PP), cr.filter))
return filterResult(cr.or.NetworkMap().GetOrganizations(cr.ctx, cr.filter))
},
},
}
2 changes: 1 addition & 1 deletion internal/apiserver/route_get_net_orgs_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ func TestGetOrganizations(t *testing.T) {
req.Header.Set("Content-Type", "application/json; charset=utf-8")
res := httptest.NewRecorder()

mnm.On("GetOrganizations", mock.Anything, "default", mock.Anything).
mnm.On("GetOrganizations", mock.Anything, mock.Anything).
Return([]*core.Identity{}, nil, nil)
r.ServeHTTP(res, req)

Expand Down
2 changes: 1 addition & 1 deletion internal/apiserver/route_get_status.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ var getStatus = &ffapi.Route{
JSONOutputCodes: []int{http.StatusOK},
Extensions: &coreExtensions{
CoreJSONHandler: func(r *ffapi.APIRequest, cr *coreRequest) (output interface{}, err error) {
output, err = cr.or.GetStatus(cr.ctx, extractNamespace(r.PP))
output, err = cr.or.GetStatus(cr.ctx)
return output, err
},
},
Expand Down
2 changes: 1 addition & 1 deletion internal/apiserver/route_get_status_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ func TestGetStatus(t *testing.T) {
req.Header.Set("Content-Type", "application/json; charset=utf-8")
res := httptest.NewRecorder()

o.On("GetStatus", mock.Anything, "default").
o.On("GetStatus", mock.Anything).
Return(&core.NodeStatus{}, nil)
r.ServeHTTP(res, req)

Expand Down
2 changes: 1 addition & 1 deletion internal/apiserver/route_get_verifier_by_id.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ var getVerifierByID = &ffapi.Route{
JSONOutputCodes: []int{http.StatusOK},
Extensions: &coreExtensions{
CoreJSONHandler: func(r *ffapi.APIRequest, cr *coreRequest) (output interface{}, err error) {
return cr.or.NetworkMap().GetVerifierByHash(cr.ctx, extractNamespace(r.PP), r.PP["hash"])
return cr.or.NetworkMap().GetVerifierByHash(cr.ctx, r.PP["hash"])
},
},
}
2 changes: 1 addition & 1 deletion internal/apiserver/route_get_verifier_by_id_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ func TestGetVerifierByID(t *testing.T) {
req.Header.Set("Content-Type", "application/json; charset=utf-8")
res := httptest.NewRecorder()

mnm.On("GetVerifierByHash", mock.Anything, "ns1", "hashid1").Return(&core.Verifier{}, nil, nil)
mnm.On("GetVerifierByHash", mock.Anything, "hashid1").Return(&core.Verifier{}, nil, nil)
r.ServeHTTP(res, req)

assert.Equal(t, 200, res.Result().StatusCode)
Expand Down
2 changes: 1 addition & 1 deletion internal/apiserver/route_get_verifiers.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ var getVerifiers = &ffapi.Route{
Extensions: &coreExtensions{
FilterFactory: database.VerifierQueryFactory,
CoreJSONHandler: func(r *ffapi.APIRequest, cr *coreRequest) (output interface{}, err error) {
return filterResult(cr.or.NetworkMap().GetVerifiers(cr.ctx, extractNamespace(r.PP), cr.filter))
return filterResult(cr.or.NetworkMap().GetVerifiers(cr.ctx, cr.filter))
},
},
}
2 changes: 1 addition & 1 deletion internal/apiserver/route_get_verifiers_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ func TestGetVerifiers(t *testing.T) {
req.Header.Set("Content-Type", "application/json; charset=utf-8")
res := httptest.NewRecorder()

mnm.On("GetVerifiers", mock.Anything, "ns1", mock.Anything).Return([]*core.Verifier{}, nil, nil)
mnm.On("GetVerifiers", mock.Anything, mock.Anything).Return([]*core.Verifier{}, nil, nil)
r.ServeHTTP(res, req)

assert.Equal(t, 200, res.Result().StatusCode)
Expand Down
2 changes: 1 addition & 1 deletion internal/apiserver/route_patch_update_identity.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ var patchUpdateIdentity = &ffapi.Route{
CoreJSONHandler: func(r *ffapi.APIRequest, cr *coreRequest) (output interface{}, err error) {
waitConfirm := strings.EqualFold(r.QP["confirm"], "true")
r.SuccessStatus = syncRetcode(waitConfirm)
org, err := cr.or.NetworkMap().UpdateIdentity(cr.ctx, extractNamespace(r.PP), r.PP["iid"], r.Input.(*core.IdentityUpdateDTO), waitConfirm)
org, err := cr.or.NetworkMap().UpdateIdentity(cr.ctx, r.PP["iid"], r.Input.(*core.IdentityUpdateDTO), waitConfirm)
return org, err
},
},
Expand Down
2 changes: 1 addition & 1 deletion internal/apiserver/route_patch_update_identity_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ func TestUpdateIdentity(t *testing.T) {
req.Header.Set("Content-Type", "application/json; charset=utf-8")
res := httptest.NewRecorder()

mnm.On("UpdateIdentity", mock.Anything, "ns1", "id1", mock.AnythingOfType("*core.IdentityUpdateDTO"), false).
mnm.On("UpdateIdentity", mock.Anything, "id1", mock.AnythingOfType("*core.IdentityUpdateDTO"), false).
Return(&core.Identity{}, nil)
r.ServeHTTP(res, req)

Expand Down
2 changes: 1 addition & 1 deletion internal/apiserver/route_post_network_action.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ var postNetworkAction = &ffapi.Route{
JSONOutputCodes: []int{http.StatusAccepted},
Extensions: &coreExtensions{
CoreJSONHandler: func(r *ffapi.APIRequest, cr *coreRequest) (output interface{}, err error) {
err = cr.or.SubmitNetworkAction(cr.ctx, extractNamespace(r.PP), r.Input.(*core.NetworkAction))
err = cr.or.SubmitNetworkAction(cr.ctx, r.Input.(*core.NetworkAction))
return r.Input, err
},
},
Expand Down
2 changes: 1 addition & 1 deletion internal/apiserver/route_post_network_action_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ func TestPostNetworkAction(t *testing.T) {
req.Header.Set("Content-Type", "application/json; charset=utf-8")
res := httptest.NewRecorder()

o.On("SubmitNetworkAction", mock.Anything, "default", mock.AnythingOfType("*core.NetworkAction")).Return(nil)
o.On("SubmitNetworkAction", mock.Anything, mock.AnythingOfType("*core.NetworkAction")).Return(nil)
r.ServeHTTP(res, req)

assert.Equal(t, 202, res.Result().StatusCode)
Expand Down
2 changes: 1 addition & 1 deletion internal/apiserver/route_post_new_identity.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ var postNewIdentity = &ffapi.Route{
CoreJSONHandler: func(r *ffapi.APIRequest, cr *coreRequest) (output interface{}, err error) {
waitConfirm := strings.EqualFold(r.QP["confirm"], "true")
r.SuccessStatus = syncRetcode(waitConfirm)
org, err := cr.or.NetworkMap().RegisterIdentity(cr.ctx, extractNamespace(r.PP), r.Input.(*core.IdentityCreateDTO), waitConfirm)
org, err := cr.or.NetworkMap().RegisterIdentity(cr.ctx, r.Input.(*core.IdentityCreateDTO), waitConfirm)
return org, err
},
},
Expand Down
Loading