Skip to content
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
14 changes: 14 additions & 0 deletions .github/workflows/ci-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,14 @@ jobs:

- name: Run Tests
run: npm run test
deploy:
needs: test
runs-on: ubuntu-latest

steps:
- name: Checkout Repository
uses: actions/checkout@v4

- name: Authenticate to Google Cloud
uses: google-github-actions/auth@v2
with:
Expand Down Expand Up @@ -57,3 +64,10 @@ jobs:
service: dc-manager-backend
image: asia-east1-docker.pkg.dev/${{ secrets.GCP_PROJECT_ID }}/dc-manager-backend/dc-manager-backend-cloud:${{ github.sha }}
region: asia-east1
flags: --port=4000 --allow-unauthenticated --add-cloudsql-instances=${{ secrets.CLOUD_SQL_INSTANCE }}
env_vars: |
NODE_ENV=prod
DATABASE_URL=postgres://${{ secrets.DB_USER }}:${{ secrets.DB_PASSWORD }}@/\
${{ secrets.DB_NAME }}?host=/cloudsql/${{ secrets.CLOUD_SQL_INSTANCE }}
ACCESS_SECRET=${{ secrets.ACCESS_SECRET }}
REFRESH_SECRET=${{ secrets.REFRESH_SECRET }}
10 changes: 10 additions & 0 deletions src/domain/rbac/policy.ts
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@ const resources = [
"Machine",
"Service",
"Subnet",
"IPPool",
"IPAddress",
"User"
] as const
export type Resource = (typeof resources)[number]
Expand Down Expand Up @@ -56,6 +58,14 @@ export const POLICY: RBACPolicy = {
resource: "Subnet",
action: ["read"]
},
{
resource: "IPPool",
action: ["read"]
},
{
resource: "IPAddress",
action: ["read"]
},
{
resource: "User",
action: ["*"]
Expand Down
8 changes: 4 additions & 4 deletions src/presentation/server/controllers/auth.controller.ts
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@ export async function userRegister(req: Request, res: Response) {
)
res.cookie('refreshToken', refreshToken, {
httpOnly: true,
secure: false,
sameSite: 'strict'
secure: process.env.NODE_ENV === 'prod',
sameSite: process.env.NODE_ENV === 'prod' ? 'none' : 'strict'
})

res.status(201).json({
Expand Down Expand Up @@ -59,8 +59,8 @@ export async function userLogin(req: Request, res: Response) {
)
res.cookie('refreshToken', refreshToken, {
httpOnly: true,
secure: false,
sameSite: 'strict'
secure: process.env.NODE_ENV === 'prod',
sameSite: process.env.NODE_ENV === 'prod' ? 'none' : 'strict'
})

res.status(200).json({
Expand Down
2 changes: 2 additions & 0 deletions src/presentation/server/middleware/auth.middleware.ts
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,8 @@ const resourceToResourceMap: Record<string, Resource> = {
machine: "Machine",
service: "Service",
subnet: "Subnet",
"ip-pool": "IPPool",
"ip-address": "IPAddress",
user: "User",
auth: "User"
}
Expand Down