@builder6/server 0.7.2 → 0.7.4

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.
@@ -47,8 +47,8 @@ exports.AppModule = AppModule = __decorate([
47
47
  pages_1.PagesModule,
48
48
  rooms_1.RoomsModule,
49
49
  microsoft365_module_1.Microsoft365Module,
50
+ oidc_module_1.OidcModule,
50
51
  core_4.PluginModule.forRootAsync(),
51
- ...(process.env.B6_OIDC_ENABLED ? [oidc_module_1.OidcModule] : []),
52
52
  ],
53
53
  controllers: [app_controller_1.AppController],
54
54
  providers: [],
@@ -1 +1 @@
1
- {"version":3,"file":"app.module.js","sourceRoot":"","sources":["../src/app.module.ts"],"names":[],"mappings":";;;;;;;;;AAAA,2CAAwC;AACxC,2CAA8C;AAE9C,yCAA+C;AAC/C,6CAAgD;AAChD,yCAA4C;AAC5C,6DAAyD;AACzD,2CAA8C;AAC9C,yCAA6C;AAC7C,mDAAsD;AACtD,4EAAwE;AACxE,oDAAgD;AAChD,qDAAiD;AACjD,yCAA8C;AAC9C,2CAA8C;AAC9C,2CAA8C;AAC9C,yCAA+E;AA8BxE,IAAM,SAAS,GAAf,MAAM,SAAS;CAAG,CAAA;AAAZ,8BAAS;oBAAT,SAAS;IA5BrB,IAAA,eAAM,EAAC;QACN,OAAO,EAAE;YACP,qBAAY,CAAC,OAAO,CAAC;gBACnB,IAAI,EAAE,CAAC,iBAAU,EAAE,mBAAY,CAAC;gBAChC,QAAQ,EAAE,IAAI;aACf,CAAC;YACF,2BAAe,CAAC,OAAO,CAAC;gBAEpB,SAAS,EAAE,SAAS;gBACpB,WAAW,EAAE,OAAO,CAAC,GAAG,CAAC,cAAc;gBAEvC,GAAG,IAAA,0BAAmB,GAAE;aAC3B,CAAC;YACF,iBAAU;YACV,oBAAa;YACb,8BAAa;YACb,kBAAW;YACX,mBAAW;YACX,qBAAY;YACZ,mBAAW;YACX,mBAAW;YACX,wCAAkB;YAClB,mBAAY,CAAC,YAAY,EAAE;YAC3B,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,eAAe,CAAC,CAAC,CAAC,CAAC,wBAAU,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;SACrD;QACD,WAAW,EAAE,CAAC,8BAAa,CAAC;QAC5B,SAAS,EAAE,EAAE;KACd,CAAC;GACW,SAAS,CAAG"}
1
+ {"version":3,"file":"app.module.js","sourceRoot":"","sources":["../src/app.module.ts"],"names":[],"mappings":";;;;;;;;;AAAA,2CAAwC;AACxC,2CAA8C;AAE9C,yCAA+C;AAC/C,6CAAgD;AAChD,yCAA4C;AAC5C,6DAAyD;AACzD,2CAA8C;AAC9C,yCAA6C;AAC7C,mDAAsD;AACtD,4EAAwE;AACxE,oDAAgD;AAChD,qDAAiD;AACjD,yCAA8C;AAC9C,2CAA8C;AAC9C,2CAA8C;AAC9C,yCAA+E;AA8BxE,IAAM,SAAS,GAAf,MAAM,SAAS;CAAG,CAAA;AAAZ,8BAAS;oBAAT,SAAS;IA5BrB,IAAA,eAAM,EAAC;QACN,OAAO,EAAE;YACP,qBAAY,CAAC,OAAO,CAAC;gBACnB,IAAI,EAAE,CAAC,iBAAU,EAAE,mBAAY,CAAC;gBAChC,QAAQ,EAAE,IAAI;aACf,CAAC;YACF,2BAAe,CAAC,OAAO,CAAC;gBAEpB,SAAS,EAAE,SAAS;gBACpB,WAAW,EAAE,OAAO,CAAC,GAAG,CAAC,cAAc;gBAEvC,GAAG,IAAA,0BAAmB,GAAE;aAC3B,CAAC;YACF,iBAAU;YACV,oBAAa;YACb,8BAAa;YACb,kBAAW;YACX,mBAAW;YACX,qBAAY;YACZ,mBAAW;YACX,mBAAW;YACX,wCAAkB;YAClB,wBAAU;YACV,mBAAY,CAAC,YAAY,EAAE;SAC5B;QACD,WAAW,EAAE,CAAC,8BAAa,CAAC;QAC5B,SAAS,EAAE,EAAE;KACd,CAAC;GACW,SAAS,CAAG"}
@@ -1,7 +1,9 @@
1
1
  import { OidcService } from './oidc.service';
2
+ import { AuthService } from '@builder6/core';
2
3
  export declare class OidcController {
3
4
  private readonly oidcService;
4
- constructor(oidcService: OidcService);
5
+ private readonly authService;
6
+ constructor(oidcService: OidcService, authService: AuthService);
5
7
  login(providerId: string, req: any, res: any): Promise<any>;
6
- callback(providerId: string, req: any, res: any): Promise<any>;
8
+ callback(providerId: string, req: any, res: any): Promise<void>;
7
9
  }
@@ -16,12 +16,15 @@ exports.OidcController = void 0;
16
16
  const common_1 = require("@nestjs/common");
17
17
  const openid_client_1 = require("openid-client");
18
18
  const oidc_service_1 = require("./oidc.service");
19
+ const core_1 = require("@builder6/core");
19
20
  let OidcController = class OidcController {
20
- constructor(oidcService) {
21
+ constructor(oidcService, authService) {
21
22
  this.oidcService = oidcService;
23
+ this.authService = authService;
22
24
  }
23
25
  async login(providerId, req, res) {
24
26
  const provider = await this.oidcService.getProviderFromDB(providerId);
27
+ console.log(provider);
25
28
  const issuer = await openid_client_1.Issuer.discover(provider.issuer);
26
29
  const client = new issuer.Client({
27
30
  client_id: provider.client_id,
@@ -64,7 +67,17 @@ let OidcController = class OidcController {
64
67
  delete req.session[`oidc_${providerId}_nonce`];
65
68
  const userInfo = await client.userinfo(tokenSet);
66
69
  console.log('userinfo %j', userInfo);
67
- return res.json({ tokenSet, userInfo });
70
+ if (userInfo.email) {
71
+ const userSession = await this.authService.signIn(userInfo.email);
72
+ const { user, space, auth_token, access_token } = userSession;
73
+ this.authService.setAuthCookies(res, {
74
+ user_id: user,
75
+ space_id: space,
76
+ auth_token,
77
+ access_token,
78
+ });
79
+ }
80
+ res.redirect('/');
68
81
  }
69
82
  };
70
83
  exports.OidcController = OidcController;
@@ -78,7 +91,7 @@ __decorate([
78
91
  __metadata("design:returntype", Promise)
79
92
  ], OidcController.prototype, "login", null);
80
93
  __decorate([
81
- (0, common_1.Get)(':providerId/callback'),
94
+ (0, common_1.Get)(':providerId/login/callback'),
82
95
  __param(0, (0, common_1.Param)('providerId')),
83
96
  __param(1, (0, common_1.Req)()),
84
97
  __param(2, (0, common_1.Res)()),
@@ -88,6 +101,6 @@ __decorate([
88
101
  ], OidcController.prototype, "callback", null);
89
102
  exports.OidcController = OidcController = __decorate([
90
103
  (0, common_1.Controller)('api/v6/oidc'),
91
- __metadata("design:paramtypes", [oidc_service_1.OidcService])
104
+ __metadata("design:paramtypes", [oidc_service_1.OidcService, core_1.AuthService])
92
105
  ], OidcController);
93
106
  //# sourceMappingURL=oidc.controller.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"oidc.controller.js","sourceRoot":"","sources":["../../src/oidc/oidc.controller.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"oidc.controller.js","sourceRoot":"","sources":["../../src/oidc/oidc.controller.ts"],"names":[],"mappings":"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"}
@@ -8,6 +8,7 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
8
8
  Object.defineProperty(exports, "__esModule", { value: true });
9
9
  exports.OidcModule = void 0;
10
10
  const common_1 = require("@nestjs/common");
11
+ const core_1 = require("@builder6/core");
11
12
  const oidc_service_1 = require("./oidc.service");
12
13
  const oidc_controller_1 = require("./oidc.controller");
13
14
  let OidcModule = class OidcModule {
@@ -15,6 +16,7 @@ let OidcModule = class OidcModule {
15
16
  exports.OidcModule = OidcModule;
16
17
  exports.OidcModule = OidcModule = __decorate([
17
18
  (0, common_1.Module)({
19
+ imports: [core_1.AuthModule],
18
20
  providers: [oidc_service_1.OidcService],
19
21
  controllers: [oidc_controller_1.OidcController],
20
22
  })
@@ -1 +1 @@
1
- {"version":3,"file":"oidc.module.js","sourceRoot":"","sources":["../../src/oidc/oidc.module.ts"],"names":[],"mappings":";;;;;;;;;AAAA,2CAAwC;AACxC,iDAA6C;AAC7C,uDAAmD;AAM5C,IAAM,UAAU,GAAhB,MAAM,UAAU;CAAG,CAAA;AAAb,gCAAU;qBAAV,UAAU;IAJtB,IAAA,eAAM,EAAC;QACN,SAAS,EAAE,CAAC,0BAAW,CAAC;QACxB,WAAW,EAAE,CAAC,gCAAc,CAAC;KAC9B,CAAC;GACW,UAAU,CAAG"}
1
+ {"version":3,"file":"oidc.module.js","sourceRoot":"","sources":["../../src/oidc/oidc.module.ts"],"names":[],"mappings":";;;;;;;;;AAAA,2CAAwC;AACxC,yCAA4C;AAC5C,iDAA6C;AAC7C,uDAAmD;AAO5C,IAAM,UAAU,GAAhB,MAAM,UAAU;CAAG,CAAA;AAAb,gCAAU;qBAAV,UAAU;IALtB,IAAA,eAAM,EAAC;QACN,OAAO,EAAE,CAAC,iBAAU,CAAC;QACrB,SAAS,EAAE,CAAC,0BAAW,CAAC;QACxB,WAAW,EAAE,CAAC,gCAAc,CAAC;KAC9B,CAAC;GACW,UAAU,CAAG"}
@@ -1,11 +1,14 @@
1
+ import { ConfigService } from '@nestjs/config';
1
2
  export declare class OidcService {
3
+ private configService;
4
+ constructor(configService: ConfigService);
2
5
  getProviderFromDB(providerId: string): Promise<{
3
- issuer: string;
4
- configUrl: string;
5
- client_id: string;
6
- client_secret: string;
6
+ issuer: any;
7
+ config_url: any;
8
+ client_id: any;
9
+ client_secret: any;
7
10
  redirect_uri: string;
8
- scope: string;
11
+ scope: any;
9
12
  state: string;
10
13
  nonce: string;
11
14
  code_challenge_method: string;
@@ -5,11 +5,18 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
5
5
  else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
6
6
  return c > 3 && r && Object.defineProperty(target, key, r), r;
7
7
  };
8
+ var __metadata = (this && this.__metadata) || function (k, v) {
9
+ if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
10
+ };
8
11
  Object.defineProperty(exports, "__esModule", { value: true });
9
12
  exports.OidcService = void 0;
10
13
  const common_1 = require("@nestjs/common");
14
+ const config_1 = require("@nestjs/config");
11
15
  const openid_client_1 = require("openid-client");
12
16
  let OidcService = class OidcService {
17
+ constructor(configService) {
18
+ this.configService = configService;
19
+ }
13
20
  async getProviderFromDB(providerId) {
14
21
  const code_challenge_method = 'S256';
15
22
  const code_verifier = openid_client_1.generators.codeVerifier();
@@ -17,12 +24,12 @@ let OidcService = class OidcService {
17
24
  const state = openid_client_1.generators.random();
18
25
  const nonce = openid_client_1.generators.random();
19
26
  return {
20
- issuer: process.env.B6_OIDC_ISSUER,
21
- configUrl: process.env.B6_OIDC_CONFIG_URL,
22
- client_id: process.env.B6_OIDC_CLIENT_ID,
23
- client_secret: process.env.B6_OIDC_CLIENT_SECRET,
27
+ issuer: this.configService.get('oidc.issuer'),
28
+ config_url: this.configService.get('oidc.config.url'),
29
+ client_id: this.configService.get('oidc.client.id'),
30
+ client_secret: this.configService.get('oidc.client.secret'),
24
31
  redirect_uri: `${process.env.ROOT_URL}/api/v6/oidc/${providerId}/login/callback`,
25
- scope: process.env.B6_OIDC_CLIENT_SCOPE || 'openid email profile',
32
+ scope: this.configService.get('oidc.scope') || 'openid email profile',
26
33
  state,
27
34
  nonce,
28
35
  code_challenge_method,
@@ -33,6 +40,7 @@ let OidcService = class OidcService {
33
40
  };
34
41
  exports.OidcService = OidcService;
35
42
  exports.OidcService = OidcService = __decorate([
36
- (0, common_1.Injectable)()
43
+ (0, common_1.Injectable)(),
44
+ __metadata("design:paramtypes", [config_1.ConfigService])
37
45
  ], OidcService);
38
46
  //# sourceMappingURL=oidc.service.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"oidc.service.js","sourceRoot":"","sources":["../../src/oidc/oidc.service.ts"],"names":[],"mappings":";;;;;;;;;AAAA,2CAA4C;AAC5C,iDAA2C;AAGpC,IAAM,WAAW,GAAjB,MAAM,WAAW;IACtB,KAAK,CAAC,iBAAiB,CAAC,UAAkB;QACxC,MAAM,qBAAqB,GAAG,MAAM,CAAC;QACrC,MAAM,aAAa,GAAG,0BAAU,CAAC,YAAY,EAAE,CAAC;QAChD,MAAM,cAAc,GAAG,0BAAU,CAAC,aAAa,CAAC,aAAa,CAAC,CAAC;QAC/D,MAAM,KAAK,GAAG,0BAAU,CAAC,MAAM,EAAE,CAAC;QAClC,MAAM,KAAK,GAAG,0BAAU,CAAC,MAAM,EAAE,CAAC;QAGlC,OAAO;YACL,MAAM,EAAE,OAAO,CAAC,GAAG,CAAC,cAAc;YAClC,SAAS,EAAE,OAAO,CAAC,GAAG,CAAC,kBAAkB;YACzC,SAAS,EAAE,OAAO,CAAC,GAAG,CAAC,iBAAiB;YACxC,aAAa,EAAE,OAAO,CAAC,GAAG,CAAC,qBAAqB;YAChD,YAAY,EAAE,GAAG,OAAO,CAAC,GAAG,CAAC,QAAQ,gBAAgB,UAAU,iBAAiB;YAChF,KAAK,EAAE,OAAO,CAAC,GAAG,CAAC,oBAAoB,IAAI,sBAAsB;YACjE,KAAK;YACL,KAAK;YACL,qBAAqB;YACrB,aAAa;YACb,cAAc;SACf,CAAC;IACJ,CAAC;CACF,CAAA;AAvBY,kCAAW;sBAAX,WAAW;IADvB,IAAA,mBAAU,GAAE;GACA,WAAW,CAuBvB"}
1
+ {"version":3,"file":"oidc.service.js","sourceRoot":"","sources":["../../src/oidc/oidc.service.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAA4C;AAC5C,2CAA+C;AAC/C,iDAA2C;AAGpC,IAAM,WAAW,GAAjB,MAAM,WAAW;IACtB,YAAoB,aAA4B;QAA5B,kBAAa,GAAb,aAAa,CAAe;IAChD,CAAC;IACD,KAAK,CAAC,iBAAiB,CAAC,UAAkB;QACxC,MAAM,qBAAqB,GAAG,MAAM,CAAC;QACrC,MAAM,aAAa,GAAG,0BAAU,CAAC,YAAY,EAAE,CAAC;QAChD,MAAM,cAAc,GAAG,0BAAU,CAAC,aAAa,CAAC,aAAa,CAAC,CAAC;QAC/D,MAAM,KAAK,GAAG,0BAAU,CAAC,MAAM,EAAE,CAAC;QAClC,MAAM,KAAK,GAAG,0BAAU,CAAC,MAAM,EAAE,CAAC;QAGlC,OAAO;YACL,MAAM,EAAE,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,aAAa,CAAC;YAC7C,UAAU,EAAE,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,iBAAiB,CAAC;YACrD,SAAS,EAAE,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,gBAAgB,CAAC;YACnD,aAAa,EAAE,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,oBAAoB,CAAC;YAC3D,YAAY,EAAE,GAAG,OAAO,CAAC,GAAG,CAAC,QAAQ,gBAAgB,UAAU,iBAAiB;YAChF,KAAK,EAAE,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,YAAY,CAAC,IAAI,sBAAsB;YACrE,KAAK;YACL,KAAK;YACL,qBAAqB;YACrB,aAAa;YACb,cAAc;SACf,CAAC;IACJ,CAAC;CACF,CAAA;AAzBY,kCAAW;sBAAX,WAAW;IADvB,IAAA,mBAAU,GAAE;qCAEwB,sBAAa;GADrC,WAAW,CAyBvB"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@builder6/server",
3
- "version": "0.7.2",
3
+ "version": "0.7.4",
4
4
  "description": "",
5
5
  "author": "",
6
6
  "license": "AGPL-3.0-only",
@@ -29,13 +29,13 @@
29
29
  "test:e2e": "jest --config ./test/jest-e2e.json"
30
30
  },
31
31
  "dependencies": {
32
- "@builder6/core": "^0.7.2",
33
- "@builder6/email": "^0.7.2",
32
+ "@builder6/core": "^0.7.4",
33
+ "@builder6/email": "^0.7.4",
34
34
  "@builder6/moleculer": "^0.7.0",
35
- "@builder6/pages": "^0.7.2",
35
+ "@builder6/pages": "^0.7.4",
36
36
  "@builder6/query-mongodb": "^0.7.0",
37
- "@builder6/rooms": "^0.7.2",
38
- "@builder6/tables": "^0.7.2",
37
+ "@builder6/rooms": "^0.7.4",
38
+ "@builder6/tables": "^0.7.4",
39
39
  "@nestjs/common": "^10.0.0",
40
40
  "@nestjs/config": "^3.3.0",
41
41
  "@nestjs/core": "^9.0.0",
@@ -117,5 +117,5 @@
117
117
  "publishConfig": {
118
118
  "access": "public"
119
119
  },
120
- "gitHead": "eb85f0bd6f4190e7b91f5bb258f367f53059244d"
120
+ "gitHead": "f30f14d167b6b222d4b16ed0d33f211cfd4afc44"
121
121
  }