@appxdigital/appx-core-cli 1.0.14 → 1.0.16

package/cli.js

@@ -27,7 +27,7 @@ import packageJson from './package.json' with {type: 'json'};
 const __filename = fileURLToPath(import.meta.url);
 const __dirname = path.dirname(__filename);
 
-const CORE_VERSION = '0.1.116';
+const CORE_VERSION = '0.1.117';
 
 const phaseDurations = {
     installDependencies: 30,
@@ -406,10 +406,15 @@ async function createProject(answers, fileUploadConfigData) {
         coreGenerate(answers?.showOutput);
         incrementProgress(answers?.showOutput, "generateCoreModels");
 
+        if (fileUploadConfigData.provider) {
+            await insertFileUploadConfiguration(fileUploadConfigData, projectPath);
+            incrementProgress(showOutput, "fileUploadSetup");
+        }
+
         // Format code
         executeCommand('npx --yes prettier --write .', answers?.showOutput);
 
-        // Initialize git repo
+        // Create git repo and initial commit
         initializeGitRepo(projectPath, answers?.showOutput);
         incrementProgress(answers?.showOutput, "gitInit");
 
@@ -418,11 +423,6 @@ async function createProject(answers, fileUploadConfigData) {
 
         incrementProgress(answers?.showOutput, "migrateDatabase");
 
-        if (fileUploadConfigData.provider) {
-            await insertFileUploadConfiguration(fileUploadConfigData, projectPath);
-            incrementProgress(showOutput, "fileUploadSetup");
-        }
-
         if (!showOutput) {
             progressBar.stop();
         }
@@ -522,7 +522,7 @@ function initializeGitRepo(projectPath, showOutput = false) {
 }
 
 async function createGitignore(projectPath) {
-    const envFilesToAdd = ['.env', '.env.production'];
+    const envFilesToAdd = ['.env', '.env.production', 'src/generated/**'];
 
     const {defaultGitIgnore} = await import(path.join(projectPath, 'node_modules', '@nestjs/cli/lib/configuration/defaults.js'));
     const existingLines = defaultGitIgnore.split('\n');

package/package.json

@@ -1,7 +1,7 @@
 {
     "type": "module",
     "name": "@appxdigital/appx-core-cli",
-    "version": "1.0.14",
+    "version": "1.0.16",
     "main": "index.js",
     "scripts": {
         "npm:publish": "npm publish --access public",

package/scaffold/prisma/schema.prisma.template

@@ -17,7 +17,7 @@ model User {
   email          String              @unique
   name           String?
   password       String?             /// @Role(none)
-  role           Role                @default(GUEST)
+  role           Role                @default(USER)
   refreshTokens  UserRefreshToken[]
 }
 
@@ -43,5 +43,5 @@ model UserRefreshToken {
 
 enum Role {
   ADMIN
-  GUEST
+  USER
 }

package/scaffold/src/config/permissions.config.ts

@@ -1,4 +1,4 @@
-import {PermissionPlaceholder, PermissionsConfigType,} from '@appxdigital/appx-core';
+import {PermissionPlaceholder, PermissionsConfigType} from '@appxdigital/appx-core';
 
 export const PermissionsConfig: PermissionsConfigType = {
     User: {
@@ -9,9 +9,9 @@ export const PermissionsConfig: PermissionsConfigType = {
             updateMany: 'ALL',
             deleteMany: 'ALL',
         },
-        CLIENT: {
+        USER: {
             findFirst: {
-                conditions: {id: PermissionPlaceholder.USER_ID},
+                conditions: {id: PermissionPlaceholder.USER_ID}, // Can only see its own user
             },
         }
     },