From 499fff799fa3e21036bb302dccce2d525ae4303c Mon Sep 17 00:00:00 2001 From: bat Date: Sun, 21 May 2023 06:51:10 +0000 Subject: [PATCH] pass gitea environment variables into auth --- auth.js | 17 +++++++++++++++++ server.js | 10 ++++++---- 2 files changed, 23 insertions(+), 4 deletions(-) diff --git a/auth.js b/auth.js index 3be909f..ecf36ba 100644 --- a/auth.js +++ b/auth.js @@ -1,5 +1,22 @@ export class Auth { + constructor({ + baseUrl, + remoteBaseUrl, + giteaAppBaseUrl, + giteaClientId, + giteaClientSecret + }) { + this.baseUrl = baseUrl + this.remoteBaseUrl = remoteBaseUrl + this.giteaAppBaseUrl = giteaAppBaseUrl + this.giteaClientId = giteaClientId + this.giteaClientSecret = giteaClientSecret + } + async redirect(event) { + const url = new URL( + this.remoteBaseUrl + '/' + ) event.respondWith(new Response( 'extract query and redirect', {status: 200} )) diff --git a/server.js b/server.js index 6f543bf..8e068e2 100644 --- a/server.js +++ b/server.js @@ -1,5 +1,5 @@ -//import { Auth } from "./auth.js" -//import { Frontend } from "./frontend.js" +import { Auth } from "./auth.js" +import { Frontend } from "./frontend.js" export class Server { async getEnv(variables) { @@ -47,9 +47,11 @@ export class Server { await this.configure() } this.auth = new Auth({ + baseUrl: this.baseUrl, remoteBaseUrl: this.remoteBaseUrl, - clientId: this.giteaClientId, - clientSecret: this.giteaClientSecret, + giteaAppBaseUrl: this.giteaAppBaseUrl, + giteaClientId: this.giteaClientId, + giteaClientSecret: this.giteaClientSecret, }) this.frontend = new Frontend({ appBaseUrl: this.giteaAppBaseUrl,