chore: cleanup directory structure (#2)

jihoon gave me permission to self-approve :D
EchoSkorJjj · Feb 25, 2024 · 119b15f · 119b15f
1 parent 4e1a1e9
commit 119b15f
Show file tree

Hide file tree

Showing 33 changed files with 48 additions and 8 deletions.
diff --git a/Makefile b/Makefile
@@ -1,6 +1,6 @@
 PROJECT_NAME = "esd"
 LOCAL_DEPLOY_DIR = "deployment/docker"
-NPM_SUBDIRS = user-storage client 
+NPM_SUBDIRS = backend/simple/user-storage client 
 
 npm-install: npm-install-subdirectories
 	@echo "Running npm install to set up Husky and other dependencies..."

diff --git a/kong-gateway/Dockerfile → backend/kong-gateway/Dockerfile b/kong-gateway/Dockerfile → backend/kong-gateway/Dockerfile
diff --git a/kong-gateway/README.md → backend/kong-gateway/README.md b/kong-gateway/README.md → backend/kong-gateway/README.md
diff --git a/kong-gateway/authn-kong/handler.lua → backend/kong-gateway/authn-kong/handler.lua b/kong-gateway/authn-kong/handler.lua → backend/kong-gateway/authn-kong/handler.lua
diff --git a/kong-gateway/authn-kong/schema.lua → backend/kong-gateway/authn-kong/schema.lua b/kong-gateway/authn-kong/schema.lua → backend/kong-gateway/authn-kong/schema.lua
diff --git a/kong-gateway/kong.yml → backend/kong-gateway/kong.yml b/kong-gateway/kong.yml → backend/kong-gateway/kong.yml
diff --git a/...teway/protos/google/api/annotations.proto → ...teway/protos/google/api/annotations.proto b/...teway/protos/google/api/annotations.proto → ...teway/protos/google/api/annotations.proto
diff --git a/kong-gateway/protos/google/api/http.proto → ...kong-gateway/protos/google/api/http.proto b/kong-gateway/protos/google/api/http.proto → ...kong-gateway/protos/google/api/http.proto
diff --git a/...y/protos/google/protobuf/descriptor.proto → ...y/protos/google/protobuf/descriptor.proto b/...y/protos/google/protobuf/descriptor.proto → ...y/protos/google/protobuf/descriptor.proto
diff --git a/kong-gateway/protos/user_storage.proto → ...nd/kong-gateway/protos/user_storage.proto b/kong-gateway/protos/user_storage.proto → ...nd/kong-gateway/protos/user_storage.proto
diff --git a/user-storage/.dockerignore → backend/simple/user-storage/.dockerignore b/user-storage/.dockerignore → backend/simple/user-storage/.dockerignore
diff --git a/backend/simple/user-storage/.env b/backend/simple/user-storage/.env
@@ -0,0 +1,32 @@
+DB=user_storage_db
+DB_HOST=user-storage-db
+DB_PORT=5432
+DB_USER=user_storage_user
+DB_PASSWORD=user_storage_password
+
+REDIS_HOST=user-redis
+REDIS_PORT=6379
+REDIS_USERNAME=default
+REDIS_PASSWORD=password
+
+GRPC_PORT=0.0.0.0:50051
+GOOGLE_CLIENT_ID=732452164989-t5obdqk38155erts9be9u6rg0fik7ptk.apps.googleusercontent.com
+GOOGLE_CLIENT_SECRET=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
+
+JWT_SECRET_KEY="KUKUBIRDAIDHAIDHAJKSDAJIDBQIheh09u2jeqinwdjnbqwsdifhnw0euq2e0nqwdo"
+
+URL_ENVIRONMENT_PREFIX=test
+MYINFO_CLIENT_ID=STG2-MYINFO-SELF-TEST
+MYINFO_SUBENTITY_ID=""
+MYINFO_CLIENT_PRIVATE_SIGNING_KEY="-----BEGIN EC PRIVATE KEY-----MHcCAQEEIGcOBk0/8HtXAR8XkSinGpVE4GTmbPQnjkhGO+A+QrPaoAoGCCqGSM49AwEHoUQDQgAEBXUWq0Z2RRFqrlWbW2muIybNnj/YBxflNQTEOg+QmCS9c7gbjIOjSI5UkDOYRbIhnBfCdKcbE8itl7tJfQ8q7g==-----END EC PRIVATE KEY-----"
+MYINFO_CLIENT_PRIVATE_ENCRYPTION_KEYS="-----BEGIN EC PRIVATE KEY-----MHcCAQEEIDr6SLHbruSfQuLOxvc6nAL3w+/Dg9C3pge1aGuZ8rn2oAoGCCqGSM49AwEHoUQDQgAENfIxJudBO1/XD4DnhkVKPonHux0LG12O3D+Z2NfsuEHYcbp7IlwQQFVlSnViUXnstYyUAibJK43nBBx4Suaj3w==-----END EC PRIVATE KEY-----"
+MYINFO_CALLBACK_URL=http://localhost:3001/callback
+MYINFO_PURPOSE_ID=demonstration
+MYINFO_SCOPES="uinfin name email"
+
+SGID_CLIENT_ID=IS213EDUCATIONHELPER-8a50e86d
+SGID_CLIENT_SECRET=877a5e8ef604594cc726e21381bd7a22
+SGID_REDIRECT_URL=http://localhost:3001/auth/sgid/callback
+SGID_SCOPES="openid"
+SGID_PUBLIC_KEY="-----BEGIN PUBLIC KEY-----MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA9jzrWZ5mU8VKcvrMuq621cLyd6M/QBbZzoisu/U1qdI8LWltxGuvfrO7VsmdOM5d+tdfQhb5b4JbO6msFoachq49oXtfgA3lLYiYbb4P0CWl9zRQ2XJ+wu1y4777glDbsS+XHEPNZms+OHCnfO6i8oW5H57RfrFFvok0AXuXsaOcRlfJ9GlNy6w2VXBD3kIPdpvimOwnRVTlcwEe/Cs9e0LNEh/Z6AVStnyaCjA3NW4hap+fOQPYbyRzYMdk6kzoiwDZ1GMqA991eLrQoN30TlMDOfy5hDQMzKy1bCEpOvOVHo318h2Ul71feig+YrWsSNjKZ0gLeudv0w8Sj1oL5wIDAQAB-----END PUBLIC KEY-----"
+SGID_PRIVATE_KEY="-----BEGIN PRIVATE KEY-----MIIEvAIBADANBgkqhkiG9w0BAQEFAASCBKYwggSiAgEAAoIBAQD2POtZnmZTxUpy+sy6rrbVwvJ3oz9AFtnOiKy79TWp0jwtaW3Ea69+s7tWyZ04zl36119CFvlvgls7qawWhpyGrj2he1+ADeUtiJhtvg/QJaX3NFDZcn7C7XLjvvuCUNuxL5ccQ81maz44cKd87qLyhbkfntF+sUW+iTQBe5exo5xGV8n0aU3LrDZVcEPeQg92m+KY7CdFVOVzAR78Kz17Qs0SH9noBVK2fJoKMDc1biFqn585A9hvJHNgx2TqTOiLANnUYyoD33V4utCg3fROUwM5/LmENAzMrLVsISk685UejfXyHZSXvV96KD5itaxI2MpnSAt652/TDxKPWgvnAgMBAAECggEABAsEbKZYKk9J2KZkF11oOes6pwVuTW9KFSt1dc9ECMTKMmzz/7UqiT1xCr/1pTzuvF4dDsKLApj5AdktrsYRlVZl3Q9fuXNFOS+SYJyDKH1MKS/NDNcZBu3tsVSLgmC5ojE2tvYo+J2aCO9WdgMkzWMDPIho14L2TKqpyM3IGnI3fjuBgCqeJ7V2MNsWtrXpglEvJ64/ZkkkHxw281jJhYXUqh4pFlXhZ9thJivYfy1F/NNBz//uO/ZOnb3kefkjjW2bAwiGS8v7hRGWpmN1O5wYxMqHRuVBlhZxI7qkKYzpGWcBhTNlGEBshS/fdmJTcwKdrY8MnDmN97eA1YbL4QKBgQD9Edqxa0xaN21mJ07cE/Zghu3P0AhqGYp2wv4h4qiM0DcplMkPsHQHj6DwxRZkq2582RrP0Ogyt4ichPw5yB/wFiQ/9eM87QquqL+n5t1hcpdX7MCOfgW5dodIn+nWQ6zsV3od9kUdvyevN4o7YVpPewuMLzC1Ss31U19uVOPNVwKBgQD5FtB9LutkG+joBZrCYk9Ph62YpUBDqnLl5Y4ds5uCzlBpX8UEbtkfaIXfLLmVCyfTROtKPxtir4izfpbDDxOIVR6aEOssiG9m6MbO1hS2CTyqYHNMQvEJugb3hKjIRSoFDq1jnZu+kh8HaNud8jqeev7tk2pzn2o9mChNTqUL8QKBgHOpsls+YBInnQ+ATbGWShfJ82z0drQPYlJvQnk4P7LEA0I050QNcKp4AaWpXle6ZnAXRgLPRyDO81geC61ZAwfXBtBY0HfrGuPC6n2RrYK5PeSIp2U4weMHAkO2Gsi7+4+1V3HUObijwj550urazszevuNeOhPR0ZobddVWZRtXAoGAELguUGjI1hRlgsV1iNyudCkoRtm4wZH8WmAZNPcsVhBhJ2GNSOnj2w7aBYvr/QwdpTm4DWjE/s/HfjzeA8PMTNdh0XeXQYr6505yocmO5FUkZE9LDfBkW4HIG+8koSS7WFGO4+PdY2JNgOLR8v0iYCbjW7EMcSxfJjlDY0UHIRECgYABqWWL9If+r2giALLT6OE01IquESFY9Sd//DE9rhTSz1im4jVIZmZ+aNilmtY51h8YS4MTj9GHwSKJeCadtD3EbfXPsCVUmajsSDnFvFSpsUA055tTzAoq9NbQwjUASePJA8DR8vg6YoI0Y2J2lctxjtvchbd4vdqa4nB55GfZ1g==-----END PRIVATE KEY-----"
diff --git a/user-storage/.gitignore → backend/simple/user-storage/.gitignore b/user-storage/.gitignore → backend/simple/user-storage/.gitignore
diff --git a/user-storage/Dockerfile → backend/simple/user-storage/Dockerfile b/user-storage/Dockerfile → backend/simple/user-storage/Dockerfile
diff --git a/user-storage/buf.gen.yaml → backend/simple/user-storage/buf.gen.yaml b/user-storage/buf.gen.yaml → backend/simple/user-storage/buf.gen.yaml
diff --git a/user-storage/buf.lock → backend/simple/user-storage/buf.lock b/user-storage/buf.lock → backend/simple/user-storage/buf.lock
diff --git a/user-storage/buf.work.yaml → backend/simple/user-storage/buf.work.yaml b/user-storage/buf.work.yaml → backend/simple/user-storage/buf.work.yaml
diff --git a/user-storage/buf.yaml → backend/simple/user-storage/buf.yaml b/user-storage/buf.yaml → backend/simple/user-storage/buf.yaml
diff --git a/user-storage/package-lock.json → ...end/simple/user-storage/package-lock.json b/user-storage/package-lock.json → ...end/simple/user-storage/package-lock.json
diff --git a/user-storage/package.json → backend/simple/user-storage/package.json b/user-storage/package.json → backend/simple/user-storage/package.json
diff --git a/user-storage/pb/google/protobuf/any.ts → ...le/user-storage/pb/google/protobuf/any.ts b/user-storage/pb/google/protobuf/any.ts → ...le/user-storage/pb/google/protobuf/any.ts
diff --git a/user-storage/pb/google/protobuf/timestamp.ts → ...r-storage/pb/google/protobuf/timestamp.ts b/user-storage/pb/google/protobuf/timestamp.ts → ...r-storage/pb/google/protobuf/timestamp.ts
diff --git a/user-storage/pb/user_storage.ts → ...nd/simple/user-storage/pb/user_storage.ts b/user-storage/pb/user_storage.ts → ...nd/simple/user-storage/pb/user_storage.ts
diff --git a/user-storage/protos/user_storage.proto → ...le/user-storage/protos/user_storage.proto b/user-storage/protos/user_storage.proto → ...le/user-storage/protos/user_storage.proto
diff --git a/user-storage/src/index.ts → backend/simple/user-storage/src/index.ts b/user-storage/src/index.ts → backend/simple/user-storage/src/index.ts
diff --git a/user-storage/src/logger/logger.ts → .../simple/user-storage/src/logger/logger.ts b/user-storage/src/logger/logger.ts → .../simple/user-storage/src/logger/logger.ts
diff --git a/...torage/src/proto-services/user_storage.ts → ...torage/src/proto-services/user_storage.ts b/...torage/src/proto-services/user_storage.ts → ...torage/src/proto-services/user_storage.ts
diff --git a/user-storage/src/server/proto.ts → ...d/simple/user-storage/src/server/proto.ts b/user-storage/src/server/proto.ts → ...d/simple/user-storage/src/server/proto.ts
diff --git a/user-storage/src/server/server.ts → .../simple/user-storage/src/server/server.ts b/user-storage/src/server/server.ts → .../simple/user-storage/src/server/server.ts
diff --git a/user-storage/src/utils/strings.ts → .../simple/user-storage/src/utils/strings.ts b/user-storage/src/utils/strings.ts → .../simple/user-storage/src/utils/strings.ts
diff --git a/user-storage/tsconfig.json → backend/simple/user-storage/tsconfig.json b/user-storage/tsconfig.json → backend/simple/user-storage/tsconfig.json
diff --git a/client/.env b/client/.env
@@ -3,7 +3,15 @@
 # -----------------------------------------------
 VITE_TELEGRAM_BOT_API_KEY = ''
 VITE_GOOGLE_MAP_API_KEY=""
-VITE_GOOGLE_CLIENT_ID=563635941658-naqb6b9b021fqsqesdrfqds3dgbrap35.apps.googleusercontent.com
+VITE_GOOGLE_CLIENT_ID=732452164989-t5obdqk38155erts9be9u6rg0fik7ptk.apps.googleusercontent.com
 VITE_LOCATIONIQ_ACCESS_TOKEN=""
 VITE_STORAGE_KEY=helloworld
-VITE_API_BASE_URL=http://localhost:8000
+VITE_API_BASE_URL=http://localhost:8000
+
+VITE_URL_ENVIRONMENT_PREFIX=test
+VITE_MYINFO_CLIENT_ID=STG2-MYINFO-SELF-TEST
+VITE_MYINFO_REDIRECT_URL=http://localhost:3001/callback
+VITE_MYINFO_SCOPE="uinfin name email"
+VITE_MYINFO_PURPOSE_ID=demonstration
+VITE_MYINFO_AUTH_API_URL=https://test.api.myinfo.gov.sg/com/v4/authorize
+VITE_MYINFO_METHOD=S256
diff --git a/deployment/docker/docker-compose.yml b/deployment/docker/docker-compose.yml
@@ -19,7 +19,7 @@ volumes:
 services:
   kong-gateway:
     image: kong:latest
-    build: ../../kong-gateway
+    build: ../../backend/kong-gateway
     environment:
       <<: *common-env
       KONG_DATABASE: off
@@ -39,12 +39,12 @@ services:
       - kong_db_password
     restart: on-failure
     volumes:
-      - ../../kong-gateway/kong.yml:/etc/kong/kong.yml 
-      - ../../kong-gateway/authn-kong:/usr/local/share/lua/5.1/kong/plugins/authn-kong 
-      - ../../kong-gateway/protos:/usr/local/share/lua/5.1/kong/protos
+      - ../../backend/kong-gateway/kong.yml:/etc/kong/kong.yml 
+      - ../../backend/kong-gateway/authn-kong:/usr/local/share/lua/5.1/kong/plugins/authn-kong 
+      - ../../backend/kong-gateway/protos:/usr/local/share/lua/5.1/kong/protos
 
   user-storage-service:
-    build: ../../user-storage
+    build: ../../backend/simple/user-storage
     image: user-storage-service:1.0
     depends_on:
       kong-gateway: