fix(ts): fix merge issues with OIDC and TS changes

Author: jescalada

src/db/file/index.ts

@@ -28,6 +28,7 @@ export const {
 
 export const {
   findUser,
+  findUserByOIDC,
   getUsers,
   createUser,
   deleteUser,

src/db/index.ts

@@ -12,19 +12,21 @@ export const createUser = async (
   password: string,
   email: string,
   gitAccount: string,
-  admin: boolean = false
+  admin: boolean = false,
+  oidcId: string = '',
 ) => {
   console.log(
     `creating user
         user=${username},
         gitAccount=${gitAccount}
         email=${email},
-        admin=${admin}`,
+        admin=${admin}
+        oidcId=${oidcId}`,
   );
 
   const data = {
     username: username,
-    password: await bcrypt.hash(password, 10),
+    password: oidcId ? null : await bcrypt.hash(password, 10),
     gitAccount: gitAccount,
     email: email,
     admin: admin,
@@ -62,6 +64,7 @@ export const {
   writeAudit,
   getPush,
   findUser,
+  findUserByOIDC,
   getUsers,
   deleteUser,
   updateUser,

test/plugin.test.js renamed to test/plugin/plugin.test.js

@@ -4,7 +4,7 @@ const {
   PullActionPlugin,
   PushActionPlugin,
   PluginLoader,
-} = require('../src/plugin');
+} = require('../../src/plugin');
 const { spawnSync } = require('child_process');
 const { rmSync } = require('fs');
 const { join } = require('path');
@@ -13,7 +13,7 @@ chai.should();
 
 const expect = chai.expect;
 
-const testPackagePath = join(__dirname, 'fixtures', 'test-package');
+const testPackagePath = join(__dirname, '../fixtures', 'test-package');
 
 describe('loading plugins from packages', function () {
   // eslint-disable-next-line no-invalid-this