diff --git a/.gitignore b/.gitignore
index cb6506b2..e61508f0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,6 @@
target/
*.iml
+.env
#############################################
diff --git a/pom.xml b/pom.xml
index 84b43049..06ff5538 100644
--- a/pom.xml
+++ b/pom.xml
@@ -49,32 +49,27 @@
com.kingsrook.qqq
qqq-backend-core
- 0.2.0-SNAPSHOT
- compile
+ 0.2.0-20220726.214150-15
com.kingsrook.qqq
qqq-backend-module-rdbms
- 0.2.0-SNAPSHOT
- compile
+ 0.2.0-20220726.214633-12
com.kingsrook.qqq
qqq-backend-module-filesystem
- 0.2.0-SNAPSHOT
- compile
+ 0.2.0-20220726.215110-8
com.kingsrook.qqq
qqq-middleware-javalin
- 0.2.0-SNAPSHOT
- compile
+ 0.2.0-20220726.215233-6
com.kingsrook.qqq
qqq-middleware-picocli
- 0.2.0-SNAPSHOT
- compile
+ 0.2.0-20220726.215232-6
diff --git a/src/main/java/com/kingsrook/sampleapp/SampleMetaDataProvider.java b/src/main/java/com/kingsrook/sampleapp/SampleMetaDataProvider.java
index 1db799d6..b8f1020d 100644
--- a/src/main/java/com/kingsrook/sampleapp/SampleMetaDataProvider.java
+++ b/src/main/java/com/kingsrook/sampleapp/SampleMetaDataProvider.java
@@ -28,7 +28,7 @@ import com.kingsrook.qqq.backend.core.exceptions.QException;
import com.kingsrook.qqq.backend.core.exceptions.QValueException;
import com.kingsrook.qqq.backend.core.model.actions.processes.RunBackendStepInput;
import com.kingsrook.qqq.backend.core.model.actions.processes.RunBackendStepOutput;
-import com.kingsrook.qqq.backend.core.model.metadata.QAuthenticationMetaData;
+import com.kingsrook.qqq.backend.core.model.metadata.QAuthenticationType;
import com.kingsrook.qqq.backend.core.model.metadata.QBackendMetaData;
import com.kingsrook.qqq.backend.core.model.metadata.QInstance;
import com.kingsrook.qqq.backend.core.model.metadata.code.QCodeReference;
@@ -43,6 +43,7 @@ import com.kingsrook.qqq.backend.core.model.metadata.processes.QFunctionOutputMe
import com.kingsrook.qqq.backend.core.model.metadata.processes.QProcessMetaData;
import com.kingsrook.qqq.backend.core.model.metadata.processes.QRecordListMetaData;
import com.kingsrook.qqq.backend.core.model.metadata.tables.QTableMetaData;
+import com.kingsrook.qqq.backend.core.modules.authentication.metadata.QAuthenticationMetaData;
import com.kingsrook.qqq.backend.core.processes.implementations.general.LoadInitialRecordsStep;
import com.kingsrook.qqq.backend.core.processes.implementations.mock.MockBackendStep;
import com.kingsrook.qqq.backend.module.filesystem.base.model.metadata.Cardinality;
@@ -50,6 +51,7 @@ import com.kingsrook.qqq.backend.module.filesystem.base.model.metadata.RecordFor
import com.kingsrook.qqq.backend.module.filesystem.local.model.metadata.FilesystemBackendMetaData;
import com.kingsrook.qqq.backend.module.filesystem.local.model.metadata.FilesystemTableBackendDetails;
import com.kingsrook.qqq.backend.module.rdbms.model.metadata.RDBMSBackendMetaData;
+import io.github.cdimascio.dotenv.Dotenv;
/*******************************************************************************
@@ -60,6 +62,10 @@ public class SampleMetaDataProvider
public static final String MYSQL_BACKEND_NAME = "mysql";
public static final String FILESYSTEM_BACKEND_NAME = "filesystem";
+ public static final String AUTH0_AUTHENTICATION_MODULE_NAME = "auth0";
+ // public static final String AUTH0_BASE_URL = "https://kingsrook.us.auth0.com/";
+ public static final String AUTH0_BASE_URL = "https://nutrifresh-one-development.us.auth0.com/";
+
public static final String PROCESS_NAME_GREET = "greet";
public static final String PROCESS_NAME_GREET_INTERACTIVE = "greetInteractive";
public static final String PROCESS_NAME_SIMPLE_SLEEP = "simpleSleep";
@@ -103,9 +109,9 @@ public class SampleMetaDataProvider
*******************************************************************************/
private static QAuthenticationMetaData defineAuthentication()
{
- return new QAuthenticationMetaData()
- .withName("Anonymous")
- .withType("fullyAnonymous");
+ return (new QAuthenticationMetaData()
+ .withName("mock")
+ .withType(QAuthenticationType.MOCK));
}
@@ -115,13 +121,14 @@ public class SampleMetaDataProvider
*******************************************************************************/
public static QBackendMetaData defineMysqlBackend()
{
+ Dotenv dotenv = Dotenv.configure().load();
return new RDBMSBackendMetaData()
.withVendor("mysql")
.withHostName("127.0.0.1")
.withPort(3306)
.withDatabaseName("qqq")
.withUsername("root")
- .withPassword("")
+ .withPassword(dotenv.get("RDBMS_PASSWORD"))
.withName(MYSQL_BACKEND_NAME);
}
@@ -151,13 +158,16 @@ public class SampleMetaDataProvider
table.addField(new QFieldMetaData("id", QFieldType.INTEGER));
- table.addField(new QFieldMetaData("name", QFieldType.STRING));
+ table.addField(new QFieldMetaData("name", QFieldType.STRING)
+ .withIsRequired(true));
table.addField(new QFieldMetaData("company_code", QFieldType.STRING) // todo enum
.withLabel("Company")
+ .withIsRequired(true)
.withBackendName("comp_code"));
- table.addField(new QFieldMetaData("service_level", QFieldType.STRING)); // todo enum
+ table.addField(new QFieldMetaData("service_level", QFieldType.STRING)
+ .withIsRequired(true)); // todo enum
return (table);
}
diff --git a/src/test/java/com/kingsrook/sampleapp/SampleMetaDataProviderTest.java b/src/test/java/com/kingsrook/sampleapp/SampleMetaDataProviderTest.java
index 68c74649..38fdeb33 100644
--- a/src/test/java/com/kingsrook/sampleapp/SampleMetaDataProviderTest.java
+++ b/src/test/java/com/kingsrook/sampleapp/SampleMetaDataProviderTest.java
@@ -25,8 +25,8 @@ package com.kingsrook.sampleapp;
import java.io.File;
import java.io.IOException;
import java.util.UUID;
-import com.kingsrook.qqq.backend.core.actions.tables.QueryAction;
import com.kingsrook.qqq.backend.core.actions.processes.RunProcessAction;
+import com.kingsrook.qqq.backend.core.actions.tables.QueryAction;
import com.kingsrook.qqq.backend.core.model.actions.processes.RunProcessInput;
import com.kingsrook.qqq.backend.core.model.actions.processes.RunProcessOutput;
import com.kingsrook.qqq.backend.core.model.actions.tables.query.QueryInput;
@@ -34,6 +34,7 @@ import com.kingsrook.qqq.backend.core.model.actions.tables.query.QueryOutput;
import com.kingsrook.qqq.backend.core.model.metadata.QInstance;
import com.kingsrook.qqq.backend.core.model.metadata.tables.QTableMetaData;
import com.kingsrook.qqq.backend.core.model.session.QSession;
+import com.kingsrook.qqq.backend.core.processes.implementations.mock.MockBackendStep;
import com.kingsrook.qqq.backend.module.filesystem.local.actions.FilesystemQueryAction;
import com.kingsrook.qqq.backend.module.filesystem.local.model.metadata.FilesystemTableBackendDetails;
import org.apache.commons.io.FileUtils;
@@ -100,7 +101,7 @@ class SampleMetaDataProviderTest
@Test
public void testGreetProcess() throws Exception
{
- QInstance qInstance = SampleMetaDataProvider.defineInstance();
+ QInstance qInstance = SampleMetaDataProvider.defineInstance();
QTableMetaData personTable = SampleMetaDataProvider.defineTablePerson();
RunProcessInput request = new RunProcessInput(qInstance);
request.setSession(new QSession());
@@ -112,8 +113,8 @@ class SampleMetaDataProviderTest
QueryOutput queryOutput = new QueryAction().execute(queryInput);
request.setRecords(queryOutput.getRecords());
- request.addValue("greetingPrefix", "Hello");
- request.addValue("greetingSuffix", "sir");
+ request.addValue(MockBackendStep.FIELD_GREETING_PREFIX, "Hello");
+ request.addValue(MockBackendStep.FIELD_GREETING_SUFFIX, "sir");
RunProcessOutput result = new RunProcessAction().execute(request);
assertNotNull(result);