@qelos/plugin-play 3.11.8 → 3.11.9

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 (9) hide show
  1. package/dist/config.d.ts +1 -0
  2. package/dist/config.js +1 -0
  3. package/dist/config.js.map +1 -1
  4. package/dist/sdk.d.ts +3 -2
  5. package/dist/sdk.js +21 -8
  6. package/dist/sdk.js.map +1 -1
  7. package/package.json +6 -6
  8. package/src/config.ts +1 -0
  9. package/src/sdk.ts +21 -7
package/dist/config.d.ts CHANGED
@@ -12,6 +12,7 @@ declare const config: {
12
12
  qelosUrl: string;
13
13
  qelosUsername: string;
14
14
  qelosPassword: string;
15
+ qelosApiToken: string;
15
16
  redisUrl: string;
16
17
  staticFrontend: {
17
18
  root: string;
package/dist/config.js CHANGED
@@ -14,6 +14,7 @@ const config = {
14
14
  qelosUrl: process.env.QELOS_URL,
15
15
  qelosUsername: process.env.QELOS_USERNAME,
16
16
  qelosPassword: process.env.QELOS_PASSWORD,
17
+ qelosApiToken: process.env.QELOS_API_TOKEN,
17
18
  redisUrl: process.env.REDIS_URL || (process.env.REDIS_HOST ? `${process.env.REDIS_HOST}:${process.env.REDIS_PORT}` : undefined),
18
19
  staticFrontend: {
19
20
  root: join(process.cwd(), process.env.STATIC_ROOT || 'public'),
package/dist/config.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"config.js","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,MAAM,CAAC;AAG5B,MAAM,IAAI,GAAG,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,IAAI,IAAI,CAAC,CAAC;AAC9C,MAAM,IAAI,GAAG,OAAO,CAAC,GAAG,CAAC,IAAI,IAAI,SAAS,CAAC;AAC3C,MAAM,MAAM,GAAG;IACb,IAAI,EAAE,IAAI;IACV,YAAY,EAAE,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,aAAa,IAAI,IAAI,GAAG,CAAC,CAAC;IAC3D,IAAI,EAAE,IAAI;IACV,YAAY,EAAE,OAAO,CAAC,GAAG,CAAC,aAAa,IAAI,IAAI;IAC/C,GAAG,EAAE,OAAO,CAAC,GAAG,CAAC,QAAQ,KAAK,YAAY;IAC1C,cAAc,EAAE,OAAO,CAAC,GAAG,CAAC,eAAe,EAAE,KAAK,CAAC,GAAG,CAAC,IAAI,EAAE;IAC7D,kBAAkB,EAAE,OAAO,CAAC,GAAG,CAAC,oBAAoB;IACpD,iBAAiB,EAAE,OAAO,CAAC,GAAG,CAAC,mBAAmB;IAClD,iBAAiB,EAAE,OAAO,CAAC,GAAG,CAAC,mBAAmB;IAClD,QAAQ,EAAE,OAAO,CAAC,GAAG,CAAC,SAAS;IAC/B,aAAa,EAAE,OAAO,CAAC,GAAG,CAAC,cAAc;IACzC,aAAa,EAAE,OAAO,CAAC,GAAG,CAAC,cAAc;IACzC,QAAQ,EAAE,OAAO,CAAC,GAAG,CAAC,SAAS,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,GAAG,CAAC,UAAU,IAAI,OAAO,CAAC,GAAG,CAAC,UAAU,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC;IAC/H,cAAc,EAAE;QACd,IAAI,EAAE,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,OAAO,CAAC,GAAG,CAAC,WAAW,IAAI,QAAQ,CAAC;QAC9D,MAAM,EAAE,OAAO,CAAC,GAAG,CAAC,aAAa,IAAI,GAAG;KACzC;IACD,UAAU,EAAE,EAA8B;CAC3C,CAAC;AAIF,MAAM,UAAU,SAAS,CAAC,SAAwB;IAChD,MAAM,CAAC,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC;AACnC,CAAC;AAED,eAAe,MAAM,CAAC"}
1
+ {"version":3,"file":"config.js","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,MAAM,CAAC;AAG5B,MAAM,IAAI,GAAG,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,IAAI,IAAI,CAAC,CAAC;AAC9C,MAAM,IAAI,GAAG,OAAO,CAAC,GAAG,CAAC,IAAI,IAAI,SAAS,CAAC;AAC3C,MAAM,MAAM,GAAG;IACb,IAAI,EAAE,IAAI;IACV,YAAY,EAAE,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,aAAa,IAAI,IAAI,GAAG,CAAC,CAAC;IAC3D,IAAI,EAAE,IAAI;IACV,YAAY,EAAE,OAAO,CAAC,GAAG,CAAC,aAAa,IAAI,IAAI;IAC/C,GAAG,EAAE,OAAO,CAAC,GAAG,CAAC,QAAQ,KAAK,YAAY;IAC1C,cAAc,EAAE,OAAO,CAAC,GAAG,CAAC,eAAe,EAAE,KAAK,CAAC,GAAG,CAAC,IAAI,EAAE;IAC7D,kBAAkB,EAAE,OAAO,CAAC,GAAG,CAAC,oBAAoB;IACpD,iBAAiB,EAAE,OAAO,CAAC,GAAG,CAAC,mBAAmB;IAClD,iBAAiB,EAAE,OAAO,CAAC,GAAG,CAAC,mBAAmB;IAClD,QAAQ,EAAE,OAAO,CAAC,GAAG,CAAC,SAAS;IAC/B,aAAa,EAAE,OAAO,CAAC,GAAG,CAAC,cAAc;IACzC,aAAa,EAAE,OAAO,CAAC,GAAG,CAAC,cAAc;IACzC,aAAa,EAAE,OAAO,CAAC,GAAG,CAAC,eAAe;IAC1C,QAAQ,EAAE,OAAO,CAAC,GAAG,CAAC,SAAS,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,GAAG,CAAC,UAAU,IAAI,OAAO,CAAC,GAAG,CAAC,UAAU,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC;IAC/H,cAAc,EAAE;QACd,IAAI,EAAE,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,OAAO,CAAC,GAAG,CAAC,WAAW,IAAI,QAAQ,CAAC;QAC9D,MAAM,EAAE,OAAO,CAAC,GAAG,CAAC,aAAa,IAAI,GAAG;KACzC;IACD,UAAU,EAAE,EAA8B;CAC3C,CAAC;AAIF,MAAM,UAAU,SAAS,CAAC,SAAwB;IAChD,MAAM,CAAC,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC;AACnC,CAAC;AAED,eAAe,MAAM,CAAC"}
package/dist/sdk.d.ts CHANGED
@@ -1,6 +1,6 @@
1
1
  import QelosAdministratorSDK from '@qelos/sdk/administrator';
2
2
  import { StandardPayload } from './handlers';
3
- export declare function authenticate(): Promise<{
3
+ export declare function authenticate(): Promise<import("@qelos/sdk/authentication").IUser> | Promise<{
4
4
  payload: import("@qelos/sdk/authentication").BasicPayload & {
5
5
  token: string;
6
6
  refreshToken: string;
@@ -10,6 +10,7 @@ export interface GetSdkForUrlOptions {
10
10
  appUrl: string;
11
11
  refreshToken?: string;
12
12
  accessToken?: string;
13
+ apiToken?: string;
13
14
  username?: string;
14
15
  password?: string;
15
16
  onRefresh?: ({ refreshToken, token }: {
@@ -17,7 +18,7 @@ export interface GetSdkForUrlOptions {
17
18
  token: string;
18
19
  }) => void;
19
20
  }
20
- export declare function getSdkForUrl<T = any>({ appUrl, refreshToken, accessToken, username, password, onRefresh }: GetSdkForUrlOptions): QelosAdministratorSDK;
21
+ export declare function getSdkForUrl<T = any>({ appUrl, refreshToken, accessToken, apiToken, username, password, onRefresh }: GetSdkForUrlOptions): QelosAdministratorSDK;
21
22
  export declare function getSdk(): QelosAdministratorSDK;
22
23
  export declare function getSdkForTenant(tenantPayload: StandardPayload): Promise<QelosAdministratorSDK | null>;
23
24
  export declare function getEncryptedDataForTenant(tenantPayload: StandardPayload, encryptedId?: string): Promise<any>;
package/dist/sdk.js CHANGED
@@ -4,6 +4,9 @@ import config from './config';
4
4
  import logger from './logger';
5
5
  let localSdk;
6
6
  export function authenticate() {
7
+ if (config.qelosApiToken) {
8
+ return localSdk.authentication.apiTokenSignin(config.qelosApiToken);
9
+ }
7
10
  return localSdk.authentication.oAuthSignin({
8
11
  username: config.qelosUsername,
9
12
  password: config.qelosPassword,
@@ -11,11 +14,17 @@ export function authenticate() {
11
14
  }
12
15
  async function bootstrapAuthenticate() {
13
16
  try {
14
- await localSdk.authentication.oAuthSignin({
15
- username: config.qelosUsername,
16
- password: config.qelosPassword,
17
- });
18
- console.log('authenticated successfully to ' + config.qelosUrl);
17
+ if (config.qelosApiToken) {
18
+ await localSdk.authentication.apiTokenSignin(config.qelosApiToken);
19
+ console.log('authenticated via API token to ' + config.qelosUrl);
20
+ }
21
+ else {
22
+ await localSdk.authentication.oAuthSignin({
23
+ username: config.qelosUsername,
24
+ password: config.qelosPassword,
25
+ });
26
+ console.log('authenticated successfully to ' + config.qelosUrl);
27
+ }
19
28
  }
20
29
  catch (err) {
21
30
  console.log('could not authenticate to own qelos app');
@@ -23,13 +32,13 @@ async function bootstrapAuthenticate() {
23
32
  process.exit(1);
24
33
  }
25
34
  }
26
- export function getSdkForUrl({ appUrl, refreshToken, accessToken, username, password, onRefresh }) {
35
+ export function getSdkForUrl({ appUrl, refreshToken, accessToken, apiToken, username, password, onRefresh }) {
27
36
  let sdk;
28
37
  const options = {
29
38
  appUrl,
30
- forceRefresh: true,
39
+ forceRefresh: !apiToken,
31
40
  fetch: globalThis.fetch || undiciFetch,
32
- onFailedRefreshToken: async () => {
41
+ onFailedRefreshToken: apiToken ? undefined : async () => {
33
42
  const res = await sdk.authentication.oAuthSignin({ username, password });
34
43
  if (onRefresh) {
35
44
  onRefresh(res.payload);
@@ -37,6 +46,9 @@ export function getSdkForUrl({ appUrl, refreshToken, accessToken, username, pass
37
46
  },
38
47
  ...(config.sdkOptions || {}),
39
48
  };
49
+ if (apiToken) {
50
+ options.apiToken = apiToken;
51
+ }
40
52
  if (refreshToken) {
41
53
  options.refreshToken = refreshToken;
42
54
  }
@@ -52,6 +64,7 @@ export function getSdk() {
52
64
  }
53
65
  localSdk = getSdkForUrl({
54
66
  appUrl: config.qelosUrl,
67
+ apiToken: config.qelosApiToken,
55
68
  refreshToken: null,
56
69
  accessToken: null,
57
70
  username: config.qelosUsername,
package/dist/sdk.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"sdk.js","sourceRoot":"","sources":["../src/sdk.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"sdk.js","sourceRoot":"","sources":["../src/sdk.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@qelos/plugin-play",
3
- "version": "3.11.8",
3
+ "version": "3.11.9",
4
4
  "description": "Play a plugin for Qelos!",
5
5
  "main": "./dist/index.js",
6
6
  "author": "David Meir-Levy <davidmeirlevy@gmail.com>",
@@ -11,13 +11,13 @@
11
11
  "dependencies": {
12
12
  "@fastify/cookie": "^8.3.0",
13
13
  "@fastify/static": "^6.12.0",
14
- "@qelos/cache-manager": "^3.11.5",
15
- "@qelos/global-types": "^3.11.5",
16
- "@qelos/sdk": "^3.11.5",
17
- "@qelos/web-sdk": "^3.11.5",
18
14
  "fastify": "~4.15.0",
19
15
  "jsonwebtoken": "^9.0.2",
20
- "undici": "^6.20.1"
16
+ "undici": "^6.20.1",
17
+ "@qelos/cache-manager": "3.11.7",
18
+ "@qelos/global-types": "3.11.7",
19
+ "@qelos/web-sdk": "3.11.7",
20
+ "@qelos/sdk": "3.11.7"
21
21
  },
22
22
  "devDependencies": {
23
23
  "tsx": "^4.7.0",
package/src/config.ts CHANGED
@@ -16,6 +16,7 @@ const config = {
16
16
  qelosUrl: process.env.QELOS_URL,
17
17
  qelosUsername: process.env.QELOS_USERNAME,
18
18
  qelosPassword: process.env.QELOS_PASSWORD,
19
+ qelosApiToken: process.env.QELOS_API_TOKEN,
19
20
  redisUrl: process.env.REDIS_URL || (process.env.REDIS_HOST ? `${process.env.REDIS_HOST}:${process.env.REDIS_PORT}` : undefined),
20
21
  staticFrontend: {
21
22
  root: join(process.cwd(), process.env.STATIC_ROOT || 'public'),
package/src/sdk.ts CHANGED
@@ -8,6 +8,9 @@ import logger from './logger';
8
8
  let localSdk: QelosAdministratorSDK<{ tokenIdentifier: string }>;
9
9
 
10
10
  export function authenticate() {
11
+ if (config.qelosApiToken) {
12
+ return localSdk.authentication.apiTokenSignin(config.qelosApiToken);
13
+ }
11
14
  return localSdk.authentication.oAuthSignin({
12
15
  username: config.qelosUsername,
13
16
  password: config.qelosPassword,
@@ -16,11 +19,16 @@ export function authenticate() {
16
19
 
17
20
  async function bootstrapAuthenticate() {
18
21
  try {
19
- await localSdk.authentication.oAuthSignin({
20
- username: config.qelosUsername,
21
- password: config.qelosPassword,
22
- });
23
- console.log('authenticated successfully to ' + config.qelosUrl);
22
+ if (config.qelosApiToken) {
23
+ await localSdk.authentication.apiTokenSignin(config.qelosApiToken);
24
+ console.log('authenticated via API token to ' + config.qelosUrl);
25
+ } else {
26
+ await localSdk.authentication.oAuthSignin({
27
+ username: config.qelosUsername,
28
+ password: config.qelosPassword,
29
+ });
30
+ console.log('authenticated successfully to ' + config.qelosUrl);
31
+ }
24
32
  } catch (err) {
25
33
  console.log('could not authenticate to own qelos app');
26
34
  logger.error('connect to qelos error: ', err);
@@ -32,6 +40,7 @@ export interface GetSdkForUrlOptions {
32
40
  appUrl: string;
33
41
  refreshToken?: string;
34
42
  accessToken?: string;
43
+ apiToken?: string;
35
44
  username?: string;
36
45
  password?: string;
37
46
  onRefresh?: ({ refreshToken, token }: { refreshToken: string, token: string }) => void
@@ -41,6 +50,7 @@ export function getSdkForUrl<T = any>({
41
50
  appUrl,
42
51
  refreshToken,
43
52
  accessToken,
53
+ apiToken,
44
54
  username,
45
55
  password,
46
56
  onRefresh
@@ -48,9 +58,9 @@ export function getSdkForUrl<T = any>({
48
58
  let sdk: QelosAdministratorSDK;
49
59
  const options: QelosSDKOptions = {
50
60
  appUrl,
51
- forceRefresh: true,
61
+ forceRefresh: !apiToken,
52
62
  fetch: globalThis.fetch || (undiciFetch as any as FetchLike),
53
- onFailedRefreshToken: async () => {
63
+ onFailedRefreshToken: apiToken ? undefined : async () => {
54
64
  const res = await sdk.authentication.oAuthSignin({ username, password });
55
65
  if (onRefresh) {
56
66
  onRefresh(res.payload)
@@ -58,6 +68,9 @@ export function getSdkForUrl<T = any>({
58
68
  },
59
69
  ...(config.sdkOptions || {}),
60
70
  };
71
+ if (apiToken) {
72
+ options.apiToken = apiToken;
73
+ }
61
74
  if (refreshToken) {
62
75
  options.refreshToken = refreshToken;
63
76
  }
@@ -74,6 +87,7 @@ export function getSdk(): QelosAdministratorSDK {
74
87
  }
75
88
  localSdk = getSdkForUrl<{ tokenIdentifier: string }>({
76
89
  appUrl: config.qelosUrl,
90
+ apiToken: config.qelosApiToken,
77
91
  refreshToken: null,
78
92
  accessToken: null,
79
93
  username: config.qelosUsername,