@intra-mart/smartlime 0.0.1-beta → 1.0.0-dev.20230228

package/lib/packages/OAuth/index.d.ts

@@ -19,6 +19,7 @@ export type StartAuthResult = {
 };
 export declare const IMPrompt: {
     readonly Login: Prompt.Login;
+    readonly None: Prompt.None;
 };
 interface RequestConfig {
     redirectUri: string;
@@ -26,7 +27,7 @@ interface RequestConfig {
     clientSecret: string;
     scopes: string[];
     state?: string;
-    prompt?: Prompt.Login;
+    prompt?: Prompt.Login | Prompt.None;
 }
 interface IMOAuthProps {
     children: JSX.Element;

package/lib/packages/OAuth/index.js

@@ -12,6 +12,7 @@ const DEFAULT_STORAGE_KEY = '@example:IMAuthKey';
 const DEFAULT_REMAINING_TIME_TO_RUN_REFRESH = 360000;
 export const IMPrompt = {
     Login: Prompt.Login,
+    None: Prompt.None,
 };
 const baseRequestConfig = {
     responseType: 'code',
@@ -22,6 +23,11 @@ const useRequestConfig = (userProps) => {
         return {
             ...baseRequestConfig,
             ...userProps,
+            /*
+              error can occur during authorization due to iap session control.
+              default to "login" which destroy the session every time to prevent error.
+            */
+            prompt: userProps.prompt ? userProps.prompt : IMPrompt.Login,
             extraParams: {
                 redirect_uri: userProps.redirectUri,
             },

package/lib/packages/WebView/index.d.ts

@@ -7,5 +7,6 @@ export interface IMWebViewProps extends Omit<WebViewProps, 'onShouldStartLoadWit
     source: WebViewSourceUri;
     onSessionCreationError?: OnSessionCreationError;
     indicator?: JSX.Element | null;
+    forceLogin?: boolean;
 }
 export declare const IMWebView: React.ForwardRefExoticComponent<IMWebViewProps & React.RefAttributes<WebView<{}>>>;

package/lib/packages/WebView/index.js

@@ -13,7 +13,7 @@ const useCheckSessionUrl = (baseUrl) => {
 const useGetSessionUrl = (baseUrl) => {
     return join(baseUrl, '/api/bearer/smacolow/session');
 };
-const usLogoutUrl = (baseUrl) => {
+const useLogoutUrl = (baseUrl) => {
     return join(baseUrl, '/logout');
 };
 const useLogin = (props, webviewRef) => {
@@ -22,8 +22,9 @@ const useLogin = (props, webviewRef) => {
     const targetUrl = props.source.uri;
     const checkSessionUrl = useCheckSessionUrl(baseUrl);
     const getSessionUrl = useGetSessionUrl(baseUrl);
-    const logoutUrl = usLogoutUrl(baseUrl);
-    const currentUrlRef = useRef(checkSessionUrl);
+    const logoutUrl = useLogoutUrl(baseUrl);
+    const initialUrlRef = useRef(props.forceLogin ? logoutUrl : checkSessionUrl);
+    const currentUrlRef = useRef(initialUrlRef.current);
     const isCheckSessionErrorRef = useRef(false);
     const [isFailedLogin, setIsFailedLogin] = useState(false);
     const [isLogin, setIsLogin] = useState(false);
@@ -123,7 +124,7 @@ const useLogin = (props, webviewRef) => {
     };
     const autoLoginProps = {
         source: {
-            uri: checkSessionUrl,
+            uri: initialUrlRef.current,
         },
         sharedCookiesEnabled: false,
         onLoad,

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@intra-mart/smartlime",
   "description": "expoで使用できるintra mart accelplatform SDK",
-  "version": "0.0.1-beta",
+  "version": "1.0.0-dev.20230228",
   "keywords": [
     "intra-mart",
     "AccelPlatform",

package/.gitattributes

@@ -1 +0,0 @@
-* text=auto eol=crlf