Skip to content

Commit 4b30e5c

Browse files
aarondlaarondl
committed
Merge branches
'frederikhors/Redundant-types-in-composite-literals' 'frederikhors/patch-1' 'frederikhors/Unhandled-error,-ignore-explicitly' 'frederikhors/Unused-parameter'
5 parents 29e5022 + e170ae3 + fd7bcb1 + 4235fa2 + ef94451 commit 4b30e5c

File tree

2 files changed

+24
-24
lines changed

2 files changed

+24
-24
lines changed

‎blog.go

+12-12
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@ func setupAuthboss() {
127127
emailRule := defaults.Rules{
128128
FieldName: "email", Required: true,
129129
MatchError: "Must be a valid e-mail address",
130-
MustMatch: regexp.MustCompile(`.*@.*\.[a-z]{1,}`),
130+
MustMatch: regexp.MustCompile(`.*@.*\.[a-z]+`),
131131
}
132132
passwordRule := defaults.Rules{
133133
FieldName: "password", Required: true,
@@ -149,7 +149,7 @@ func setupAuthboss() {
149149
"recover_end": {"password", authboss.ConfirmPrefix + "password"},
150150
},
151151
Whitelist: map[string][]string{
152-
"register": []string{"email", "name", "password"},
152+
"register": {"email", "name", "password"},
153153
},
154154
}
155155

@@ -180,7 +180,7 @@ func setupAuthboss() {
180180
if err == nil && len(oauthcreds.ClientID) != 0 && len(oauthcreds.ClientSecret) != 0 {
181181
fmt.Println("oauth2.toml exists, configuring google oauth2")
182182
ab.Config.Modules.OAuth2Providers = map[string]authboss.OAuth2Provider{
183-
"google": authboss.OAuth2Provider{
183+
"google": {
184184
OAuth2Config: &oauth2.Config{
185185
ClientID: oauthcreds.ClientID,
186186
ClientSecret: oauthcreds.ClientSecret,
@@ -347,7 +347,7 @@ func create(w http.ResponseWriter, r *http.Request) {
347347
var b Blog
348348
if *flagAPI {
349349
byt, err := ioutil.ReadAll(r.Body)
350-
r.Body.Close()
350+
_ = r.Body.Close()
351351
if badRequest(w, err) {
352352
return
353353
}
@@ -405,7 +405,7 @@ func update(w http.ResponseWriter, r *http.Request) {
405405

406406
if *flagAPI {
407407
byt, err := ioutil.ReadAll(r.Body)
408-
r.Body.Close()
408+
_ = r.Body.Close()
409409
if badRequest(w, err) {
410410
return
411411
}
@@ -489,10 +489,10 @@ func mustRender(w http.ResponseWriter, r *http.Request, name string, data authbo
489489
if err != nil {
490490
w.WriteHeader(http.StatusInternalServerError)
491491
fmt.Println("failed to marshal json:", err)
492-
fmt.Fprintln(w, `{"error":"internal server error"}`)
492+
_, _ = fmt.Fprintln(w, `{"error":"internal server error"}`)
493493
}
494494

495-
w.Write(byt)
495+
_, _ = w.Write(byt)
496496
return
497497
}
498498

@@ -503,15 +503,15 @@ func mustRender(w http.ResponseWriter, r *http.Request, name string, data authbo
503503

504504
w.Header().Set("Content-Type", "text/plain")
505505
w.WriteHeader(http.StatusInternalServerError)
506-
fmt.Fprintln(w, "Error occurred rendering template:", err)
506+
_, _ = fmt.Fprintln(w, "Error occurred rendering template:", err)
507507
}
508508

509509
func redirect(w http.ResponseWriter, r *http.Request, path string) {
510510
if *flagAPI {
511511
w.Header().Set("Content-Type", "application/json")
512512
w.Header().Set("Location", path)
513513
w.WriteHeader(http.StatusFound)
514-
fmt.Fprintf(w, `{"path": %q}`, path)
514+
_, _ = fmt.Fprintf(w, `{"path": %q}`, path)
515515
return
516516
}
517517

@@ -526,21 +526,21 @@ func badRequest(w http.ResponseWriter, err error) bool {
526526
if *flagAPI {
527527
w.Header().Set("Content-Type", "application/json")
528528
w.WriteHeader(http.StatusBadRequest)
529-
fmt.Fprintln(w, `{"error":"bad request"}`, err)
529+
_, _ = fmt.Fprintln(w, `{"error":"bad request"}`, err)
530530
return true
531531
}
532532

533533
w.Header().Set("Content-Type", "text/plain")
534534
w.WriteHeader(http.StatusBadRequest)
535-
fmt.Fprintln(w, "Bad request:", err)
535+
_, _ = fmt.Fprintln(w, "Bad request:", err)
536536
return true
537537
}
538538

539539
type smsLogSender struct {
540540
}
541541

542542
// Send an SMS
543-
func (s smsLogSender) Send(ctx context.Context, number, text string) error {
543+
func (s smsLogSender) Send(_ context.Context, number, text string) error {
544544
fmt.Println("sms sent to:", number, "contents:", text)
545545
return nil
546546
}

‎storer.go

+12-12
Original file line numberDiff line numberDiff line change
@@ -226,7 +226,7 @@ type MemStorer struct {
226226
func NewMemStorer() *MemStorer {
227227
return &MemStorer{
228228
Users: map[string]User{
229-
"rick@councilofricks.com": User{
229+
"rick@councilofricks.com": {
230230
ID: 1,
231231
Name: "Rick",
232232
Password: "$2a$10$XtW/BrS5HeYIuOCXYe8DFuInetDMdaarMUJEOg/VA/JAIDgw3l4aG", // pass = 1234
@@ -240,7 +240,7 @@ func NewMemStorer() *MemStorer {
240240
}
241241

242242
// Save the user
243-
func (m MemStorer) Save(ctx context.Context, user authboss.User) error {
243+
func (m MemStorer) Save(_ context.Context, user authboss.User) error {
244244
u := user.(*User)
245245
m.Users[u.Email] = *u
246246

@@ -249,7 +249,7 @@ func (m MemStorer) Save(ctx context.Context, user authboss.User) error {
249249
}
250250

251251
// Load the user
252-
func (m MemStorer) Load(ctx context.Context, key string) (user authboss.User, err error) {
252+
func (m MemStorer) Load(_ context.Context, key string) (user authboss.User, err error) {
253253
// Check to see if our key is actually an oauth2 pid
254254
provider, uid, err := authboss.ParseOAuth2PID(key)
255255
if err == nil {
@@ -273,12 +273,12 @@ func (m MemStorer) Load(ctx context.Context, key string) (user authboss.User, er
273273
}
274274

275275
// New user creation
276-
func (m MemStorer) New(ctx context.Context) authboss.User {
276+
func (m MemStorer) New(_ context.Context) authboss.User {
277277
return &User{}
278278
}
279279

280280
// Create the user
281-
func (m MemStorer) Create(ctx context.Context, user authboss.User) error {
281+
func (m MemStorer) Create(_ context.Context, user authboss.User) error {
282282
u := user.(*User)
283283

284284
if _, ok := m.Users[u.Email]; ok {
@@ -291,7 +291,7 @@ func (m MemStorer) Create(ctx context.Context, user authboss.User) error {
291291
}
292292

293293
// LoadByConfirmSelector looks a user up by confirmation token
294-
func (m MemStorer) LoadByConfirmSelector(ctx context.Context, selector string) (user authboss.ConfirmableUser, err error) {
294+
func (m MemStorer) LoadByConfirmSelector(_ context.Context, selector string) (user authboss.ConfirmableUser, err error) {
295295
for _, v := range m.Users {
296296
if v.ConfirmSelector == selector {
297297
debugln("Loaded user by confirm selector:", selector, v.Name)
@@ -303,7 +303,7 @@ func (m MemStorer) LoadByConfirmSelector(ctx context.Context, selector string) (
303303
}
304304

305305
// LoadByRecoverSelector looks a user up by confirmation selector
306-
func (m MemStorer) LoadByRecoverSelector(ctx context.Context, selector string) (user authboss.RecoverableUser, err error) {
306+
func (m MemStorer) LoadByRecoverSelector(_ context.Context, selector string) (user authboss.RecoverableUser, err error) {
307307
for _, v := range m.Users {
308308
if v.RecoverSelector == selector {
309309
debugln("Loaded user by recover selector:", selector, v.Name)
@@ -315,15 +315,15 @@ func (m MemStorer) LoadByRecoverSelector(ctx context.Context, selector string) (
315315
}
316316

317317
// AddRememberToken to a user
318-
func (m MemStorer) AddRememberToken(ctx context.Context, pid, token string) error {
318+
func (m MemStorer) AddRememberToken(_ context.Context, pid, token string) error {
319319
m.Tokens[pid] = append(m.Tokens[pid], token)
320320
debugf("Adding rm token to %s: %s\n", pid, token)
321321
spew.Dump(m.Tokens)
322322
return nil
323323
}
324324

325325
// DelRememberTokens removes all tokens for the given pid
326-
func (m MemStorer) DelRememberTokens(ctx context.Context, pid string) error {
326+
func (m MemStorer) DelRememberTokens(_ context.Context, pid string) error {
327327
delete(m.Tokens, pid)
328328
debugln("Deleting rm tokens from:", pid)
329329
spew.Dump(m.Tokens)
@@ -332,7 +332,7 @@ func (m MemStorer) DelRememberTokens(ctx context.Context, pid string) error {
332332

333333
// UseRememberToken finds the pid-token pair and deletes it.
334334
// If the token could not be found return ErrTokenNotFound
335-
func (m MemStorer) UseRememberToken(ctx context.Context, pid, token string) error {
335+
func (m MemStorer) UseRememberToken(_ context.Context, pid, token string) error {
336336
tokens, ok := m.Tokens[pid]
337337
if !ok {
338338
debugln("Failed to find rm tokens for:", pid)
@@ -352,7 +352,7 @@ func (m MemStorer) UseRememberToken(ctx context.Context, pid, token string) erro
352352
}
353353

354354
// NewFromOAuth2 creates an oauth2 user (but not in the database, just a blank one to be saved later)
355-
func (m MemStorer) NewFromOAuth2(ctx context.Context, provider string, details map[string]string) (authboss.OAuth2User, error) {
355+
func (m MemStorer) NewFromOAuth2(_ context.Context, provider string, details map[string]string) (authboss.OAuth2User, error) {
356356
switch provider {
357357
case "google":
358358
email := details[aboauth.OAuth2Email]
@@ -379,7 +379,7 @@ func (m MemStorer) NewFromOAuth2(ctx context.Context, provider string, details m
379379
}
380380

381381
// SaveOAuth2 user
382-
func (m MemStorer) SaveOAuth2(ctx context.Context, user authboss.OAuth2User) error {
382+
func (m MemStorer) SaveOAuth2(_ context.Context, user authboss.OAuth2User) error {
383383
u := user.(*User)
384384
m.Users[u.Email] = *u
385385

0 commit comments

Comments
 (0)