@hed-hog/core 0.0.155 → 0.0.159
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/oauth/oauth.controller.js +3 -3
- package/dist/oauth/oauth.controller.js.map +1 -1
- package/dist/oauth/oauth.service.d.ts.map +1 -1
- package/dist/oauth/oauth.service.js +27 -10
- package/dist/oauth/oauth.service.js.map +1 -1
- package/dist/oauth/providers/microsoft-entra-id.provider.d.ts.map +1 -1
- package/dist/oauth/providers/microsoft-entra-id.provider.js +48 -36
- package/dist/oauth/providers/microsoft-entra-id.provider.js.map +1 -1
- package/dist/security/security.service.d.ts.map +1 -1
- package/dist/security/security.service.js +4 -0
- package/dist/security/security.service.js.map +1 -1
- package/hedhog/data/setting_group.yaml +22 -1
- package/hedhog/table/user_account.yaml +1 -0
- package/package.json +5 -5
- package/src/oauth/oauth.controller.ts +3 -3
- package/src/oauth/oauth.service.ts +35 -10
- package/src/oauth/providers/microsoft-entra-id.provider.ts +25 -9
- package/src/security/security.service.ts +6 -0
|
@@ -30,15 +30,15 @@ let OAuthController = class OAuthController {
|
|
|
30
30
|
return res.redirect(redirectURL);
|
|
31
31
|
}
|
|
32
32
|
async login(provider, res) {
|
|
33
|
-
const url = await this.service.getAuthUrl(provider, `/
|
|
33
|
+
const url = await this.service.getAuthUrl(provider, `/callback/${provider}/login`);
|
|
34
34
|
return res.redirect(url);
|
|
35
35
|
}
|
|
36
36
|
async register(provider, res) {
|
|
37
|
-
const url = await this.service.getAuthUrl(provider, `/
|
|
37
|
+
const url = await this.service.getAuthUrl(provider, `/callback/${provider}/register`);
|
|
38
38
|
return res.redirect(url);
|
|
39
39
|
}
|
|
40
40
|
async connect(provider, res) {
|
|
41
|
-
const url = this.service.getAuthUrl(provider, `/
|
|
41
|
+
const url = this.service.getAuthUrl(provider, `/callback/${provider}/connect`);
|
|
42
42
|
return res.redirect(url);
|
|
43
43
|
}
|
|
44
44
|
async callbackLogin(locale, ipAddress, userAgent, provider, code, res) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"oauth.controller.js","sourceRoot":"","sources":["../../src/oauth/oauth.controller.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AACA,sCAA4C;AAC5C,oDAA6C;AAE7C,2CAUwB;AACxB,gEAA4D;AAC5D,mDAA+C;AAGxC,IAAM,eAAe,GAArB,MAAM,eAAe;IAC1B,YAA6B,OAAqB,EAAmB,cAA8B;QAAtE,YAAO,GAAP,OAAO,CAAc;QAAmB,mBAAc,GAAd,cAAc,CAAgB;IAAG,CAAC;IAIjG,AAAN,KAAK,CAAC,cAAc,CACH,IAAY,EACX,KAAa,EACtB,GAAG;QAEV,MAAM,IAAI,GAAG,KAAK,IAAI,OAAO,CAAC;QAC9B,MAAM,EAAE,GAAG,EAAE,WAAW,GAAG,EAAE,EAAE,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,gBAAgB,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC;QACtF,MAAM,WAAW,GAAG,GAAG,WAAW,oBAAoB,IAAI,SAAS,kBAAkB,CAAC,IAAI,CAAC,EAAE,CAAC;QAC9F,OAAO,GAAG,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAC;IACnC,CAAC;IAIK,AAAN,KAAK,CAAC,KAAK,CAAoB,QAAgB,EAAS,GAAG;QACzD,MAAM,GAAG,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,UAAU,CACvC,QAAsC,EACtC,
|
|
1
|
+
{"version":3,"file":"oauth.controller.js","sourceRoot":"","sources":["../../src/oauth/oauth.controller.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"oauth.service.d.ts","sourceRoot":"","sources":["../../src/oauth/oauth.service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,0BAA0B,EAAE,MAAM,qBAAqB,CAAC;AAShF,OAAO,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AACnD,OAAO,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AACnD,OAAO,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AACnD,OAAO,EAAE,eAAe,EAAE,MAAM,8BAA8B,CAAC;AAC/D,OAAO,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAC;AAC5D,OAAO,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAC;AACtD,OAAO,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AAEnD,OAAO,EAAE,gBAAgB,EAAE,MAAM,+BAA+B,CAAC;AACjE,OAAO,EAAE,cAAc,EAAE,MAAM,6BAA6B,CAAC;AAC7D,OAAO,EAAE,cAAc,EAAE,MAAM,6BAA6B,CAAC;AAC7D,OAAO,EAAE,wBAAwB,EAAE,MAAM,yCAAyC,CAAC;AACnF,OAAO,EAAE,iBAAiB,EAAE,MAAM,gCAAgC,CAAC;AAEnE,KAAK,mBAAmB,GAAG;IACzB,MAAM,EAAE,MAAM,CAAC;IACf,SAAS,EAAE,MAAM,CAAC;IAClB,SAAS,EAAE,MAAM,CAAC;IAClB,GAAG,EAAE,QAAQ,CAAC;IACd,QAAQ,EAAE,0BAA0B,CAAC;IACrC,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,IAAI,EAAE,OAAO,GAAG,UAAU,GAAG,SAAS,GAAG,YAAY,CAAC;IACtD,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB,CAAC;AAEF,qBACa,YAAY;IAUrB,OAAO,CAAC,QAAQ,CAAC,IAAI;IACrB,OAAO,CAAC,QAAQ,CAAC,IAAI;IACrB,OAAO,CAAC,QAAQ,CAAC,IAAI;IACrB,OAAO,CAAC,QAAQ,CAAC,QAAQ;IACzB,OAAO,CAAC,QAAQ,CAAC,MAAM;IACvB,OAAO,CAAC,QAAQ,CAAC,KAAK;IACtB,OAAO,CAAC,QAAQ,CAAC,OAAO;IAExB,OAAO,CAAC,QAAQ,CAAC,IAAI;IAjBvB,OAAO,CAAC,SAAS,CAAyC;gBAGxD,MAAM,EAAE,cAAc,EACtB,QAAQ,EAAE,gBAAgB,EAC1B,SAAS,EAAE,iBAAiB,EAC5B,MAAM,EAAE,cAAc,EACtB,gBAAgB,EAAE,wBAAwB,EAEzB,IAAI,EAAE,WAAW,EACjB,IAAI,EAAE,WAAW,EACjB,IAAI,EAAE,WAAW,EACjB,QAAQ,EAAE,eAAe,EACzB,MAAM,EAAE,aAAa,EACrB,KAAK,EAAE,YAAY,EACnB,OAAO,EAAE,cAAc,EAEvB,IAAI,EAAE,WAAW;IASpC,UAAU,CAAC,QAAQ,EAAE,0BAA0B,EAAE,YAAY,EAAE,MAAM;IAI/D,cAAc,CAAC,EACnB,GAAG,EACH,MAAM,EACN,SAAS,EACT,SAAS,EACT,QAAQ,EACR,IAAI,EACJ,IAAI,EACJ,MAAM,EACN,KAAK,GACN,EAAE,mBAAmB;;;
|
|
1
|
+
{"version":3,"file":"oauth.service.d.ts","sourceRoot":"","sources":["../../src/oauth/oauth.service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,0BAA0B,EAAE,MAAM,qBAAqB,CAAC;AAShF,OAAO,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AACnD,OAAO,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AACnD,OAAO,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AACnD,OAAO,EAAE,eAAe,EAAE,MAAM,8BAA8B,CAAC;AAC/D,OAAO,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAC;AAC5D,OAAO,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAC;AACtD,OAAO,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AAEnD,OAAO,EAAE,gBAAgB,EAAE,MAAM,+BAA+B,CAAC;AACjE,OAAO,EAAE,cAAc,EAAE,MAAM,6BAA6B,CAAC;AAC7D,OAAO,EAAE,cAAc,EAAE,MAAM,6BAA6B,CAAC;AAC7D,OAAO,EAAE,wBAAwB,EAAE,MAAM,yCAAyC,CAAC;AACnF,OAAO,EAAE,iBAAiB,EAAE,MAAM,gCAAgC,CAAC;AAEnE,KAAK,mBAAmB,GAAG;IACzB,MAAM,EAAE,MAAM,CAAC;IACf,SAAS,EAAE,MAAM,CAAC;IAClB,SAAS,EAAE,MAAM,CAAC;IAClB,GAAG,EAAE,QAAQ,CAAC;IACd,QAAQ,EAAE,0BAA0B,CAAC;IACrC,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,IAAI,EAAE,OAAO,GAAG,UAAU,GAAG,SAAS,GAAG,YAAY,CAAC;IACtD,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB,CAAC;AAEF,qBACa,YAAY;IAUrB,OAAO,CAAC,QAAQ,CAAC,IAAI;IACrB,OAAO,CAAC,QAAQ,CAAC,IAAI;IACrB,OAAO,CAAC,QAAQ,CAAC,IAAI;IACrB,OAAO,CAAC,QAAQ,CAAC,QAAQ;IACzB,OAAO,CAAC,QAAQ,CAAC,MAAM;IACvB,OAAO,CAAC,QAAQ,CAAC,KAAK;IACtB,OAAO,CAAC,QAAQ,CAAC,OAAO;IAExB,OAAO,CAAC,QAAQ,CAAC,IAAI;IAjBvB,OAAO,CAAC,SAAS,CAAyC;gBAGxD,MAAM,EAAE,cAAc,EACtB,QAAQ,EAAE,gBAAgB,EAC1B,SAAS,EAAE,iBAAiB,EAC5B,MAAM,EAAE,cAAc,EACtB,gBAAgB,EAAE,wBAAwB,EAEzB,IAAI,EAAE,WAAW,EACjB,IAAI,EAAE,WAAW,EACjB,IAAI,EAAE,WAAW,EACjB,QAAQ,EAAE,eAAe,EACzB,MAAM,EAAE,aAAa,EACrB,KAAK,EAAE,YAAY,EACnB,OAAO,EAAE,cAAc,EAEvB,IAAI,EAAE,WAAW;IASpC,UAAU,CAAC,QAAQ,EAAE,0BAA0B,EAAE,YAAY,EAAE,MAAM;IAI/D,cAAc,CAAC,EACnB,GAAG,EACH,MAAM,EACN,SAAS,EACT,SAAS,EACT,QAAQ,EACR,IAAI,EACJ,IAAI,EACJ,MAAM,EACN,KAAK,GACN,EAAE,mBAAmB;;;IAqBtB,OAAO,CAAC,WAAW;YAOL,iBAAiB;YAejB,WAAW;YA2DX,cAAc;YA0Fd,aAAa;YAmEb,gBAAgB;YAuBhB,6BAA6B;CA+B5C"}
|
|
@@ -52,6 +52,7 @@ let OAuthService = class OAuthService {
|
|
|
52
52
|
if (type !== 'disconnect') {
|
|
53
53
|
profile = await this.getProvider(provider).getProfile(code, type);
|
|
54
54
|
}
|
|
55
|
+
console.log('[OAuthService] Callback received for provider:', provider, 'with type:', type, 'and profile:', profile);
|
|
55
56
|
switch (type) {
|
|
56
57
|
case 'login':
|
|
57
58
|
return this.handleLogin(res, locale, ipAddress, userAgent, provider, profile);
|
|
@@ -64,33 +65,36 @@ let OAuthService = class OAuthService {
|
|
|
64
65
|
}
|
|
65
66
|
}
|
|
66
67
|
getProvider(provider) {
|
|
67
|
-
const prov = this.providers.get(provider.toUpperCase());
|
|
68
|
+
const prov = this.providers.get(String(provider).toUpperCase());
|
|
68
69
|
if (!prov)
|
|
69
70
|
throw new common_1.BadRequestException(`Provider ${provider} não suportado`);
|
|
70
71
|
return prov;
|
|
71
72
|
}
|
|
72
73
|
async getProviderScopes(provider) {
|
|
73
|
-
const settingKey = `${provider.toLowerCase()}_scopes`;
|
|
74
|
+
const settingKey = `${String(provider).toLowerCase().replace(/-/g, '_')}_scopes`;
|
|
74
75
|
const settings = await this.setting.getSettingValues([
|
|
75
76
|
'oauth-mfa',
|
|
76
77
|
'google_scopes',
|
|
77
78
|
'facebook_scopes',
|
|
78
79
|
'github_scopes',
|
|
79
80
|
'microsoft_scopes',
|
|
81
|
+
'microsoft_entra_id_scopes',
|
|
80
82
|
]);
|
|
81
83
|
return settings[settingKey].join(',') || '';
|
|
82
84
|
}
|
|
83
85
|
async handleLogin(res, locale, ipAddress, userAgent, provider, profile) {
|
|
84
86
|
var _a;
|
|
87
|
+
console.log('[OAuthService] Handling login for provider:', provider);
|
|
85
88
|
const userAccount = await this.prisma.user_account.findFirst({
|
|
86
89
|
where: {
|
|
87
|
-
provider: provider.toLowerCase(),
|
|
90
|
+
provider: String(provider).toLowerCase().replace(/-/g, '_'),
|
|
88
91
|
email: profile.email,
|
|
89
92
|
},
|
|
90
93
|
include: {
|
|
91
94
|
user: true,
|
|
92
95
|
},
|
|
93
96
|
});
|
|
97
|
+
console.log('[OAuthService] Found user account:', userAccount);
|
|
94
98
|
if (!userAccount) {
|
|
95
99
|
const userIdentifier = await this.prisma.user_identifier.findFirst({
|
|
96
100
|
where: {
|
|
@@ -138,11 +142,24 @@ let OAuthService = class OAuthService {
|
|
|
138
142
|
if (existingUser) {
|
|
139
143
|
throw new common_1.ConflictException('Este email já está sendo usado. Entre em sua conta e utilize a opção "Conectar".');
|
|
140
144
|
}
|
|
141
|
-
const encryptedRefreshToken = this.security.encrypt(profile.oauth_tokens.refresh_token);
|
|
145
|
+
const encryptedRefreshToken = profile.oauth_tokens.refresh_token ? this.security.encrypt(profile.oauth_tokens.refresh_token) : null;
|
|
142
146
|
const scopes = await this.getProviderScopes(provider);
|
|
147
|
+
const settings = await this.setting.getSettingValues([
|
|
148
|
+
'oauth-role-assignment',
|
|
149
|
+
]);
|
|
150
|
+
const roles = settings['oauth-role-assignment'] || [];
|
|
151
|
+
const roleIds = this.prisma.role.findMany({
|
|
152
|
+
where: {
|
|
153
|
+
slug: { in: roles }
|
|
154
|
+
},
|
|
155
|
+
select: { id: true }
|
|
156
|
+
});
|
|
143
157
|
const user = await this.prisma.user.create({
|
|
144
158
|
data: {
|
|
145
159
|
name: profile.name,
|
|
160
|
+
role_user: {
|
|
161
|
+
connect: (await roleIds).map((role) => ({ id: role.id })),
|
|
162
|
+
},
|
|
146
163
|
user_identifier: {
|
|
147
164
|
create: {
|
|
148
165
|
type: 'email',
|
|
@@ -153,10 +170,10 @@ let OAuthService = class OAuthService {
|
|
|
153
170
|
},
|
|
154
171
|
user_account: {
|
|
155
172
|
create: {
|
|
156
|
-
provider: provider.toLowerCase(),
|
|
173
|
+
provider: String(provider).toLowerCase().replace(/-/g, '_'),
|
|
157
174
|
provider_user_id: profile.id,
|
|
158
175
|
email: profile.email,
|
|
159
|
-
refresh_token: Buffer.from(encryptedRefreshToken),
|
|
176
|
+
refresh_token: encryptedRefreshToken ? Buffer.from(encryptedRefreshToken) : null,
|
|
160
177
|
token_expires_at: ((_a = profile.oauth_tokens) === null || _a === void 0 ? void 0 : _a.expires_in)
|
|
161
178
|
? new Date(Date.now() + profile.oauth_tokens.expires_in * 1000)
|
|
162
179
|
: null,
|
|
@@ -188,18 +205,18 @@ let OAuthService = class OAuthService {
|
|
|
188
205
|
const existingAccount = await this.prisma.user_account.findFirst({
|
|
189
206
|
where: {
|
|
190
207
|
user_id: userId,
|
|
191
|
-
provider: provider.toLowerCase(),
|
|
208
|
+
provider: String(provider).toLowerCase().replace(/-/g, '_'),
|
|
192
209
|
},
|
|
193
210
|
});
|
|
194
211
|
if (existingAccount) {
|
|
195
212
|
throw new common_1.BadRequestException(`Usuário já conectado com o ${provider}.`);
|
|
196
213
|
}
|
|
197
|
-
const encryptedRefreshToken = this.security.encrypt(profile.oauth_tokens.refresh_token);
|
|
214
|
+
const encryptedRefreshToken = profile.oauth_tokens.refresh_token ? this.security.encrypt(profile.oauth_tokens.refresh_token) : null;
|
|
198
215
|
const scopes = await this.getProviderScopes(provider);
|
|
199
216
|
await this.prisma.user_account.create({
|
|
200
217
|
data: {
|
|
201
218
|
user_id: userId,
|
|
202
|
-
provider: provider.toLowerCase(),
|
|
219
|
+
provider: String(provider).toLowerCase().replace(/-/g, '_'),
|
|
203
220
|
provider_user_id: profile.id,
|
|
204
221
|
email: profile.email,
|
|
205
222
|
refresh_token: Buffer.from(encryptedRefreshToken),
|
|
@@ -236,7 +253,7 @@ let OAuthService = class OAuthService {
|
|
|
236
253
|
const userAccount = await this.prisma.user_account.findFirst({
|
|
237
254
|
where: {
|
|
238
255
|
email,
|
|
239
|
-
provider: provider.toLowerCase(),
|
|
256
|
+
provider: String(provider).toLowerCase().replace(/-/g, '_'),
|
|
240
257
|
},
|
|
241
258
|
include: { user: true }
|
|
242
259
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"oauth.service.js","sourceRoot":"","sources":["../../src/oauth/oauth.service.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"oauth.service.js","sourceRoot":"","sources":["../../src/oauth/oauth.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"microsoft-entra-id.provider.d.ts","sourceRoot":"","sources":["../../../src/oauth/providers/microsoft-entra-id.provider.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAE5C,OAAO,EAAE,cAAc,EAAE,MAAM,+BAA+B,CAAC;AAC/D,OAAO,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AAExD,qBACa,wBAAyB,SAAQ,iBAAiB;IAI3D,OAAO,CAAC,QAAQ,CAAC,OAAO;gBAFxB,IAAI,EAAE,WAAW,EAEA,OAAO,EAAE,cAAc;IAK1C,eAAe;IAIT,UAAU,CAAC,YAAY,EAAE,MAAM;
|
|
1
|
+
{"version":3,"file":"microsoft-entra-id.provider.d.ts","sourceRoot":"","sources":["../../../src/oauth/providers/microsoft-entra-id.provider.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAE5C,OAAO,EAAE,cAAc,EAAE,MAAM,+BAA+B,CAAC;AAC/D,OAAO,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AAExD,qBACa,wBAAyB,SAAQ,iBAAiB;IAI3D,OAAO,CAAC,QAAQ,CAAC,OAAO;gBAFxB,IAAI,EAAE,WAAW,EAEA,OAAO,EAAE,cAAc;IAK1C,eAAe;IAIT,UAAU,CAAC,YAAY,EAAE,MAAM;IAqC/B,UAAU,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,GAAG,CAAC;CAyD3D"}
|
|
@@ -23,7 +23,7 @@ let MicrosoftEntraIdProvider = class MicrosoftEntraIdProvider extends abstract_p
|
|
|
23
23
|
this.setting = setting;
|
|
24
24
|
}
|
|
25
25
|
getProviderType() {
|
|
26
|
-
return '
|
|
26
|
+
return 'MICROSOFT-ENTRA-ID';
|
|
27
27
|
}
|
|
28
28
|
async getAuthUrl(callbackPath) {
|
|
29
29
|
const settings = await this.setting.getSettingValues([
|
|
@@ -33,12 +33,6 @@ let MicrosoftEntraIdProvider = class MicrosoftEntraIdProvider extends abstract_p
|
|
|
33
33
|
'microsoft_entra_id_tenant_id',
|
|
34
34
|
'url',
|
|
35
35
|
]);
|
|
36
|
-
console.log('[MicrosoftEntraIdProvider] Settings loaded:', {
|
|
37
|
-
client_id: settings['microsoft_entra_id_client_id'] ? `${settings['microsoft_entra_id_client_id'].substring(0, 8)}...` : 'NOT SET',
|
|
38
|
-
tenant_id: settings['microsoft_entra_id_tenant_id'] ? `${settings['microsoft_entra_id_tenant_id'].substring(0, 8)}...` : 'NOT SET',
|
|
39
|
-
scopes: settings['microsoft_entra_id_scopes'],
|
|
40
|
-
url: settings['url'],
|
|
41
|
-
});
|
|
42
36
|
if (!settings['microsoft_entra_id_client_id'] ||
|
|
43
37
|
!settings['microsoft_entra_id_client_secret'] ||
|
|
44
38
|
!settings['microsoft_entra_id_scopes'] ||
|
|
@@ -62,35 +56,53 @@ let MicrosoftEntraIdProvider = class MicrosoftEntraIdProvider extends abstract_p
|
|
|
62
56
|
return authUrl;
|
|
63
57
|
}
|
|
64
58
|
async getProfile(code, type) {
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
59
|
+
var _a, _b, _c;
|
|
60
|
+
console.log('[MicrosoftEntraIdProvider] Fetching profile with code:', code, 'and type:', type);
|
|
61
|
+
try {
|
|
62
|
+
const settings = await this.setting.getSettingValues([
|
|
63
|
+
'microsoft_entra_id_client_id',
|
|
64
|
+
'microsoft_entra_id_client_secret',
|
|
65
|
+
'microsoft_entra_id_scopes',
|
|
66
|
+
'microsoft_entra_id_tenant_id',
|
|
67
|
+
'url',
|
|
68
|
+
]);
|
|
69
|
+
const tenantId = settings['microsoft_entra_id_tenant_id'];
|
|
70
|
+
console.log({
|
|
71
|
+
url: `https://login.microsoftonline.com/${tenantId}/oauth2/v2.0/token`,
|
|
72
|
+
clientId: settings['microsoft_entra_id_client_id'],
|
|
73
|
+
clientSecret: settings['microsoft_entra_id_client_secret'],
|
|
74
|
+
redirectUri: `${settings['url']}/callback/microsoft-entra-id/${type}`,
|
|
75
|
+
});
|
|
76
|
+
const token = await this.fetchToken({
|
|
77
|
+
code,
|
|
78
|
+
url: `https://login.microsoftonline.com/${tenantId}/oauth2/v2.0/token`,
|
|
79
|
+
clientId: settings['microsoft_entra_id_client_id'],
|
|
80
|
+
clientSecret: settings['microsoft_entra_id_client_secret'],
|
|
81
|
+
redirectUri: `${settings['url']}/callback/microsoft-entra-id/${type}`,
|
|
82
|
+
});
|
|
83
|
+
console.log('[MicrosoftEntraIdProvider] Fetched token:', token);
|
|
84
|
+
const profile = await this.fetchProfile(token.access_token, 'https://graph.microsoft.com/v1.0/me');
|
|
85
|
+
console.log('[MicrosoftEntraIdProvider] Fetched profile:', profile);
|
|
86
|
+
const pictureUrl = 'https://graph.microsoft.com/v1.0/me/photo/$value';
|
|
87
|
+
return {
|
|
88
|
+
id: profile.id,
|
|
89
|
+
email: profile.mail || profile.userPrincipalName,
|
|
90
|
+
name: profile.displayName,
|
|
91
|
+
picture: pictureUrl,
|
|
92
|
+
oauth_tokens: {
|
|
93
|
+
access_token: token.access_token,
|
|
94
|
+
refresh_token: token.refresh_token,
|
|
95
|
+
expires_in: token.expires_in,
|
|
96
|
+
token_type: token.token_type,
|
|
97
|
+
},
|
|
98
|
+
};
|
|
99
|
+
}
|
|
100
|
+
catch (err) {
|
|
101
|
+
console.log('URL:', (_a = err === null || err === void 0 ? void 0 : err.config) === null || _a === void 0 ? void 0 : _a.url);
|
|
102
|
+
console.log('STATUS:', (_b = err === null || err === void 0 ? void 0 : err.response) === null || _b === void 0 ? void 0 : _b.status);
|
|
103
|
+
console.log('DATA:', (_c = err === null || err === void 0 ? void 0 : err.response) === null || _c === void 0 ? void 0 : _c.data);
|
|
104
|
+
throw err;
|
|
105
|
+
}
|
|
94
106
|
}
|
|
95
107
|
};
|
|
96
108
|
exports.MicrosoftEntraIdProvider = MicrosoftEntraIdProvider;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"microsoft-entra-id.provider.js","sourceRoot":"","sources":["../../../src/oauth/providers/microsoft-entra-id.provider.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,yCAA4C;AAC5C,2CAAgE;AAChE,mEAA+D;AAC/D,2DAAwD;AAGjD,IAAM,wBAAwB,GAA9B,MAAM,wBAAyB,SAAQ,qCAAiB;IAC7D,YACE,IAAiB,EAEA,OAAuB;QAExC,KAAK,CAAC,IAAI,CAAC,CAAC;QAFK,YAAO,GAAP,OAAO,CAAgB;IAG1C,CAAC;IAED,eAAe;QACb,OAAO,oBAAoB,CAAC;IAC9B,CAAC;IAED,KAAK,CAAC,UAAU,CAAC,YAAoB;QACnC,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,gBAAgB,CAAC;YACnD,8BAA8B;YAC9B,kCAAkC;YAClC,2BAA2B;YAC3B,8BAA8B;YAC9B,KAAK;SACN,CAAC,CAAC;QAEH,
|
|
1
|
+
{"version":3,"file":"microsoft-entra-id.provider.js","sourceRoot":"","sources":["../../../src/oauth/providers/microsoft-entra-id.provider.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"security.service.d.ts","sourceRoot":"","sources":["../../src/security/security.service.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAC;AAI/C,qBACa,eAAe;IAGxB,OAAO,CAAC,QAAQ,CAAC,aAAa;gBAAb,aAAa,EAAE,aAAa;IAG/C,YAAY,IAAI,MAAM;IAItB,kBAAkB,CAAC,KAAK,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,MAAM,GAAG,MAAM;IAI1D,cAAc,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM;IAIrC,YAAY,CAAC,IAAI,SAAK,GAAG,MAAM;IAI/B,UAAU,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM;IAIjC,UAAU,CAAC,KAAK,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAIrD,gBAAgB,CAAC,MAAM,EAAE,MAAM,EAAE,WAAW,EAAE;QAAE,IAAI,EAAE,MAAM,CAAA;KAAE,EAAE,EAAE,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAcrG,YAAY,CAAC,KAAK,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IASlF,OAAO,CAAC,KAAK,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,MAAM,GAAG,MAAM;
|
|
1
|
+
{"version":3,"file":"security.service.d.ts","sourceRoot":"","sources":["../../src/security/security.service.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAC;AAI/C,qBACa,eAAe;IAGxB,OAAO,CAAC,QAAQ,CAAC,aAAa;gBAAb,aAAa,EAAE,aAAa;IAG/C,YAAY,IAAI,MAAM;IAItB,kBAAkB,CAAC,KAAK,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,MAAM,GAAG,MAAM;IAI1D,cAAc,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM;IAIrC,YAAY,CAAC,IAAI,SAAK,GAAG,MAAM;IAI/B,UAAU,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM;IAIjC,UAAU,CAAC,KAAK,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAIrD,gBAAgB,CAAC,MAAM,EAAE,MAAM,EAAE,WAAW,EAAE;QAAE,IAAI,EAAE,MAAM,CAAA;KAAE,EAAE,EAAE,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAcrG,YAAY,CAAC,KAAK,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IASlF,OAAO,CAAC,KAAK,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,MAAM,GAAG,MAAM;IAwB/C,OAAO,CAAC,cAAc,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,MAAM,GAAG,MAAM;IAwBxD,YAAY,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM;CAQrC"}
|
|
@@ -93,6 +93,10 @@ let SecurityService = class SecurityService {
|
|
|
93
93
|
}
|
|
94
94
|
}
|
|
95
95
|
encrypt(value, secret) {
|
|
96
|
+
console.log('Encrypting:', {
|
|
97
|
+
value,
|
|
98
|
+
secret
|
|
99
|
+
});
|
|
96
100
|
const encryptionSecret = secret || this.configService.get('ENCRYPTION_SECRET');
|
|
97
101
|
if (!encryptionSecret)
|
|
98
102
|
throw new Error('Missing encryption secret');
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"security.service.js","sourceRoot":"","sources":["../../src/security/security.service.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,oDAAoD;AACpD,2CAAiE;AACjE,2CAA+C;AAC/C,+CAAiC;AACjC,mCAA+F;AAGxF,IAAM,eAAe,GAArB,MAAM,eAAe;IAE1B,YACmB,aAA4B;QAA5B,kBAAa,GAAb,aAAa,CAAe;IAC3C,CAAC;IAEL,YAAY;QACV,OAAO,IAAI,CAAC,aAAa,CAAC,GAAG,CAAS,YAAY,CAAC,CAAC;IACtD,CAAC;IAED,kBAAkB,CAAC,KAAa,EAAE,MAAe;QAC/C,OAAO,KAAK,GAAG,CAAC,MAAM,IAAI,IAAI,CAAC,aAAa,CAAC,GAAG,CAAS,QAAQ,CAAC,CAAC,CAAC;IACtE,CAAC;IAED,cAAc,CAAC,KAAa;QAC1B,OAAO,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,kBAAkB,CAAC,KAAK,CAAC,CAAC,CAAC;IACzD,CAAC;IAED,YAAY,CAAC,IAAI,GAAG,EAAE;QACpB,OAAO,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAC;IACjD,CAAC;IAED,UAAU,CAAC,KAAa;QACtB,OAAO,IAAA,mBAAU,EAAC,QAAQ,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC;IAChE,CAAC;IAED,UAAU,CAAC,KAAa,EAAE,MAAe;QACvC,OAAO,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,kBAAkB,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC,CAAC;IAC7D,CAAC;IAED,KAAK,CAAC,gBAAgB,CAAC,MAAc,EAAE,WAA+B,EAAE,QAAgB;QAEtF,IAAI,CAAC;YACH,MAAM,QAAQ,GAAG,IAAI,CAAC,kBAAkB,CAAC,QAAQ,CAAC,CAAC;YACnD,KAAK,MAAM,EAAE,IAAI,EAAE,IAAI,WAAW,EAAE,CAAC;gBAEnC,IAAI,MAAM,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,QAAQ,CAAC;oBAAE,OAAO,IAAI,CAAC;YACvD,CAAC;YACD,OAAO,KAAK,CAAC;QACf,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,MAAM,IAAI,4BAAmB,CAAC,IAAA,0BAAa,EAAC,cAAc,EAAE,MAAM,EAAE,gBAAgB,CAAC,CAAC,CAAC;QACzF,CAAC;IACH,CAAC;IAED,KAAK,CAAC,YAAY,CAAC,KAAa,EAAE,IAAY,EAAE,MAAe;QAC7D,IAAI,CAAC;YACH,MAAM,QAAQ,GAAG,IAAI,CAAC,kBAAkB,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;YACxD,OAAO,MAAM,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;QAC7C,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,OAAO,KAAK,CAAC;QACf,CAAC;IACH,CAAC;IAED,OAAO,CAAC,KAAa,EAAE,MAAe;
|
|
1
|
+
{"version":3,"file":"security.service.js","sourceRoot":"","sources":["../../src/security/security.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -380,6 +380,27 @@
|
|
|
380
380
|
order: 3
|
|
381
381
|
- value: microsoft-entra-id
|
|
382
382
|
order: 4
|
|
383
|
+
- slug: oauth-role-assignment
|
|
384
|
+
type: string
|
|
385
|
+
component: checkbox
|
|
386
|
+
name:
|
|
387
|
+
en: OAuth Role Assignment
|
|
388
|
+
pt: Atribuição de Função OAuth
|
|
389
|
+
description:
|
|
390
|
+
en: The role assigned to users who register via OAuth. If not set, the default role will be assigned.
|
|
391
|
+
pt: A função atribuída aos usuários que se registram via OAuth. Se não definido, a função padrão será atribuída.
|
|
392
|
+
value: ""
|
|
393
|
+
user_override: false
|
|
394
|
+
relations:
|
|
395
|
+
setting_list:
|
|
396
|
+
- value: ""
|
|
397
|
+
order: 0
|
|
398
|
+
- value: admin
|
|
399
|
+
order: 1
|
|
400
|
+
- value: admin-access
|
|
401
|
+
order: 2
|
|
402
|
+
- value: user
|
|
403
|
+
order: 3
|
|
383
404
|
- slug: microsoft_entra_id_client_id
|
|
384
405
|
type: string
|
|
385
406
|
name:
|
|
@@ -409,7 +430,7 @@
|
|
|
409
430
|
description:
|
|
410
431
|
en: The scopes for Microsoft Entra ID OAuth
|
|
411
432
|
pt: Os escopos para o OAuth do Microsoft Entra ID
|
|
412
|
-
value: '["openid","profile","email","User.Read"]'
|
|
433
|
+
value: '["openid","profile","email","User.Read","offline_access"]'
|
|
413
434
|
component: checkbox
|
|
414
435
|
relations:
|
|
415
436
|
setting_list:
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@hed-hog/core",
|
|
3
|
-
"version": "0.0.
|
|
3
|
+
"version": "0.0.159",
|
|
4
4
|
"main": "dist/index.js",
|
|
5
5
|
"types": "dist/index.d.ts",
|
|
6
6
|
"dependencies": {
|
|
@@ -30,11 +30,11 @@
|
|
|
30
30
|
"speakeasy": "^2.0.0",
|
|
31
31
|
"uuid": "^11.1.0",
|
|
32
32
|
"@hed-hog/api-locale": "0.0.11",
|
|
33
|
-
"@hed-hog/api": "0.0.3",
|
|
34
|
-
"@hed-hog/api-mail": "0.0.7",
|
|
35
33
|
"@hed-hog/api-prisma": "0.0.4",
|
|
36
|
-
"@hed-hog/api-
|
|
37
|
-
"@hed-hog/types": "0.0.1"
|
|
34
|
+
"@hed-hog/api-mail": "0.0.7",
|
|
35
|
+
"@hed-hog/types": "0.0.1",
|
|
36
|
+
"@hed-hog/api": "0.0.3",
|
|
37
|
+
"@hed-hog/api-pagination": "0.0.5"
|
|
38
38
|
},
|
|
39
39
|
"exports": {
|
|
40
40
|
".": {
|
|
@@ -38,7 +38,7 @@ export class OAuthController {
|
|
|
38
38
|
async login(@Param('provider') provider: string, @Res() res) {
|
|
39
39
|
const url = await this.service.getAuthUrl(
|
|
40
40
|
provider as user_account_provider_enum,
|
|
41
|
-
`/
|
|
41
|
+
`/callback/${provider}/login`,
|
|
42
42
|
);
|
|
43
43
|
return res.redirect(url);
|
|
44
44
|
}
|
|
@@ -49,7 +49,7 @@ export class OAuthController {
|
|
|
49
49
|
async register(@Param('provider') provider: string, @Res() res) {
|
|
50
50
|
const url = await this.service.getAuthUrl(
|
|
51
51
|
provider as user_account_provider_enum,
|
|
52
|
-
`/
|
|
52
|
+
`/callback/${provider}/register`,
|
|
53
53
|
);
|
|
54
54
|
return res.redirect(url);
|
|
55
55
|
}
|
|
@@ -60,7 +60,7 @@ export class OAuthController {
|
|
|
60
60
|
async connect(@Param('provider') provider: string, @Res() res) {
|
|
61
61
|
const url = this.service.getAuthUrl(
|
|
62
62
|
provider as user_account_provider_enum,
|
|
63
|
-
`/
|
|
63
|
+
`/callback/${provider}/connect`,
|
|
64
64
|
);
|
|
65
65
|
return res.redirect(url);
|
|
66
66
|
}
|
|
@@ -82,6 +82,8 @@ export class OAuthService {
|
|
|
82
82
|
profile = await this.getProvider(provider).getProfile(code, type);
|
|
83
83
|
}
|
|
84
84
|
|
|
85
|
+
console.log('[OAuthService] Callback received for provider:', provider, 'with type:', type, 'and profile:', profile);
|
|
86
|
+
|
|
85
87
|
switch (type) {
|
|
86
88
|
case 'login':
|
|
87
89
|
return this.handleLogin(res, locale, ipAddress, userAgent, provider, profile);
|
|
@@ -95,14 +97,14 @@ export class OAuthService {
|
|
|
95
97
|
}
|
|
96
98
|
|
|
97
99
|
private getProvider(provider: user_account_provider_enum) {
|
|
98
|
-
const prov = this.providers.get(provider.toUpperCase());
|
|
100
|
+
const prov = this.providers.get(String(provider).toUpperCase());
|
|
99
101
|
if (!prov)
|
|
100
102
|
throw new BadRequestException(`Provider ${provider} não suportado`);
|
|
101
103
|
return prov;
|
|
102
104
|
}
|
|
103
105
|
|
|
104
106
|
private async getProviderScopes(provider: user_account_provider_enum) {
|
|
105
|
-
const settingKey = `${provider.toLowerCase()}_scopes`;
|
|
107
|
+
const settingKey = `${String(provider).toLowerCase().replace(/-/g, '_')}_scopes`;
|
|
106
108
|
|
|
107
109
|
const settings = await this.setting.getSettingValues([
|
|
108
110
|
'oauth-mfa',
|
|
@@ -110,15 +112,19 @@ export class OAuthService {
|
|
|
110
112
|
'facebook_scopes',
|
|
111
113
|
'github_scopes',
|
|
112
114
|
'microsoft_scopes',
|
|
115
|
+
'microsoft_entra_id_scopes',
|
|
113
116
|
]);
|
|
114
117
|
|
|
115
118
|
return settings[settingKey].join(',') || '';
|
|
116
119
|
}
|
|
117
120
|
|
|
118
121
|
private async handleLogin(res: Response, locale: string, ipAddress: string, userAgent: string, provider: user_account_provider_enum, profile: any) {
|
|
122
|
+
|
|
123
|
+
console.log('[OAuthService] Handling login for provider:', provider);
|
|
124
|
+
|
|
119
125
|
const userAccount = await this.prisma.user_account.findFirst({
|
|
120
126
|
where: {
|
|
121
|
-
provider: provider.toLowerCase() as user_account_provider_enum,
|
|
127
|
+
provider: String(provider).toLowerCase().replace(/-/g, '_') as user_account_provider_enum,
|
|
122
128
|
email: profile.email,
|
|
123
129
|
},
|
|
124
130
|
include: {
|
|
@@ -126,6 +132,8 @@ export class OAuthService {
|
|
|
126
132
|
},
|
|
127
133
|
});
|
|
128
134
|
|
|
135
|
+
console.log('[OAuthService] Found user account:', userAccount);
|
|
136
|
+
|
|
129
137
|
if (!userAccount) {
|
|
130
138
|
const userIdentifier = await this.prisma.user_identifier.findFirst({
|
|
131
139
|
where: {
|
|
@@ -183,11 +191,28 @@ export class OAuthService {
|
|
|
183
191
|
);
|
|
184
192
|
}
|
|
185
193
|
|
|
186
|
-
const encryptedRefreshToken = this.security.encrypt(profile.oauth_tokens.refresh_token)
|
|
194
|
+
const encryptedRefreshToken = profile.oauth_tokens.refresh_token ? this.security.encrypt(profile.oauth_tokens.refresh_token) : null;
|
|
187
195
|
const scopes = await this.getProviderScopes(provider);
|
|
196
|
+
|
|
197
|
+
const settings = await this.setting.getSettingValues([
|
|
198
|
+
'oauth-role-assignment',
|
|
199
|
+
]);
|
|
200
|
+
|
|
201
|
+
const roles = settings['oauth-role-assignment'] || [];
|
|
202
|
+
|
|
203
|
+
const roleIds = this.prisma.role.findMany({
|
|
204
|
+
where: {
|
|
205
|
+
slug: { in: roles }
|
|
206
|
+
},
|
|
207
|
+
select: { id: true }
|
|
208
|
+
});
|
|
209
|
+
|
|
188
210
|
const user = await this.prisma.user.create({
|
|
189
211
|
data: {
|
|
190
212
|
name: profile.name,
|
|
213
|
+
role_user: {
|
|
214
|
+
connect: (await roleIds).map((role) => ({ id: role.id })),
|
|
215
|
+
},
|
|
191
216
|
user_identifier: {
|
|
192
217
|
create: {
|
|
193
218
|
type: 'email',
|
|
@@ -198,10 +223,10 @@ export class OAuthService {
|
|
|
198
223
|
},
|
|
199
224
|
user_account: {
|
|
200
225
|
create: {
|
|
201
|
-
provider: provider.toLowerCase() as user_account_provider_enum,
|
|
226
|
+
provider: String(provider).toLowerCase().replace(/-/g, '_') as user_account_provider_enum,
|
|
202
227
|
provider_user_id: profile.id,
|
|
203
228
|
email: profile.email,
|
|
204
|
-
refresh_token: Buffer.from(encryptedRefreshToken),
|
|
229
|
+
refresh_token: encryptedRefreshToken ? Buffer.from(encryptedRefreshToken) : null,
|
|
205
230
|
token_expires_at: profile.oauth_tokens?.expires_in
|
|
206
231
|
? new Date(Date.now() + profile.oauth_tokens.expires_in * 1000)
|
|
207
232
|
: null,
|
|
@@ -254,7 +279,7 @@ export class OAuthService {
|
|
|
254
279
|
const existingAccount = await this.prisma.user_account.findFirst({
|
|
255
280
|
where: {
|
|
256
281
|
user_id: userId,
|
|
257
|
-
provider: provider.toLowerCase() as user_account_provider_enum,
|
|
282
|
+
provider: String(provider).toLowerCase().replace(/-/g, '_') as user_account_provider_enum,
|
|
258
283
|
},
|
|
259
284
|
});
|
|
260
285
|
|
|
@@ -262,12 +287,12 @@ export class OAuthService {
|
|
|
262
287
|
throw new BadRequestException(`Usuário já conectado com o ${provider}.`);
|
|
263
288
|
}
|
|
264
289
|
|
|
265
|
-
const encryptedRefreshToken = this.security.encrypt(profile.oauth_tokens.refresh_token)
|
|
290
|
+
const encryptedRefreshToken = profile.oauth_tokens.refresh_token ? this.security.encrypt(profile.oauth_tokens.refresh_token) : null;
|
|
266
291
|
const scopes = await this.getProviderScopes(provider);
|
|
267
292
|
await this.prisma.user_account.create({
|
|
268
293
|
data: {
|
|
269
294
|
user_id: userId,
|
|
270
|
-
provider: provider.toLowerCase() as user_account_provider_enum,
|
|
295
|
+
provider: String(provider).toLowerCase().replace(/-/g, '_') as user_account_provider_enum,
|
|
271
296
|
provider_user_id: profile.id,
|
|
272
297
|
email: profile.email,
|
|
273
298
|
refresh_token: Buffer.from(encryptedRefreshToken),
|
|
@@ -313,7 +338,7 @@ export class OAuthService {
|
|
|
313
338
|
const userAccount = await this.prisma.user_account.findFirst({
|
|
314
339
|
where: {
|
|
315
340
|
email,
|
|
316
|
-
provider: provider.toLowerCase() as user_account_provider_enum,
|
|
341
|
+
provider: String(provider).toLowerCase().replace(/-/g, '_') as user_account_provider_enum,
|
|
317
342
|
},
|
|
318
343
|
include: { user: true }
|
|
319
344
|
});
|
|
@@ -14,7 +14,7 @@ export class MicrosoftEntraIdProvider extends BaseOAuthProvider {
|
|
|
14
14
|
}
|
|
15
15
|
|
|
16
16
|
getProviderType() {
|
|
17
|
-
return '
|
|
17
|
+
return 'MICROSOFT-ENTRA-ID';
|
|
18
18
|
}
|
|
19
19
|
|
|
20
20
|
async getAuthUrl(callbackPath: string) {
|
|
@@ -26,13 +26,6 @@ export class MicrosoftEntraIdProvider extends BaseOAuthProvider {
|
|
|
26
26
|
'url',
|
|
27
27
|
]);
|
|
28
28
|
|
|
29
|
-
console.log('[MicrosoftEntraIdProvider] Settings loaded:', {
|
|
30
|
-
client_id: settings['microsoft_entra_id_client_id'] ? `${settings['microsoft_entra_id_client_id'].substring(0, 8)}...` : 'NOT SET',
|
|
31
|
-
tenant_id: settings['microsoft_entra_id_tenant_id'] ? `${settings['microsoft_entra_id_tenant_id'].substring(0, 8)}...` : 'NOT SET',
|
|
32
|
-
scopes: settings['microsoft_entra_id_scopes'],
|
|
33
|
-
url: settings['url'],
|
|
34
|
-
});
|
|
35
|
-
|
|
36
29
|
if (
|
|
37
30
|
!settings['microsoft_entra_id_client_id'] ||
|
|
38
31
|
!settings['microsoft_entra_id_client_secret'] ||
|
|
@@ -62,6 +55,9 @@ export class MicrosoftEntraIdProvider extends BaseOAuthProvider {
|
|
|
62
55
|
}
|
|
63
56
|
|
|
64
57
|
async getProfile(code: string, type: string): Promise<any> {
|
|
58
|
+
|
|
59
|
+
console.log('[MicrosoftEntraIdProvider] Fetching profile with code:', code, 'and type:', type);
|
|
60
|
+
try {
|
|
65
61
|
const settings = await this.setting.getSettingValues([
|
|
66
62
|
'microsoft_entra_id_client_id',
|
|
67
63
|
'microsoft_entra_id_client_secret',
|
|
@@ -70,17 +66,30 @@ export class MicrosoftEntraIdProvider extends BaseOAuthProvider {
|
|
|
70
66
|
'url',
|
|
71
67
|
]);
|
|
72
68
|
const tenantId = settings['microsoft_entra_id_tenant_id'];
|
|
69
|
+
|
|
70
|
+
console.log({
|
|
71
|
+
url: `https://login.microsoftonline.com/${tenantId}/oauth2/v2.0/token`,
|
|
72
|
+
clientId: settings['microsoft_entra_id_client_id'],
|
|
73
|
+
clientSecret: settings['microsoft_entra_id_client_secret'],
|
|
74
|
+
redirectUri: `${settings['url']}/callback/microsoft-entra-id/${type}`,
|
|
75
|
+
})
|
|
76
|
+
|
|
73
77
|
const token = await this.fetchToken({
|
|
74
78
|
code,
|
|
75
79
|
url: `https://login.microsoftonline.com/${tenantId}/oauth2/v2.0/token`,
|
|
76
80
|
clientId: settings['microsoft_entra_id_client_id'],
|
|
77
81
|
clientSecret: settings['microsoft_entra_id_client_secret'],
|
|
78
|
-
redirectUri: `${settings['url']}/
|
|
82
|
+
redirectUri: `${settings['url']}/callback/microsoft-entra-id/${type}`,
|
|
79
83
|
});
|
|
84
|
+
console.log('[MicrosoftEntraIdProvider] Fetched token:', token);
|
|
85
|
+
|
|
80
86
|
const profile = await this.fetchProfile(
|
|
81
87
|
token.access_token,
|
|
82
88
|
'https://graph.microsoft.com/v1.0/me',
|
|
83
89
|
);
|
|
90
|
+
|
|
91
|
+
console.log('[MicrosoftEntraIdProvider] Fetched profile:', profile);
|
|
92
|
+
|
|
84
93
|
const pictureUrl = 'https://graph.microsoft.com/v1.0/me/photo/$value';
|
|
85
94
|
return {
|
|
86
95
|
id: profile.id,
|
|
@@ -94,5 +103,12 @@ export class MicrosoftEntraIdProvider extends BaseOAuthProvider {
|
|
|
94
103
|
token_type: token.token_type,
|
|
95
104
|
},
|
|
96
105
|
};
|
|
106
|
+
|
|
107
|
+
} catch (err: any) {
|
|
108
|
+
console.log('URL:', err?.config?.url);
|
|
109
|
+
console.log('STATUS:', err?.response?.status);
|
|
110
|
+
console.log('DATA:', err?.response?.data);
|
|
111
|
+
throw err;
|
|
112
|
+
}
|
|
97
113
|
}
|
|
98
114
|
}
|
|
@@ -59,6 +59,12 @@ export class SecurityService {
|
|
|
59
59
|
}
|
|
60
60
|
|
|
61
61
|
encrypt(value: string, secret?: string): string {
|
|
62
|
+
|
|
63
|
+
console.log('Encrypting:', {
|
|
64
|
+
value,
|
|
65
|
+
secret
|
|
66
|
+
});
|
|
67
|
+
|
|
62
68
|
const encryptionSecret = secret || this.configService.get('ENCRYPTION_SECRET');
|
|
63
69
|
if (!encryptionSecret) throw new Error('Missing encryption secret');
|
|
64
70
|
const salt = randomBytes(16);
|