From 211313729801419a60a81fe754077601da020868 Mon Sep 17 00:00:00 2001
From: Dima Rosmait <dima.rosmait@holi.team>
Date: Fri, 27 Oct 2023 14:15:28 +0200
Subject: [PATCH] NOISSUE: provide and use CHAT_SERVER_NAME variable
---
.envrc.local.template | 1 +
src/constants.ts | 1 +
src/helpers/rooms.ts | 4 ++--
terraform/common/function.tf | 2 ++
4 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/.envrc.local.template b/.envrc.local.template
index e1b33e7..1e2ccce 100644
--- a/.envrc.local.template
+++ b/.envrc.local.template
@@ -6,5 +6,6 @@ export CHAT_OIDC_ISSUER=https://dev-auth.holi.social
# Chat environment variables
export CHAT_SERVER_URL="http://192.168.180.44:8008"
+export CHAT_SERVER_NAME="local.chat.holi.social"
export CHAT_ADMIN_USERNAME=""
export CHAT_ADMIN_ACCESS_TOKEN=""
\ No newline at end of file
diff --git a/src/constants.ts b/src/constants.ts
index 05be9b1..4748a21 100644
--- a/src/constants.ts
+++ b/src/constants.ts
@@ -1,3 +1,4 @@
export const CHAT_SERVER_URL = process.env.CHAT_SERVER_URL
+export const CHAT_SERVER_NAME = process.env.CHAT_SERVER_NAME
export const CHAT_ADMIN_USERNAME = process.env.CHAT_ADMIN_USERNAME
export const CHAT_ADMIN_ACCESS_TOKEN = process.env.CHAT_ADMIN_ACCESS_TOKEN
diff --git a/src/helpers/rooms.ts b/src/helpers/rooms.ts
index de9da67..1fc72d4 100644
--- a/src/helpers/rooms.ts
+++ b/src/helpers/rooms.ts
@@ -1,7 +1,7 @@
-import { CHAT_ADMIN_ACCESS_TOKEN, CHAT_SERVER_URL } from '../constants'
+import { CHAT_ADMIN_ACCESS_TOKEN, CHAT_SERVER_NAME, CHAT_SERVER_URL } from '../constants'
import { ChatRoomEvent } from './type'
-export const getMatrixUserId = (holiIdentity: string) => `@${holiIdentity}:local.chat.holi.social`
+export const getMatrixUserId = (holiIdentity: string) => `@${holiIdentity}:${CHAT_SERVER_NAME}`
export const getRooms = async (searchTerm?: string) => {
const resp = await fetch(
diff --git a/terraform/common/function.tf b/terraform/common/function.tf
index 7a254b5..19e9247 100644
--- a/terraform/common/function.tf
+++ b/terraform/common/function.tf
@@ -97,6 +97,7 @@ resource "google_cloudfunctions2_function" "holi-chat-integration-staging" {
ENVIRONMENT = "staging"
CHAT_OIDC_ISSUER = "https://dev-auth.holi.social"
CHAT_SERVER_URL = "https://development-chat.holi.social"
+ CHAT_SERVER_NAME = "development-chat.holi.social"
}
vpc_connector = data.terraform_remote_state.holi_infra_state.outputs.vpc_access_connector_name
vpc_connector_egress_settings = "PRIVATE_RANGES_ONLY"
@@ -154,6 +155,7 @@ resource "google_cloudfunctions2_function" "holi-chat-integration-staging" {
# ENVIRONMENT = "production"
# CHAT_OIDC_ISSUER = "https://auth.holi.social"
# CHAT_SERVER_URL = "https://chat.holi.social"
+# CHAT_SERVER_NAME = "chat.holi.social"
# }
# vpc_connector = data.terraform_remote_state.holi_infra_state.outputs.vpc_access_connector_name
# vpc_connector_egress_settings = "PRIVATE_RANGES_ONLY"
--
GitLab