Commit 9bc53b1e authored by Timo Furrer's avatar Timo Furrer ☕
Browse files

Merge branch 'do-requests-special-resp-code-handling' into 'main' 

Migrate endpoints with special status code handling to new `do` pattern

See merge request !2733
parents a8e82484 21cdb6f3

users.go

+70 −101
Original line number Diff line number Diff line
@@ -939,40 +939,30 @@ func (s *UsersService) DeleteEmailForUser(user, email int64, options ...RequestO 
}



func (s *UsersService) BlockUser(user int64, options ...RequestOptionFunc) error {

	u := fmt.Sprintf("users/%d/block", user)



	req, err := s.client.NewRequest(http.MethodPost, u, nil, options)

	if err != nil {

	_, _, err := do[none](s.client,

		withMethod(http.MethodPost),

		withPath("users/%d/block", user),

		withRequestOpts(options...),

	)

	return err

}



	_, doErr := s.client.Do(req, nil)

	if doErr != nil {

		return doErr

	}



	return nil

}



func (s *UsersService) UnblockUser(user int64, options ...RequestOptionFunc) error {

	u := fmt.Sprintf("users/%d/unblock", user)



	req, err := s.client.NewRequest(http.MethodPost, u, nil, options)

	if err != nil {

		return err

	}



	resp, err := s.client.Do(req, nil)

	_, resp, err := do[none](s.client,

		withMethod(http.MethodPost),

		withPath("users/%d/unblock", user),

		withRequestOpts(options...),

	)

	if err != nil && resp == nil {

		return err

	}



	switch resp.StatusCode {

	case 201:

	case http.StatusCreated:

		return nil

	case 403:

	case http.StatusForbidden:

		return ErrUserUnblockPrevented

	case 404:

	case http.StatusNotFound:

		return ErrUserNotFound

	default:

		return fmt.Errorf("%w: %d", errUnexpectedResultCode, resp.StatusCode)
@@ -980,22 +970,19 @@ func (s *UsersService) UnblockUser(user int64, options ...RequestOptionFunc) err 
}



func (s *UsersService) BanUser(user int64, options ...RequestOptionFunc) error {

	u := fmt.Sprintf("users/%d/ban", user)



	req, err := s.client.NewRequest(http.MethodPost, u, nil, options)

	if err != nil {

		return err

	}



	resp, err := s.client.Do(req, nil)

	_, resp, err := do[none](s.client,

		withMethod(http.MethodPost),

		withPath("users/%d/ban", user),

		withRequestOpts(options...),

	)

	if err != nil && resp == nil {

		return err

	}



	switch resp.StatusCode {

	case 201:

	case http.StatusCreated:

		return nil

	case 404:

	case http.StatusNotFound:

		return ErrUserNotFound

	default:

		return fmt.Errorf("%w: %d", errUnexpectedResultCode, resp.StatusCode)
@@ -1003,22 +990,19 @@ func (s *UsersService) BanUser(user int64, options ...RequestOptionFunc) error { 
}



func (s *UsersService) UnbanUser(user int64, options ...RequestOptionFunc) error {

	u := fmt.Sprintf("users/%d/unban", user)



	req, err := s.client.NewRequest(http.MethodPost, u, nil, options)

	if err != nil {

		return err

	}



	resp, err := s.client.Do(req, nil)

	_, resp, err := do[none](s.client,

		withMethod(http.MethodPost),

		withPath("users/%d/unban", user),

		withRequestOpts(options...),

	)

	if err != nil && resp == nil {

		return err

	}



	switch resp.StatusCode {

	case 201:

	case http.StatusCreated:

		return nil

	case 404:

	case http.StatusNotFound:

		return ErrUserNotFound

	default:

		return fmt.Errorf("%w: %d", errUnexpectedResultCode, resp.StatusCode)
@@ -1026,24 +1010,21 @@ func (s *UsersService) UnbanUser(user int64, options ...RequestOptionFunc) error 
}



func (s *UsersService) DeactivateUser(user int64, options ...RequestOptionFunc) error {

	u := fmt.Sprintf("users/%d/deactivate", user)



	req, err := s.client.NewRequest(http.MethodPost, u, nil, options)

	if err != nil {

		return err

	}



	resp, err := s.client.Do(req, nil)

	_, resp, err := do[none](s.client,

		withMethod(http.MethodPost),

		withPath("users/%d/deactivate", user),

		withRequestOpts(options...),

	)

	if err != nil && resp == nil {

		return err

	}



	switch resp.StatusCode {

	case 201:

	case http.StatusCreated:

		return nil

	case 403:

	case http.StatusForbidden:

		return ErrUserDeactivatePrevented

	case 404:

	case http.StatusNotFound:

		return ErrUserNotFound

	default:

		return fmt.Errorf("%w: %d", errUnexpectedResultCode, resp.StatusCode)
@@ -1051,24 +1032,21 @@ func (s *UsersService) DeactivateUser(user int64, options ...RequestOptionFunc) 
}



func (s *UsersService) ActivateUser(user int64, options ...RequestOptionFunc) error {

	u := fmt.Sprintf("users/%d/activate", user)



	req, err := s.client.NewRequest(http.MethodPost, u, nil, options)

	if err != nil {

		return err

	}



	resp, err := s.client.Do(req, nil)

	_, resp, err := do[none](s.client,

		withMethod(http.MethodPost),

		withPath("users/%d/activate", user),

		withRequestOpts(options...),

	)

	if err != nil && resp == nil {

		return err

	}



	switch resp.StatusCode {

	case 201:

	case http.StatusCreated:

		return nil

	case 403:

	case http.StatusForbidden:

		return ErrUserActivatePrevented

	case 404:

	case http.StatusNotFound:

		return ErrUserNotFound

	default:

		return fmt.Errorf("%w: %d", errUnexpectedResultCode, resp.StatusCode)
@@ -1076,24 +1054,21 @@ func (s *UsersService) ActivateUser(user int64, options ...RequestOptionFunc) er 
}



func (s *UsersService) ApproveUser(user int64, options ...RequestOptionFunc) error {

	u := fmt.Sprintf("users/%d/approve", user)



	req, err := s.client.NewRequest(http.MethodPost, u, nil, options)

	if err != nil {

		return err

	}



	resp, err := s.client.Do(req, nil)

	_, resp, err := do[none](s.client,

		withMethod(http.MethodPost),

		withPath("users/%d/approve", user),

		withRequestOpts(options...),

	)

	if err != nil && resp == nil {

		return err

	}



	switch resp.StatusCode {

	case 201:

	case http.StatusCreated:

		return nil

	case 403:

	case http.StatusForbidden:

		return ErrUserApprovePrevented

	case 404:

	case http.StatusNotFound:

		return ErrUserNotFound

	default:

		return fmt.Errorf("%w: %d", errUnexpectedResultCode, resp.StatusCode)
@@ -1101,26 +1076,23 @@ func (s *UsersService) ApproveUser(user int64, options ...RequestOptionFunc) err 
}



func (s *UsersService) RejectUser(user int64, options ...RequestOptionFunc) error {

	u := fmt.Sprintf("users/%d/reject", user)



	req, err := s.client.NewRequest(http.MethodPost, u, nil, options)

	if err != nil {

		return err

	}



	resp, err := s.client.Do(req, nil)

	_, resp, err := do[none](s.client,

		withMethod(http.MethodPost),

		withPath("users/%d/reject", user),

		withRequestOpts(options...),

	)

	if err != nil && resp == nil {

		return err

	}



	switch resp.StatusCode {

	case 200:

	case http.StatusOK:

		return nil

	case 403:

	case http.StatusForbidden:

		return ErrUserRejectPrevented

	case 404:

	case http.StatusNotFound:

		return ErrUserNotFound

	case 409:

	case http.StatusConflict:

		return ErrUserConflict

	default:

		return fmt.Errorf("%w: %d", errUnexpectedResultCode, resp.StatusCode)
@@ -1294,26 +1266,23 @@ func (s *UsersService) GetUserMemberships(user int64, opt *GetUserMembershipOpti 
}



func (s *UsersService) DisableTwoFactor(user int64, options ...RequestOptionFunc) error {

	u := fmt.Sprintf("users/%d/disable_two_factor", user)



	req, err := s.client.NewRequest(http.MethodPatch, u, nil, options)

	if err != nil {

		return err

	}



	resp, err := s.client.Do(req, nil)

	_, resp, err := do[none](s.client,

		withMethod(http.MethodPatch),

		withPath("users/%d/disable_two_factor", user),

		withRequestOpts(options...),

	)

	if err != nil && resp == nil {

		return err

	}



	switch resp.StatusCode {

	case 204:

	case http.StatusNoContent:

		return nil

	case 400:

	case http.StatusBadRequest:

		return ErrUserTwoFactorNotEnabled

	case 403:

	case http.StatusForbidden:

		return ErrUserDisableTwoFactorPrevented

	case 404:

	case http.StatusNotFound:

		return ErrUserNotFound

	default:

		return fmt.Errorf("%w: %d", errUnexpectedResultCode, resp.StatusCode)