Merge pull request #20 from synolia/hotfix/env-variable-name

Change oauth env variable name to avoid conflict with knpu's base ones

Makefile

@@ -71,10 +71,10 @@ ifneq ("$(wildcard tests/data)","")
  cp -r tests/data/* ${TEST_DIRECTORY}/
 endif
 
- echo "OAUTH_GOOGLE_CLIENT_ID=" >> ${TEST_DIRECTORY}/.env
- echo "OAUTH_GOOGLE_CLIENT_SECRET=" >> ${TEST_DIRECTORY}/.env
- echo "OAUTH_MICROSOFT_CLIENT_ID=" >> ${TEST_DIRECTORY}/.env
- echo "OAUTH_MICROSOFT_CLIENT_SECRET=" >> ${TEST_DIRECTORY}/.env
+ echo "SYNOLIA_ADMIN_OAUTH_GOOGLE_CLIENT_ID=" >> ${TEST_DIRECTORY}/.env
+ echo "SYNOLIA_ADMIN_OAUTH_GOOGLE_CLIENT_SECRET=" >> ${TEST_DIRECTORY}/.env
+ echo "SYNOLIA_ADMIN_OAUTH_MICROSOFT_CLIENT_ID=" >> ${TEST_DIRECTORY}/.env
+ echo "SYNOLIA_ADMIN_OAUTH_MICROSOFT_CLIENT_SECRET=" >> ${TEST_DIRECTORY}/.env
 
 install-sylius:
  ${CONSOLE} doctrine:database:create --if-not-exists

README.md

@@ -36,11 +36,11 @@
  ```
 2. Write your Google and/or Microsoft client Id and client secret in you .env file with those keys :
  ```dotenv
- OAUTH_GOOGLE_CLIENT_ID=
- OAUTH_GOOGLE_CLIENT_SECRET=
+ SYNOLIA_ADMIN_OAUTH_GOOGLE_CLIENT_ID=
+ SYNOLIA_ADMIN_OAUTH_GOOGLE_CLIENT_SECRET=
 
- OAUTH_MICROSOFT_CLIENT_ID=
- OAUTH_MICROSOFT_CLIENT_SECRET=
+ SYNOLIA_ADMIN_OAUTH_MICROSOFT_CLIENT_ID=
+ SYNOLIA_ADMIN_OAUTH_MICROSOFT_CLIENT_SECRET=
  ```
 3. In your security.yaml, add the OAuth authenticator in your admin firewall and put access_control paths you need depending on wich provider you use. **They must be on top of the others** :
  ```yaml

config/app.yaml

@@ -8,21 +8,21 @@ sylius_ui:
 
 twig:
  globals:
- google_client_id: '%env(default::OAUTH_GOOGLE_CLIENT_ID)%'
- microsoft_client_id: '%env(default::OAUTH_MICROSOFT_CLIENT_ID)%'
+ google_client_id: '%env(default::SYNOLIA_ADMIN_OAUTH_GOOGLE_CLIENT_ID)%'
+ microsoft_client_id: '%env(default::SYNOLIA_ADMIN_OAUTH_MICROSOFT_CLIENT_ID)%'
 
 knpu_oauth2_client:
  clients:
  google_admin:
  type: google
- client_id: '%env(default::OAUTH_GOOGLE_CLIENT_ID)%'
- client_secret: '%env(default::OAUTH_GOOGLE_CLIENT_SECRET)%'
+ client_id: '%env(default::SYNOLIA_ADMIN_OAUTH_GOOGLE_CLIENT_ID)%'
+ client_secret: '%env(default::SYNOLIA_ADMIN_OAUTH_GOOGLE_CLIENT_SECRET)%'
  redirect_route: 'connect_admin_google_check'
  redirect_params: {}
  azure_admin:
  type: azure
- client_id: '%env(default::OAUTH_MICROSOFT_CLIENT_ID)%'
- client_secret: '%env(default::OAUTH_MICROSOFT_CLIENT_SECRET)%'
+ client_id: '%env(default::SYNOLIA_ADMIN_OAUTH_MICROSOFT_CLIENT_ID)%'
+ client_secret: '%env(default::SYNOLIA_ADMIN_OAUTH_MICROSOFT_CLIENT_SECRET)%'
  redirect_route: 'connect_admin_microsoft_check'
  redirect_params: {}
 

config/services.php

@@ -34,7 +34,7 @@
  ])
  ->load('Synolia\SyliusAdminOauthPlugin\Security\Authenticator\\', '../src/Security/Authenticator')
  ->args([
- '$googleClientId' => '%env(default::OAUTH_GOOGLE_CLIENT_ID)%',
- '$microsoftClientId' => '%env(default::OAUTH_MICROSOFT_CLIENT_ID)%',
+ '$googleClientId' => '%env(default::SYNOLIA_ADMIN_OAUTH_GOOGLE_CLIENT_ID)%',
+ '$microsoftClientId' => '%env(default::SYNOLIA_ADMIN_OAUTH_MICROSOFT_CLIENT_ID)%',
  ]);
 };