@intra-mart/smartlime 2.1.1 → 2.2.0-dev.20250408

package/lib/packages/WebView/InternalIMWebView.js

@@ -4,8 +4,8 @@ import { WebView } from 'react-native-webview';
 import { useIMBaseUrl, useIMToken } from '../..';
 import { mergeRef } from '../../utils/mergeRef';
 import { join } from '../../utils/path';
-import { useIMModuleInfo } from '../Tenant/hooks/useIMModuleInfo';
-import { HYBRID_SSO_KEY } from '../Tenant/modulesType';
+import { useIMModules } from '../Tenant/hooks/useIMModules';
+import { IM_HYBRID_SSO_KEY } from '../Tenant/modulesType';
 import { IMWebViewError } from './IMWebViewError';
 const IMAUTOLOGIN_SUCCESS = 'IMAUTOLOGIN_SUCCESS';
 const IMAUTOLOGIN_ERROR = 'IMAUTOLOGIN_ERROR';
@@ -16,10 +16,10 @@ const useSessionEstablishmentUrl = (baseUrl) => {
     return join(baseUrl, '/api/bearer/smacolow/session');
 };
 const useLogoutUrl = (baseUrl) => {
-    const { getModuleInfo } = useIMModuleInfo();
-    const info = getModuleInfo();
-    if (info && info[HYBRID_SSO_KEY]) {
-        const hybridSSO = info[HYBRID_SSO_KEY];
+    const { getModules } = useIMModules();
+    const modules = getModules();
+    if (modules && modules[IM_HYBRID_SSO_KEY]) {
+        const hybridSSO = modules[IM_HYBRID_SSO_KEY];
         if (hybridSSO.enabled)
             return join(baseUrl, '/login');
     }

package/lib/packages/WebView/index.js

@@ -1,18 +1,18 @@
 import React, { useRef } from 'react';
 import { ActivityIndicator, View } from 'react-native';
-import { useIMFetchModuleState } from '../Tenant/hooks/useIMFetchModuleState';
-import { useIMModuleInfo } from '../Tenant/hooks/useIMModuleInfo';
+import { useIMModules } from '../Tenant/hooks/useIMModules';
 import { IMWebViewError } from './IMWebViewError';
 import { InternalIMWebView, internalIMWebViewStyles, } from './InternalIMWebView';
+import { useIMModulesState } from '../Tenant/hooks/useIMModulesState';
 const useInitModuleState = (onSessionCreationError) => {
     const initRef = useRef(true);
-    const fetchModuleState = useIMFetchModuleState();
-    const { fetchModuleInfo } = useIMModuleInfo();
-    if (fetchModuleState === 'notFetched' && initRef.current) {
+    const state = useIMModulesState();
+    const { request } = useIMModules();
+    if (!state && initRef.current) {
         initRef.current = false;
         (async () => {
             try {
-                await fetchModuleInfo();
+                await request();
             }
             catch (error) {
                 onSessionCreationError?.(new IMWebViewError('failed to fetch module status.', {
@@ -21,11 +21,11 @@ const useInitModuleState = (onSessionCreationError) => {
             }
         })();
     }
-    return fetchModuleState;
+    return state;
 };
 export const IMWebView = React.forwardRef((props, ref) => {
     const moduleState = useInitModuleState(props.onSessionCreationError);
-    return moduleState !== 'notFetched' ? (<InternalIMWebView ref={ref} {...props}/>) : (<>
+    return moduleState ? (<InternalIMWebView ref={ref} {...props}/>) : (<>
         <View style={props.style}/>
         <ActivityIndicator style={internalIMWebViewStyles.indicator}/>
       </>);

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@intra-mart/smartlime",
   "description": "expoで使用できるintra mart accelplatform SDK",
-  "version": "2.1.1",
+  "version": "2.2.0-dev.20250408",
   "keywords": [
     "intra-mart",
     "AccelPlatform",
@@ -49,7 +49,6 @@
     "@react-native-async-storage/async-storage": "1.23.1",
     "expo-auth-session": "~6.0.1",
     "expo-crypto": "~14.0.1",
-    "expo-random": "~14.0.1",
     "expo-secure-store": "~14.0.0",
     "react-native-webview": "13.12.5",
     "set-cookie-parser": "^2.7.1"

package/lib/packages/Tenant/hooks/useIMFetchModuleState.d.ts

@@ -1,2 +0,0 @@
-import { Context as DefaultContext } from '../Context';
-export declare const useIMFetchModuleState: (Context?: typeof DefaultContext) => import("..").FetchModuleState;

package/lib/packages/Tenant/hooks/useIMModuleInfo.d.ts

@@ -1,6 +0,0 @@
-import { Context as DefaultContext } from '../Context';
-export declare const useIMModuleInfo: (Context?: typeof DefaultContext) => {
-    fetchModuleInfo: () => Promise<void>;
-    getModuleInfo: () => import("..").Moudles | undefined;
-    destroyModuleInfo: () => Promise<void>;
-};

package/lib/packages/Tenant/hooks/useIMModuleInfo.js

@@ -1,13 +0,0 @@
-import { useContext, useMemo } from 'react';
-import { Context as DefaultContext } from '../Context';
-import { IMTenantError } from '../IMTenantError';
-export const useIMModuleInfo = (Context) => {
-    const tenantContext = useContext(Context || DefaultContext);
-    if (tenantContext == null) {
-        throw new IMTenantError('useIMModuleInfo requires either a Context provide or an ancestor element with a IMTenantProvider.');
-    }
-    return useMemo(() => {
-        const { fetchModuleInfo, getModuleInfo, destroyModuleInfo } = tenantContext;
-        return { fetchModuleInfo, getModuleInfo, destroyModuleInfo };
-    }, [tenantContext]);
-};