Update docker compose versions of neucore to 2.4.0

cmd-johnson · May 5, 2024 · 1dd3bd6 · 1dd3bd6
1 parent 14f4f75
commit 1dd3bd6
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 4 deletions.
diff --git a/docker-compose.dev.yml b/docker-compose.dev.yml
@@ -20,7 +20,7 @@ services:
       MARIADB_PASSWORD: "neucore"
 
   neucore:
-    image: tkhamez/neucore:2.2.1
+    image: tkhamez/neucore:2.4.0
     ports:
       - "8080:80"
     environment:

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -34,6 +34,8 @@ services:
       SSO_CLIENT_ID:
       SSO_CLIENT_SECRET:
       SSO_REDIRECT_URI: "http://localhost:3000/auth/callback"
+      SSO_TOKEN_URI: "https://login.eveonline.com/v2/oauth/token"
+      SSO_AUTHORIZATION_URI: "https://login.eveonline.com/v2/oauth/authorize"
       SLACK_TOKEN:
       CORE_URL: "http://neucore/api"
       CORE_APP_ID:
@@ -68,7 +70,7 @@ services:
       MARIADB_PASSWORD: "neucore"
 
   neucore:
-    image: tkhamez/neucore:2.2.1
+    image: tkhamez/neucore:2.4.0
     ports:
       - "8080:80"
     environment:

diff --git a/packages/backend/README.md b/packages/backend/README.md
@@ -78,6 +78,11 @@ SSO_CLIENT_SECRET
 # if you mount the application behind a reverse proxy and under a subpath, it
 # may also be something like https://example.com/pingboard/auth/callback.
 SSO_REDIRECT_URI
+
+# The Eve OAuth2 Token URI (defaults to https://login.eveonline.com/v2/oauth/token)
+#SSO_TOKEN_URI
+# The Eve OAuth2 Authorization URI (defaults to https://login.eveonline.com/v2/oauth/authorize/)
+#SSO_AUTHORIZATION_URI
 ```
 
 ### Slack configuration

diff --git a/packages/backend/src/index.ts b/packages/backend/src/index.ts
@@ -12,6 +12,8 @@ async function main() {
     clientId: getFromEnv('SSO_CLIENT_ID'),
     clientSecret: getFromEnv('SSO_CLIENT_SECRET'),
     redirectUri: getFromEnv('SSO_REDIRECT_URI'),
+    accessTokenUri: getOptionalFromEnv('SSO_TOKEN_URI'),
+    authorizationUri: getOptionalFromEnv('SSO_AUTHORIZATION_URI'),
   })
   eveSsoClient.startAutoCleanup()
 
@@ -93,6 +95,12 @@ function getFromEnv(key: string): string {
   return value
 }
 
+function getOptionalFromEnv(key: string): string | undefined {
+  const value = process.env[key]
+  if (value) return value
+  return undefined
+}
+
 function getNumberFromEnv(key: string, fallback?: number): number {
   const value = process.env[key]
   if (typeof value !== 'string') {

diff --git a/packages/backend/src/sso/eve-sso-client.ts b/packages/backend/src/sso/eve-sso-client.ts
@@ -13,6 +13,11 @@ export interface EveSSOClientConfig {
   /** The Callback URL configured on https://developers.eveonline.com/ */
   redirectUri: string
 
+  /** The Eve OAuth2 Token URI */
+  accessTokenUri?: string,
+  /** The Eve OAuth2 Authorization URI */
+  authorizationUri?: string,
+
   /**
    * Time in seconds after which OAuth2 login states expire.
    * Defaults to 5 minutes.
@@ -45,8 +50,8 @@ export class EveSSOClient {
       clientId: options.clientId,
       clientSecret: options.clientSecret,
       redirectUri: options.redirectUri,
-      accessTokenUri: 'https://login.eveonline.com/v2/oauth/token',
-      authorizationUri: 'https://login.eveonline.com/v2/oauth/authorize/',
+      accessTokenUri: options.accessTokenUri ?? 'https://login.eveonline.com/v2/oauth/token',
+      authorizationUri: options.authorizationUri ?? 'https://login.eveonline.com/v2/oauth/authorize',
     })
 
     this.stateTimeout = options.stateTimeout ?? 300