diff --git a/server.js b/server.js index 04987b8..6f543bf 100644 --- a/server.js +++ b/server.js @@ -23,24 +23,34 @@ export class Server { const env = await this.getEnv([ 'PORT', 'BASE_URL', + 'REMOTE_BASE_URL', 'GITEA_APP_BASE_URL', 'GITEA_API_BASE_URL', + 'GITEA_CLIENT_ID', + 'GITEA_CLIENT_SECRET', ]) this.port = env.PORT ?? 3000 this.baseUrl = env.BASE_URL ?? '/macchiato' + this.remoteBaseUrl = env.REMOTE_BASE_URL this.giteaAppBaseUrl = ( env.GITEA_APP_BASE_URL ?? 'http://gitea:3000' ) this.giteaApiBaseUrl = ( env.GITEA_API_BASE_URL ?? 'http://gitea:3000/api/v1' ) + this.giteaClientId = env.GITEA_CLIENT_ID + this.giteaClientSecret = env.GITEA_CLIENT_SECRET } async init() { if (this.port === undefined) { await this.configure() } - this.auth = new Auth() + this.auth = new Auth({ + remoteBaseUrl: this.remoteBaseUrl, + clientId: this.giteaClientId, + clientSecret: this.giteaClientSecret, + }) this.frontend = new Frontend({ appBaseUrl: this.giteaAppBaseUrl, apiBaseUrl: this.giteaApiBaseUrl,