unleash-server 4.6.0-beta.9 → 4.6.0

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/README.md CHANGED
@@ -71,7 +71,6 @@ The frontend SDKs connects via the [Unleash Proxy](https://docs.getunleash.io/sd
71
71
  - [Javascript SDK](https://docs.getunleash.io/sdks/proxy-javascript)
72
72
  - [React SDK](https://docs.getunleash.io/sdks/proxy-react)
73
73
 
74
-
75
74
  **Community SDKs**
76
75
 
77
76
  In addition there exists a good list of [community developed SDKs](https://docs.getunleash.io/sdks/community), so there might already exist an implementation for your favorite programming language (e.g. [Rust](https://github.com/cognitedata/unleash-client-rust), [Elixir](https://gitlab.com/afontaine/unleash_ex), [Dart](https://pub.dev/packages/unleash), [Clojure](https://github.com/AppsFlyer/unleash-client-clojure), [NestJS](https://github.com/pmb0/nestjs-unleash), [Kotlin](https://github.com/silvercar/unleash-client-kotlin), [PHP](https://gitlab.com/minds/unleash-client-php) and more.)
@@ -86,7 +85,7 @@ In addition there exists a good list of [community developed SDKs](https://docs.
86
85
 
87
86
  The main motivation for doing feature toggling is to decouple the process for deploying code to production and releasing new features. This helps reducing risk, and allow us to easily manage which features to enable, and have full control of how we exposed the new feature for.
88
87
 
89
- > Feature toggles decouple **deployment** of code from **release** of new features
88
+ > Feature toggles decouple **deployment** of code from **release** of new features.
90
89
 
91
90
  This repo contains the unleash-server, which contains the Unleash Admin UI and the Unleash API. To make use of unleash you will also need a client SDK.
92
91
 
@@ -183,6 +182,7 @@ We know that learning a new tool can be hard and time-consuming. We have a growi
183
182
  - [Follow Unleash on Twitter](https://twitter.com/getunleash) if you want to stay updated on the latest progress of the Unleash project.
184
183
 
185
184
  # In the media
185
+
186
186
  - [Free Code Camp: Feature toggles - Why and how to add to your software](https://www.youtube.com/watch?v=-yHZ9uLVSp4)
187
187
  - [Feature toggling transient errors in load tests](https://nrkbeta.no/2021/08/23/feature-toggling-transient-errors-in-load-tests/) (English)
188
188
  - [The Code Kitchen Episode 7: Feature flags with Unleash](https://share.fireside.fm/episode/zD-4e4KI+Pr379KBv) (English)
@@ -12,8 +12,8 @@ const fromRow = (row) => ({
12
12
  appName: row.app_name,
13
13
  environment: row.environment,
14
14
  timestamp: row.timestamp,
15
- yes: row.yes,
16
- no: row.no,
15
+ yes: Number(row.yes),
16
+ no: Number(row.no),
17
17
  });
18
18
  const toRow = (metric) => ({
19
19
  feature_name: metric.featureName,
@@ -1 +1 @@
1
- {"version":3,"file":"client-metrics-store-v2.js","sourceRoot":"","sources":["../../../src/lib/db/client-metrics-store-v2.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"client-metrics-store-v2.js","sourceRoot":"","sources":["../../../src/lib/db/client-metrics-store-v2.ts"],"names":[],"mappings":"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"}
@@ -17,8 +17,10 @@ export default class UserAdminController extends Controller {
17
17
  private emailService;
18
18
  private resetTokenService;
19
19
  private sessionService;
20
- constructor(config: IUnleashConfig, { userService, accessService, emailService, resetTokenService, sessionService, }: Pick<IUnleashServices, 'userService' | 'accessService' | 'emailService' | 'resetTokenService' | 'sessionService'>);
21
- resetPassword(req: any, res: any): Promise<void>;
20
+ private settingService;
21
+ readonly unleashUrl: string;
22
+ constructor(config: IUnleashConfig, { userService, accessService, emailService, resetTokenService, sessionService, settingService, }: Pick<IUnleashServices, 'userService' | 'accessService' | 'emailService' | 'resetTokenService' | 'sessionService' | 'settingService'>);
23
+ resetPassword(req: IAuthRequest, res: Response): Promise<void>;
22
24
  getUsers(req: Request, res: Response): Promise<void>;
23
25
  getActiveSessions(req: Request, res: Response): Promise<void>;
24
26
  search(req: Request, res: Response): Promise<void>;
@@ -5,15 +5,18 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
5
5
  Object.defineProperty(exports, "__esModule", { value: true });
6
6
  const controller_1 = __importDefault(require("../controller"));
7
7
  const permissions_1 = require("../../types/permissions");
8
+ const simple_auth_settings_1 = require("../../types/settings/simple-auth-settings");
8
9
  class UserAdminController extends controller_1.default {
9
- constructor(config, { userService, accessService, emailService, resetTokenService, sessionService, }) {
10
+ constructor(config, { userService, accessService, emailService, resetTokenService, sessionService, settingService, }) {
10
11
  super(config);
11
12
  this.userService = userService;
12
13
  this.accessService = accessService;
13
14
  this.emailService = emailService;
14
- this.logger = config.getLogger('routes/user-controller.ts');
15
15
  this.resetTokenService = resetTokenService;
16
16
  this.sessionService = sessionService;
17
+ this.settingService = settingService;
18
+ this.logger = config.getLogger('routes/user-controller.ts');
19
+ this.unleashUrl = config.server.unleashUrl;
17
20
  this.get('/', this.getUsers, permissions_1.ADMIN);
18
21
  this.get('/search', this.search);
19
22
  this.post('/', this.createUser, permissions_1.ADMIN);
@@ -25,35 +28,26 @@ class UserAdminController extends controller_1.default {
25
28
  this.post('/reset-password', this.resetPassword, permissions_1.ADMIN);
26
29
  this.get('/active-sessions', this.getActiveSessions, permissions_1.ADMIN);
27
30
  }
28
- // eslint-disable-next-line @typescript-eslint/explicit-module-boundary-types
29
31
  async resetPassword(req, res) {
30
32
  const { user } = req;
31
33
  const receiver = req.body.id;
32
34
  const resetPasswordUrl = await this.userService.createResetPasswordEmail(receiver, user);
33
35
  res.json({ resetPasswordUrl });
34
36
  }
35
- // eslint-disable-next-line @typescript-eslint/explicit-module-boundary-types
36
37
  async getUsers(req, res) {
37
- try {
38
- const users = await this.userService.getAll();
39
- const rootRoles = await this.accessService.getRootRoles();
40
- const inviteLinks = await this.resetTokenService.getActiveInvitations();
41
- const usersWithInviteLinks = users.map((user) => {
42
- const inviteLink = inviteLinks[user.id] || '';
43
- return { ...user, inviteLink };
44
- });
45
- res.json({ users: usersWithInviteLinks, rootRoles });
46
- }
47
- catch (error) {
48
- this.logger.error(error);
49
- res.status(500).send({ msg: 'server errors' });
50
- }
38
+ const users = await this.userService.getAll();
39
+ const rootRoles = await this.accessService.getRootRoles();
40
+ const inviteLinks = await this.resetTokenService.getActiveInvitations();
41
+ const usersWithInviteLinks = users.map((user) => {
42
+ const inviteLink = inviteLinks[user.id] || '';
43
+ return { ...user, inviteLink };
44
+ });
45
+ res.json({ users: usersWithInviteLinks, rootRoles });
51
46
  }
52
47
  async getActiveSessions(req, res) {
53
48
  const sessions = await this.sessionService.getActiveSessions();
54
49
  res.json(sessions);
55
50
  }
56
- // eslint-disable-next-line @typescript-eslint/explicit-module-boundary-types
57
51
  async search(req, res) {
58
52
  const { q } = req.query;
59
53
  try {
@@ -70,7 +64,6 @@ class UserAdminController extends controller_1.default {
70
64
  const user = await this.userService.getUser(Number(id));
71
65
  res.json(user);
72
66
  }
73
- // eslint-disable-next-line @typescript-eslint/explicit-module-boundary-types
74
67
  async createUser(req, res) {
75
68
  const { username, email, name, rootRole, sendEmail } = req.body;
76
69
  const { user } = req;
@@ -81,13 +74,18 @@ class UserAdminController extends controller_1.default {
81
74
  name,
82
75
  rootRole,
83
76
  }, user);
84
- const inviteLink = await this.resetTokenService.createNewUserUrl(createdUser.id, user.email);
77
+ const passwordAuthSettings = await this.settingService.get(simple_auth_settings_1.simpleAuthKey);
78
+ let inviteLink;
79
+ if (!passwordAuthSettings?.disabled) {
80
+ const inviteUrl = await this.resetTokenService.createNewUserUrl(createdUser.id, user.email);
81
+ inviteLink = inviteUrl.toString();
82
+ }
85
83
  let emailSent = false;
86
84
  const emailConfigured = this.emailService.configured();
87
85
  const reallySendEmail = emailConfigured && (sendEmail !== undefined ? sendEmail : true);
88
86
  if (reallySendEmail) {
89
87
  try {
90
- await this.emailService.sendGettingStartedMail(createdUser.name, createdUser.email, inviteLink.toString());
88
+ await this.emailService.sendGettingStartedMail(createdUser.name, createdUser.email, this.unleashUrl, inviteLink);
91
89
  emailSent = true;
92
90
  }
93
91
  catch (e) {
@@ -99,7 +97,7 @@ class UserAdminController extends controller_1.default {
99
97
  }
100
98
  res.status(201).send({
101
99
  ...createdUser,
102
- inviteLink,
100
+ inviteLink: inviteLink || this.unleashUrl,
103
101
  emailSent,
104
102
  rootRole,
105
103
  });
@@ -146,5 +144,4 @@ class UserAdminController extends controller_1.default {
146
144
  }
147
145
  }
148
146
  exports.default = UserAdminController;
149
- module.exports = UserAdminController;
150
147
  //# sourceMappingURL=user-admin.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"user-admin.js","sourceRoot":"","sources":["../../../../src/lib/routes/admin-api/user-admin.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"user-admin.js","sourceRoot":"","sources":["../../../../src/lib/routes/admin-api/user-admin.ts"],"names":[],"mappings":"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"}
@@ -1,9 +1,12 @@
1
- export = PasswordProvider;
2
- declare class PasswordProvider {
3
- constructor(config: any, { userService }: {
4
- userService: any;
5
- });
6
- logger: any;
7
- userService: any;
8
- login(req: any, res: any): Promise<any>;
1
+ import { Response } from 'express';
2
+ import { IUnleashConfig } from '../../server-impl';
3
+ import { IUnleashServices } from '../../types';
4
+ import Controller from '../controller';
5
+ import { IAuthRequest } from '../unleash-types';
6
+ declare class PasswordProvider extends Controller {
7
+ private userService;
8
+ private logger;
9
+ constructor(config: IUnleashConfig, { userService }: Pick<IUnleashServices, 'userService'>);
10
+ login(req: IAuthRequest, res: Response): Promise<void>;
9
11
  }
12
+ export default PasswordProvider;
@@ -1,22 +1,29 @@
1
- const Controller = require('../controller');
2
- class PasswordProvider extends Controller {
1
+ "use strict";
2
+ var __importDefault = (this && this.__importDefault) || function (mod) {
3
+ return (mod && mod.__esModule) ? mod : { "default": mod };
4
+ };
5
+ Object.defineProperty(exports, "__esModule", { value: true });
6
+ const permissions_1 = require("../../types/permissions");
7
+ const controller_1 = __importDefault(require("../controller"));
8
+ class PasswordProvider extends controller_1.default {
3
9
  constructor(config, { userService }) {
4
10
  super(config);
5
11
  this.logger = config.getLogger('/auth/password-provider.js');
6
12
  this.userService = userService;
7
- this.post('/login', this.login);
13
+ this.post('/login', this.login, permissions_1.NONE);
8
14
  }
9
15
  async login(req, res) {
10
16
  const { username, password } = req.body;
11
17
  if (!username || !password) {
12
- return res.status(400).json({
18
+ res.status(400).json({
13
19
  message: 'You must provide username and password',
14
20
  });
21
+ return;
15
22
  }
16
23
  const user = await this.userService.loginUser(username, password);
17
24
  req.session.user = user;
18
- return res.status(200).json(user);
25
+ res.status(200).json(user);
19
26
  }
20
27
  }
21
- module.exports = PasswordProvider;
28
+ exports.default = PasswordProvider;
22
29
  //# sourceMappingURL=simple-password-provider.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"simple-password-provider.js","sourceRoot":"","sources":["../../../../src/lib/routes/auth/simple-password-provider.js"],"names":[],"mappings":"AAAA,MAAM,UAAU,GAAG,OAAO,CAAC,eAAe,CAAC,CAAC;AAE5C,MAAM,gBAAiB,SAAQ,UAAU;IACrC,YAAY,MAAM,EAAE,EAAE,WAAW,EAAE;QAC/B,KAAK,CAAC,MAAM,CAAC,CAAC;QACd,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC,SAAS,CAAC,4BAA4B,CAAC,CAAC;QAC7D,IAAI,CAAC,WAAW,GAAG,WAAW,CAAC;QAE/B,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,IAAI,CAAC,KAAK,CAAC,CAAC;IACpC,CAAC;IAED,KAAK,CAAC,KAAK,CAAC,GAAG,EAAE,GAAG;QAChB,MAAM,EAAE,QAAQ,EAAE,QAAQ,EAAE,GAAG,GAAG,CAAC,IAAI,CAAC;QAExC,IAAI,CAAC,QAAQ,IAAI,CAAC,QAAQ,EAAE;YACxB,OAAO,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC;gBACxB,OAAO,EAAE,wCAAwC;aACpD,CAAC,CAAC;SACN;QAED,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,SAAS,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAC;QAClE,GAAG,CAAC,OAAO,CAAC,IAAI,GAAG,IAAI,CAAC;QACxB,OAAO,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IACtC,CAAC;CACJ;AAED,MAAM,CAAC,OAAO,GAAG,gBAAgB,CAAC"}
1
+ {"version":3,"file":"simple-password-provider.js","sourceRoot":"","sources":["../../../../src/lib/routes/auth/simple-password-provider.ts"],"names":[],"mappings":";;;;;AAKA,yDAA+C;AAC/C,+DAAuC;AAGvC,MAAM,gBAAiB,SAAQ,oBAAU;IAKrC,YACI,MAAsB,EACtB,EAAE,WAAW,EAAyC;QAEtD,KAAK,CAAC,MAAM,CAAC,CAAC;QACd,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC,SAAS,CAAC,4BAA4B,CAAC,CAAC;QAC7D,IAAI,CAAC,WAAW,GAAG,WAAW,CAAC;QAE/B,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,IAAI,CAAC,KAAK,EAAE,kBAAI,CAAC,CAAC;IAC1C,CAAC;IAED,KAAK,CAAC,KAAK,CAAC,GAAiB,EAAE,GAAa;QACxC,MAAM,EAAE,QAAQ,EAAE,QAAQ,EAAE,GAAG,GAAG,CAAC,IAAI,CAAC;QAExC,IAAI,CAAC,QAAQ,IAAI,CAAC,QAAQ,EAAE;YACxB,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC;gBACjB,OAAO,EAAE,wCAAwC;aACpD,CAAC,CAAC;YACH,OAAO;SACV;QAED,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,SAAS,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAC;QAClE,GAAG,CAAC,OAAO,CAAC,IAAI,GAAG,IAAI,CAAC;QACxB,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAC/B,CAAC;CACJ;AAED,kBAAe,gBAAgB,CAAC"}
@@ -1,15 +1,23 @@
1
- const request = require('supertest');
2
- const express = require('express');
3
- const User = require('../../types/user');
4
- const PasswordProvider = require('./simple-password-provider');
5
- const getLogger = () => ({ info: () => { }, error: () => { } });
1
+ "use strict";
2
+ var __importDefault = (this && this.__importDefault) || function (mod) {
3
+ return (mod && mod.__esModule) ? mod : { "default": mod };
4
+ };
5
+ Object.defineProperty(exports, "__esModule", { value: true });
6
+ const supertest_1 = __importDefault(require("supertest"));
7
+ const express_1 = __importDefault(require("express"));
8
+ const user_1 = __importDefault(require("../../types/user"));
9
+ const simple_password_provider_1 = __importDefault(require("./simple-password-provider"));
10
+ const password_mismatch_1 = __importDefault(require("../../error/password-mismatch"));
11
+ const no_logger_1 = __importDefault(require("../../../test/fixtures/no-logger"));
6
12
  test('Should require password', async () => {
7
- const app = express();
8
- app.use(express.json());
13
+ const app = (0, express_1.default)();
14
+ app.use(express_1.default.json());
9
15
  const userService = () => { };
10
- const ctr = new PasswordProvider({ getLogger }, { userService });
16
+ // @ts-ignore
17
+ const ctr = new simple_password_provider_1.default({ getLogger: no_logger_1.default }, { userService });
18
+ //@ts-ignore
11
19
  app.use('/auth/simple', ctr.router);
12
- const res = await request(app)
20
+ const res = await (0, supertest_1.default)(app)
13
21
  .post('/auth/simple/login')
14
22
  .send({ name: 'john' });
15
23
  expect(400).toBe(res.status);
@@ -17,10 +25,11 @@ test('Should require password', async () => {
17
25
  test('Should login user', async () => {
18
26
  const username = 'ola';
19
27
  const password = 'simplepass';
20
- const user = new User({ id: 123, username });
21
- const app = express();
22
- app.use(express.json());
28
+ const user = new user_1.default({ id: 123, username });
29
+ const app = (0, express_1.default)();
30
+ app.use(express_1.default.json());
23
31
  app.use((req, res, next) => {
32
+ //@ts-ignore
24
33
  req.session = {};
25
34
  next();
26
35
  });
@@ -32,9 +41,11 @@ test('Should login user', async () => {
32
41
  throw new Error('Wrong password');
33
42
  },
34
43
  };
35
- const ctr = new PasswordProvider({ getLogger }, { userService });
44
+ // @ts-ignore
45
+ const ctr = new simple_password_provider_1.default({ getLogger: no_logger_1.default }, { userService });
46
+ //@ts-ignore
36
47
  app.use('/auth/simple', ctr.router);
37
- const res = await request(app)
48
+ const res = await (0, supertest_1.default)(app)
38
49
  .post('/auth/simple/login')
39
50
  .send({ username, password });
40
51
  expect(200).toBe(res.status);
@@ -43,10 +54,11 @@ test('Should login user', async () => {
43
54
  test('Should not login user with wrong password', async () => {
44
55
  const username = 'ola';
45
56
  const password = 'simplepass';
46
- const user = new User({ id: 133, username });
47
- const app = express();
48
- app.use(express.json());
57
+ const user = new user_1.default({ id: 133, username });
58
+ const app = (0, express_1.default)();
59
+ app.use(express_1.default.json());
49
60
  app.use((req, res, next) => {
61
+ //@ts-ignore
50
62
  req.session = {};
51
63
  next();
52
64
  });
@@ -55,14 +67,16 @@ test('Should not login user with wrong password', async () => {
55
67
  if (u === username && p === password) {
56
68
  return user;
57
69
  }
58
- throw new Error('Wrong password');
70
+ throw new password_mismatch_1.default();
59
71
  },
60
72
  };
61
- const ctr = new PasswordProvider({ getLogger }, { userService });
73
+ // @ts-ignore
74
+ const ctr = new simple_password_provider_1.default({ getLogger: no_logger_1.default }, { userService });
75
+ //@ts-ignore
62
76
  app.use('/auth/simple', ctr.router);
63
- const res = await request(app)
77
+ const res = await (0, supertest_1.default)(app)
64
78
  .post('/auth/simple/login')
65
79
  .send({ username, password: 'not-correct' });
66
- expect(401).toBe(res.status);
80
+ expect(res.status).toBe(401);
67
81
  });
68
82
  //# sourceMappingURL=simple-password-provider.test.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"simple-password-provider.test.js","sourceRoot":"","sources":["../../../../src/lib/routes/auth/simple-password-provider.test.js"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"simple-password-provider.test.js","sourceRoot":"","sources":["../../../../src/lib/routes/auth/simple-password-provider.test.ts"],"names":[],"mappings":"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"}
@@ -5,20 +5,20 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
5
5
  Object.defineProperty(exports, "__esModule", { value: true });
6
6
  const backstage_1 = require("./backstage");
7
7
  const reset_password_controller_1 = __importDefault(require("./auth/reset-password-controller"));
8
+ const simple_password_provider_1 = __importDefault(require("./auth/simple-password-provider"));
8
9
  const api_def_1 = require("./api-def");
9
10
  const AdminApi = require('./admin-api');
10
11
  const ClientApi = require('./client-api');
11
12
  const Controller = require('./controller');
12
13
  const HealthCheckController = require('./health-check');
13
14
  const LogoutController = require('./logout');
14
- const SimplePasswordProvider = require('./auth/simple-password-provider');
15
15
  class IndexRouter extends Controller {
16
16
  constructor(config, services) {
17
17
  super(config);
18
18
  this.use('/health', new HealthCheckController(config, services).router);
19
19
  this.use('/internal-backstage', new backstage_1.BackstageController(config).router);
20
20
  this.use('/logout', new LogoutController(config).router);
21
- this.use('/auth/simple', new SimplePasswordProvider(config, services).router);
21
+ this.use('/auth/simple', new simple_password_provider_1.default(config, services).router);
22
22
  this.use('/auth/reset', new reset_password_controller_1.default(config, services).router);
23
23
  this.get(api_def_1.api.uri, this.index);
24
24
  this.use(api_def_1.api.links.admin.uri, new AdminApi(config, services).router);
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/lib/routes/index.ts"],"names":[],"mappings":";;;;;AACA,2CAAkD;AAClD,iGAAuE;AAGvE,uCAAgC;AAEhC,MAAM,QAAQ,GAAG,OAAO,CAAC,aAAa,CAAC,CAAC;AACxC,MAAM,SAAS,GAAG,OAAO,CAAC,cAAc,CAAC,CAAC;AAC1C,MAAM,UAAU,GAAG,OAAO,CAAC,cAAc,CAAC,CAAC;AAC3C,MAAM,qBAAqB,GAAG,OAAO,CAAC,gBAAgB,CAAC,CAAC;AACxD,MAAM,gBAAgB,GAAG,OAAO,CAAC,UAAU,CAAC,CAAC;AAC7C,MAAM,sBAAsB,GAAG,OAAO,CAAC,iCAAiC,CAAC,CAAC;AAE1E,MAAM,WAAY,SAAQ,UAAU;IAChC,YAAY,MAAsB,EAAE,QAA0B;QAC1D,KAAK,CAAC,MAAM,CAAC,CAAC;QACd,IAAI,CAAC,GAAG,CAAC,SAAS,EAAE,IAAI,qBAAqB,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC,MAAM,CAAC,CAAC;QACxE,IAAI,CAAC,GAAG,CAAC,qBAAqB,EAAE,IAAI,+BAAmB,CAAC,MAAM,CAAC,CAAC,MAAM,CAAC,CAAC;QACxE,IAAI,CAAC,GAAG,CAAC,SAAS,EAAE,IAAI,gBAAgB,CAAC,MAAM,CAAC,CAAC,MAAM,CAAC,CAAC;QACzD,IAAI,CAAC,GAAG,CACJ,cAAc,EACd,IAAI,sBAAsB,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC,MAAM,CACtD,CAAC;QACF,IAAI,CAAC,GAAG,CACJ,aAAa,EACb,IAAI,mCAAuB,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC,MAAM,CACvD,CAAC;QACF,IAAI,CAAC,GAAG,CAAC,aAAG,CAAC,GAAG,EAAE,IAAI,CAAC,KAAK,CAAC,CAAC;QAC9B,IAAI,CAAC,GAAG,CAAC,aAAG,CAAC,KAAK,CAAC,KAAK,CAAC,GAAG,EAAE,IAAI,QAAQ,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC,MAAM,CAAC,CAAC;QACrE,IAAI,CAAC,GAAG,CAAC,aAAG,CAAC,KAAK,CAAC,MAAM,CAAC,GAAG,EAAE,IAAI,SAAS,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC,MAAM,CAAC,CAAC;IAC3E,CAAC;IAED,KAAK,CAAC,KAAK,CAAC,GAAY,EAAE,GAAa;QACnC,GAAG,CAAC,IAAI,CAAC,aAAG,CAAC,CAAC;IAClB,CAAC;CACJ;AAED,kBAAe,WAAW,CAAC;AAE3B,MAAM,CAAC,OAAO,GAAG,WAAW,CAAC"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/lib/routes/index.ts"],"names":[],"mappings":";;;;;AACA,2CAAkD;AAClD,iGAAuE;AACvE,+FAAqE;AAGrE,uCAAgC;AAEhC,MAAM,QAAQ,GAAG,OAAO,CAAC,aAAa,CAAC,CAAC;AACxC,MAAM,SAAS,GAAG,OAAO,CAAC,cAAc,CAAC,CAAC;AAC1C,MAAM,UAAU,GAAG,OAAO,CAAC,cAAc,CAAC,CAAC;AAC3C,MAAM,qBAAqB,GAAG,OAAO,CAAC,gBAAgB,CAAC,CAAC;AACxD,MAAM,gBAAgB,GAAG,OAAO,CAAC,UAAU,CAAC,CAAC;AAE7C,MAAM,WAAY,SAAQ,UAAU;IAChC,YAAY,MAAsB,EAAE,QAA0B;QAC1D,KAAK,CAAC,MAAM,CAAC,CAAC;QACd,IAAI,CAAC,GAAG,CAAC,SAAS,EAAE,IAAI,qBAAqB,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC,MAAM,CAAC,CAAC;QACxE,IAAI,CAAC,GAAG,CAAC,qBAAqB,EAAE,IAAI,+BAAmB,CAAC,MAAM,CAAC,CAAC,MAAM,CAAC,CAAC;QACxE,IAAI,CAAC,GAAG,CAAC,SAAS,EAAE,IAAI,gBAAgB,CAAC,MAAM,CAAC,CAAC,MAAM,CAAC,CAAC;QACzD,IAAI,CAAC,GAAG,CACJ,cAAc,EACd,IAAI,kCAAsB,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC,MAAM,CACtD,CAAC;QACF,IAAI,CAAC,GAAG,CACJ,aAAa,EACb,IAAI,mCAAuB,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC,MAAM,CACvD,CAAC;QACF,IAAI,CAAC,GAAG,CAAC,aAAG,CAAC,GAAG,EAAE,IAAI,CAAC,KAAK,CAAC,CAAC;QAC9B,IAAI,CAAC,GAAG,CAAC,aAAG,CAAC,KAAK,CAAC,KAAK,CAAC,GAAG,EAAE,IAAI,QAAQ,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC,MAAM,CAAC,CAAC;QACrE,IAAI,CAAC,GAAG,CAAC,aAAG,CAAC,KAAK,CAAC,MAAM,CAAC,GAAG,EAAE,IAAI,SAAS,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC,MAAM,CAAC,CAAC;IAC3E,CAAC;IAED,KAAK,CAAC,KAAK,CAAC,GAAY,EAAE,GAAa;QACnC,GAAG,CAAC,IAAI,CAAC,aAAG,CAAC,CAAC;IAClB,CAAC;CACJ;AAED,kBAAe,WAAW,CAAC;AAE3B,MAAM,CAAC,OAAO,GAAG,WAAW,CAAC"}
@@ -34,7 +34,7 @@ export declare class EmailService {
34
34
  private readonly sender;
35
35
  constructor(email: IEmailOption, getLogger: LogProvider);
36
36
  sendResetMail(name: string, recipient: string, resetLink: string): Promise<IEmailEnvelope>;
37
- sendGettingStartedMail(name: string, recipient: string, passwordLink: string): Promise<IEmailEnvelope>;
37
+ sendGettingStartedMail(name: string, recipient: string, unleashUrl: string, passwordLink?: string): Promise<IEmailEnvelope>;
38
38
  isEnabled(): boolean;
39
39
  private compileTemplate;
40
40
  private resolveTemplate;
@@ -80,10 +80,10 @@ class EmailService {
80
80
  });
81
81
  });
82
82
  }
83
- async sendGettingStartedMail(name, recipient, passwordLink) {
83
+ async sendGettingStartedMail(name, recipient, unleashUrl, passwordLink) {
84
84
  if (this.configured()) {
85
85
  const year = new Date().getFullYear();
86
- const context = { passwordLink, name, year };
86
+ const context = { passwordLink, name, year, unleashUrl };
87
87
  const bodyHtml = await this.compileTemplate('getting-started', TemplateFormat.HTML, context);
88
88
  const bodyText = await this.compileTemplate('getting-started', TemplateFormat.PLAIN, context);
89
89
  const email = {
@@ -1 +1 @@
1
- {"version":3,"file":"email-service.js","sourceRoot":"","sources":["../../../src/lib/services/email-service.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"email-service.js","sourceRoot":"","sources":["../../../src/lib/services/email-service.ts"],"names":[],"mappings":"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"}
@@ -484,10 +484,18 @@
484
484
 
485
485
  <p>You have been invited to your organization's Unleash account - the new way of delivering software.</p>
486
486
 
487
+ {{# passwordLink }}
487
488
  <p>Below is your magic sign-in link. Just click the button and follow the steps provided to update your password and get started using Unleash.</p>
488
489
 
489
490
  <br />
490
491
  <a class="resetPasswordLink" href="{{{ passwordLink }}}" target="_blank" rel="noopener noreferrer">Setup account<a/>
492
+ {{/ passwordLink }}
493
+ {{^ passwordLink }}
494
+ <p>Use the link below to access your Unleash instance.</p>
495
+
496
+ <br />
497
+ <a class="resetPasswordLink" href="{{{ unleashUrl }}}" target="_blank" rel="noopener noreferrer">Login<a/>
498
+ {{/ passwordLink }}
491
499
  <br />
492
500
  <br />
493
501
  <p>By the way - did you know we have built Unleash on best practice when releasing new features. Our solution removes pressure from developers, allowing you to focus on delivering value through experimentation.</p>
@@ -2,9 +2,19 @@ Welcome to Unleash {{ name }}!
2
2
 
3
3
  You have been invited to your organization's Unleash account - the new way of delivering software.
4
4
 
5
+ {{# passwordLink }}
6
+
5
7
  Below is your magic sign-in link. Just click the button and follow the steps provided to update your password and get started using Unleash.
6
8
 
7
9
  Visit {{{ passwordLink }}} to get started.
10
+ {{/ passwordLink }}
11
+ {{^ passwordLink }}
12
+
13
+ Use the link below to access your Unleash instance:
14
+
15
+ {{{ unleashUrl }}}
16
+
17
+ {{/ passwordLink }}
8
18
 
9
19
  By the way - did you know we have built Unleash on best practice when releasing new features. Our solution removes pressure from developers, allowing you to focus on delivering value through experimentation.
10
20
  Looking forward to having a lot of fun together.
@@ -0,0 +1,2 @@
1
+ export function up(db: any, cb: any): void;
2
+ export function down(db: any, cb: any): void;
@@ -0,0 +1,16 @@
1
+ 'use strict';
2
+ exports.up = function (db, cb) {
3
+ db.runSql(`
4
+ ALTER TABLE client_metrics_env
5
+ ALTER COLUMN yes TYPE BIGINT,
6
+ ALTER COLUMN no TYPE BIGINT;
7
+ `, cb);
8
+ };
9
+ exports.down = function (db, cb) {
10
+ db.runSql(`
11
+ ALTER TABLE client_metrics_env
12
+ ALTER COLUMN yes TYPE INTEGER,
13
+ ALTER COLUMN no TYPE INTEGER;
14
+ `, cb);
15
+ };
16
+ //# sourceMappingURL=20220129113106-metrics-counters-as-bigint.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"20220129113106-metrics-counters-as-bigint.js","sourceRoot":"","sources":["../../src/migrations/20220129113106-metrics-counters-as-bigint.js"],"names":[],"mappings":"AAAA,YAAY,CAAC;AAEb,OAAO,CAAC,EAAE,GAAG,UAAU,EAAE,EAAE,EAAE;IACzB,EAAE,CAAC,MAAM,CACL;;;;SAIC,EACD,EAAE,CACL,CAAC;AACN,CAAC,CAAC;AAEF,OAAO,CAAC,IAAI,GAAG,UAAU,EAAE,EAAE,EAAE;IAC3B,EAAE,CAAC,MAAM,CACL;;;;SAIC,EACD,EAAE,CACL,CAAC;AACN,CAAC,CAAC"}
package/package.json CHANGED
@@ -1,7 +1,7 @@
1
1
  {
2
2
  "name": "unleash-server",
3
3
  "description": "Unleash is an enterprise ready feature toggles service. It provides different strategies for handling feature toggles.",
4
- "version": "4.6.0-beta.9",
4
+ "version": "4.6.0",
5
5
  "keywords": [
6
6
  "unleash",
7
7
  "feature toggle",
@@ -112,7 +112,7 @@
112
112
  "serve-favicon": "^2.5.0",
113
113
  "stoppable": "^1.1.0",
114
114
  "type-is": "^1.6.18",
115
- "unleash-frontend": "4.6.0-beta.9",
115
+ "unleash-frontend": "4.6.1",
116
116
  "uuid": "^8.3.2"
117
117
  },
118
118
  "devDependencies": {
@@ -138,7 +138,7 @@
138
138
  "copyfiles": "2.4.1",
139
139
  "coveralls": "3.1.1",
140
140
  "del-cli": "4.0.1",
141
- "eslint": "8.7.0",
141
+ "eslint": "8.8.0",
142
142
  "eslint-config-airbnb-base": "15.0.0",
143
143
  "eslint-config-airbnb-typescript": "16.0.0",
144
144
  "eslint-config-prettier": "8.3.0",
@@ -149,7 +149,7 @@
149
149
  "husky": "7.0.4",
150
150
  "jest": "27.4.7",
151
151
  "jest-fetch-mock": "3.0.3",
152
- "lint-staged": "12.3.1",
152
+ "lint-staged": "12.3.2",
153
153
  "prettier": "2.5.1",
154
154
  "proxyquire": "2.1.3",
155
155
  "source-map-support": "0.5.21",