Revert "feat!: migrates to farmos3 and postgres 13" (#22)

Reverts #21 Action to create release did not work correctly.
FarmData2 · Dec 12, 2023 · 1b0256c · 1b0256c
1 parent dc606e8
commit 1b0256c
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 39 deletions.
diff --git a/dist/db.base.tar.gz b/dist/db.base.tar.gz
diff --git a/dist/db.sample.tar.gz b/dist/db.sample.tar.gz
diff --git a/src/sampleDB/addConsumerCORSOrigins.cy.js b/src/sampleDB/addConsumerCORSOrigins.cy.js
@@ -2,41 +2,41 @@ describe("Add CORS origins to the farm consumer", () => {
   it("Add CORS origins", () => {
     cy.login("admin", "admin");
     cy.visit(
-      "admin/config/services/consumer/34/edit?destination=/admin/config/services/consumer"
+      "admin/config/services/consumer/2/edit?destination=/admin/config/services/consumer"
     );
     cy.get("#edit-allowed-origins-0-value").clear();
     cy.get("#edit-allowed-origins-0-value").type("http://localhost:5173");
     cy.get("#edit-submit").click();
     cy.visit(
-      "admin/config/services/consumer/34/edit?destination=/admin/config/services/consumer"
+      "admin/config/services/consumer/2/edit?destination=/admin/config/services/consumer"
     );
 
     cy.get("#edit-allowed-origins-1-value").clear();
     cy.get("#edit-allowed-origins-1-value").type("http://localhost:5174");
     cy.get("#edit-submit").click();
     cy.visit(
-      "admin/config/services/consumer/34/edit?destination=/admin/config/services/consumer"
+      "admin/config/services/consumer/2/edit?destination=/admin/config/services/consumer"
     );
 
     cy.get("#edit-allowed-origins-2-value").clear();
     cy.get("#edit-allowed-origins-2-value").type("http://localhost:5175");
     cy.get("#edit-submit").click();
     cy.visit(
-      "admin/config/services/consumer/34/edit?destination=/admin/config/services/consumer"
+      "admin/config/services/consumer/2/edit?destination=/admin/config/services/consumer"
     );    
 
     cy.get("#edit-allowed-origins-3-value").clear();
     cy.get("#edit-allowed-origins-3-value").type("http://localhost:4173");
     cy.get("#edit-submit").click();
     cy.visit(
-      "admin/config/services/consumer/34/edit?destination=/admin/config/services/consumer"
+      "admin/config/services/consumer/2/edit?destination=/admin/config/services/consumer"
     );
 
     cy.get("#edit-allowed-origins-4-value").clear();
     cy.get("#edit-allowed-origins-4-value").type("http://localhost:4174");
     cy.get("#edit-submit").click();
     cy.visit(
-      "admin/config/services/consumer/34/edit?destination=/admin/config/services/consumer"
+      "admin/config/services/consumer/2/edit?destination=/admin/config/services/consumer"
     );
 
     cy.get("#edit-allowed-origins-5-value").clear();

diff --git a/src/sampleDB/buildSampleDB.bash b/src/sampleDB/buildSampleDB.bash
@@ -25,8 +25,7 @@ echo ""
 error_check
 echo ""
 
-# Enable the farmOS modules needed for FarmData2, including
-# the FarmData2 modules themselves.
+# Enable the FarmData2 modules in farmos
 "$SCRIPT_DIR/enableFarmData2Modules.bash"
 error_check
 echo ""
@@ -40,15 +39,6 @@ error_check
 safe_cd "$CUR_DIR"
 echo "Added."
 
-# Generate the API keys
-echo "Generating API keys..."
-CUR_DIR=$(pwd)
-safe_cd "$REPO_DIR"
-npx cypress run --spec=src/sampleDB/generateAPIKeys.cy.js
-error_check 
-safe_cd "$CUR_DIR"
-echo "Generated."
-
 # Add the users and assign their roles
 "$SCRIPT_DIR/addUsers.bash"
 error_check

diff --git a/src/sampleDB/enableFarmData2Modules.bash b/src/sampleDB/enableFarmData2Modules.bash
@@ -8,16 +8,6 @@ source "$REPO_DIR/bin/preflight.bash"
 
 echo "Enabling FarmData2 modules..."
 
-echo "  Enabling the farmOS Simple Auth Password Grant Module..."
-docker exec -it fd2_farmos drush en simple_oauth_password_grant -y
-error_check
-echo "  Enabled."
-
-echo "  Enabling the farmOS Default API Consumer Module..."
-docker exec -it fd2_farmos drush en farm_api_default_consumer -y
-error_check
-echo "  Enabled."
-
 echo "  Enabling the farmOS Inventory Module..."
 docker exec -it fd2_farmos drush en farm_inventory -y
 error_check

diff --git a/src/sampleDB/generateAPIKeys.cy.js b/src/sampleDB/generateAPIKeys.cy.js