fix: implement redirect in ApplicationWizard for users with no edit p…

…ermission (certifier)
bcgov · Jul 31, 2020 · 3251091 · 3251091
1 parent 91b23a3
commit 3251091
Show file tree

Hide file tree

Showing 5 changed files with 40 additions and 3 deletions.
diff --git a/app/containers/Applications/ApplicationWizard.tsx b/app/containers/Applications/ApplicationWizard.tsx
@@ -27,6 +27,19 @@ const ApplicationWizard = ({query}) => {
   const {formResultId} = router.query;
   const confirmationPage = Boolean(router.query.confirmationPage);
   const orderedFormResults = application.orderedFormResults.edges;
+
+  // Redirect a certifier given a bad link to the certify page for the application
+  if (!application.currentUserCanEdit) {
+    router.push({
+      pathname: '/certifier/certify',
+      query: {
+        applicationId: application.id,
+        version: router.query.version
+      }
+    });
+    return null;
+  }
+
   if (!confirmationPage && !formResultId) {
     setRouterQueryParam(
       router,
@@ -96,6 +109,7 @@ export default createFragmentContainer(ApplicationWizard, {
       ) {
       application(id: $applicationId) {
         id
+        currentUserCanEdit
         orderedFormResults(versionNumberInput: $version) {
           edges {
             node {

diff --git a/app/pages/reporter/application.tsx b/app/pages/reporter/application.tsx
@@ -25,6 +25,7 @@ class Application extends Component<Props> {
       query {
         application(id: $applicationId) {
           id
+          currentUserCanEdit
           latestDraftRevision {
             versionNumber
             legalDisclaimerAccepted

diff --git a/app/server/schema.graphql b/app/server/schema.graphql
@@ -63,6 +63,11 @@ type Application implements Node {
     orderBy: [CertificationUrlsOrderBy!] = [PRIMARY_KEY_ASC]
   ): CertificationUrlsConnection!
 
+  """
+  returns a boolean value based on whether the current user has edit permission on the application
+  """
+  currentUserCanEdit: Boolean
+
   """Reads a single `Facility` that is related to this `Application`."""
   facilityByFacilityId: Facility
 

diff --git a/app/server/schema.json b/app/server/schema.json
@@ -5795,6 +5795,18 @@
               "isDeprecated": false,
               "deprecationReason": null
             },
+            {
+              "name": "currentUserCanEdit",
+              "description": "returns a boolean value based on whether the current user has edit permission on the application",
+              "args": [],
+              "type": {
+                "kind": "SCALAR",
+                "name": "Boolean",
+                "ofType": null
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
             {
               "name": "facilityByFacilityId",
               "description": "Reads a single `Facility` that is related to this `Application`.",

diff --git a/schema/deploy/computed_columns/application_current_user_can_edit.sql b/schema/deploy/computed_columns/application_current_user_can_edit.sql
@@ -12,10 +12,15 @@ begin;
   $body$
     declare
       return_value boolean;
-      current_user_id = (select id from ggircs_portal.ciip_user where uuid=(select sub from ggircs_portal.session));
-      org_id = (select organisation_id from app join ggircs_portal.facility f on app.facility_id = f.id);
+      current_user_id int;
+      org_id int;
     begin
-      return (select exists(select * from ggircs_portal.ciip_user_organisation where user_id=current_user_id and organisation_id=org_id and status='approved'));
+      current_user_id:= (select id from ggircs_portal.ciip_user where uuid=(select sub from ggircs_portal.session()));
+      org_id:= (select organisation_id from ggircs_portal.application a join ggircs_portal.facility f on a.facility_id = f.id and a.id=app.id);
+      if (select exists(select * from ggircs_portal.ciip_user_organisation where user_id=current_user_id and organisation_id=org_id and status='approved')) then
+        return true;
+      end if;
+      return false;
     end;
   $body$
   language 'plpgsql' stable;