Skip to content

Upgrade to the latest version of XP 8 #385 #386

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

Draft
wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

Upgrade to the latest version of XP 8 #385 #386

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 5 additions & 5 deletions src/main/java/com/enonic/lib/asset/RequestVerifierHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
import java.util.regex.Matcher;
import java.util.regex.Pattern;

import com.enonic.xp.admin.extension.AdminExtensionDescriptorService;
import com.enonic.xp.admin.tool.AdminToolDescriptorService;
import com.enonic.xp.admin.widget.WidgetDescriptorService;
import com.enonic.xp.app.ApplicationKey;
import com.enonic.xp.content.ContentService;
import com.enonic.xp.portal.PortalRequest;
Expand Down Expand Up @@ -33,7 +33,7 @@ public class RequestVerifierHandler

private Supplier<AdminToolDescriptorService> adminToolDescriptorServiceSupplier;

private Supplier<WidgetDescriptorService> widgetDescriptorServiceSupplier;
private Supplier<AdminExtensionDescriptorService> extensionDescriptorServiceSupplier;

@Override
public void initialize( final BeanContext beanContext )
Expand All @@ -42,7 +42,7 @@ public void initialize( final BeanContext beanContext )
this.contentServiceSupplier = beanContext.getService( ContentService.class );
this.projectServiceSupplier = beanContext.getService( ProjectService.class );
this.adminToolDescriptorServiceSupplier = beanContext.getService( AdminToolDescriptorService.class );
this.widgetDescriptorServiceSupplier = beanContext.getService( WidgetDescriptorService.class );
this.extensionDescriptorServiceSupplier = beanContext.getService( AdminExtensionDescriptorService.class );
}

public boolean verify()
Expand All @@ -68,7 +68,7 @@ public boolean verify()

if ( rawPath.startsWith( "/admin/site/admin/" ) )
{
return widgetDescriptorServiceSupplier.get().getByApplication( applicationKey ).isNotEmpty();
return extensionDescriptorServiceSupplier.get().getByApplication( applicationKey ).isNotEmpty();
}
else if ( rawPath.startsWith( "/site/" ) || rawPath.startsWith( "/admin/site/" ) )
{
Expand All @@ -81,7 +81,7 @@ else if ( rawPath.startsWith( "/webapp/" ) )
else
{
return adminToolDescriptorServiceSupplier.get().getByApplication( applicationKey ).isNotEmpty() ||
widgetDescriptorServiceSupplier.get().getByApplication( applicationKey ).isNotEmpty();
extensionDescriptorServiceSupplier.get().getByApplication( applicationKey ).isNotEmpty();
}
}

Expand Down
24 changes: 12 additions & 12 deletions src/test/java/com/enonic/lib/asset/RequestVerifierHandlerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,17 +2,17 @@

import org.junit.jupiter.api.Test;

import com.enonic.xp.admin.extension.AdminExtensionDescriptor;
import com.enonic.xp.admin.extension.AdminExtensionDescriptorService;
import com.enonic.xp.admin.tool.AdminToolDescriptor;
import com.enonic.xp.admin.tool.AdminToolDescriptorService;
import com.enonic.xp.admin.tool.AdminToolDescriptors;
import com.enonic.xp.admin.widget.WidgetDescriptor;
import com.enonic.xp.admin.widget.WidgetDescriptorService;
import com.enonic.xp.app.ApplicationKey;
import com.enonic.xp.branch.Branch;
import com.enonic.xp.content.ContentPath;
import com.enonic.xp.data.PropertyTree;
import com.enonic.xp.descriptor.Descriptors;
import com.enonic.xp.descriptor.DescriptorKey;
import com.enonic.xp.descriptor.Descriptors;
import com.enonic.xp.project.Project;
import com.enonic.xp.project.ProjectName;
import com.enonic.xp.repository.RepositoryId;
Expand All @@ -35,7 +35,7 @@ public class RequestVerifierHandlerTest
{
private AdminToolDescriptorService adminToolDescriptorService;

private WidgetDescriptorService widgetDescriptorService;
private AdminExtensionDescriptorService extensionDescriptorService;

@Override
protected void initialize()
Expand All @@ -46,8 +46,8 @@ protected void initialize()
adminToolDescriptorService = mock( AdminToolDescriptorService.class );
addService( AdminToolDescriptorService.class, adminToolDescriptorService );

widgetDescriptorService = mock( WidgetDescriptorService.class );
addService( WidgetDescriptorService.class, widgetDescriptorService );
extensionDescriptorService = mock( AdminExtensionDescriptorService.class );
addService( AdminExtensionDescriptorService.class, extensionDescriptorService );
}

@Test
Expand Down Expand Up @@ -147,8 +147,8 @@ void testAssetRequestOnLegacyAdminTool()
final ApplicationKey applicationKey = ApplicationKey.from( "myapplication" );

when( adminToolDescriptorService.getByApplication( eq( applicationKey ) ) ).thenReturn( AdminToolDescriptors.empty() );
when( widgetDescriptorService.getByApplication( eq( applicationKey ) ) ).thenReturn(
Descriptors.from( WidgetDescriptor.create().key( DescriptorKey.from( applicationKey, "widgetName" ) ).build() ) );
when( extensionDescriptorService.getByApplication( eq( applicationKey ) ) ).thenReturn(
Descriptors.from( AdminExtensionDescriptor.create().key( DescriptorKey.from( applicationKey, "widgetName" ) ).build() ) );

runFunction( "lib/request-verifier-test.js", "testAssetRequestOnLegacyAdminTool" );
}
Expand All @@ -173,7 +173,7 @@ void testAssetRequestOnRoot()

when( adminToolDescriptorService.getByApplication( eq( ApplicationKey.from( "myapplication" ) ) ) ).thenReturn(
AdminToolDescriptors.empty() );
when( widgetDescriptorService.getByApplication( eq( ApplicationKey.from( "myapplication" ) ) ) ).thenReturn( Descriptors.empty() );
when( extensionDescriptorService.getByApplication( eq( ApplicationKey.from( "myapplication" ) ) ) ).thenReturn( Descriptors.empty() );

runFunction( "lib/request-verifier-test.js", "testAssetRequestOnRoot" );
}
Expand All @@ -186,7 +186,7 @@ void testAssetRequestOnAdminWithoutToolsAndWidgets()

when( adminToolDescriptorService.getByApplication( eq( ApplicationKey.from( "myapplication" ) ) ) ).thenReturn(
AdminToolDescriptors.empty() );
when( widgetDescriptorService.getByApplication( eq( ApplicationKey.from( "myapplication" ) ) ) ).thenReturn( Descriptors.empty() );
when( extensionDescriptorService.getByApplication( eq( ApplicationKey.from( "myapplication" ) ) ) ).thenReturn( Descriptors.empty() );

runFunction( "lib/request-verifier-test.js", "testAssetRequestOnAdminWithoutToolsAndWidgets" );
}
Expand Down Expand Up @@ -233,8 +233,8 @@ void testAssetRequestInAdminMode()
when( adminToolDescriptorService.getByApplication( eq( applicationKey ) ) ).thenReturn(
AdminToolDescriptors.from( AdminToolDescriptor.create().build() ) );

when( widgetDescriptorService.getByApplication( eq( applicationKey ) ) ).thenReturn(
Descriptors.from( WidgetDescriptor.create().key( DescriptorKey.from( applicationKey, "widgetName" ) ).build() ) );
when( extensionDescriptorService.getByApplication( eq( applicationKey ) ) ).thenReturn(
Descriptors.from( AdminExtensionDescriptor.create().key( DescriptorKey.from( applicationKey, "widgetName" ) ).build() ) );

runFunction( "lib/request-verifier-test.js", "testAssetRequestInAdminMode" );
}
Expand Down
Loading