gitea_admin/maestro
1
0
Fork 0
mirror of https://github.com/dadosfera/maestro.git synced 2026-11-11 08:29:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

FEAT: dynamic callback and issuer urls

Browse Source
This commit is contained in:
marcos-silva-rodrigues
2025-07-16 11:35:47 -03:00
parent 42a39ee891
commit cb66d4f6c0
5 changed files with 42 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files
package-lock.json
Generated
+4 -4
View File
@@ -12,7 +12,7 @@
"@aws-sdk/client-secrets-manager": "^3.414.0",
"@dadosfera/dadosfera-logs": "^1.0.0-beta.4",
"@dadosfera/protospack": "2.5.3",
"@dadosfera/protospack-v2": "3.38.0-beta.9",
"@dadosfera/protospack-v2": "3.38.0-beta.10",
"@grpc/grpc-js": "^1.9.3",
"@grpc/proto-loader": "^0.7.9",
"@nestjs/cli": "^9.5.0",
@@ -1407,9 +1407,9 @@
}
},
"node_modules/@dadosfera/protospack-v2": {
"version": "3.38.0-beta.9",
"resolved": "https://dadosfera-611330257153.d.codeartifact.us-east-1.amazonaws.com/npm/dadosfera-npm/@dadosfera/protospack-v2/-/protospack-v2-3.38.0-beta.9.tgz",
"integrity": "sha512-9rCSI3g/VVysJUoZ7SdaVe+/UOZUC4qwlnKntf7YxVhb5yVGS3D9U/TjLvjI8zVe5gQ3f711GrhXUgrTGYU/2g==",
"version": "3.38.0-beta.10",
"resolved": "https://dadosfera-611330257153.d.codeartifact.us-east-1.amazonaws.com/npm/dadosfera-npm/@dadosfera/protospack-v2/-/protospack-v2-3.38.0-beta.10.tgz",
"integrity": "sha512-4miwovVFHtBY1VTHdW8BVmSB8m+LXfIA8uigHbeo8IwreMtTHuLpvfenT4MBSPkdVmlo9+0XBKKf+PaSqtdMAg==",
"license": "ISC",
"dependencies": {
"@grpc/grpc-js": "^1.9.3",
package.json
+1 -1
View File
@@ -30,7 +30,7 @@
"@aws-sdk/client-secrets-manager": "^3.414.0",
"@dadosfera/dadosfera-logs": "^1.0.0-beta.4",
"@dadosfera/protospack": "2.5.3",
"@dadosfera/protospack-v2": "3.38.0-beta.9",
"@dadosfera/protospack-v2": "3.38.0-beta.10",
"@grpc/grpc-js": "^1.9.3",
"@grpc/proto-loader": "^0.7.9",
"@nestjs/cli": "^9.5.0",
src/modules/identity-provider/dto/sso-signin.dto.ts
+1
View File
@@ -6,4 +6,5 @@ export class SsoSignInDto {
readonly clientId: string;
readonly clientSecret: string;
readonly issuerUrl: string;
readonly redirectUrls: string[];
}
src/modules/identity-provider/identity-provider.controller.ts
+30 -9
View File
@@ -27,7 +27,11 @@ import {
} from './dto/identity-provider.dto';
import { Request } from 'express';
import ErrorCodes from 'src/utils/errorCodes';
import { Authenticated, RequireModule, RequireSomePermission } from 'src/decorators/authentication.decorator';
import {
Authenticated,
RequireModule,
RequireSomePermission,
} from 'src/decorators/authentication.decorator';
import { PERMISSIONS_GROUPS } from 'src/authentication/permissions.enum';
@Controller('identity-providers')
@@ -119,15 +123,24 @@ export class IdentityProviderController {
...user,
});
return await this.identityProviderService.updateIdentityProviders(id, body, metadata);
return await this.identityProviderService.updateIdentityProviders(
id,
body,
metadata,
);
}
@Post('/callback')
@HttpCode(HttpStatus.OK)
async callbackIdp(@Req() req: Request, @Body() body: {
state: string,
code: string
}) {
async callbackIdp(
@Req() req: Request,
@Language() language: LanguageEnum,
@Body()
body: {
state: string;
code: string;
},
) {
this.logger.info('GET /identity-providers/callback');
const { code, state } = body;
@@ -141,7 +154,13 @@ export class IdentityProviderController {
throw new Error(ErrorCodes.IDENTITY_PROVIDER.INVALID_RESPONSE);
}
return await this.identityProviderService.getTokenByIdp(code, state);
const origin = req.headers['origin'] as string;
const langHeader = req.headers['dadosfera-lang'] as string;
const lang = langHeader.substring(0, 2) + langHeader.substring(2).toUpperCase();
const callbackUrl = process.env.ENV !== "prd" ? `${origin}/auth/callback` : `${origin}/${lang}/auth/callback`;
return await this.identityProviderService.getTokenByIdp(code, state, callbackUrl);
}
@Get('/links')
@@ -155,7 +174,10 @@ export class IdentityProviderController {
throw new Error(ErrorCodes.IDENTITY_PROVIDER.INVALID_HEADER);
}
const result = await this.identityProviderService.identityProvidersLinksPerDomain(frontDomain);
const result =
await this.identityProviderService.identityProvidersLinksPerDomain(
frontDomain,
);
return result;
}
@@ -171,5 +193,4 @@ export class IdentityProviderController {
url: redirectUrl,
};
}
}
src/modules/identity-provider/identity-provider.service.ts
+6 -19
View File
@@ -49,14 +49,11 @@ export class IdentityProviderService implements OnModuleInit {
this.identityProviderService.FindIdentityProvider({ id }),
);
const redirectUri = this.getCallbackUrl();
const cognitoIssuerURL = this.getCognitoIssuerUrl();
const issuer = await Issuer.discover(cognitoIssuerURL);
const issuer = await Issuer.discover(idp.issuerUrl);
const client = new issuer.Client({
client_id: idp.clientId,
client_secret: idp.clientSecret,
redirect_uris: [redirectUri],
redirect_uris: idp.redirectUrls,
response_types: ['code'],
});
@@ -75,7 +72,8 @@ export class IdentityProviderService implements OnModuleInit {
state,
clientId: idp.clientId,
clientSecret: idp.clientSecret,
issuerUrl: cognitoIssuerURL,
issuerUrl: idp.issuerUrl,
redirectUrls: idp.redirectUrls,
});
const url = client.authorizationUrl({
@@ -90,29 +88,18 @@ export class IdentityProviderService implements OnModuleInit {
return idpUrl;
}
private getCallbackUrl() {
const AUTH_CALLBACK = process.env.AUTH_CALLBACK;
return AUTH_CALLBACK;
}
private getCognitoIssuerUrl() {
const COGNITO_ISSUER_URL = process.env.COGNITO_ISSUER_URL;
return COGNITO_ISSUER_URL;
}
async getTokenByIdp(code: string, state: string) {
async getTokenByIdp(code: string, state: string, callbackUrl: string) {
const ssoSign = await this.cacheService.get(state);
if (!ssoSign) {
throw new BadRequestException('SSO sign-in is expired or not found');
}
const callbackUrl = this.getCallbackUrl();
const issuer = await Issuer.discover(ssoSign.issuerUrl);
const client = new issuer.Client({
client_id: ssoSign.clientId,
client_secret: ssoSign.clientSecret,
redirect_uris: [callbackUrl],
redirect_uris: ssoSign.redirectUrls,
});
if (ssoSign === null) {