fix(handlers.user): get user exists check
This commit is contained in:
parent
73a575bb1e
commit
a20171a4f4
17
.env.example
17
.env.example
@ -9,14 +9,15 @@ AUTH_SERVICE_PORT=8081
|
|||||||
# Database Options
|
# Database Options
|
||||||
DB_HOST=127.0.0.1
|
DB_HOST=127.0.0.1
|
||||||
DB_PORT=27017
|
DB_PORT=27017
|
||||||
DB_USERNAME=admin
|
DB_USERNAME=test
|
||||||
DB_PASSWORD=admin
|
DB_PASSWORD=test
|
||||||
DB_NAME=admin
|
DB_NAME=admin
|
||||||
|
|
||||||
# Other
|
# Other
|
||||||
PUBLIC_ACCESS_SECRET_KEY=`-----BEGIN PUBLIC KEY-----
|
PUBLIC_ACCESS_SECRET_KEY= |
|
||||||
MIGeMA0GCSqGSIb3DQEBAQUAA4GMADCBiAKBgHgnvr7O2tiApjJfid1orFnIGm69
|
-----BEGIN PUBLIC KEY-----
|
||||||
80fZp+Lpbjo+NC/0whMFga2Biw5b1G2Q/B2u0tpO1Fs/E8z7Lv1nYfr5jx2S8x6B
|
MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCLW1tlHyKC9AG0hGpmkksET2DE
|
||||||
dA4TS2kB9Kf0wn0+7wSlyikHoKhbtzwXHZl17GsyEi6wHnsqNBSauyIWhpha8i+Y
|
r7ojSPemxFWAgFgcPJWQ7x3uNbsdJ3bIZFoA/FClaWKMCZmjnH9tv0bKZtY/CDhM
|
||||||
+3GyaOY536H47qyXAgMBAAE=
|
ZEyHpMruRSn6IKrxjtQZWy4uv/w6MzUeyBYG0OvNCiYpdvz5SkAGAUHD5ZNFqn2w
|
||||||
-----END PUBLIC KEY-----`
|
KKFD0I2Dr59BFVSGJwIDAQAB
|
||||||
|
-----END PUBLIC KEY-----
|
33
compose.yml
33
compose.yml
@ -1,33 +0,0 @@
|
|||||||
services:
|
|
||||||
auth:
|
|
||||||
build: .
|
|
||||||
ports:
|
|
||||||
- 8090:8080
|
|
||||||
depends_on:
|
|
||||||
- mongo
|
|
||||||
networks:
|
|
||||||
- penahub_ntwrk
|
|
||||||
- default
|
|
||||||
mongo:
|
|
||||||
image: mongo:6
|
|
||||||
hostname: mongo
|
|
||||||
restart: always
|
|
||||||
container_name: mongodb
|
|
||||||
networks:
|
|
||||||
- penahub_ntwrk
|
|
||||||
entrypoint: ["/usr/bin/mongod","--bind_ip_all","--replSet","rs0"]
|
|
||||||
mongosetup:
|
|
||||||
image: mongo:6
|
|
||||||
depends_on:
|
|
||||||
- mongo
|
|
||||||
restart: "no"
|
|
||||||
networks:
|
|
||||||
- penahub_ntwrk
|
|
||||||
entrypoint: [ "bash", "-c", "sleep 5 && mongosh --host mongo:27017 --eval 'rs.initiate()'"]
|
|
||||||
volumes:
|
|
||||||
mongo_state: {}
|
|
||||||
networks:
|
|
||||||
penahub_ntwrk:
|
|
||||||
driver: bridge
|
|
||||||
attachable: true
|
|
||||||
internal: true
|
|
40
deployments/dev/docker-compose.yaml
Normal file
40
deployments/dev/docker-compose.yaml
Normal file
@ -0,0 +1,40 @@
|
|||||||
|
version: "3.3"
|
||||||
|
|
||||||
|
services:
|
||||||
|
admin:
|
||||||
|
build:
|
||||||
|
context: ../../.
|
||||||
|
dockerfile: Dockerfile
|
||||||
|
environment:
|
||||||
|
- DB_HOST=10.6.0.11
|
||||||
|
- DB_PORT=27017
|
||||||
|
- ENVIRONMENT=staging
|
||||||
|
- HTTP_HOST=0.0.0.0
|
||||||
|
- HTTP_PORT=8005
|
||||||
|
- AUTH_SERVICE_HOST=http://pena-auth-service
|
||||||
|
- AUTH_SERVICE_PORT=8000
|
||||||
|
- DB_USERNAME=test
|
||||||
|
- DB_PASSWORD=test
|
||||||
|
- DB_NAME=admin
|
||||||
|
- PUBLIC_ACCESS_SECRET_KEY= |
|
||||||
|
-----BEGIN PUBLIC KEY-----
|
||||||
|
MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCLW1tlHyKC9AG0hGpmkksET2DE
|
||||||
|
r7ojSPemxFWAgFgcPJWQ7x3uNbsdJ3bIZFoA/FClaWKMCZmjnH9tv0bKZtY/CDhM
|
||||||
|
ZEyHpMruRSn6IKrxjtQZWy4uv/w6MzUeyBYG0OvNCiYpdvz5SkAGAUHD5ZNFqn2w
|
||||||
|
KKFD0I2Dr59BFVSGJwIDAQAB
|
||||||
|
-----END PUBLIC KEY-----
|
||||||
|
networks:
|
||||||
|
- dev
|
||||||
|
|
||||||
|
mongo:
|
||||||
|
image: "mongo:6.0.3"
|
||||||
|
environment:
|
||||||
|
MONGO_INITDB_ROOT_USERNAME: test
|
||||||
|
MONGO_INITDB_ROOT_PASSWORD: test
|
||||||
|
ports:
|
||||||
|
- "27017:27017"
|
||||||
|
networks:
|
||||||
|
- dev
|
||||||
|
|
||||||
|
networks:
|
||||||
|
dev:
|
18
nodemon.json
18
nodemon.json
@ -1,9 +1,9 @@
|
|||||||
{
|
{
|
||||||
"ignore": ["test", ".git", "node_modules"],
|
"ignore": ["test", ".git", "node_modules"],
|
||||||
"watch": ["src"],
|
"watch": ["src"],
|
||||||
"exec": "npm run start:server",
|
"exec": "npm run start",
|
||||||
"ext": "ts",
|
"ext": "ts",
|
||||||
"env": {
|
"env": {
|
||||||
"ENVIRONMENT": "development"
|
"ENVIRONMENT": "development"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -13,6 +13,8 @@
|
|||||||
"test": "jest --coverage",
|
"test": "jest --coverage",
|
||||||
"test:watch": "jest --watch",
|
"test:watch": "jest --watch",
|
||||||
"build": "tsc -p tsconfig.json && tsc-alias -p tsconfig.json",
|
"build": "tsc -p tsconfig.json && tsc-alias -p tsconfig.json",
|
||||||
|
"compose:start:dev": "docker-compose -f deployments/dev/docker-compose.yaml up -d",
|
||||||
|
"compose:stop:dev": "docker-compose -f deployments/dev/docker-compose.yaml down --volumes --rmi local",
|
||||||
"code:check": "prettier --check \"src/**/*.{ts,tsx,js,css,scss,html}\"",
|
"code:check": "prettier --check \"src/**/*.{ts,tsx,js,css,scss,html}\"",
|
||||||
"code:format": "prettier --write \"src/**/*.{ts,tsx,js,css,scss,html}\"",
|
"code:format": "prettier --write \"src/**/*.{ts,tsx,js,css,scss,html}\"",
|
||||||
"code:format:specific-file": "prettier --write",
|
"code:format:specific-file": "prettier --write",
|
||||||
|
@ -13,10 +13,6 @@ export const configureENV = () => {
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
if (environment === "staging") {
|
|
||||||
return dotenv.config({ debug: true });
|
|
||||||
}
|
|
||||||
|
|
||||||
return dotenv.config();
|
return dotenv.config();
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -2,6 +2,6 @@ import type { DatabaseOptions } from "@/types/configuration/database-options";
|
|||||||
|
|
||||||
export const constituteMongoURI = ({ username, password, host, port, database }: DatabaseOptions) => {
|
export const constituteMongoURI = ({ username, password, host, port, database }: DatabaseOptions) => {
|
||||||
const dbConnection = `mongodb://${username}:${password}@${host}:${port}`;
|
const dbConnection = `mongodb://${username}:${password}@${host}:${port}`;
|
||||||
|
|
||||||
return database ? `${dbConnection}/${database}` : dbConnection;
|
return database ? `${dbConnection}/${database}` : dbConnection;
|
||||||
};
|
};
|
||||||
|
@ -51,7 +51,14 @@ export const getAccount = async (request: GetAccountRequest, reply: FastifyReply
|
|||||||
return new Error("invalid user id");
|
return new Error("invalid user id");
|
||||||
}
|
}
|
||||||
|
|
||||||
return AccountModel.findOne({ userId: getAccountRequestParams.userId }).lean();
|
const account = await AccountModel.findOne({ userId: getAccountRequestParams.userId }).lean();
|
||||||
|
|
||||||
|
if (!account) {
|
||||||
|
reply.status(404);
|
||||||
|
throw new Error("account not found");
|
||||||
|
}
|
||||||
|
|
||||||
|
return account;
|
||||||
};
|
};
|
||||||
|
|
||||||
export const setAccountRole = async (request: SetAccountRoleRequest, reply: FastifyReply) => {
|
export const setAccountRole = async (request: SetAccountRoleRequest, reply: FastifyReply) => {
|
||||||
|
Loading…
Reference in New Issue
Block a user