Merge pull request #148 from xmartlabs/dependencies-update

[Fix] Bring back Expo plugin

Author: Joaguirrem

README.md

@@ -35,7 +35,8 @@ Line SDK wrapper for React Native 🚀
             "useFrameworks": "static" // This is required
           }
         }
-      ]
+      ],
+      "@xmartlabs/react-native-line"
     ]
     ```
 
@@ -57,6 +58,39 @@ Line SDK wrapper for React Native 🚀
     cd ios && pod install
     ```
 
+3. Change your `AppDelegate.m` to match the following:
+
+    ```objectivec
+    #import "RNLine-Swift.h"
+
+    ...
+
+    - (BOOL)application:(UIApplication *)application openURL:(NSURL *)url options:(NSDictionary<UIApplicationOpenURLOptionsKey,id> *)options
+    {
+      return [LineLogin application:application open:url options:options];
+    }
+    ```
+
+4. Insert the following snippet in your `Info.plist` to match the [LINE documentation](https://developers.line.biz/en/docs/line-login-sdks/ios-sdk/swift/setting-up-project/#config-infoplist-file):
+
+    ```xml
+    <key>CFBundleURLTypes</key>
+    <array>
+        <dict>
+            <key>CFBundleTypeRole</key>
+            <string>Editor</string>
+            <key>CFBundleURLSchemes</key>
+            <array>
+                <string>line3rdp.$(PRODUCT_BUNDLE_IDENTIFIER)</string>
+            </array>
+        </dict>
+    </array>
+    <key>LSApplicationQueriesSchemes</key>
+    <array>
+        <string>lineauth2</string>
+    </array>
+    ```
+
 ## Usage
 
 1. Import the `LineLogin` module:
@@ -69,14 +103,14 @@ Line SDK wrapper for React Native 🚀
 
     ```typescript
     useEffect(() => {
-      LineLogin.setup('YOUR_CHANNEL_ID')
+      LineLogin.setup({ channelId: 'YOUR_CHANNEL_ID' })
     }, [])
     ```
 
 3. Login with the `login` method:
 
     ```typescript
-    LineLogin.login({})
+    LineLogin.login()
     ```
 
 ## API

android/src/main/java/com/xmartlabs/rnline/LineLogin.kt

@@ -30,7 +30,6 @@ class LineLogin(private val reactContext: ReactApplicationContext) :
     ReactContextBaseJavaModule(reactContext) {
     companion object {
         private const val MODULE_NAME: String = "LineLogin"
-        private const val ERROR_MESSAGE: String = "ERROR"
     }
 
     private lateinit var channelId: String
@@ -43,13 +42,12 @@ class LineLogin(private val reactContext: ReactApplicationContext) :
     override fun getName() = MODULE_NAME
 
     @ReactMethod
-    fun setup(channelId: String, promise: Promise) {
+    fun setup(args: ReadableMap, promise: Promise) {
         val context: Context = reactContext.applicationContext
-        this.channelId = channelId
-        this.lineApiClient = LineApiClientBuilder(context, channelId).build()
+        channelId = args.getString("channelId")!!
+        lineApiClient = LineApiClientBuilder(context, channelId).build()
         reactContext.addActivityEventListener(object : ActivityEventListener {
             override fun onNewIntent(intent: Intent?) {}
-
             override fun onActivityResult(
                 activity: Activity?,
                 requestCode: Int,
@@ -118,7 +116,7 @@ class LineLogin(private val reactContext: ReactApplicationContext) :
     @ReactMethod
     fun getProfile(promise: Promise) {
         uiCoroutineScope.launch {
-            val lineApiResponse = withContext(Dispatchers.IO) { lineApiClient.profile }
+            val lineApiResponse = withContext(Dispatchers.IO) { lineApiClient.getProfile() }
             if (!lineApiResponse.isSuccess) {
                 promise.reject(
                     lineApiResponse.responseCode.name,
@@ -137,7 +135,7 @@ class LineLogin(private val reactContext: ReactApplicationContext) :
         if (resultCode != Activity.RESULT_OK || intent == null) {
             loginResult?.reject(
                 resultCode.toString(),
-                ERROR_MESSAGE,
+                "ERROR",
                 null
             )
         }

app.plugin.js

@@ -0,0 +1 @@
+module.exports = require('./plugin/withLineSDK')

example/app.json

@@ -42,7 +42,8 @@
           "resizeMode": "contain",
           "backgroundColor": "#ffffff"
         }
-      ]
+      ],
+      "@xmartlabs/react-native-line"
     ],
     "experiments": {
       "typedRoutes": true

example/app/_layout.tsx

@@ -23,7 +23,7 @@ export default function () {
 
   useEffect(() => {
     if (loaded) {
-      Line.setup('2006826760')
+      Line.setup({ channelId: '2006826760' })
       SplashScreen.hideAsync()
     }
   }, [loaded])

example/package-lock.json

@@ -2,7 +2,7 @@
 #import "React/RCTBridgeModule.h"
 
 @interface RCT_EXTERN_MODULE(LineLogin, NSObject)
-RCT_EXTERN_METHOD(setup: (NSString *)channelId
+RCT_EXTERN_METHOD(setup: (NSDictionary *)arguments
                   resolver: (RCTPromiseResolveBlock)resolve
                   rejecter: (RCTPromiseRejectBlock)reject
                   )

ios/LineLogin.m

@@ -19,9 +19,17 @@ import LineSDK
         return LoginManager.shared.application(application, open: userActivity.webpageURL)
     }
 
-    @objc func setup(_ channelId: String, resolver resolve: @escaping RCTPromiseResolveBlock,
+    @objc func setup(_ arguments: NSDictionary, resolver resolve: @escaping RCTPromiseResolveBlock,
                      rejecter reject: @escaping RCTPromiseRejectBlock) {
-        return LoginManager.shared.setup(channelID: channelId, universalLinkURL: nil)
+        
+        guard let channelID = arguments["channelId"] as? String else {
+            reject("INVALID_ARGUMENTS", "Missing required argument: channelId", nil)
+            return
+        }
+        
+        let universalLinkURL: URL? = (arguments["universalLinkUrl"] as? String).flatMap { URL(string: $0) }
+        
+        return LoginManager.shared.setup(channelID: channelID, universalLinkURL: universalLinkURL)
     }
 
     @objc func login(_ arguments: NSDictionary?, resolver resolve: @escaping RCTPromiseResolveBlock,
@@ -34,7 +42,7 @@ import LineSDK
 
         let scopes = (args["scopes"] as? [String])?.map { LoginPermission(rawValue: $0) } ?? [.profile]
         let onlyWebLogin = (args["onlyWebLogin"] as? Bool) ?? false
-        var parameters: LoginManager.Parameters = LoginManager.Parameters.init()
+        var parameters = LoginManager.Parameters.init()
 
         if onlyWebLogin { parameters.onlyWebLogin = onlyWebLogin }