@qelos/plugin-play 3.8.0 → 3.8.1

package/dist/endpoints.d.ts

@@ -4,7 +4,7 @@ export interface QelosRouteParams extends RouteOptions {
     verifyToken: boolean;
 }
 export declare const endpoints: Map<string, QelosRouteParams>;
-export declare const internalEndpoints: Map<string, RouteOptions<import("fastify").RawServerDefault, import("http").IncomingMessage, import("http").ServerResponse<import("http").IncomingMessage>, import("fastify/types/route").RouteGenericInterface, unknown, import("fastify").FastifySchema, import("fastify").FastifyTypeProviderDefault, import("fastify").FastifyLoggerInstance>>;
+export declare const internalEndpoints: Map<string, RouteOptions<import("fastify").RawServerDefault, import("http").IncomingMessage, import("http").ServerResponse<import("http").IncomingMessage>, import("fastify/types/route").RouteGenericInterface, unknown, import("fastify").FastifySchema, import("fastify").FastifyTypeProviderDefault, import("fastify").FastifyBaseLogger>>;
 export declare function addProxyEndpoint(path: string, options: Partial<QelosRouteParams>): void;
 export declare function addEndpoint(path: string, options: Partial<QelosRouteParams>): void;
 export declare function addInternalEndpoint(path: string, options: Partial<RouteOptions>): void;

package/dist/sdk.d.ts

@@ -6,7 +6,17 @@ export declare function authenticate(): Promise<{
         refreshToken: string;
     };
 }>;
-export declare function getSdkForUrl<T = any>(appUrl: string, refreshToken?: string, accessToken?: string, username?: string, password?: string): QelosAdministratorSDK;
+export declare function getSdkForUrl<T = any>({ appUrl, refreshToken, accessToken, username, password, onRefresh }: {
+    appUrl: string;
+    refreshToken?: string;
+    accessToken?: string;
+    username?: string;
+    password?: string;
+    onRefresh?: ({ refreshToken, token }: {
+        refreshToken: string;
+        token: string;
+    }) => void;
+}): QelosAdministratorSDK;
 export declare function getSdk(): QelosAdministratorSDK;
 export declare function getSdkForTenant(tenantPayload: StandardPayload): Promise<QelosAdministratorSDK | null>;
 export declare function getEncryptedDataForTenant(tenantPayload: StandardPayload, encryptedId?: string): Promise<any>;

package/dist/sdk.js

@@ -4,11 +4,17 @@ import config from './config';
 import logger from './logger';
 let localSdk;
 export function authenticate() {
-    return localSdk.authentication.oAuthSignin({ username: config.qelosUsername, password: config.qelosPassword });
+    return localSdk.authentication.oAuthSignin({
+        username: config.qelosUsername,
+        password: config.qelosPassword,
+    });
 }
 async function bootstrapAuthenticate() {
     try {
-        await localSdk.authentication.oAuthSignin({ username: config.qelosUsername, password: config.qelosPassword });
+        await localSdk.authentication.oAuthSignin({
+            username: config.qelosUsername,
+            password: config.qelosPassword,
+        });
         console.log('authenticated successfully to ' + config.qelosUrl);
     }
     catch (err) {
@@ -17,17 +23,19 @@ async function bootstrapAuthenticate() {
         process.exit(1);
     }
 }
-export function getSdkForUrl(appUrl, refreshToken, accessToken, username, password) {
+export function getSdkForUrl({ appUrl, refreshToken, accessToken, username, password, onRefresh }) {
     let sdk;
     const options = {
         appUrl,
         forceRefresh: true,
         fetch: globalThis.fetch || undiciFetch,
-        ...(config.sdkOptions || {}),
         onFailedRefreshToken: async () => {
-            await sdk.authentication.oAuthSignin({ username, password });
-            // throw new Error('could not able to refresh token');
-        }
+            const res = await sdk.authentication.oAuthSignin({ username, password });
+            if (onRefresh) {
+                onRefresh(res.payload);
+            }
+        },
+        ...(config.sdkOptions || {}),
     };
     if (refreshToken) {
         options.refreshToken = refreshToken;
@@ -42,7 +50,13 @@ export function getSdk() {
     if (localSdk) {
         return localSdk;
     }
-    localSdk = getSdkForUrl(config.qelosUrl, null, null, config.qelosUsername, config.qelosPassword);
+    localSdk = getSdkForUrl({
+        appUrl: config.qelosUrl,
+        refreshToken: null,
+        accessToken: null,
+        username: config.qelosUsername,
+        password: config.qelosPassword,
+    });
     bootstrapAuthenticate().catch();
     return localSdk;
 }
@@ -52,7 +66,17 @@ export async function getSdkForTenant(tenantPayload) {
         if (!data.appUrl) {
             return null;
         }
-        const sdk = getSdkForUrl(data.appUrl, data.currentAuthPayload?.refreshToken, data.currentAuthPayload?.token, data.username, data.password);
+        const sdk = getSdkForUrl({
+            appUrl: data.appUrl,
+            refreshToken: data.currentAuthPayload?.refreshToken,
+            accessToken: data.currentAuthPayload?.token,
+            username: data.username,
+            password: data.password,
+            onRefresh: (payload) => {
+                data.currentAuthPayload = payload;
+                setEncryptedDataForTenant(tenantPayload, config.userPayloadSecret, data);
+            }
+        });
         return sdk;
     }
     catch (e) {

package/dist/sdk.js.map

@@ -1 +1 @@
-{"version":3,"file":"sdk.js","sourceRoot":"","sources":["../src/sdk.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"sdk.js","sourceRoot":"","sources":["../src/sdk.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@qelos/plugin-play",
-  "version": "3.8.0",
+  "version": "3.8.1",
   "description": "Play a plugin for Qelos!",
   "main": "./dist/index.js",
   "scripts": {
@@ -15,15 +15,15 @@
   "dependencies": {
     "@fastify/cookie": "^8.3.0",
     "@fastify/static": "^6.12.0",
-    "@qelos/cache-manager": "^3.8.0",
-    "@qelos/sdk": "^3.8.0",
-    "@qelos/web-sdk": "^3.8.0",
-    "fastify": "~4.3.0",
+    "@qelos/cache-manager": "^3.8.1",
+    "@qelos/sdk": "^3.8.1",
+    "@qelos/web-sdk": "^3.8.1",
+    "fastify": "~4.15.0",
     "jsonwebtoken": "^9.0.2",
     "undici": "^6.20.1"
   },
   "devDependencies": {
     "typescript": "^4.9.5"
   },
-  "gitHead": "cb6281585059df8baa9b2ce388fb00577b2cf99b"
+  "gitHead": "870f8846e1cdcc13af9327c6e70844a33a9f9cba"
 }

package/src/sdk.ts

@@ -8,13 +8,19 @@ import logger from './logger';
 let localSdk: QelosAdministratorSDK<{ tokenIdentifier: string }>;
 
 export function authenticate() {
-  return localSdk.authentication.oAuthSignin({ username: config.qelosUsername, password: config.qelosPassword });
+  return localSdk.authentication.oAuthSignin({
+    username: config.qelosUsername,
+    password: config.qelosPassword,
+  });
 }
 
 async function bootstrapAuthenticate() {
   try {
-    await localSdk.authentication.oAuthSignin({ username: config.qelosUsername, password: config.qelosPassword });
-    console.log('authenticated successfully to ' + config.qelosUrl)
+    await localSdk.authentication.oAuthSignin({
+      username: config.qelosUsername,
+      password: config.qelosPassword,
+    });
+    console.log('authenticated successfully to ' + config.qelosUrl);
   } catch (err) {
     console.log('could not authenticate to own qelos app');
     logger.error('connect to qelos error: ', err);
@@ -22,17 +28,33 @@ async function bootstrapAuthenticate() {
   }
 }
 
-export function getSdkForUrl<T = any>(appUrl: string, refreshToken?: string, accessToken?: string, username?: string, password?: string): QelosAdministratorSDK {
+export function getSdkForUrl<T = any>({
+  appUrl,
+  refreshToken,
+  accessToken,
+  username,
+  password,
+  onRefresh
+}: {
+  appUrl: string;
+  refreshToken?: string;
+  accessToken?: string;
+  username?: string;
+  password?: string;
+  onRefresh?: ({ refreshToken, token }: { refreshToken: string, token: string }) => void
+}): QelosAdministratorSDK {
   let sdk: QelosAdministratorSDK;
   const options: QelosSDKOptions = {
     appUrl,
     forceRefresh: true,
-    fetch: globalThis.fetch || undiciFetch as any as FetchLike,
-    ...(config.sdkOptions || {}),
+    fetch: globalThis.fetch || (undiciFetch as any as FetchLike),
     onFailedRefreshToken: async () => {
-      await sdk.authentication.oAuthSignin({ username, password });
-      // throw new Error('could not able to refresh token');
-    }
+      const res = await sdk.authentication.oAuthSignin({ username, password });
+      if (onRefresh) {
+        onRefresh(res.payload)
+      }
+    },
+    ...(config.sdkOptions || {}),
   };
   if (refreshToken) {
     options.refreshToken = refreshToken;
@@ -48,29 +70,57 @@ export function getSdk(): QelosAdministratorSDK {
   if (localSdk) {
     return localSdk;
   }
-  localSdk = getSdkForUrl<{ tokenIdentifier: string }>(config.qelosUrl, null, null, config.qelosUsername, config.qelosPassword);
+  localSdk = getSdkForUrl<{ tokenIdentifier: string }>({
+    appUrl: config.qelosUrl,
+    refreshToken: null,
+    accessToken: null,
+    username: config.qelosUsername,
+    password: config.qelosPassword,
+  });
   bootstrapAuthenticate().catch();
   return localSdk;
 }
 
-export async function getSdkForTenant(tenantPayload: StandardPayload): Promise<QelosAdministratorSDK | null> {
+export async function getSdkForTenant(
+  tenantPayload: StandardPayload
+): Promise<QelosAdministratorSDK | null> {
   try {
-    const data = await getEncryptedDataForTenant(tenantPayload, config.userPayloadSecret);
+    const data = await getEncryptedDataForTenant(
+      tenantPayload,
+      config.userPayloadSecret
+    );
     if (!data.appUrl) {
       return null;
     }
-    const sdk = getSdkForUrl(data.appUrl, data.currentAuthPayload?.refreshToken, data.currentAuthPayload?.token, data.username, data.password);
+    const sdk = getSdkForUrl({
+      appUrl: data.appUrl,
+      refreshToken: data.currentAuthPayload?.refreshToken,
+      accessToken: data.currentAuthPayload?.token,
+      username: data.username,
+      password: data.password,
+      onRefresh: (payload) => {
+        data.currentAuthPayload = payload;
+        setEncryptedDataForTenant(tenantPayload, config.userPayloadSecret, data);
+      }
+    });
     return sdk;
   } catch (e) {
-    logger.log(e)
+    logger.log(e);
     return null;
   }
 }
 
-export function getEncryptedDataForTenant(tenantPayload: StandardPayload, encryptedId: string = '') {
+export function getEncryptedDataForTenant(
+  tenantPayload: StandardPayload,
+  encryptedId: string = ''
+) {
   return getSdk().users.getEncryptedData(tenantPayload.sub, encryptedId);
 }
 
-export function setEncryptedDataForTenant(tenantPayload: StandardPayload, encryptedId: string = '', data: any) {
+export function setEncryptedDataForTenant(
+  tenantPayload: StandardPayload,
+  encryptedId: string = '',
+  data: any
+) {
   return getSdk().users.setEncryptedData(tenantPayload.sub, encryptedId, data);
 }