deserializer and ui improvements

Author: MarcoF09

example/ios/Podfile.lock

@@ -226,7 +226,7 @@ PODS:
     - React
   - RNGestureHandler (1.5.2):
     - React
-  - RNLine (2.0.0):
+  - RNLine (2.0.1):
     - LineSDKSwift (~> 5.0)
     - React
   - RNReanimated (1.4.0):
@@ -375,7 +375,7 @@ SPEC CHECKSUMS:
   ReactNativeLocalization: dbb269b27d8a84bb22b9c2cdec38ba780b51dd72
   RNCAsyncStorage: 44395cb9c7c1523104c2b499eb426ef7aff82bca
   RNGestureHandler: 946a7691e41df61e2c4b1884deab41a4cdc3afff
-  RNLine: cd30f81208647017750cbfcf0223f57946652efe
+  RNLine: 677e5a14ab348c2085452cdad1a2ac68795717d9
   RNReanimated: b2ab0b693dddd2339bd2f300e770f6302d2e960c
   RNScreens: 36f8c83e5e23b6bfd5b912148453d81e335573eb
   RNSVG: ce9d996113475209013317e48b05c21ee988d42e

example/package.json

@@ -23,7 +23,7 @@
     "react-navigation": "^4.0.10",
     "react-navigation-stack": "^1.9.3",
     "react-navigation-tabs": "^2.5.6",
-    "@xmartlabs/react-native-line": "^2.0.0"
+    "@xmartlabs/react-native-line": "^2.0.1"
   },
   "devDependencies": {
     "@babel/core": "^7.6.2",

example/src/navigation/TabNavigator.tsx

@@ -10,15 +10,15 @@ export const TabNavigator = createBottomTabNavigator(
   {
     [Route.UserTab]: {
       navigationOptions: {
-        tabBarLabel: ({ tintColor }) => (
+        tabBarIcon: ({ tintColor }) => (
           <Text style={{ color: tintColor }}>User</Text>
         ),
       },
       screen: UserStack,
     },
     [Route.API]: {
       navigationOptions: {
-        tabBarLabel: ({ tintColor }) => (
+        tabBarIcon: ({ tintColor }) => (
           <Text style={{ color: tintColor }}>API</Text>
         ),
       },
@@ -27,6 +27,9 @@ export const TabNavigator = createBottomTabNavigator(
   },
   {
     initialRouteName: Route.UserTab,
+    tabBarOptions: {
+      showLabel: false,
+    },
     lazy: false,
   },
 )

example/yarn.lock

@@ -1087,10 +1087,10 @@
   dependencies:
     "@types/yargs-parser" "*"
 
-"@xmartlabs/react-native-line@^2.0.0":
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/@xmartlabs/react-native-line/-/react-native-line-2.0.0.tgz#d8e8834b65f88f10875bf16c6a20360aa67753d5"
-  integrity sha512-zCixb3o75hxEqqdUmA7lyS708btT0sz06Pz7MorndoAxPDr8EhzcytoutitW5k4Sl+bIXq3LiBvrCsEQ/KGtRA==
+"@xmartlabs/react-native-line@^2.0.1":
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/@xmartlabs/react-native-line/-/react-native-line-2.0.1.tgz#1b9879406aa7c5e1ebf7cde5bfa18939afb0ecd0"
+  integrity sha512-KD4+svfYw1jSAmc6bn0GirPc02UtVkz8ULnaLgVphkEKhHQcCqf56ZoLYXUwSVLvvNK2lV0EdegYu12ourCtSg==
 
 abab@^2.0.0:
   version "2.0.3"

src/deserializers/index.ts

@@ -11,7 +11,7 @@ export const deserializeLoginResult = (data: any): LoginResult => ({
   accessToken: deserializeAccessToken(data.accessToken),
   friendshipStatusChanged: data.friendshipStatusChanged,
   scope: data.scope,
-  userProfile: data.userProfile,
+  userProfile: deserializeUserProfile(data.userProfile),
 })
 
 export const deserializeAccessToken = (data: any): AccessToken => ({
@@ -24,7 +24,7 @@ export const deserializeUserProfile = (data: any): UserProfile => ({
   displayName: data.displayName,
   pictureURL: data.pictureURL ?? undefined,
   statusMessage: data.statusMessage ?? undefined,
-  userID: data.userID,
+  userID: data.userId ?? data.userID,
 })
 
 export const deserializeVerifyAccessToken = (

src/index.ts

@@ -7,6 +7,7 @@ import {
   refreshToken as LineSDKRefreshToken,
   verifyAccessToken as LineSDKVerifyAccessToken,
 } from './lineSDKWrapper'
+import { LoginArguments } from './types'
 
 export {
   BotFriendshipStatus,
@@ -29,7 +30,7 @@ export default {
   getProfile() {
     return LineSDKGetProfile()
   },
-  login(args = {}) {
+  login(args: LoginArguments = {}) {
     return LineSDKLogin(args)
   },
   logout() {

src/lineSDKWrapper.ts

@@ -13,13 +13,12 @@ import {
   BotFriendshipStatus,
   LoginResult,
   UserProfile,
+  LoginArguments,
 } from './types'
 
 const { LineLogin } = NativeModules
 
-export const getBotFriendshipStatus = async (): Promise<
-  BotFriendshipStatus
-> => {
+export const getBotFriendshipStatus = async (): Promise<BotFriendshipStatus> => {
   const result = await LineLogin.getBotFriendshipStatus()
   const deserializedResult = deserializeBotFriendshipStatus(result)
   return deserializedResult
@@ -37,7 +36,9 @@ export const getProfile = async (): Promise<UserProfile> => {
   return deserializedResult
 }
 
-export const login = async (args: any = {}): Promise<LoginResult> => {
+export const login = async (
+  args: LoginArguments = {},
+): Promise<LoginResult> => {
   const result = await LineLogin.login(args)
   const deserializedResult = deserializeLoginResult(result)
   return deserializedResult