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.

Sign up for GitHub

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

feat: login fallback error #19537

Merged
merged 9 commits into from
Dec 23, 2024
Merged

feat: login fallback error #19537

Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
1d4c721
feat: dynamically get url to make api calls
Chisomchima Dec 9, 2024
c8b8aef
feat: dynamically get url to make api calls
Chisomchima Dec 9, 2024
d461569
fix: use relative path instead of dynamic url
Chisomchima Dec 10, 2024
4fc19b7
Merge branch 'master' of github-chisom:dhis2/dhis2-core into DHIS2-18…
Chisomchima Dec 11, 2024
3b6bb90
Merge branch 'master' of github-chisom:dhis2/dhis2-core into DHIS2-18…
Chisomchima Dec 17, 2024
5f472f1
feat: update relative path
Chisomchima Dec 19, 2024
8e7f1ce
Merge branch 'master' of github-chisom:dhis2/dhis2-core into DHIS2-18…
Chisomchima Dec 19, 2024
c1c3499
chore: add relative paths for images
Chisomchima Dec 20, 2024
bf8faee
Merge branch 'master' into DHIS2-18585/login-fallback-error
Chisomchima Dec 20, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions dhis-2/dhis-web-api/src/main/resources/org/hisp/dhis/webapi/servlet/login.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -250,7 +250,7 @@
</div>
<img
class="logo"
src="/dhis-web-commons/security/logo_front.png"
src="./dhis-web-commons/security/logo_front.png"
alt="DHIS2 Logo"
/>
</div>
Expand Down Expand Up @@ -328,7 +328,7 @@ <h1>Log in</h1>
// Fetch the login configuration dynamically
async function fetchLoginConfig() {
try {
const response = await fetch("../api/loginConfig");
const response = await fetch("./api/loginConfig");

if (!response.ok) {
let errorMessage = "Login failed: " + response.status;
Expand All @@ -351,7 +351,7 @@ <h1>Log in</h1>
config.applicationDescription || "Welcome to the DHIS2 application";
if (config.countryFlag) {
const flag = document.getElementById("flag");
flag.src = `/dhis-web-commons/flags/${config.countryFlag}.png`;
flag.src = `./dhis-web-commons/flags/${config.countryFlag}.png`;
flag.style.display = "block";
}
} catch (error) {
Expand Down Expand Up @@ -400,7 +400,7 @@ <h1>Log in</h1>
}

try {
const response = await fetch("../api/auth/login", {
const response = await fetch("./api/auth/login", {
method: "POST",
headers: {
"Content-Type": "application/json",
Expand All @@ -425,7 +425,7 @@ <h1>Log in</h1>
const user = await response.json();

if (user.loginStatus === "SUCCESS") {
const redirectUrl = user.redirectUrl || "/";
const redirectUrl = user.redirectUrl || "./";
window.location.href = redirectUrl;
} else {
throw new Error("Login failed. Status: " + user.loginStatus);
Expand Down
Loading