fix(cli): Fix flaky authentication migration and SQL id schema types (#…

…2676)
feathersjs · Jun 22, 2022 · 04ce9a5 · 04ce9a5
1 parent 252c872
commit 04ce9a5
Show file tree

Hide file tree

Showing 5 changed files with 33 additions and 39 deletions.
diff --git a/packages/cli/src/authentication/templates/knex.tpl.ts b/packages/cli/src/authentication/templates/knex.tpl.ts
@@ -39,24 +39,23 @@ export async function down(knex: Knex): Promise<void> {
 `
 
 export const generate = (ctx: AuthenticationGeneratorContext) =>
-  generator(ctx)
-    // We need to wait a second otherwise the migration filenames won't be in the right order
-    .then(
-      (ctx) => new Promise<AuthenticationGeneratorContext>((resolve) => setTimeout(() => resolve(ctx), 1100))
-    )
-    .then(
-      when(
-        (ctx) => getDatabaseAdapter(ctx.feathers.database) === 'knex',
-        renderSource(
-          migrationTemplate,
-          toFile(
-            toFile<AuthenticationGeneratorContext>('migrations', () => {
-              // Probably not great but it works to align with the Knex migration file format
-              const migrationDate = new Date().toISOString().replace(/\D/g, '').substring(0, 14)
+  generator(ctx).then(
+    when(
+      (ctx) => getDatabaseAdapter(ctx.feathers.database) === 'knex',
+      renderSource(
+        migrationTemplate,
+        toFile(
+          toFile<AuthenticationGeneratorContext>('migrations', () => {
+            // Probably not great but it works to align with the Knex migration file format
+            // We add 2 seconds so that the migrations run in the correct order
+            const migrationDate = new Date(Date.now() + 2000)
+              .toISOString()
+              .replace(/\D/g, '')
+              .substring(0, 14)
 
-              return `${migrationDate}_authentication`
-            })
-          )
+            return `${migrationDate}_authentication`
+          })
         )
       )
     )
+  )
diff --git a/packages/cli/src/authentication/templates/user.schema.tpl.ts b/packages/cli/src/authentication/templates/user.schema.tpl.ts
@@ -16,15 +16,9 @@ export const ${camelName}DataSchema = schema({
     ${authStrategies
       .map((name) =>
         name === 'local'
-          ? `email: {
-      type: 'string'
-    },
-    password: {
-      type: 'string'
-    }`
-          : `    ${name}Id: {
-      type: 'string'
-    }`
+          ? `    email: { type: 'string' },
+    password: { type: 'string' }`
+          : `    ${name}Id: { type: 'string' }`
       )
       .join(',\n')}
   }
@@ -55,7 +49,7 @@ export const ${camelName}ResultSchema = schema({
   properties: {
     ...${camelName}DataSchema.properties,
     ${type === 'mongodb' ? '_id' : 'id'}: {
-      type: 'string'
+      type: '${type === 'mongodb' ? 'string' : 'number'}'
     }
   }
 } as const)

diff --git a/packages/cli/src/index.ts b/packages/cli/src/index.ts
@@ -20,8 +20,9 @@ export const command = (yargs: Argv) =>
       yarg
         .command('app', 'Generate a new app', commandRunner)
         .command('service', 'Generate a service', commandRunner)
-        .command('connection', 'Connect to a different database', commandRunner)
         .command('hook', 'Generate a hook', commandRunner)
+        .command('connection', 'Connect to a different database', commandRunner)
+        .command('authentication', 'Set up authentication with a custom entity', commandRunner)
     )
     .usage('Usage: $0 <command> [options]')
     .help()
diff --git a/packages/cli/src/service/templates/schema.tpl.ts b/packages/cli/src/service/templates/schema.tpl.ts
@@ -45,7 +45,7 @@ export const ${camelName}ResultSchema = schema({
   properties: {
     ...${camelName}DataSchema.properties,
     ${type === 'mongodb' ? '_id' : 'id'}: {
-      type: 'string'
+      type: '${type === 'mongodb' ? 'string' : 'number'}'
     }
   }
 } as const)

diff --git a/packages/cli/src/service/type/custom.tpl.ts b/packages/cli/src/service/type/custom.tpl.ts
@@ -22,9 +22,9 @@ export class ${className} {
 
   async get (id: Id, _params?: ${upperName}Params): Promise<${upperName}Result> {
     return {
-      id: \`\${id}\`,
+      id: 0,
       text: \`A new message with ID: \${id}!\`
-    };
+    }
   }
 
   async create (data: ${upperName}Data, params?: ${upperName}Params): Promise<${upperName}Result>
@@ -35,30 +35,30 @@ export class ${className} {
     }
 
     return {
-      id: 'created',
+      id: 0,
       ...data
-    };
+    }
   }
 
   async update (id: NullableId, data: ${upperName}Data, _params?: ${upperName}Params): Promise<${upperName}Result> {
     return {
-      id: \`\${id}\`,
+      id: 0,
       ...data
-    };
+    }
   }
 
   async patch (id: NullableId, data: ${upperName}Data, _params?: ${upperName}Params): Promise<${upperName}Result> {
     return {
-      id: \`\${id}\`,
+      id: 0,
       ...data
-    };
+    }
   }
 
   async remove (id: NullableId, _params?: ${upperName}Params): Promise<${upperName}Result> {
     return {
-      id: \`\${id}\`,
+      id: 0,
       text: 'removed'
-    };
+    }
   }
 }
 `