Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Improve "Wrong Token." message #832

Merged
merged 2 commits into from Aug 24, 2018

Conversation

Projects
None yet
3 participants
@DL6ER
Copy link
Member

commented Aug 24, 2018

By submitting this pull request, I confirm the following:

  • I have read and understood the contributors guide, as well as this entire template.
  • I have made only one major change in my proposed changes.
  • I have commented my proposed changes within the code.
  • I have tested my proposed changes.
  • I am willing to help maintain this change if there are issues with it later.
  • I give this submission freely and claim no ownership.
  • It is compatible with the EUPL 1.2 license
  • I have squashed any insignificant commits. (git rebase)
  • I have Signed Off all commits. (git commit --signoff)

What does this PR aim to accomplish?:

The Wrong Token. error message is shown whenever the token is wrong or not available. This commit adds more details into this message to help user's in their own troubleshooting.

This should improve situations like described here: https://discourse.pi-hole.net/t/regex-wrong-token/12232

How does this PR accomplish the above?:

Differentiate one if with three conditions into three individual ifs, each with its own error message.

What documentation changes (if any) are needed to support this PR?:

None.

The "Wrong Token." message is shown whenever the token is wrong or no…
…t available. This commit adds more details into this message to help user's in their own troubleshooting.

Signed-off-by: DL6ER <dl6er@dl6er.de>

@DL6ER DL6ER added the Enhancement label Aug 24, 2018

@DL6ER DL6ER added this to the v4.1 milestone Aug 24, 2018

@DL6ER DL6ER requested a review from pi-hole/web-approvers Aug 24, 2018

Wrong token is either when users try to do it via an old session or t…
…hrough a script. Hence, the message should tell the user to re-login

Signed-off-by: DL6ER <dl6er@dl6er.de>
@Mcat12

Mcat12 approved these changes Aug 24, 2018

@Mcat12 Mcat12 merged commit ae3fdb4 into devel Aug 24, 2018

1 check passed

Codacy/PR Quality Review Up to standards. A positive pull request.
Details

@Mcat12 Mcat12 deleted the tweak/wrong-token-message branch Aug 24, 2018

@pralor

This comment has been minimized.

Copy link

commented Dec 9, 2018

This pull request has been mentioned on Pi-hole Userspace. There might be relevant details there:

https://discourse.pi-hole.net/t/pi-hole-v4-1-is-now-available/14990/1

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.