@streamlayer/sdk-web-core 0.17.7 → 0.18.0

package/lib/auth/bypass/index.js

@@ -60,8 +60,6 @@ export class BypassAuth extends AbstractAuthenticationProvider {
      */
     softLogout = () => {
         const storage = new UserStorage();
-        this.$coreStore.getValues().user.setValue();
-        this.$coreStore.getValues().userToken.setValue();
         this.transport.setAuth('', '');
         storage.setToken('');
         void this.reLogin();
@@ -78,11 +76,9 @@ export class BypassAuth extends AbstractAuthenticationProvider {
         const prevUserToken = storage.getToken();
         const prevUserExternalToken = storage.getExternalToken();
         this.$coreStore.getValues().userKey.setValue(prevUserExternalToken);
-        this.$coreStore.getValues().userToken.setValue(prevUserToken);
         if (prevUserToken) {
             this.saveUser(prevUserToken, '');
             return this.me().then((user) => {
-                console.log('user', user);
                 if (user?.id) {
                     const userId = user.id;
                     this.saveUser(prevUserToken, userId);

package/lib/auth/index.d.ts

@@ -1,5 +1,5 @@
 import { StreamLayerContext } from '@streamlayer/sdk-web-interfaces';
-import { CoreStores } from '../store/store';
+import { CoreStores, StoreObj } from '../store/store';
 import { UserStorage } from '../storage';
 import { BypassAuth } from './bypass';
 declare module '@streamlayer/sdk-web-interfaces' {
@@ -7,6 +7,7 @@ declare module '@streamlayer/sdk-web-interfaces' {
         authorizationBypass: (schema: string, userKey: string) => Promise<void>;
         logout: () => void;
         getUserStore: () => CoreStores['user'];
+        userId: StoreObj['user']['getAtomStore'];
         isUserAuthorized: BypassAuth['isAuthenticated'];
     }
     interface StreamLayerContext {

package/lib/auth/index.js

@@ -13,15 +13,21 @@ export const bypass = (instance, opts, done) => {
             void instance.auth.reLogin();
         }
     });
+    instance.sdk.userId = instance.stores.user.getAtomStore;
     instance.sdk.authorizationBypass = async (schema, userKey) => {
         if (storage.getSchema() === schema &&
             storage.getExternalToken() === userKey &&
             instance.transport.getHeader('authorization')) {
             return;
         }
-        await instance.auth.login(schema, userKey);
-        storage.setSchema(schema);
-        storage.setExternalToken(userKey);
+        try {
+            await instance.auth.login(schema, userKey);
+            storage.setSchema(schema);
+            storage.setExternalToken(userKey);
+        }
+        catch (err) {
+            instance.sdk.logout();
+        }
     };
     instance.sdk.logout = () => {
         instance.auth.logout();

package/lib/index.d.ts

@@ -5,7 +5,7 @@ import './store';
 import './auth';
 declare module '@streamlayer/sdk-web-interfaces' {
     interface StreamLayerSDK {
-        initializeApp: () => Promise<{
+        initializeApp: (contextConfig?: ContextConfig) => Promise<{
             enabled?: boolean;
             err?: string;
         }>;

package/lib/index.js

@@ -19,7 +19,8 @@ export const core = (instance, opts, done) => {
      * On initialize we subscribe to store and launch listeners
      * that activate data downloading over the network
      */
-    instance.sdk.initializeApp = async () => {
+    instance.sdk.initializeApp = async (contextConfig) => {
+        instance.contextConfig = contextConfig;
         if (instance.stores.enabled.get() === 'on') {
             return { enabled: true };
         }
@@ -47,7 +48,11 @@ export const core = (instance, opts, done) => {
         }
         instance.stores.enabled.setValue();
         instance.stores.status.setValue(CoreStatus.DISABLED);
+        instance.stores.slStreamId.setValue();
+        instance.stores.providerStreamId.setValue();
+        instance.sdk.closeFeature(true);
         instance.storeUnsubscribe();
+        instance.transport.disconnect();
     };
     /**
      * Configure the "event id" using the "provider," enabling subscribed stores to

package/lib/store/index.d.ts

@@ -1,18 +1,25 @@
 import { StreamLayerContext } from '@streamlayer/sdk-web-interfaces';
-import { CoreStore, CoreStores, StoreObj, CoreStoreInstance } from './store';
+import { CoreStore, CoreStores, StoreObj } from './store';
 declare module '@streamlayer/sdk-web-interfaces' {
     interface StreamLayerSDK {
-        sdkStore: CoreStoreInstance;
+        sdkStore: CoreStores;
         enabled: CoreStores['enabled'];
         status: CoreStores['status'];
         organizationStore: () => CoreStores['organizationSettings'];
         streamStore: () => CoreStores['streamSettings'];
     }
+    interface ContextConfig {
+        skipOrganizationSettings?: boolean;
+    }
+    interface StreamLayerContext {
+        contextConfig?: ContextConfig;
+    }
     interface StreamLayerContext {
         store: CoreStore;
         stores: StoreObj;
         storeSubscribe: () => void;
         storeUnsubscribe: () => void;
+        contextConfig?: ContextConfig;
     }
 }
 /**

package/lib/store/index.js

@@ -7,7 +7,7 @@ export const store = (instance, opts, done) => {
     instance.stores = instance.store.getValues();
     instance.sdk.enabled = instance.stores.enabled.getStore();
     instance.sdk.status = instance.stores.status.getStore();
-    instance.sdk.sdkStore = instance.store.getStore();
+    instance.sdk.sdkStore = Object.fromEntries(Object.entries(instance.stores).map(([key, store]) => [key, store.getStore()]));
     instance.sdk.organizationStore = () => instance.stores.organizationSettings.getStore();
     instance.sdk.streamStore = () => instance.stores.streamSettings.getStore();
     instance.storeUnsubscribe = () => {

package/lib/store/init.js

@@ -16,7 +16,18 @@ const initializeUserStores = (transport) => {
     // sl user key
     const userToken = new SingleStore(createSingleStore(storage.getToken()), 'userToken');
     // sl user data
-    const user = new ApiStore(queries.$user(userToken.getStore(), transport), 'user', (data) => data?.data?.data?.id);
+    const user = new ApiStore(queries.$user(userToken.getStore(), transport), 'user', ({ data, error, loading }, prev) => {
+        if (error) {
+            return undefined;
+        }
+        if (data?.data?.id) {
+            return data.data.id;
+        }
+        else if (loading === false) {
+            return undefined;
+        }
+        return prev;
+    });
     // sl user settings
     const userSettings = new ApiStore(queries.$userSettings(userToken.getStore(), transport), 'userSettings');
     return {

package/package.json

@@ -5,12 +5,12 @@
   },
   "peerDependencies": {
     "@nanostores/query": "^0.2.8",
+    "@streamlayer/sl-eslib": "^5.63.3",
     "nanostores": "^0.9.5",
-    "@streamlayer/sl-eslib": "^5.53.6",
-    "@streamlayer/sdk-web-interfaces": "^0.18.14",
-    "@streamlayer/sdk-web-storage": "^0.0.3",
-    "@streamlayer/sdk-web-api": "^0.0.1",
-    "@streamlayer/sdk-web-types": "^0.20.0"
+    "@streamlayer/sdk-web-api": "^0.19.0",
+    "@streamlayer/sdk-web-interfaces": "^0.19.0",
+    "@streamlayer/sdk-web-storage": "^0.3.11",
+    "@streamlayer/sdk-web-types": "^0.21.0"
   },
   "exports": {
     ".": {
@@ -39,7 +39,7 @@
       "default": "./lib/auth/index.js"
     }
   },
-  "version": "0.17.7",
+  "version": "0.18.0",
   "type": "module",
   "main": "./lib/index.js",
   "module": "./lib/index.js",