Merge pull request #72 from ioigoume/Error_handling_fixes

Error_handling_fixes

CHANGELOG.md

@@ -4,6 +4,13 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [unreleased]
+
+### Fixed
+
+- Do not construct the `organization` attribute for a Removed OrgIdentity
+- Fixed error handling on database related error
+
 ## [v2.3.0] - 2021-11-15
 
 ### Added

dictionaries/noty.definition.json

@@ -1,38 +1,62 @@
 {
-    "yes": {
-        "en": "Resend Verfication Email"
+    "account_pending_confirmation": {
+        "en": "Account in Pending Email Confirmation Status"
     },
-    "no": {
-        "en": "Abort Login"
+    "default_status": {
+        "en": "Action Required"
     },
-    "title": {
-        "en": "Please verify your email address by clicking the link in the email we sent you"
+    "invitation_restored": {
+        "en": "Invitation has been restored."
     },
     "msg_title": {
         "en": "<b>This is your current status:</b>"
     },
-    "default_status": {
-        "en": "Action Required"
+    "no": {
+        "en": "Abort Login"
     },
-    "account_pending_confirmation": {
-        "en": "Account in Pending Email Confirmation Status"
+    "org_identity_expired_banner": {
+        "en": "Identity Expired"
     },
-    "invitation_restored": {
-        "en": "Invitation has been restored."
+    "org_identity_expired_description": {
+        "en": "Your identity (%ORGID%) has expired. Please contact <a href=\"mailto:[email protected]\">our support</a> and make sure to include the error message above."
+    },
+    "org_identity_nologin_banner": {
+        "en": "Identity not enabled for login"
+    },
+    "org_identity_nologin_description": {
+        "en": "Your identity (%ORGID%) cannot be used for login. Please contact <a href=\"mailto:[email protected]\">our support</a> and make sure to include the error message above."
+    },
+    "org_identity_removed_banner": {
+        "en": "Identity not valid for login"
+    },
+    "org_identity_removed_description": {
+        "en": "Your identity (%ORGID%) has been removed. Please contact <a href=\"mailto:[email protected]\">our support</a> and make sure to include the error message above."
     },
     "petition_info": {
-        "en": "The identifier <cite><b>%ORGIDENT%</b></cite> is in Email Pending Confirmation Status.&nbspPlease check your Mail <cite><b>%MAIL%</b></cite> Inbox or Spam for further information.&nbsp"
+        "en": "The identifier <cite><b>%ORGIDENT%</b></cite> is in Email Pending Confirmation Status.&nbsp;Please check your Mail <cite><b>%MAIL%</b></cite> Inbox or Spam for further information.&nbsp;"
     },
-    "petition_user_notify": {
-        "en": "<p class=\"petition-user-notify\">We have sent an email with a confirmation link to your email address <cite><b>%MAIL%</b></cite>. In order to complete the sign-up process, please click the confirmation link. If you do not find the email in your Inbox, please check your Spam or Junk folder for an email from \"RCIAM Notifications\". If you do find the email in these folders, mark the email as \"safe\" or \"not spam\" to ensure that you receive any future notifications about your RCIAM ID.</p><p>You can also click the <strong>\"Resend Verfication Email\"</strong> button below to have another email sent to you."
+    "petition_invalidate_msg": {
+        "en": "<p><i class=\"fa fa-exclamation-triangle\" aria-hidden=\"true\"></i>This action will invalidate any previous confirmation links.</p>"
     },
     "petition_token_expired": {
-        "en": "<div class=\"invite-expire\">Email confirmation token EXPIRED <b>&nbsp%DATE%</b>&nbspago</div>"
+        "en": "<div class=\"invite-expire\">Email confirmation token EXPIRED <b>&nbsp;%DATE%</b>&nbsp;ago</div>"
     },
     "petition_token_expires": {
-        "en": "<div class=\"invite-expire\">Email confirmation token EXPIRES in <b>&nbsp%DATE%</b></div>"
+        "en": "<div class=\"invite-expire\">Email confirmation token EXPIRES in <b>&nbsp;%DATE%</b></div>"
     },
-    "petition_invalidate_msg": {
-        "en": "<p><i class=\"fa fa-exclamation-triangle\" aria-hidden=\"true\"></i>This action will invalidate any previous confirmation links.</p>"
+    "petition_user_notify": {
+        "en": "<p class=\"petition-user-notify\">We have sent an email with a confirmation link to your email address <cite><b>%MAIL%</b></cite>. In order to complete the sign-up process, please click the confirmation link. If you do not find the email in your Inbox, please check your Spam or Junk folder for an email from \"RCIAM Notifications\". If you do find the email in these folders, mark the email as \"safe\" or \"not spam\" to ensure that you receive any future notifications about your RCIAM ID.</p><p>You can also click the <strong>\"Resend Verfication Email\"</strong> button below to have another email sent to you."
+    },
+    "resend_confirmation_email": {
+        "en": "Please verify your email address by clicking the link in the email we sent you"
+    },
+    "user_suspended": {
+        "en": "Your identity (%ORGID%) has been suspended. Please contact our <a href=\"mailto:[email protected]\">support</a> and make sure to include the error message above"
+    },
+    "user_suspended_title": {
+        "en": "Identity suspended"
+    },
+    "yes": {
+        "en": "Resend Verification Email"
     }
 }

lib/Attributes/SshPublicKey.php

@@ -64,7 +64,9 @@ public function getSshPublicKeys($personId)
                 . var_export($result, true));
             return $result;
         } else {
-            throw new Exception('Failed to communicate with COmanage Registry: ' . var_export($db->getLastError(), true));
+            throw new Error\Error(
+                ['UNHANDLEDEXCEPTION', 'Failed to communicate with COmanage Registry: ' . var_export($db->getLastError(), true)]
+            );
         }
 
         return $result;