@minimaltech/node-infra 0.5.10-21 → 0.5.10-22

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.
Files changed (77) hide show
  1. package/dist/components/authenticate/common/types.d.ts +33 -0
  2. package/dist/components/authenticate/common/types.d.ts.map +1 -1
  3. package/dist/components/authenticate/common/types.js +5 -0
  4. package/dist/components/authenticate/common/types.js.map +1 -1
  5. package/dist/components/authenticate/controllers/oauth2.controller.d.ts +41 -0
  6. package/dist/components/authenticate/controllers/oauth2.controller.d.ts.map +1 -1
  7. package/dist/components/authenticate/controllers/oauth2.controller.js +25 -3
  8. package/dist/components/authenticate/controllers/oauth2.controller.js.map +1 -1
  9. package/dist/components/authenticate/models/oauth2-scope.model.d.ts +6 -2
  10. package/dist/components/authenticate/models/oauth2-scope.model.d.ts.map +1 -1
  11. package/dist/components/authenticate/models/oauth2-scope.model.js +47 -0
  12. package/dist/components/authenticate/models/oauth2-scope.model.js.map +1 -1
  13. package/dist/components/authenticate/oauth2-handlers/authorization-code.handler.d.ts.map +1 -1
  14. package/dist/components/authenticate/oauth2-handlers/authorization-code.handler.js +20 -13
  15. package/dist/components/authenticate/oauth2-handlers/authorization-code.handler.js.map +1 -1
  16. package/dist/components/authenticate/oauth2-handlers/base.d.ts +22 -5
  17. package/dist/components/authenticate/oauth2-handlers/base.d.ts.map +1 -1
  18. package/dist/components/authenticate/oauth2-handlers/base.js +103 -28
  19. package/dist/components/authenticate/oauth2-handlers/base.js.map +1 -1
  20. package/dist/components/authenticate/oauth2-handlers/config/index.d.ts +2 -0
  21. package/dist/components/authenticate/oauth2-handlers/config/index.d.ts.map +1 -0
  22. package/dist/components/authenticate/oauth2-handlers/config/index.js +18 -0
  23. package/dist/components/authenticate/oauth2-handlers/config/index.js.map +1 -0
  24. package/dist/components/authenticate/oauth2-handlers/config/scope-config-validator.d.ts +46 -0
  25. package/dist/components/authenticate/oauth2-handlers/config/scope-config-validator.d.ts.map +1 -0
  26. package/dist/components/authenticate/oauth2-handlers/config/scope-config-validator.js +199 -0
  27. package/dist/components/authenticate/oauth2-handlers/config/scope-config-validator.js.map +1 -0
  28. package/dist/components/authenticate/oauth2-handlers/constants/index.d.ts +2 -0
  29. package/dist/components/authenticate/oauth2-handlers/constants/index.d.ts.map +1 -0
  30. package/dist/components/authenticate/oauth2-handlers/constants/index.js +18 -0
  31. package/dist/components/authenticate/oauth2-handlers/constants/index.js.map +1 -0
  32. package/dist/components/authenticate/oauth2-handlers/constants/scope-constants.d.ts +79 -0
  33. package/dist/components/authenticate/oauth2-handlers/constants/scope-constants.d.ts.map +1 -0
  34. package/dist/components/authenticate/oauth2-handlers/constants/scope-constants.js +117 -0
  35. package/dist/components/authenticate/oauth2-handlers/constants/scope-constants.js.map +1 -0
  36. package/dist/components/authenticate/oauth2-handlers/data/index.d.ts +2 -0
  37. package/dist/components/authenticate/oauth2-handlers/data/index.d.ts.map +1 -0
  38. package/dist/components/authenticate/oauth2-handlers/data/index.js +18 -0
  39. package/dist/components/authenticate/oauth2-handlers/data/index.js.map +1 -0
  40. package/dist/components/authenticate/oauth2-handlers/data/user-data-fetcher.d.ts +99 -0
  41. package/dist/components/authenticate/oauth2-handlers/data/user-data-fetcher.d.ts.map +1 -0
  42. package/dist/components/authenticate/oauth2-handlers/data/user-data-fetcher.js +371 -0
  43. package/dist/components/authenticate/oauth2-handlers/data/user-data-fetcher.js.map +1 -0
  44. package/dist/components/authenticate/oauth2-handlers/index.d.ts +4 -0
  45. package/dist/components/authenticate/oauth2-handlers/index.d.ts.map +1 -1
  46. package/dist/components/authenticate/oauth2-handlers/index.js +4 -0
  47. package/dist/components/authenticate/oauth2-handlers/index.js.map +1 -1
  48. package/dist/components/authenticate/oauth2-handlers/scope/index.d.ts +4 -0
  49. package/dist/components/authenticate/oauth2-handlers/scope/index.d.ts.map +1 -0
  50. package/dist/components/authenticate/oauth2-handlers/scope/index.js +20 -0
  51. package/dist/components/authenticate/oauth2-handlers/scope/index.js.map +1 -0
  52. package/dist/components/authenticate/oauth2-handlers/scope/scope-manager.d.ts +64 -0
  53. package/dist/components/authenticate/oauth2-handlers/scope/scope-manager.d.ts.map +1 -0
  54. package/dist/components/authenticate/oauth2-handlers/scope/scope-manager.js +100 -0
  55. package/dist/components/authenticate/oauth2-handlers/scope/scope-manager.js.map +1 -0
  56. package/dist/components/authenticate/oauth2-handlers/scope/scope-parser.d.ts +49 -0
  57. package/dist/components/authenticate/oauth2-handlers/scope/scope-parser.d.ts.map +1 -0
  58. package/dist/components/authenticate/oauth2-handlers/scope/scope-parser.js +89 -0
  59. package/dist/components/authenticate/oauth2-handlers/scope/scope-parser.js.map +1 -0
  60. package/dist/components/authenticate/oauth2-handlers/scope/scope-validator.d.ts +58 -0
  61. package/dist/components/authenticate/oauth2-handlers/scope/scope-validator.d.ts.map +1 -0
  62. package/dist/components/authenticate/oauth2-handlers/scope/scope-validator.js +165 -0
  63. package/dist/components/authenticate/oauth2-handlers/scope/scope-validator.js.map +1 -0
  64. package/dist/components/authenticate/services/index.d.ts +1 -0
  65. package/dist/components/authenticate/services/index.d.ts.map +1 -1
  66. package/dist/components/authenticate/services/index.js +1 -0
  67. package/dist/components/authenticate/services/index.js.map +1 -1
  68. package/dist/components/authenticate/services/oauth2-scope.service.d.ts +22 -0
  69. package/dist/components/authenticate/services/oauth2-scope.service.d.ts.map +1 -0
  70. package/dist/components/authenticate/services/oauth2-scope.service.js +63 -0
  71. package/dist/components/authenticate/services/oauth2-scope.service.js.map +1 -0
  72. package/dist/components/authenticate/services/oauth2.service.d.ts +2 -0
  73. package/dist/components/authenticate/services/oauth2.service.d.ts.map +1 -1
  74. package/dist/components/authenticate/services/oauth2.service.js +8 -3
  75. package/dist/components/authenticate/services/oauth2.service.js.map +1 -1
  76. package/dist/components/authenticate/views/pages/auth.ejs +6 -2
  77. package/package.json +1 -1
@@ -0,0 +1,22 @@
1
+ import { TInjectionGetter } from '../../../common';
2
+ import { IScopeDefinition } from '../common';
3
+ export interface IOAuth2ScopeServiceOptions {
4
+ injectionGetter: TInjectionGetter;
5
+ repositoryKey?: string;
6
+ }
7
+ export declare class OAuth2ScopeService {
8
+ private logger;
9
+ private injectionGetter;
10
+ private repositoryKey;
11
+ private scopeCache;
12
+ private cacheTimestamp;
13
+ private cacheTTL;
14
+ constructor(opts: {
15
+ options: IOAuth2ScopeServiceOptions;
16
+ scope?: string;
17
+ });
18
+ loadScopes(useCache?: boolean): Promise<IScopeDefinition[]>;
19
+ private convertToScopeDefinitions;
20
+ private isCacheValid;
21
+ }
22
+ //# sourceMappingURL=oauth2-scope.service.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"oauth2-scope.service.d.ts","sourceRoot":"","sources":["../../../../src/components/authenticate/services/oauth2-scope.service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,UAAU,CAAC;AAG5C,OAAO,EAAE,gBAAgB,EAAE,MAAM,WAAW,CAAC;AAI7C,MAAM,WAAW,0BAA0B;IACzC,eAAe,EAAE,gBAAgB,CAAC;IAClC,aAAa,CAAC,EAAE,MAAM,CAAC;CACxB;AAED,qBAAa,kBAAkB;IAC7B,OAAO,CAAC,MAAM,CAAoB;IAClC,OAAO,CAAC,eAAe,CAAmB;IAC1C,OAAO,CAAC,aAAa,CAAS;IAC9B,OAAO,CAAC,UAAU,CAAmC;IACrD,OAAO,CAAC,cAAc,CAAa;IACnC,OAAO,CAAC,QAAQ,CAAiB;gBAErB,IAAI,EAAE;QAAE,OAAO,EAAE,0BAA0B,CAAC;QAAC,KAAK,CAAC,EAAE,MAAM,CAAA;KAAE;IASnE,UAAU,CAAC,QAAQ,UAAO,GAAG,OAAO,CAAC,gBAAgB,EAAE,CAAC;IAsC9D,OAAO,CAAC,yBAAyB;IAUjC,OAAO,CAAC,YAAY;CAQrB"}
@@ -0,0 +1,63 @@
1
+ "use strict";
2
+ Object.defineProperty(exports, "__esModule", { value: true });
3
+ exports.OAuth2ScopeService = void 0;
4
+ const helpers_1 = require("../../../helpers");
5
+ const utilities_1 = require("../../../utilities");
6
+ class OAuth2ScopeService {
7
+ constructor(opts) {
8
+ this.scopeCache = null;
9
+ this.cacheTimestamp = 0;
10
+ this.cacheTTL = 60000; // 1 minute cache TTL
11
+ const { options, scope } = opts;
12
+ this.logger = helpers_1.LoggerFactory.getLogger([scope ?? OAuth2ScopeService.name]);
13
+ this.injectionGetter = options.injectionGetter;
14
+ this.repositoryKey = options.repositoryKey ?? 'repositories.OAuth2ScopeRepository';
15
+ this.logger.info('[constructor] Initialized | Repository: %s', this.repositoryKey);
16
+ }
17
+ async loadScopes(useCache = true) {
18
+ if (useCache && this.isCacheValid()) {
19
+ this.logger.debug('[loadScopes] Returning cached scopes | count: %d', this.scopeCache.length);
20
+ return this.scopeCache;
21
+ }
22
+ try {
23
+ this.logger.info('[loadScopes] Loading scopes from database');
24
+ const repository = this.injectionGetter(this.repositoryKey);
25
+ this.logger.info('[loadScopes] Repository injected: %s', this.repositoryKey);
26
+ const scopes = await repository.find({
27
+ where: { isActive: true },
28
+ order: ['identifier ASC'],
29
+ });
30
+ this.logger.info('[loadScopes] Loaded scopes from database | count: %d', scopes.length);
31
+ const scopeDefinitions = this.convertToScopeDefinitions(scopes);
32
+ this.scopeCache = scopeDefinitions;
33
+ this.cacheTimestamp = Date.now();
34
+ return scopeDefinitions;
35
+ }
36
+ catch (error) {
37
+ this.logger.error('[loadScopes] Error loading scopes: %s', (0, utilities_1.getError)(error).message);
38
+ if (this.scopeCache) {
39
+ this.logger.warn('[loadScopes] Returning stale cached scopes due to error');
40
+ return this.scopeCache;
41
+ }
42
+ return [];
43
+ }
44
+ }
45
+ convertToScopeDefinitions(scopes) {
46
+ return scopes.map(scope => ({
47
+ identifier: scope.identifier,
48
+ name: scope.name,
49
+ description: scope.description,
50
+ fields: scope?.fields,
51
+ relations: scope?.relations,
52
+ }));
53
+ }
54
+ isCacheValid() {
55
+ if (!this.scopeCache) {
56
+ return false;
57
+ }
58
+ const age = Date.now() - this.cacheTimestamp;
59
+ return age < this.cacheTTL;
60
+ }
61
+ }
62
+ exports.OAuth2ScopeService = OAuth2ScopeService;
63
+ //# sourceMappingURL=oauth2-scope.service.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"oauth2-scope.service.js","sourceRoot":"","sources":["../../../../src/components/authenticate/services/oauth2-scope.service.ts"],"names":[],"mappings":"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"}
@@ -27,6 +27,7 @@ export declare class OAuth2Service extends BaseService {
27
27
  clientId: string;
28
28
  clientSecret: string;
29
29
  redirectUrl: string;
30
+ scope?: string;
30
31
  }): Promise<{
31
32
  requestPath: string;
32
33
  }>;
@@ -43,6 +44,7 @@ export declare class OAuth2Service extends BaseService {
43
44
  authServiceKey: string;
44
45
  signInRequest: SignInRequest;
45
46
  redirectUrl?: string;
47
+ scopes?: string[];
46
48
  }): Promise<{
47
49
  redirectUrl: string;
48
50
  oauth2TokenRs: Token;
@@ -1 +1 @@
1
- {"version":3,"file":"oauth2.service.d.ts","sourceRoot":"","sources":["../../../../src/components/authenticate/services/oauth2.service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AAEtD,OAAO,EAA+B,mBAAmB,EAAE,MAAM,WAAW,CAAC;AAG7E,OAAO,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAC;AAChD,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,KAAK,EAAE,MAAM,2BAA2B,CAAC;AAErE,OAAO,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;AAC9C,OAAO,EAAkC,aAAa,EAAE,MAAM,WAAW,CAAC;AAC1E,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AACnD,OAAO,EAAE,sBAAsB,EAAE,MAAM,iBAAiB,CAAC;AAEzD,qBAAa,aAAc,SAAQ,WAAW;IAM1C,OAAO,CAAC,WAAW;IACsB,OAAO,CAAC,OAAO;IAExD,OAAO,CAAC,sBAAsB;IARhC,OAAO,CAAC,GAAG,CAAoC;IAC/C,SAAS,CAAC,cAAc,EAAE,mBAAmB,CAAC;gBAIpC,WAAW,EAAE,eAAe,EACa,OAAO,EAAE,aAAa,EAE/D,sBAAsB,EAAE,sBAAsB;IAWxD,kBAAkB,CAAC,IAAI,EAAE;QAAE,QAAQ,EAAE,MAAM,CAAC;QAAC,YAAY,EAAE,MAAM,CAAA;KAAE;IASnE,kBAAkB,CAAC,IAAI,EAAE;QAAE,KAAK,EAAE,MAAM,CAAA;KAAE;;;;IAmB1C,oBAAoB,CAAC,IAAI,EAAE;QACzB,QAAQ,EAAE,MAAM,CAAC;QACjB,YAAY,EAAE,MAAM,CAAC;QACrB,WAAW,EAAE,MAAM,CAAC;KACrB,GAAG,OAAO,CAAC;QAAE,WAAW,EAAE,MAAM,CAAA;KAAE,CAAC;IAoDpC,aAAa,CAAC,IAAI,EAAE;QAAE,OAAO,EAAE,OAAO,CAAC;QAAC,QAAQ,EAAE,QAAQ,CAAA;KAAE;IAc5D,SAAS,CAAC,IAAI,EAAE;QAAE,OAAO,EAAE,OAAO,CAAC;QAAC,QAAQ,EAAE,QAAQ,CAAA;KAAE;IAclD,QAAQ,CAAC,IAAI,EAAE;QACnB,OAAO,EAAE,IAAI,CAAC,cAAc,EAAE,SAAS,GAAG,UAAU,CAAC,CAAC;QACtD,cAAc,EAAE,MAAM,CAAC;QACvB,aAAa,EAAE,aAAa,CAAC;QAC7B,WAAW,CAAC,EAAE,MAAM,CAAC;KACtB;;;;IA0DK,gBAAgB,CAAC,IAAI,EAAE;QAC3B,WAAW,EAAE,MAAM,CAAC;QACpB,WAAW,EAAE,KAAK,CAAC;QACnB,gBAAgB,EAAE,OAAO,CAAC;KAC3B;CAyDF"}
1
+ {"version":3,"file":"oauth2.service.d.ts","sourceRoot":"","sources":["../../../../src/components/authenticate/services/oauth2.service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AAEtD,OAAO,EAA+B,mBAAmB,EAAE,MAAM,WAAW,CAAC;AAG7E,OAAO,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAC;AAChD,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,KAAK,EAAE,MAAM,2BAA2B,CAAC;AAErE,OAAO,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;AAC9C,OAAO,EAAkC,aAAa,EAAE,MAAM,WAAW,CAAC;AAC1E,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AACnD,OAAO,EAAE,sBAAsB,EAAE,MAAM,iBAAiB,CAAC;AAEzD,qBAAa,aAAc,SAAQ,WAAW;IAM1C,OAAO,CAAC,WAAW;IACsB,OAAO,CAAC,OAAO;IAExD,OAAO,CAAC,sBAAsB;IARhC,OAAO,CAAC,GAAG,CAAoC;IAC/C,SAAS,CAAC,cAAc,EAAE,mBAAmB,CAAC;gBAIpC,WAAW,EAAE,eAAe,EACa,OAAO,EAAE,aAAa,EAE/D,sBAAsB,EAAE,sBAAsB;IAWxD,kBAAkB,CAAC,IAAI,EAAE;QAAE,QAAQ,EAAE,MAAM,CAAC;QAAC,YAAY,EAAE,MAAM,CAAA;KAAE;IASnE,kBAAkB,CAAC,IAAI,EAAE;QAAE,KAAK,EAAE,MAAM,CAAA;KAAE;;;;IAmB1C,oBAAoB,CAAC,IAAI,EAAE;QACzB,QAAQ,EAAE,MAAM,CAAC;QACjB,YAAY,EAAE,MAAM,CAAC;QACrB,WAAW,EAAE,MAAM,CAAC;QACpB,KAAK,CAAC,EAAE,MAAM,CAAC;KAChB,GAAG,OAAO,CAAC;QAAE,WAAW,EAAE,MAAM,CAAA;KAAE,CAAC;IAyDpC,aAAa,CAAC,IAAI,EAAE;QAAE,OAAO,EAAE,OAAO,CAAC;QAAC,QAAQ,EAAE,QAAQ,CAAA;KAAE;IAc5D,SAAS,CAAC,IAAI,EAAE;QAAE,OAAO,EAAE,OAAO,CAAC;QAAC,QAAQ,EAAE,QAAQ,CAAA;KAAE;IAclD,QAAQ,CAAC,IAAI,EAAE;QACnB,OAAO,EAAE,IAAI,CAAC,cAAc,EAAE,SAAS,GAAG,UAAU,CAAC,CAAC;QACtD,cAAc,EAAE,MAAM,CAAC;QACvB,aAAa,EAAE,aAAa,CAAC;QAC7B,WAAW,CAAC,EAAE,MAAM,CAAC;QACrB,MAAM,CAAC,EAAE,MAAM,EAAE,CAAC;KACnB;;;;IA0DK,gBAAgB,CAAC,IAAI,EAAE;QAC3B,WAAW,EAAE,MAAM,CAAC;QACpB,WAAW,EAAE,KAAK,CAAC;QACnB,gBAAgB,EAAE,OAAO,CAAC;KAC3B;CAyDF"}
@@ -57,7 +57,8 @@ let OAuth2Service = OAuth2Service_1 = class OAuth2Service extends services_1.Bas
57
57
  }
58
58
  // --------------------------------------------------------------------------------
59
59
  getOAuth2RequestPath(opts) {
60
- const { clientId, clientSecret, redirectUrl } = opts;
60
+ const { clientId, clientSecret, redirectUrl, scope } = opts;
61
+ this.logger.debug('[OAuth2 Scopes] Generating request path with scopes: %s', scope);
61
62
  return new Promise((resolve, reject) => {
62
63
  this.oauth2ClientRepository
63
64
  .findOne({ where: { ...opts }, fields: ['id', 'endpoints'] })
@@ -85,6 +86,9 @@ let OAuth2Service = OAuth2Service_1 = class OAuth2Service extends services_1.Bas
85
86
  if (redirectUrl) {
86
87
  urlParam.set('r', encodeURIComponent(redirectUrl));
87
88
  }
89
+ if (scope) {
90
+ urlParam.set('scope', encodeURIComponent(scope));
91
+ }
88
92
  resolve({
89
93
  requestPath: `${basePath}/oauth2/auth?${urlParam.toString()}`,
90
94
  });
@@ -114,19 +118,20 @@ let OAuth2Service = OAuth2Service_1 = class OAuth2Service extends services_1.Bas
114
118
  }
115
119
  // --------------------------------------------------------------------------------
116
120
  async doOAuth2(opts) {
117
- const { context, authServiceKey, signInRequest, redirectUrl } = opts;
121
+ const { context, authServiceKey, signInRequest, redirectUrl, scopes } = opts;
118
122
  const authService = this.application.getSync(authServiceKey);
119
123
  const signInRs = await authService.signIn(signInRequest);
120
124
  const tokenValue = signInRs?.token?.value;
121
125
  if (!tokenValue) {
122
126
  throw (0, utilities_1.getError)({ message: `[auth] Failed to get token value!` });
123
127
  }
128
+ this.logger.debug('[doOAuth2] SignIn successful | Scopes: %s', scopes?.join(' '));
124
129
  const authorizationCodeRequest = new oauth2_server_1.Request(context.request);
125
130
  authorizationCodeRequest.body = {
126
131
  client_id: signInRequest.clientId, // eslint-disable-line @typescript-eslint/naming-convention
127
132
  response_type: 'code', // eslint-disable-line @typescript-eslint/naming-convention
128
133
  grant_type: 'authorization_code', // eslint-disable-line @typescript-eslint/naming-convention
129
- scope: 'profile',
134
+ scope: scopes && scopes.length > 0 ? scopes.join(' ') : '',
130
135
  access_token: tokenValue, // eslint-disable-line @typescript-eslint/naming-convention
131
136
  redirect_uri: redirectUrl, // eslint-disable-line @typescript-eslint/naming-convention
132
137
  };
@@ -1 +1 @@
1
- {"version":3,"file":"oauth2.service.js","sourceRoot":"","sources":["../../../../src/components/authenticate/services/oauth2.service.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"oauth2.service.js","sourceRoot":"","sources":["../../../../src/components/authenticate/services/oauth2.service.ts"],"names":[],"mappings":"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"}
@@ -23,7 +23,7 @@
23
23
  <br />
24
24
 
25
25
  <% if (payload.c) { %>
26
- <form method="post" action=<%- payload.action %>>
26
+ <form id="authForm" method="post" action=<%- payload.action %>>
27
27
  <p>
28
28
  <label for="username">Username:</label>
29
29
  <input type="text" name="username" />
@@ -37,8 +37,12 @@
37
37
  <input type="hidden" name="token" value=<%- payload.c %>>
38
38
  <input type="hidden" name="redirectUrl" value=<%- payload.r %>>
39
39
 
40
+ <% if (payload.scope) { %>
41
+ <input type="hidden" name="scope" value="<%- payload.scope %>">
42
+ <% } %>
43
+
40
44
  <p>
41
- <input type="submit" value="Login">
45
+ <input type="submit" id="submitBtn" value="Login">
42
46
  </p>
43
47
  </form>
44
48
  <% } %>
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@minimaltech/node-infra",
3
- "version": "0.5.10-21",
3
+ "version": "0.5.10-22",
4
4
  "description": "Minimal Technology - NodeJS Infrastructure - Loopback 4 Framework",
5
5
  "keywords": [
6
6
  "web",