OHRM5X-2407: Change auth button logo selector

ManulMax · Dec 18, 2023 · ef033f1 · ef033f1
1 parent 3f77de6
commit ef033f1
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 55 deletions.
diff --git a/src/client/src/orangehrmAuthenticationPlugin/components/AuthButton.vue b/src/client/src/orangehrmAuthenticationPlugin/components/AuthButton.vue
@@ -24,10 +24,6 @@ import {OxdText} from '@ohrm/oxd';
 export default {
   name: 'AuthButton',
   props: {
-    url: {
-      type: String,
-      required: true,
-    },
     color: {
       type: String,
       required: true,
@@ -42,7 +38,6 @@ export default {
       h(
         'a',
         {
-          href: props.url,
           title: props.label,
           class: 'orangehrm-auth-button',
         },

diff --git a/src/client/src/orangehrmAuthenticationPlugin/components/SocialMediaAuth.vue b/src/client/src/orangehrmAuthenticationPlugin/components/SocialMediaAuth.vue
@@ -27,7 +27,6 @@
     <auth-button
       v-for="authenticator in socialAuthenticators"
       :key="authenticator.id"
-      :url="authenticator.url"
       :color="authenticator.color"
       :label="authenticator.label"
       :style="{
@@ -62,19 +61,18 @@ export default {
     },
   },
 
-  // TODO
   setup(props) {
     const http = new APIService(window.appGlobal.baseUrl, '');
 
     const socialAuthenticators = computed(() => {
       return props.authenticators.map((authenticator) => ({
         ...authenticator,
-        backgroundUrl: getBackgroundUrl(authenticator.label),
+        backgroundUrl: getBackgroundUrl(authenticator.url),
       }));
     });
 
-    const getBackgroundUrl = (label) => {
-      const lowercasedLabel = label.toLowerCase();
+    const getBackgroundUrl = (url) => {
+      const lowercasedLabel = url.toLowerCase();
 
       switch (true) {
         case lowercasedLabel.includes('google'):

diff --git a/src/plugins/orangehrmAuthenticationPlugin/Controller/LoginController.php b/src/plugins/orangehrmAuthenticationPlugin/Controller/LoginController.php
@@ -97,6 +97,7 @@ public function preRender(Request $request): void
             return [
                 'id' => $provider->getId(),
                 'label' => $provider->getProviderName(),
+                'url' => $provider->getProviderUrl(),
             ];
         }, $providersArray);
 

diff --git a/src/plugins/orangehrmOpenidAuthenticationPlugin/Service/SocialMediaAuthenticationService.php b/src/plugins/orangehrmOpenidAuthenticationPlugin/Service/SocialMediaAuthenticationService.php
@@ -20,6 +20,8 @@
 namespace OrangeHRM\OpenidAuthentication\Service;
 
 use OrangeHRM\Entity\AuthProviderExtraDetails;
+use OrangeHRM\Framework\Routing\UrlGenerator;
+use OrangeHRM\Framework\Services;
 use OrangeHRM\OpenidAuthentication\Dao\AuthProviderDao;
 use OrangeHRM\OpenidAuthentication\OpenID\OpenIDConnectClient;
 use OrangeHRM\OpenidAuthentication\Traits\Service\SocialMediaAuthenticationServiceTrait;
@@ -30,7 +32,6 @@ class SocialMediaAuthenticationService
     private AuthProviderDao $authProviderDao;
 
     public const SCOPE = 'email';
-    public const REDIRECT_URL = 'https://734d-2402-d000-a500-40f9-f1e8-1109-5f81-bcf4.ngrok-free.app/openidauth/openIdCredentials';
 
     /**
      * @return AuthProviderDao
@@ -66,7 +67,9 @@ public function initiateAuthentication(AuthProviderExtraDetails $provider, strin
      */
     public function getRedirectURL(): string
     {
-        return self::REDIRECT_URL;
+        /** @var UrlGenerator $urlGenerator */
+        $urlGenerator = $this->getContainer()->get(Services::URL_GENERATOR);
+        return  $urlGenerator->generate('auth_oidc_login_redirect', [], UrlGenerator::ABSOLUTE_URL);
     }
 
     /**

diff --git a/web/images/Github.svg b/web/images/Github.svg
diff --git a/web/images/default.svg b/web/images/default.svg