Skip to content

Commit 66aa5dd

Browse files
committed
fix: oidc http/https redirect issue
1 parent 34335e9 commit 66aa5dd

3 files changed

Lines changed: 8 additions & 14 deletions

File tree

docker/nginx-https.conf

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ http {
9090
proxy_set_header Host $host;
9191
proxy_set_header X-Real-IP $remote_addr;
9292
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
93-
proxy_set_header X-Forwarded-Proto $scheme;
93+
proxy_set_header X-Forwarded-Proto $proxy_x_forwarded_proto;
9494
}
9595

9696
location ~ ^/users(/.*)?$ {
@@ -99,7 +99,7 @@ http {
9999
proxy_set_header Host $host;
100100
proxy_set_header X-Real-IP $remote_addr;
101101
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
102-
proxy_set_header X-Forwarded-Proto $scheme;
102+
proxy_set_header X-Forwarded-Proto $proxy_x_forwarded_proto;
103103
}
104104

105105
location ~ ^/version(/.*)?$ {

docker/nginx.conf

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ http {
7979
proxy_set_header Host $host;
8080
proxy_set_header X-Real-IP $remote_addr;
8181
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
82-
proxy_set_header X-Forwarded-Proto $scheme;
82+
proxy_set_header X-Forwarded-Proto $proxy_x_forwarded_proto;
8383
}
8484

8585
location ~ ^/users(/.*)?$ {
@@ -88,7 +88,7 @@ http {
8888
proxy_set_header Host $host;
8989
proxy_set_header X-Real-IP $remote_addr;
9090
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
91-
proxy_set_header X-Forwarded-Proto $scheme;
91+
proxy_set_header X-Forwarded-Proto $proxy_x_forwarded_proto;
9292
}
9393

9494
location ~ ^/version(/.*)?$ {

src/backend/database/routes/users.ts

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -46,10 +46,6 @@ import { loginRateLimiter } from "../../utils/login-rate-limiter.js";
4646

4747
const authManager = AuthManager.getInstance();
4848

49-
/**
50-
* Get OIDC configuration from environment variables.
51-
* Returns null if required env vars are not set.
52-
*/
5349
function getOIDCConfigFromEnv(): {
5450
client_id: string;
5551
client_secret: string;
@@ -1309,9 +1305,8 @@ router.get("/oidc/callback", async (req, res) => {
13091305
}
13101306

13111307
try {
1312-
const { SharedCredentialManager } = await import(
1313-
"../../utils/shared-credential-manager.js"
1314-
);
1308+
const { SharedCredentialManager } =
1309+
await import("../../utils/shared-credential-manager.js");
13151310
const sharedCredManager = SharedCredentialManager.getInstance();
13161311
await sharedCredManager.reEncryptPendingCredentialsForUser(userRecord.id);
13171312
} catch {
@@ -1519,9 +1514,8 @@ router.post("/login", async (req, res) => {
15191514
}
15201515

15211516
try {
1522-
const { SharedCredentialManager } = await import(
1523-
"../../utils/shared-credential-manager.js"
1524-
);
1517+
const { SharedCredentialManager } =
1518+
await import("../../utils/shared-credential-manager.js");
15251519
const sharedCredManager = SharedCredentialManager.getInstance();
15261520
await sharedCredManager.reEncryptPendingCredentialsForUser(userRecord.id);
15271521
} catch (error) {

0 commit comments

Comments
 (0)