From 9f51001a502950d6b9967c6155763083798c1f87 Mon Sep 17 00:00:00 2001
From: Chika <djchikalkin@gmail.com>
Date: Mon, 28 Nov 2022 19:46:51 +0300
Subject: [PATCH] Docker: fix api variables names

---
 apps/api/src/auth/auth.service.ts |  6 +++---
 apps/api/src/ldap/ldap.service.ts | 10 +++++-----
 docker-compose.yml                | 12 ++++++------
 3 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/apps/api/src/auth/auth.service.ts b/apps/api/src/auth/auth.service.ts
index da86223..fd0d912 100644
--- a/apps/api/src/auth/auth.service.ts
+++ b/apps/api/src/auth/auth.service.ts
@@ -23,18 +23,18 @@ export class AuthService {
 
     const user = {
       username,
-      domain: process.env.domain,
+      domain: process.env.LDAP_DOMAIN,
       displayName,
       department,
       position: title,
       mail,
-      domainName: `${process.env.domain}\\${username}`,
+      domainName: `${process.env.LDAP_DOMAIN}\\${username}`,
     };
     await this.usersCache.addUser(username, user);
 
     const payload: TokenPayload = {
       username,
-      domain: process.env.domain,
+      domain: process.env.LDAP_DOMAIN,
     };
 
     return this.jwtService.sign(payload);
diff --git a/apps/api/src/ldap/ldap.service.ts b/apps/api/src/ldap/ldap.service.ts
index 3f9343f..3c15d1b 100644
--- a/apps/api/src/ldap/ldap.service.ts
+++ b/apps/api/src/ldap/ldap.service.ts
@@ -8,12 +8,12 @@ export class LdapService {
   async authenticate(login: string, password?: string) {
     const options: AuthenticationOptions = {
       ldapOpts: {
-        url: process.env.ldapUrl,
+        url: process.env.LDAP_URL,
       },
-      adminDn: process.env.bindDN,
-      adminPassword: process.env.bindCredentials,
-      userSearchBase: process.env.base,
-      usernameAttribute: process.env.attribute,
+      adminDn: process.env.LDAP_BIND_DN,
+      adminPassword: process.env.LDAP_BIND_CREDENTIALS,
+      userSearchBase: process.env.LDAP_BASE,
+      usernameAttribute: process.env.LDAP_ATTRIBUTE,
       username: login,
       userPassword: password,
       verifyUserExists: password === undefined,
diff --git a/docker-compose.yml b/docker-compose.yml
index be1db06..834f974 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -17,12 +17,12 @@ services:
       context: .
       dockerfile: ./apps/api/Dockerfile
     environment:
-      - bindDN=${LDAP_BIND_DN}
-      - bindCredentials=${LDAP_BIND_CREDENTIALS}
-      - domain=${LDAP_DOMAIN}
-      - ldapUrl=${LDAP_URL}
-      - base=${LDAP_BASE}
-      - attribute=${LDAP_ATTRIBUTE}
+      - LDAP_BIND_DN=${LDAP_BIND_DN}
+      - LDAP_BIND_CREDENTIALS=${LDAP_BIND_CREDENTIALS}
+      - LDAP_DOMAIN=${LDAP_DOMAIN}
+      - LDAP_URL=${LDAP_URL}
+      - LDAP_BASE=${LDAP_BASE}
+      - LDAP_ATTRIBUTE=${LDAP_ATTRIBUTE}
       - SECRET=${API_SECRET}
       - TOKEN_TTL=${API_TOKEN_TTL}
       - CACHE_TTL=${API_CACHE_TTL}