Merge remote-tracking branch 'origin/main' into scripting_cleanup

structr · May 21, 2024 · 505dc68 · 505dc68
2 parents 013dd47 + 51668cd
commit 505dc68
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 5 deletions.
diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml
@@ -84,8 +84,8 @@ jobs:
  - run: mvn -U clean install -Pwith-sources -DskipTests -DskipDockerTestDB
  - name: Upload binaries
  run: >-
- scp -v structr-binaries/target/structr-*.deb structr.com:/files/repositories/upload > /dev/null 2>&1 &&
- scp -v structr-binaries/target/structr-*-dist.zip structr.com:/files/repositories/upload >/dev/null 2>&1
+ scp -v structr-binaries/target/structr-*.deb download.structr.com:/files/repositories/upload > /dev/null 2>&1 &&
+ scp -v structr-binaries/target/structr-*-dist.zip download.structr.com:/files/repositories/upload >/dev/null 2>&1
 
  cleanup-system:
  runs-on: self-hosted

diff --git a/structr-base/src/main/java/org/structr/web/auth/AbstractOAuth2Client.java b/structr-base/src/main/java/org/structr/web/auth/AbstractOAuth2Client.java
@@ -32,6 +32,7 @@
 import org.slf4j.LoggerFactory;
 import org.structr.api.config.Settings;
 import org.structr.common.error.FrameworkException;
+import org.structr.core.app.StructrApp;
 import org.structr.core.entity.Principal;
 import org.structr.schema.action.EvaluationHints;
 
@@ -215,7 +216,7 @@ public Map<String, Object> getUserInfo() {
  @Override
  public void invokeOnLoginMethod(Principal user) throws FrameworkException {
 
- final AbstractMethod method = Methods.resolveMethod(User.class, "onOAuthLogin");
+ final AbstractMethod method = Methods.resolveMethod(StructrApp.getConfiguration().getNodeEntityClass("User"), "onOAuthLogin");
  if (method != null) {
 
  final Arguments arguments = new Arguments();

diff --git a/structr-db-driver-api/src/main/java/org/structr/api/config/Settings.java b/structr-db-driver-api/src/main/java/org/structr/api/config/Settings.java
@@ -78,8 +78,8 @@ public enum POSSIBLE_UUID_V4_FORMATS {
  public static final SettingsGroup licensingGroup = new SettingsGroup("licensing", "Licensing");
 
  // general settings
- public static final Setting<String> ReleasesIndexUrl = new StringSetting(generalGroup, "Application", "application.releases.index.url", "https://structr.com/repositories/releases/org/structr/structr/index", "URL with release index (list of version strings for Structr releases)");
- public static final Setting<String> SnapshotsIndexUrl = new StringSetting(generalGroup, "Application", "application.snapshots.index.url", "https://structr.com/repositories/snapshots/org/structr/structr/index", "URL with snapshot index (list of version strings for Structr unstable builds)");
+ public static final Setting<String> ReleasesIndexUrl = new StringSetting(generalGroup, "Application", "application.releases.index.url", "https://download.structr.com/repositories/releases/org/structr/structr/index", "URL with release index (list of version strings for Structr releases)");
+ public static final Setting<String> SnapshotsIndexUrl = new StringSetting(generalGroup, "Application", "application.snapshots.index.url", "https://download.structr.com/repositories/snapshots/org/structr/structr/index", "URL with snapshot index (list of version strings for Structr unstable builds)");
  public static final Setting<String> ApplicationTitle = new StringSetting(generalGroup, "Application", "application.title", "Structr", "The title of the application as shown in the log file. This entry exists for historical reasons and has no functional impact other than appearing in the log file.");
  public static final Setting<String> InstanceName = new StringSetting(generalGroup, "Application", "application.instance.name", "", "The name of the Structr instance (displayed in the top right corner of structr-ui)");
  public static final Setting<String> InstanceStage = new StringSetting(generalGroup, "Application", "application.instance.stage", "", "The stage of the Structr instance (displayed in the top right corner of structr-ui)");