use web base url for redirect in browser

shared-server
bat 3 years ago
parent c207fcc949
commit 3027d04584

@ -4,20 +4,22 @@ export class Auth {
constructor({ constructor({
baseUrl, baseUrl,
remoteBaseUrl, remoteBaseUrl,
giteaAppBaseUrl, giteaApiBaseUrl,
giteaWebBaseUrl,
giteaClientId, giteaClientId,
giteaClientSecret giteaClientSecret
}) { }) {
this.baseUrl = baseUrl this.baseUrl = baseUrl
this.remoteBaseUrl = remoteBaseUrl this.remoteBaseUrl = remoteBaseUrl
this.giteaAppBaseUrl = giteaAppBaseUrl this.giteaApiBaseUrl = giteaApiBaseUrl
this.giteaWebBaseUrl = giteaWebBaseUrl
this.giteaClientId = giteaClientId this.giteaClientId = giteaClientId
this.giteaClientSecret = giteaClientSecret this.giteaClientSecret = giteaClientSecret
} }
async redirect(event) { async redirect(event) {
const url = new URL( const url = new URL(
this.giteaAppBaseUrl + '/login/oauth/authorize' this.giteaWebBaseUrl + '/login/oauth/authorize'
) )
const search = new URLSearchParams() const search = new URLSearchParams()
search.set('response_type', 'code') search.set('response_type', 'code')

@ -26,6 +26,7 @@ export class Server {
'REMOTE_BASE_URL', 'REMOTE_BASE_URL',
'GITEA_APP_BASE_URL', 'GITEA_APP_BASE_URL',
'GITEA_API_BASE_URL', 'GITEA_API_BASE_URL',
'GITEA_WEB_BASE_URL',
'GITEA_CLIENT_ID', 'GITEA_CLIENT_ID',
'GITEA_CLIENT_SECRET', 'GITEA_CLIENT_SECRET',
]) ])
@ -38,6 +39,7 @@ export class Server {
this.giteaApiBaseUrl = ( this.giteaApiBaseUrl = (
env.GITEA_API_BASE_URL ?? 'http://gitea:3000/api/v1' env.GITEA_API_BASE_URL ?? 'http://gitea:3000/api/v1'
) )
this.giteaWebBaseUrl = env.GITEA_WEB_BASE_URL
this.giteaClientId = env.GITEA_CLIENT_ID this.giteaClientId = env.GITEA_CLIENT_ID
this.giteaClientSecret = env.GITEA_CLIENT_SECRET this.giteaClientSecret = env.GITEA_CLIENT_SECRET
} }
@ -49,7 +51,8 @@ export class Server {
this.auth = new Auth({ this.auth = new Auth({
baseUrl: this.baseUrl, baseUrl: this.baseUrl,
remoteBaseUrl: this.remoteBaseUrl, remoteBaseUrl: this.remoteBaseUrl,
giteaAppBaseUrl: this.giteaAppBaseUrl, giteaApiBaseUrl: this.giteaApiBaseUrl,
giteaWebBaseUrl: this.giteaWebBaseUrl,
giteaClientId: this.giteaClientId, giteaClientId: this.giteaClientId,
giteaClientSecret: this.giteaClientSecret, giteaClientSecret: this.giteaClientSecret,
}) })

Loading…
Cancel
Save