From 3027d0458433733529645997e3a69d0ce6b23bbd Mon Sep 17 00:00:00 2001
From: bat <bat@noreply.codeberg.org>
Date: Thu, 25 May 2023 06:53:02 +0000
Subject: [PATCH] use web base url for redirect in browser

---
 auth.js   | 8 +++++---
 server.js | 5 ++++-
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/auth.js b/auth.js
index 2913b58..390ea95 100644
--- a/auth.js
+++ b/auth.js
@@ -4,20 +4,22 @@ export class Auth {
   constructor({
     baseUrl,
     remoteBaseUrl,
-    giteaAppBaseUrl,
+    giteaApiBaseUrl,
+    giteaWebBaseUrl,
     giteaClientId,
     giteaClientSecret
   }) {
     this.baseUrl = baseUrl
     this.remoteBaseUrl = remoteBaseUrl
-    this.giteaAppBaseUrl = giteaAppBaseUrl
+    this.giteaApiBaseUrl = giteaApiBaseUrl
+    this.giteaWebBaseUrl = giteaWebBaseUrl
     this.giteaClientId = giteaClientId
     this.giteaClientSecret = giteaClientSecret
   }
 
   async redirect(event) {
     const url = new URL(
-      this.giteaAppBaseUrl + '/login/oauth/authorize'
+      this.giteaWebBaseUrl + '/login/oauth/authorize'
     )
     const search = new URLSearchParams()
     search.set('response_type', 'code')
diff --git a/server.js b/server.js
index 8e068e2..0c91d94 100644
--- a/server.js
+++ b/server.js
@@ -26,6 +26,7 @@ export class Server {
       'REMOTE_BASE_URL',
       'GITEA_APP_BASE_URL',
       'GITEA_API_BASE_URL',
+      'GITEA_WEB_BASE_URL',
       'GITEA_CLIENT_ID',
       'GITEA_CLIENT_SECRET',
     ])
@@ -38,6 +39,7 @@ export class Server {
     this.giteaApiBaseUrl = (
       env.GITEA_API_BASE_URL ?? 'http://gitea:3000/api/v1'
     )
+    this.giteaWebBaseUrl = env.GITEA_WEB_BASE_URL
     this.giteaClientId = env.GITEA_CLIENT_ID
     this.giteaClientSecret = env.GITEA_CLIENT_SECRET
   }
@@ -49,7 +51,8 @@ export class Server {
     this.auth = new Auth({
       baseUrl: this.baseUrl,
       remoteBaseUrl: this.remoteBaseUrl,
-      giteaAppBaseUrl: this.giteaAppBaseUrl,
+      giteaApiBaseUrl: this.giteaApiBaseUrl,
+      giteaWebBaseUrl: this.giteaWebBaseUrl,
       giteaClientId: this.giteaClientId,
       giteaClientSecret: this.giteaClientSecret,
     })