hrms-bangkok/hrms-api-org
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Merge branch 'develop' into dev
All checks were successful
Build & Deploy on Dev / build (push) Successful in 59s
Details

Browse source
This commit is contained in:
Adisak 2025-11-12 14:40:36 +07:00
commit ccf012ee1d
2 changed files with 12 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/controllers/ProfileController.ts
View file

@ -86,7 +86,7 @@ import { ProfileSalaryHistory } from "../entities/ProfileSalaryHistory";
import { ProfileAssistance } from "../entities/ProfileAssistance"; import { ProfileAssistance } from "../entities/ProfileAssistance";
import { CommandRecive } from "../entities/CommandRecive"; import { CommandRecive } from "../entities/CommandRecive";
import { EmployeePosMaster } from "../entities/EmployeePosMaster"; import { EmployeePosMaster } from "../entities/EmployeePosMaster";
import { getTopDegrees } from "../services/PositionService"; import { CreatePosMasterHistoryOfficer, getTopDegrees } from "../services/PositionService";
import { ProfileLeaveService } from "../services/ProfileLeaveService"; import { ProfileLeaveService } from "../services/ProfileLeaveService";
@Route("api/v1/org/profile") @Route("api/v1/org/profile")
@ -10789,6 +10789,9 @@ export class ProfileController extends Controller {
await this.profileRepo.save(profile, { data: request }); await this.profileRepo.save(profile, { data: request });
setLogDataDiff(request, { before, after: profile }); setLogDataDiff(request, { before, after: profile });
if (requestBody.isLeave == true) { if (requestBody.isLeave == true) {
if(orgRevisionRef){
await CreatePosMasterHistoryOfficer(orgRevisionRef.id, request);
}
await removeProfileInOrganize(profile.id, "OFFICER"); await removeProfileInOrganize(profile.id, "OFFICER");
} }
return new HttpSuccess(); return new HttpSuccess();

8
src/middlewares/auth.ts
View file

@ -27,6 +27,14 @@ export async function expressAuthentication(
securityName: string, securityName: string,
_scopes?: string[], _scopes?: string[],
) { ) {
// API_KEY bypass logic (support api_key, x-api-key, apikey)
const apiKeyHeader =
request.headers["api-key"] || request.headers["x-api-key"] || request.headers["apikey"];
if (apiKeyHeader !== undefined) {
if (apiKeyHeader === process.env.API_KEY) {
return { preferred_username: "api_key_bypass", apiKeyBypass: true };
}
}
if (process.env.NODE_ENV !== "production" && process.env.AUTH_BYPASS) { if (process.env.NODE_ENV !== "production" && process.env.AUTH_BYPASS) {
return { preferred_username: "bypassed" }; return { preferred_username: "bypassed" };
} }