Skip to content

Issue 54174: Trial sites have csp violation #7164

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
labkey-jeckels merged 2 commits into from
Oct 31, 2025
Merged

Issue 54174: Trial sites have csp violation #7164

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c5ce266
Issue 54174: Trial sites have csp violation
labkey-jeckels Oct 30, 2025
202e93b
Avoid JS errors on initial user creation page
labkey-jeckels Oct 30, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions core/src/org/labkey/core/CoreModule.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,10 +57,7 @@
import org.labkey.api.data.CoreSchema;
import org.labkey.api.data.DataColumn;
import org.labkey.api.data.DataRegion;
import org.labkey.api.data.DatabaseMigrationService;
import org.labkey.api.data.DatabaseMigrationService.DefaultMigrationSchemaHandler;
import org.labkey.api.data.DbSchema;
import org.labkey.api.data.DbSchemaType;
import org.labkey.api.data.DbScope;
import org.labkey.api.data.FileSqlScriptProvider;
import org.labkey.api.data.MvUtil;
Expand Down Expand Up @@ -107,7 +104,6 @@
import org.labkey.api.products.ProductRegistry;
import org.labkey.api.qc.DataStateManager;
import org.labkey.api.query.DefaultSchema;
import org.labkey.api.query.FieldKey;
import org.labkey.api.query.QuerySchema;
import org.labkey.api.query.QueryService;
import org.labkey.api.query.QuerySettings;
Expand Down
1 change: 1 addition & 0 deletions core/src/org/labkey/core/analytics/AnalyticsServiceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -288,5 +288,6 @@ public void handle(Map<AnalyticsProperty, StartupPropertyEntry> startupPropertie
}
});
properties.save();
get().resetCSP();
}
}
1 change: 1 addition & 0 deletions core/src/org/labkey/core/login/LoginController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2496,6 +2496,7 @@ public Object execute(Object o, BindException errors) throws Exception
@IgnoresTermsOfUse
@IgnoresForbiddenProjectCheck
@AllowedDuringUpgrade
@AllowedBeforeInitialUserIsSet
public static class WhoAmIAction extends ReadOnlyApiAction<Object>
{
@Override
Expand Down