mifi/auth-db
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

Merge branch 'main' into develop
Some checks failed
continuous-integration/drone/pr Build is failing
Details

Browse Source 
# Conflicts:
#	.npmignore
#	lib/dao/deleteById.ts
#	lib/dao/readOneByRecord.ts
#	lib/dao/readOneByUsername.ts
#	package.json
#	src/dao/auth/deleteById.ts
#	src/dao/auth/readOneByRecord.ts
#	src/dao/auth/readOneByUsername.ts
#	src/dao/create.ts
#	src/dao/deleteById.ts
#	src/dao/readOneByRecord.ts
#	src/dao/readOneByUsername.ts
This commit is contained in:
Mike Fitzpatrick
2023-05-26 17:44:52 -04:00
parent 4bbe520366 08293e8c16
commit d97a7d7f95
3 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.npmignore
View File

@@ -1,6 +1,7 @@
.build.yarnrc.yml .build.yarnrc.yml
.drone.yml .drone.yml
.eslintrc* .eslintrc*
.npmrc
.prettierrc* .prettierrc*
.yarnrc.yml .yarnrc.yml
babel.config.* babel.config.*

4
src/dao/auth/readOneByRecord.ts
View File

@@ -1,5 +1,9 @@
import { Types } from 'mongoose'; import { Types } from 'mongoose';
<<<<<<<< HEAD:src/dao/auth/readOneByRecord.ts
import { Auth } from '../../model/auth'; import { Auth } from '../../model/auth';
========
import { Auth } from '../model/auth';
>>>>>>>> main:src/dao/readOneByRecord.ts
export const readOneByRecord = async (record: Types.ObjectId) => Auth.findOne({ record }); export const readOneByRecord = async (record: Types.ObjectId) => Auth.findOne({ record });

4
src/dao/auth/readOneByUsername.ts
View File

@@ -1,3 +1,7 @@
<<<<<<<< HEAD:src/dao/auth/readOneByUsername.ts
import { Auth } from '../../model/auth'; import { Auth } from '../../model/auth';
========
import { Auth } from '../model/auth';
>>>>>>>> main:src/dao/readOneByUsername.ts
export const readOneByUsername = async (username: string) => Auth.findOne({ username }); export const readOneByUsername = async (username: string) => Auth.findOne({ username });