Skip to content

Commit 5afafdd

Browse files
author
aengels
committed
Few enhancements
1 parent 224aa14 commit 5afafdd

File tree

29 files changed

+144
-38
lines changed

29 files changed

+144
-38
lines changed

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ This plugin allow your admin users to sign in with SAML providers (Google, Azure
5252
# config/packages/gl_events_saml_admin_plugin.yaml
5353

5454
imports:
55-
- { resource: "@GlEventsSyliusAdminSamlPlugin/config/services.yaml" }
55+
- { resource: "@GlEventsSyliusAdminSamlPlugin/Resources/config/config.yaml" }
5656

5757

5858
```
@@ -85,7 +85,7 @@ imports:
8585

8686
```yaml
8787
glevents_sylius_admin_saml_plugin:
88-
resource: "@GlEventsSyliusAdminSamlPlugin/config/routing.yml"
88+
resource: "@GlEventsSyliusAdminSamlPlugin/Resources/config/routing.yml"
8989
```
9090
You are now ready to go ! 🚀
9191

docs/login.png

100644100755
File mode changed.

ecs.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
return static function (ECSConfig $ecsConfig): void {
99
$ecsConfig->paths([
1010
__DIR__ . '/src',
11-
__DIR__ . '/tests/Behat',
11+
// __DIR__ . '/tests/Behat',
1212
__DIR__ . '/ecs.php',
1313
]);
1414

src/Controller/SamlAcsAction.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44

55
namespace GlEvents\SyliusAdminSamlPlugin\Controller;
66

7-
use GlEvents\SyliusAdminSamlPlugin\Provider\SamlUserProvider;
87
use GlEvents\SyliusAdminSamlPlugin\Provider\SamlConfigProvider;
8+
use GlEvents\SyliusAdminSamlPlugin\Provider\SamlUserProvider;
99
use GlEvents\SyliusAdminSamlPlugin\Security\SamlAuthenticator;
1010
use OneLogin\Saml2\Auth;
1111
use OneLogin\Saml2\Error;
Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
<?php
2+
3+
declare(strict_types=1);
4+
5+
namespace GlEvents\SyliusAdminSamlPlugin\DependencyInjection;
6+
7+
use Symfony\Component\Config\Definition\Builder\TreeBuilder;
8+
use Symfony\Component\Config\Definition\ConfigurationInterface;
9+
10+
final class Configuration implements ConfigurationInterface
11+
{
12+
/**
13+
* @psalm-suppress UnusedVariable
14+
*/
15+
public function getConfigTreeBuilder(): TreeBuilder
16+
{
17+
$treeBuilder = new TreeBuilder('sylius-admin-saml-plugin');
18+
$rootNode = $treeBuilder->getRootNode();
19+
20+
return $treeBuilder;
21+
}
22+
}
Lines changed: 50 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,50 @@
1+
<?php
2+
3+
declare(strict_types=1);
4+
5+
namespace GlEvents\SyliusAdminSamlPlugin\DependencyInjection;
6+
7+
use Sylius\Bundle\CoreBundle\DependencyInjection\PrependDoctrineMigrationsTrait;
8+
use Sylius\Bundle\ResourceBundle\DependencyInjection\Extension\AbstractResourceExtension;
9+
use Symfony\Component\Config\FileLocator;
10+
use Symfony\Component\DependencyInjection\ContainerBuilder;
11+
use Symfony\Component\DependencyInjection\Extension\PrependExtensionInterface;
12+
use Symfony\Component\DependencyInjection\Loader\YamlFileLoader;
13+
14+
final class GlEventsSyliusAdminSamlExtension extends AbstractResourceExtension implements PrependExtensionInterface
15+
{
16+
use PrependDoctrineMigrationsTrait;
17+
18+
/** @psalm-suppress UnusedVariable */
19+
public function load(array $configs, ContainerBuilder $container): void
20+
{
21+
$loader = new YamlFileLoader(
22+
$container,
23+
new FileLocator(__DIR__ . '/../Resources/config'),
24+
);
25+
26+
$loader->load('services.yaml');
27+
}
28+
29+
public function prepend(ContainerBuilder $container): void
30+
{
31+
$this->prependDoctrineMigrations($container);
32+
}
33+
34+
protected function getMigrationsNamespace(): string
35+
{
36+
return 'DoctrineMigrations';
37+
}
38+
39+
protected function getMigrationsDirectory(): string
40+
{
41+
return '@GlEventsSyliusAdminSamlPlugin/migrations';
42+
}
43+
44+
protected function getNamespacesOfMigrationsExecutedBefore(): array
45+
{
46+
return [
47+
'Sylius\Bundle\CoreBundle\Migrations',
48+
];
49+
}
50+
}

src/GlEventsSyliusAdminSamlPlugin.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,6 @@ final class GlEventsSyliusAdminSamlPlugin extends Bundle
1313

1414
public function getPath(): string
1515
{
16-
return \dirname(__DIR__);
16+
return \dirname(__DIR__) . '/src';
1717
}
1818
}

src/Resources/config/config.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
imports:
2+
- { resource: "packages/framework.yaml" }
3+
- { resource: "packages/twig.yaml" }
4+
- { resource: "packages/sylius_ui.yaml" }
File renamed without changes.
Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
sylius_ui:
2+
events:
3+
sylius.admin.login.form.content:
4+
blocks:
5+
divider:
6+
enabled: false
7+
credentials:
8+
template: "@GlEventsSyliusAdminSamlPlugin/Security/Form/_credentials.html.twig"
9+
priority: 20
10+
submit:
11+
template: "@GlEventsSyliusAdminSamlPlugin/Security/Form/_submit.html.twig"
12+
priority: 10
13+
request_password_reset:
14+
template: "@GlEventsSyliusAdminSamlPlugin/Security/Form/_requestPasswordResetButton.html.twig"
15+
priority: 5
16+
sso:
17+
template: "@GlEventsSyliusAdminSamlPlugin/Security/Form/_sso.html.twig"
18+
priority: 0

0 commit comments

Comments
 (0)