Skip to content

Commit 1f146de

Browse files
KenWilliamsonKenWilliamson
committed
updates
1 parent 790bd7c commit 1f146de

File tree

7 files changed

+435
-262
lines changed

7 files changed

+435
-262
lines changed

‎managers/clientRoleManager.go

+32-4
Original file line numberDiff line numberDiff line change
@@ -20,18 +20,46 @@ package managers
2020
2121
*/
2222

23+
import (
24+
//"fmt"
25+
26+
odb "github.com/Ulbora/GoAuth2/oauth2database"
27+
)
28+
2329
//ClientRole ClientRole
2430
type ClientRole struct {
2531
ID int64
2632
Role string
2733
ClientID int64
28-
Super bool
2934
}
3035

3136
//AddClientRole AddClientRole
3237
func (m *OauthManager) AddClientRole(r *ClientRole) (bool, int64) {
33-
var suc bool
34-
var id int64
35-
38+
// var suc bool
39+
// var id int64
40+
var cr odb.ClientRole
41+
cr.Role = r.Role
42+
cr.ClientID = r.ClientID
43+
suc, id := m.Db.AddClientRole(&cr)
3644
return suc, id
3745
}
46+
47+
//GetClientRoleList GetClientRoleList
48+
func (m *OauthManager) GetClientRoleList(clientID int64) *[]ClientRole {
49+
var rtn []ClientRole
50+
rl := m.Db.GetClientRoleList(clientID)
51+
for _, r := range *rl {
52+
var cr ClientRole
53+
cr.ID = r.ID
54+
cr.Role = r.Role
55+
cr.ClientID = r.ClientID
56+
rtn = append(rtn, cr)
57+
}
58+
return &rtn
59+
}
60+
61+
//DeleteClientRole DeleteClientRole
62+
func (m *OauthManager) DeleteClientRole(id int64) bool {
63+
suc := m.Db.DeleteClientRole(id)
64+
return suc
65+
}

‎managers/clientRoleManager_test.go

+139
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,139 @@
1+
package managers
2+
3+
import (
4+
"testing"
5+
6+
db "github.com/Ulbora/dbinterface"
7+
mdb "github.com/Ulbora/dbinterface_mysql"
8+
9+
msdb "github.com/Ulbora/GoAuth2/mysqldb"
10+
odb "github.com/Ulbora/GoAuth2/oauth2database"
11+
)
12+
13+
func TestOauthManagerClientRoles_AddClientRole(t *testing.T) {
14+
15+
var dbAu db.Database
16+
var odbAu odb.Oauth2DB
17+
var mydb mdb.MyDBMock
18+
mydb.Host = "localhost:3306"
19+
mydb.User = "admin"
20+
mydb.Password = "admin"
21+
mydb.Database = "ulbora_oauth2_server"
22+
dbAu = &mydb
23+
24+
var mTestRow db.DbRow
25+
mTestRow.Row = []string{}
26+
mydb.MockTestRow = &mTestRow
27+
28+
mydb.MockInsertID1 = 2
29+
mydb.MockInsertSuccess1 = true
30+
31+
// var rows [][]string
32+
// row1 := []string{"1", "code", "2"}
33+
// rows = append(rows, row1)
34+
// var dbrows db.DbRows
35+
// dbrows.Rows = rows
36+
// mydb.MockRows1 = &dbrows
37+
38+
var moadb msdb.MySQLOauthDB
39+
moadb.DB = dbAu
40+
41+
odbAu = &moadb
42+
43+
var man OauthManager
44+
man.Db = odbAu
45+
var m Manager
46+
m = &man
47+
48+
var cr ClientRole
49+
cr.Role = "tester"
50+
cr.ClientID = 3
51+
suc, id := m.AddClientRole(&cr)
52+
if !suc || id != 2 {
53+
t.Fail()
54+
}
55+
}
56+
57+
func TestOauthManagerClientRoles_GetClientRole(t *testing.T) {
58+
59+
var dbAu db.Database
60+
var odbAu odb.Oauth2DB
61+
var mydb mdb.MyDBMock
62+
mydb.Host = "localhost:3306"
63+
mydb.User = "admin"
64+
mydb.Password = "admin"
65+
mydb.Database = "ulbora_oauth2_server"
66+
dbAu = &mydb
67+
68+
var mTestRow db.DbRow
69+
mTestRow.Row = []string{}
70+
mydb.MockTestRow = &mTestRow
71+
72+
// mydb.MockInsertID1 = 2
73+
// mydb.MockInsertSuccess1 = true
74+
75+
var rows [][]string
76+
row1 := []string{"1", "role1", "2"}
77+
rows = append(rows, row1)
78+
row2 := []string{"2", "role2", "2"}
79+
rows = append(rows, row2)
80+
var dbrows db.DbRows
81+
dbrows.Rows = rows
82+
mydb.MockRows1 = &dbrows
83+
84+
var moadb msdb.MySQLOauthDB
85+
moadb.DB = dbAu
86+
87+
odbAu = &moadb
88+
89+
var man OauthManager
90+
man.Db = odbAu
91+
var m Manager
92+
m = &man
93+
94+
rl := m.GetClientRoleList(2)
95+
if len(*rl) != 2 || (*rl)[1].ID != 2 {
96+
t.Fail()
97+
}
98+
}
99+
100+
func TestOauthManagerClientRoles_DeleteClientRole(t *testing.T) {
101+
102+
var dbAu db.Database
103+
var odbAu odb.Oauth2DB
104+
var mydb mdb.MyDBMock
105+
mydb.Host = "localhost:3306"
106+
mydb.User = "admin"
107+
mydb.Password = "admin"
108+
mydb.Database = "ulbora_oauth2_server"
109+
dbAu = &mydb
110+
111+
var mTestRow db.DbRow
112+
mTestRow.Row = []string{}
113+
mydb.MockTestRow = &mTestRow
114+
115+
//mydb.MockInsertID1 = 2
116+
mydb.MockDeleteSuccess1 = true
117+
118+
// var rows [][]string
119+
// row1 := []string{"1", "code", "2"}
120+
// rows = append(rows, row1)
121+
// var dbrows db.DbRows
122+
// dbrows.Rows = rows
123+
// mydb.MockRows1 = &dbrows
124+
125+
var moadb msdb.MySQLOauthDB
126+
moadb.DB = dbAu
127+
128+
odbAu = &moadb
129+
130+
var man OauthManager
131+
man.Db = odbAu
132+
var m Manager
133+
m = &man
134+
135+
suc := m.DeleteClientRole(2)
136+
if !suc {
137+
t.Fail()
138+
}
139+
}

‎managers/coverage.out

+14-10
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,4 @@
11
mode: set
2-
github.com/Ulbora/GoAuth2/managers/clientRedirectUriManager.go:37.82,45.2 5 1
3-
github.com/Ulbora/GoAuth2/managers/clientRedirectUriManager.go:48.86,51.24 3 1
4-
github.com/Ulbora/GoAuth2/managers/clientRedirectUriManager.go:58.2,58.13 1 1
5-
github.com/Ulbora/GoAuth2/managers/clientRedirectUriManager.go:51.24,57.3 5 1
6-
github.com/Ulbora/GoAuth2/managers/clientRedirectUriManager.go:62.63,65.2 2 1
72
github.com/Ulbora/GoAuth2/managers/clientManager.go:49.64,54.74 3 1
83
github.com/Ulbora/GoAuth2/managers/clientManager.go:76.2,76.16 1 1
94
github.com/Ulbora/GoAuth2/managers/clientManager.go:54.74,64.42 9 1
@@ -26,11 +21,16 @@ github.com/Ulbora/GoAuth2/managers/clientManager.go:147.2,147.13 1 1
2621
github.com/Ulbora/GoAuth2/managers/clientManager.go:143.24,146.3 2 1
2722
github.com/Ulbora/GoAuth2/managers/clientManager.go:151.52,154.2 2 1
2823
github.com/Ulbora/GoAuth2/managers/clientManager.go:156.42,164.2 7 1
29-
github.com/Ulbora/GoAuth2/managers/clientRoleManager.go:32.67,37.2 3 0
30-
github.com/Ulbora/GoAuth2/managers/grantTypeManager.go:23.75,26.29 3 1
31-
github.com/Ulbora/GoAuth2/managers/grantTypeManager.go:31.2,31.12 1 1
32-
github.com/Ulbora/GoAuth2/managers/grantTypeManager.go:26.29,27.32 1 1
33-
github.com/Ulbora/GoAuth2/managers/grantTypeManager.go:27.32,29.4 1 1
24+
github.com/Ulbora/GoAuth2/managers/clientRedirectUriManager.go:37.82,45.2 5 1
25+
github.com/Ulbora/GoAuth2/managers/clientRedirectUriManager.go:48.86,51.24 3 1
26+
github.com/Ulbora/GoAuth2/managers/clientRedirectUriManager.go:58.2,58.13 1 1
27+
github.com/Ulbora/GoAuth2/managers/clientRedirectUriManager.go:51.24,57.3 5 1
28+
github.com/Ulbora/GoAuth2/managers/clientRedirectUriManager.go:62.63,65.2 2 1
29+
github.com/Ulbora/GoAuth2/managers/clientRoleManager.go:37.67,45.2 5 1
30+
github.com/Ulbora/GoAuth2/managers/clientRoleManager.go:48.72,51.24 3 1
31+
github.com/Ulbora/GoAuth2/managers/clientRoleManager.go:58.2,58.13 1 1
32+
github.com/Ulbora/GoAuth2/managers/clientRoleManager.go:51.24,57.3 5 1
33+
github.com/Ulbora/GoAuth2/managers/clientRoleManager.go:62.56,65.2 2 1
3434
github.com/Ulbora/GoAuth2/managers/utilities.go:32.36,35.26 3 1
3535
github.com/Ulbora/GoAuth2/managers/utilities.go:40.2,40.13 1 1
3636
github.com/Ulbora/GoAuth2/managers/utilities.go:35.26,39.3 3 1
@@ -40,3 +40,7 @@ github.com/Ulbora/GoAuth2/managers/utilities.go:45.37,54.3 4 1
4040
github.com/Ulbora/GoAuth2/managers/utilities.go:59.41,61.37 2 1
4141
github.com/Ulbora/GoAuth2/managers/utilities.go:71.2,71.12 1 1
4242
github.com/Ulbora/GoAuth2/managers/utilities.go:61.37,70.3 4 1
43+
github.com/Ulbora/GoAuth2/managers/grantTypeManager.go:23.75,26.29 3 1
44+
github.com/Ulbora/GoAuth2/managers/grantTypeManager.go:31.2,31.12 1 1
45+
github.com/Ulbora/GoAuth2/managers/grantTypeManager.go:26.29,27.32 1 1
46+
github.com/Ulbora/GoAuth2/managers/grantTypeManager.go:27.32,29.4 1 1

‎managers/manager.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,8 @@ type Manager interface {
4141

4242
// //client roles
4343
AddClientRole(r *ClientRole) (bool, int64)
44-
// GetClientRoleList(clientID int64) *[]odb.ClientRole
45-
// DeleteClientRole(id int64) bool
44+
GetClientRoleList(clientID int64) *[]ClientRole
45+
DeleteClientRole(id int64) bool
4646

4747
// //client allowed uri
4848
// AddClientAllowedUri(au *odb.ClientAllowedURI) (bool, int64)

0 commit comments

Comments
 (0)