Merge branch 'main' into dev/matthieu/refactor
This commit is contained in:
commit
06ba94cdb9
|
|
@ -17,9 +17,7 @@ ENV AUTHENTIK_AUTH_URL="https://auth.targo.ca/application/o/authorize/"
|
|||
ENV AUTHENTIK_TOKEN_URL="https://auth.targo.ca/application/o/token/"
|
||||
ENV AUTHENTIK_USERINFO_URL="https://auth.targo.ca/application/o/userinfo/"
|
||||
|
||||
ENV TARGO_FRONTEND_URI_1="http://targo-frontend-nicolas:9000"
|
||||
ENV TARGO_FRONTEND_URI_2="http://targo-frontend-matthieu:9000"
|
||||
ENV TARGO_FRONTEND_URI_3="http://targo-frontend-lion:9000"
|
||||
ENV TARGO_FRONTEND_URI="http://10.100.251.2/"
|
||||
|
||||
ENV ATTACHMENTS_SERVER_ID="server"
|
||||
ENV ATTACHMENTS_ROOT=C:/
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@ export class AuthController {
|
|||
@Get('/callback')
|
||||
@UseGuards(OIDCLoginGuard)
|
||||
loginCallback(@Req() req: Request, @Res() res: Response) {
|
||||
res.redirect('http://localhost:9000/#/login-success');
|
||||
res.redirect('http://10.100.251.2:9011/#/login-success');
|
||||
}
|
||||
|
||||
@Get('/me')
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
import 'reflect-metadata';
|
||||
//import and if case for @nestjs/schedule Cron jobs
|
||||
import * as nodeCrypto from 'crypto';
|
||||
if(!(globalThis as any).crypto) {
|
||||
if (!(globalThis as any).crypto) {
|
||||
(globalThis as any).crypto = nodeCrypto;
|
||||
}
|
||||
import { ensureAttachmentsTmpDir } from './config/attachment.fs';
|
||||
|
|
@ -46,7 +46,7 @@ async function bootstrap() {
|
|||
|
||||
// Enable CORS
|
||||
app.enableCors({
|
||||
origin: [process.env.TARGO_FRONTEND_URI_1, process.env.TARGO_FRONTEND_URI_2, process.env.TARGO_FRONTEND_URI_3],
|
||||
origin: ['http://10.100.251.2:9011', 'http://10.100.251.2:9012', 'http://10.100.251.2:9013'],
|
||||
credentials: true,
|
||||
});
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user