mirror of
https://github.com/arsvendg/Stirling-PDF.git
synced 2026-07-16 19:33:11 +02:00
always allow tauri cors (#5616)
# Description of Changes <!-- Please provide a summary of the changes, including: - What was changed - Why the change was made - Any challenges encountered Closes #(issue_number) --> --- ## Checklist ### General - [ ] I have read the [Contribution Guidelines](https://github.com/Stirling-Tools/Stirling-PDF/blob/main/CONTRIBUTING.md) - [ ] I have read the [Stirling-PDF Developer Guide](https://github.com/Stirling-Tools/Stirling-PDF/blob/main/devGuide/DeveloperGuide.md) (if applicable) - [ ] I have read the [How to add new languages to Stirling-PDF](https://github.com/Stirling-Tools/Stirling-PDF/blob/main/devGuide/HowToAddNewLanguage.md) (if applicable) - [ ] I have performed a self-review of my own code - [ ] My changes generate no new warnings ### Documentation - [ ] I have updated relevant docs on [Stirling-PDF's doc repo](https://github.com/Stirling-Tools/Stirling-Tools.github.io/blob/main/docs/) (if functionality has heavily changed) - [ ] I have read the section [Add New Translation Tags](https://github.com/Stirling-Tools/Stirling-PDF/blob/main/devGuide/HowToAddNewLanguage.md#add-new-translation-tags) (for new translation tags only) ### Translations (if applicable) - [ ] I ran [`scripts/counter_translation.py`](https://github.com/Stirling-Tools/Stirling-PDF/blob/main/docs/counter_translation.md) ### UI Changes (if applicable) - [ ] Screenshots or videos demonstrating the UI changes are attached (e.g., as comments or direct attachments in the PR) ### Testing (if applicable) - [ ] I have tested my changes locally. Refer to the [Testing Guide](https://github.com/Stirling-Tools/Stirling-PDF/blob/main/devGuide/DeveloperGuide.md#6-testing) for more details.
This commit is contained in:
@@ -106,16 +106,29 @@ public class WebMvcConfig implements WebMvcConfigurer {
|
|||||||
.allowCredentials(true)
|
.allowCredentials(true)
|
||||||
.maxAge(3600);
|
.maxAge(3600);
|
||||||
} else if (hasConfiguredOrigins) {
|
} else if (hasConfiguredOrigins) {
|
||||||
// Use user-configured origins
|
// Use user-configured origins + always include Tauri origins for desktop app support
|
||||||
logger.info(
|
logger.info(
|
||||||
"Configuring CORS with allowed origins: {}",
|
"Configuring CORS with allowed origins: {}",
|
||||||
applicationProperties.getSystem().getCorsAllowedOrigins());
|
applicationProperties.getSystem().getCorsAllowedOrigins());
|
||||||
|
|
||||||
String[] allowedOrigins =
|
// Combine user-configured origins with Tauri origins
|
||||||
applicationProperties
|
java.util.List<String> allOrigins =
|
||||||
.getSystem()
|
new java.util.ArrayList<>(
|
||||||
.getCorsAllowedOrigins()
|
applicationProperties.getSystem().getCorsAllowedOrigins());
|
||||||
.toArray(new String[0]);
|
|
||||||
|
// Always include Tauri origins for desktop app compatibility
|
||||||
|
// Tauri v1 uses tauri://localhost, v2 uses http(s)://tauri.localhost
|
||||||
|
if (!allOrigins.contains("tauri://localhost")) {
|
||||||
|
allOrigins.add("tauri://localhost");
|
||||||
|
}
|
||||||
|
if (!allOrigins.contains("http://tauri.localhost")) {
|
||||||
|
allOrigins.add("http://tauri.localhost");
|
||||||
|
}
|
||||||
|
if (!allOrigins.contains("https://tauri.localhost")) {
|
||||||
|
allOrigins.add("https://tauri.localhost");
|
||||||
|
}
|
||||||
|
|
||||||
|
String[] allowedOrigins = allOrigins.toArray(new String[0]);
|
||||||
|
|
||||||
registry.addMapping("/**")
|
registry.addMapping("/**")
|
||||||
.allowedOriginPatterns(allowedOrigins)
|
.allowedOriginPatterns(allowedOrigins)
|
||||||
|
|||||||
+1
-1
@@ -67,7 +67,7 @@ springBoot {
|
|||||||
|
|
||||||
allprojects {
|
allprojects {
|
||||||
group = 'stirling.software'
|
group = 'stirling.software'
|
||||||
version = '2.4.2'
|
version = '2.4.3'
|
||||||
|
|
||||||
configurations.configureEach {
|
configurations.configureEach {
|
||||||
exclude group: 'commons-logging', module: 'commons-logging'
|
exclude group: 'commons-logging', module: 'commons-logging'
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
{
|
{
|
||||||
"$schema": "../node_modules/@tauri-apps/cli/config.schema.json",
|
"$schema": "../node_modules/@tauri-apps/cli/config.schema.json",
|
||||||
"productName": "Stirling-PDF",
|
"productName": "Stirling-PDF",
|
||||||
"version": "2.4.2",
|
"version": "2.4.3",
|
||||||
"identifier": "stirling.pdf.dev",
|
"identifier": "stirling.pdf.dev",
|
||||||
"build": {
|
"build": {
|
||||||
"frontendDist": "../dist",
|
"frontendDist": "../dist",
|
||||||
|
|||||||
@@ -38,7 +38,7 @@ const FREE_LICENSE_INFO: LicenseInfo = {
|
|||||||
|
|
||||||
const BASE_NO_LOGIN_CONFIG: AppConfig = {
|
const BASE_NO_LOGIN_CONFIG: AppConfig = {
|
||||||
enableAnalytics: true,
|
enableAnalytics: true,
|
||||||
appVersion: '2.4.2',
|
appVersion: '2.4.3',
|
||||||
serverCertificateEnabled: false,
|
serverCertificateEnabled: false,
|
||||||
enableAlphaFunctionality: false,
|
enableAlphaFunctionality: false,
|
||||||
serverPort: 8080,
|
serverPort: 8080,
|
||||||
|
|||||||
@@ -48,7 +48,7 @@ const FREE_LICENSE_INFO: LicenseInfo = {
|
|||||||
|
|
||||||
const BASE_NO_LOGIN_CONFIG: AppConfig = {
|
const BASE_NO_LOGIN_CONFIG: AppConfig = {
|
||||||
enableAnalytics: true,
|
enableAnalytics: true,
|
||||||
appVersion: '2.4.2',
|
appVersion: '2.4.3',
|
||||||
serverCertificateEnabled: false,
|
serverCertificateEnabled: false,
|
||||||
enableAlphaFunctionality: false,
|
enableAlphaFunctionality: false,
|
||||||
enableDesktopInstallSlide: true,
|
enableDesktopInstallSlide: true,
|
||||||
|
|||||||
Reference in New Issue
Block a user