Skip to content

Commit b049a36

Browse files
committedFeb 17, 2020
finished adding 3 level logging
1 parent f961319 commit b049a36

File tree

6 files changed

+316
-297
lines changed

6 files changed

+316
-297
lines changed
 

‎handlers/coverage.out

+157-157
Large diffs are not rendered by default.

‎handlers/utilites.go

+4-2
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,9 @@ import (
4040
*/
4141

4242
//UseWebHandler UseWebHandler
43-
func UseWebHandler(dbi db.Database, compressJtw bool, authURL string, logger *lg.Logger) *OauthWebHandler {
43+
func UseWebHandler(dbi db.Database, compressJtw bool, authURL string, logger *lg.Logger, tokenParams *m.TokenParams) *OauthWebHandler {
4444
var oauthManagerw m.OauthManager
45+
oauthManagerw.TokenParams = tokenParams
4546
oauthManagerw.Log = logger
4647
var oauthMySqldbw msdb.MySQLOauthDB
4748
oauthMySqldbw.Log = logger
@@ -66,8 +67,9 @@ func UseWebHandler(dbi db.Database, compressJtw bool, authURL string, logger *lg
6667
}
6768

6869
//UseRestHandler UseRestHandler
69-
func UseRestHandler(dbi db.Database, assets string, compressJtw bool, authURL string, logger *lg.Logger) *OauthRestHandler {
70+
func UseRestHandler(dbi db.Database, assets string, compressJtw bool, authURL string, logger *lg.Logger, tokenParams *m.TokenParams) *OauthRestHandler {
7071
var oauthManager m.OauthManager
72+
oauthManager.TokenParams = tokenParams
7173
oauthManager.Log = logger
7274
var oauthMySqldb msdb.MySQLOauthDB
7375
oauthMySqldb.Log = logger

‎handlers/utilites_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import (
99

1010
func TestUseHanders_UseWebHandler(t *testing.T) {
1111
var dbi db.Database
12-
h := UseWebHandler(dbi, false, "url", nil)
12+
h := UseWebHandler(dbi, false, "url", nil, nil)
1313
if h == nil {
1414
t.Fail()
1515
}
@@ -18,7 +18,7 @@ func TestUseHanders_UseWebHandler(t *testing.T) {
1818
func TestUseHanders_UseRestHandler(t *testing.T) {
1919
var dbi db.Database
2020
var assets = "WwogICB7CiAgICAgICJ1cmwiOiIvdWxib3JhL3JzL2NsaWVudEFsbG93ZWRVcmkvYWRkIiwKICAgICAgImFzc2V0cyI6WwogICAgICAgICB7CiAgICAgICAgICAgICJjb250cm9sbGVkQXNzZXQiOiJ1bGJvcmEiLAogICAgICAgICAgICAiYWxsb3dlZFJvbGUiOiJzdXBlckFkbWluIgogICAgICAgICB9CiAgICAgIF0KICAgfSwKICAgewogICAgICAidXJsIjoiL3VsYm9yYS9ycy9jbGllbnRBbGxvd2VkVXJpL3VwZGF0ZSIsCiAgICAgICJhc3NldHMiOlsKICAgICAgICAgewogICAgICAgICAgICAiY29udHJvbGxlZEFzc2V0IjoidWxib3JhIiwKICAgICAgICAgICAgImFsbG93ZWRSb2xlIjoic3VwZXJBZG1pbiIKICAgICAgICAgfQogICAgICBdCiAgIH0sCiAgIHsKICAgICAgInVybCI6Ii91bGJvcmEvcnMvY2xpZW50Um9sZS9hZGQiLAogICAgICAiYXNzZXRzIjpbCiAgICAgICAgIHsKICAgICAgICAgICAgImNvbnRyb2xsZWRBc3NldCI6InN1cGVyQWRtaW4iLAogICAgICAgICAgICAiYWxsb3dlZFJvbGUiOiJzdXBlckFkbWluIgogICAgICAgICB9CiAgICAgIF0KICAgfQpd"
21-
h := UseRestHandler(dbi, assets, false, "url", nil)
21+
h := UseRestHandler(dbi, assets, false, "url", nil, nil)
2222
if h == nil {
2323
t.Fail()
2424
}

‎main

264 Bytes
Binary file not shown.

0 commit comments

Comments
 (0)