(bc) Move to Craft 5

composer.json

@@ -2,7 +2,7 @@
   "name": "deuxhuithuit/craft-agency-auth",
   "description": "Adds SSO login in the cp with Google",
   "type": "craft-plugin",
-  "version": "1.1.2",
+  "version": "2.0.0",
   "keywords": [
     "admin",
     "control panel",
@@ -24,7 +24,7 @@
   },
   "require": {
     "php": "8.1.*|8.2.*|8.3.*",
-    "craftcms/cms": "^4.0.0"
+    "craftcms/cms": "^5.0.0"
   },
   "autoload": {
     "psr-4": {

src/Plugin.php

@@ -71,7 +71,7 @@ public function onAfterPluginLoad($event)
         $isLoginPage = \Craft::$app->getRequest()->getSegment(1) === 'login';
 
         // only register css and js if we are on the login page
-        if (!$isConsoleRequest && (bool) $isCPRequest && (bool) $isLoginPage) {
+        if ((bool) $isCPRequest && (bool) $isLoginPage) {
             \Craft::$app->getView()->registerAssetBundle(LoginAsset::class);
         }
     }
@@ -84,6 +84,8 @@ public function onBeforeLogin($event)
         $client_id = isset($config['client_id']) ? $config['client_id'] : null;
         $client_secret = isset($config['client_secret']) ? $config['client_secret'] : null;
 
+        $isLoginPage = \Craft::$app->getRequest()->getSegment(1) === 'login';
+
         // only block the user if the email is from sso domain AND the client_id/secret is not set
         if (
             !empty($domain)
@@ -93,7 +95,7 @@ public function onBeforeLogin($event)
         ) {
             $request = \Craft::$app->getRequest();
             $body = $request->getBodyParams();
-            if (isset($body['password'])) {
+            if (isset($body['password']) && $isLoginPage) {
                 throw new \Exception('Agency users can\'t login with their password. Please use your Google Workspace account.');
             }
         }

src/controllers/CallbackController.php

@@ -188,7 +188,7 @@ public function actionIndex()
 
         // Make sure password is set
         if (!$user->newPassword) {
-            throw new \Exception('default_password is not set config.');
+            throw new \Exception('default_password is not set in config.');
         }
 
         // Save the user

src/web/assets/login/dist/login.css

@@ -1,7 +1,4 @@
-#poweredby {
-	margin-top: 50px !important;
-}
-
 .dhh-btn {
 	width: 100%;
-}
+	margin-top: 16px;
+}

src/web/assets/login/dist/login.js

@@ -1,19 +1,13 @@
-(($) => {
+(() => {
 	'use strict';
 
-	const scope = $('body');
-
-	const sels = {
-		ref: '#poweredby'
-	};
-
-	const init = () => {
-		const ref = scope.find(sels.ref);
-		const html = $('<a href="/actions/agency-auth/dialog" class="btn dhh-btn" />')
-			.text('Agency Login');
-
-		html.insertBefore(ref);
-	};
-
-	init();
-})(jQuery);
+	const formContainer = document.querySelector('.login-form-container');
+	if (!formContainer) {
+		return;
+	}
+	const link = document.createElement('a');
+	link.href = '/actions/agency-auth/dialog';
+	link.className = 'btn dhh-btn';
+	link.textContent = 'Agency Login';
+	formContainer.appendChild(link);
+})();