Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

update: improve docker setup #159

Merged
merged 1 commit into from
Jan 30, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 26 additions & 0 deletions .env.dev
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
# Common
DATABASE_URL=postgres://postgres:postgres@postgres:5432/postgres

HASURA_GRAPHQL_ADMIN_SECRET=hasura-admin
HASURA_GRAPHQL_JWT_SECRET='{"type":"HS256","key":"my-jwt-secret-key-with-at-least-32-chars"}'
HASURA_GRAPHQL_ENABLE_CONSOLE=true
HASURA_GRAPHQL_CORS_DOMAIN="*"
HASURA_GRAPHQL_PORT=6565

FILES_GATEWAY_URL=https://example.com
FILES_GATEWAY_TOKEN=1234567890
PORT=3000
RPC_ENDPOINT=wss://rpc.taurus.subspace.foundation/ws
PRIVATE_KEYS_PATH='<private-keys-path>'
CORS_ALLOWED_ORIGINS=*
OBJECT_MAPPING_ARCHIVER_URL=wss://indexer.taurus.autonomys.xyz
MAX_CACHE_SIZE=1073741824
AUTH_SERVICE_URL=http://auth:3030
AUTH_SERVICE_API_KEY=1234567890

# Auth
AUTH_PORT=3030
JWT_SECRET=my-jwt-secret-key-with-at-least-32-chars
JWT_SECRET=$(echo $JWT_SECRET | base64)
JWT_SECRET_ALGORITHM=HS256
API_SECRET=1234567890
5 changes: 5 additions & 0 deletions auth/.dockerignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
node_modules/
Dockerfile
docker-compose.yml
dist/
.env
5 changes: 5 additions & 0 deletions auth/.env.sample
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
DATABASE_URL=postgresql://postgres:postgres@localhost:5432/postgres
JWT_SECRET=mytest
JWT_SECRET_ALGORITHM=HS256
API_SECRET=test
AWS_REGION=us-east-2
6 changes: 3 additions & 3 deletions auth/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ RUN rm -rf node_modules
RUN yarn install
RUN yarn build

EXPOSE 3000
EXPOSE 3030

HEALTHCHECK --interval=30s --timeout=10s --start-period=5s --retries=3 CMD curl -f http://localhost:3000/health || exit 1
HEALTHCHECK --interval=30s --timeout=10s --start-period=5s --retries=3 CMD curl -f http://localhost:3030/health || exit 1

CMD ["bash", "start-server.sh"]
CMD ["bash", "start-server.sh"]
1 change: 1 addition & 0 deletions auth/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
"lambda:build": "yarn build && esbuild src/lambda.ts --bundle --platform=node --target=node18 --outfile=build/index.js"
},
"dependencies": {
"@aws-sdk/dsql-signer": "^3.734.0",
"@types/express": "^5.0.0",
"@types/jsonwebtoken": "^9.0.7",
"@types/pg": "^8.11.10",
Expand Down
1 change: 1 addition & 0 deletions auth/src/config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -11,5 +11,6 @@ export const config = {
},
corsAllowedOrigins: process.env.CORS_ALLOWED_ORIGINS,
jwtSecret: env("JWT_SECRET"),
jwtSecretAlgorithm: env("JWT_SECRET_ALGORITHM", "RS256"),
apiSecret: env("API_SECRET"),
};
14 changes: 7 additions & 7 deletions auth/src/services/authManager/providers/custom.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
import jwt from "jsonwebtoken";
import { OAuthUser, UserRole } from "../../../models/index";
import { createPrivateKey } from "crypto";
import {
CustomAccessTokenPayload,
CustomRefreshTokenPayload,
Expand All @@ -12,12 +11,13 @@ import { UsersUseCases } from "../../../useCases/index";
import { config } from "../../../config";

const JWT_SECRET = Buffer.from(config.jwtSecret, "base64").toString("utf-8");
const JWT_SECRET_ALGORITHM = config.jwtSecretAlgorithm as jwt.Algorithm;

const getUserFromAccessToken = async (
accessToken: string
): Promise<OAuthUser> => {
const decoded = jwt.verify(accessToken, JWT_SECRET, {
algorithms: ["RS256"],
algorithms: [JWT_SECRET_ALGORITHM],
}) as CustomAccessTokenPayload;
if (typeof decoded === "string") {
throw new Error("Invalid access token");
Expand Down Expand Up @@ -68,7 +68,7 @@ const createAccessToken = async (

return jwt.sign(payload, JWT_SECRET, {
expiresIn: "1h",
algorithm: "RS256",
algorithm: JWT_SECRET_ALGORITHM,
});
};

Expand All @@ -84,7 +84,7 @@ const createRefreshToken = async (user: OAuthUser) => {

return jwt.sign(payload, JWT_SECRET, {
expiresIn: "7d",
algorithm: "RS256",
algorithm: JWT_SECRET_ALGORITHM,
});
};

Expand All @@ -106,7 +106,7 @@ const getUserFromRefreshToken = async (
refreshToken: string
): Promise<OAuthUser> => {
const decoded = jwt.verify(refreshToken, JWT_SECRET, {
algorithms: ["RS256"],
algorithms: [JWT_SECRET_ALGORITHM],
}) as CustomAccessTokenPayload;
if (typeof decoded === "string") {
throw new Error("Invalid refresh token");
Expand All @@ -130,7 +130,7 @@ const getUserFromRefreshToken = async (

const refreshAccessToken = async (refreshToken: string): Promise<string> => {
const decoded = jwt.verify(refreshToken, JWT_SECRET, {
algorithms: ["RS256"],
algorithms: [JWT_SECRET_ALGORITHM],
}) as CustomRefreshTokenPayload;
if (typeof decoded === "string") {
throw new Error("Invalid refresh token");
Expand All @@ -143,7 +143,7 @@ const refreshAccessToken = async (refreshToken: string): Promise<string> => {

const invalidateRefreshToken = async (refreshOrAccessToken: string) => {
const decoded = jwt.verify(refreshOrAccessToken, JWT_SECRET, {
algorithms: ["RS256"],
algorithms: [JWT_SECRET_ALGORITHM],
}) as CustomTokenPayload;

if (typeof decoded === "string") {
Expand Down
Loading