Skip to content

Commit

Permalink
Merge pull request #229 from aroskanalen/feature/394_fix_post_activate
Browse files Browse the repository at this point in the history
#394: Fixed body of activate request
  • Loading branch information
tuj authored Mar 4, 2024
2 parents d6c7f7f + 3026193 commit a92a240
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 3 deletions.
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@ All notable changes to this project will be documented in this file.

## [Unreleased]

- [#229](https://github.com/os2display/display-admin-client/pull/229)
- Fixed post body of activation POST request.
- [#228](https://github.com/os2display/display-admin-client/pull/228)
- Changed login page to only get oidc urls when a login button has been clicked.
- [#227](https://github.com/os2display/display-admin-client/pull/227)
Expand Down
4 changes: 2 additions & 2 deletions src/components/activation-code/activation-code-activate.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@ import FormInput from "../util/forms/form-input";
import ContentFooter from "../util/content-footer/content-footer";

/**
* The user create component.
* The activation code activate page.
*
* @returns {object} The user create page.
* @returns {object} The activation code activate page.
*/
function ActivationCodeActivate() {
const { t } = useTranslation("common", {
Expand Down
2 changes: 1 addition & 1 deletion src/components/user/login.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,7 @@ function Login() {

dispatch(
api.endpoints.postV1UserActivationCodesActivate.initiate({
userActivationCodeUserActivateInput: JSON.stringify({
userActivationCodeActivationCode: JSON.stringify({
activationCode,
}),
})
Expand Down

0 comments on commit a92a240

Please sign in to comment.