Merge pull request xmartlabs#51 from xmartlabs/refactor/swift_support_email_token

Refactor/ios_android_common_interface.

Author: nicoache1

.babelrc

@@ -0,0 +1,25 @@
+{
+  "root": true,
+  "extends": [
+    "@react-native-community",
+    "plugin:prettier/recommended",
+    "prettier"
+  ],
+  "parser": "@typescript-eslint/parser",
+  "plugins": [
+    "@typescript-eslint",
+    "simple-import-sort",
+    "sort-keys-fix",
+    "prettier"
+  ],
+  "rules": {
+    "prettier/prettier": "error",
+    "sort-keys-fix/sort-keys-fix": "warn",
+    "semi": ["off"],
+    "simple-import-sort/sort": "error",
+    "no-console": ["error", { "allow": ["warn"] }],
+    "sort-keys": "error",
+    "sort-imports": "off",
+    "import/order": "off"
+  }
+}

.eslintignore

@@ -66,3 +66,5 @@ buck-out/
 # CocoaPods
 /ios/Pods/
 /example/ios/Pods/
+
+dist/

.eslintrc

@@ -0,0 +1,2 @@
+package.json
+ios

.eslintrc.js

@@ -61,7 +61,8 @@ Inside your `AppDelegate.m`, setup the line sdk by passing the channel id obtain
 1. Add `platform :ios, '10.0'` in `Podfile` line:1
 2. Enable `use_frameworks!` in `Podfile` line:3
 3. Comment the code related to flipper, flipper doesn't support `use_frameworks!` !
-4. Add this code to your `AppDelegate.m`
+4. Modify your info.plist like it says here [Configuring the Info.plist file](https://developers.line.biz/en/docs/ios-sdk/swift/setting-up-project/#configuring-the-info-plist-file)
+5. Add this code to your `AppDelegate.m`
 
 ```objc
 - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions
@@ -121,15 +122,15 @@ import LineLogin from '@xmartlabs/react-native-line'
 
 Then, you can start using all the functions that are available:
 
-| Function                                                | Description                                                                                                                                                                                                                        |
-| ------------------------------------------------------- | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
-| `login(args?: LoginArguments): Promise<LoginResult>`    | Starts the login flow of Line's SDK (Opens the apps if it's installed and defaults to the browser otherwise). It accepts the same argumements as the LineSDK, in an object `{ key: value }`, defaults the same way as LineSDK too. |
-| `getCurrentAccessToken(): Promise<AccessToken>`         | Returns the current access token for the currently logged in user.                                                                                                                                                                 |
-| `getProfile(): Promise<UserProfile>`                    | Returns the profile of the currently logged in user.                                                                                                                                                                               |
-| `logout(): Promise<void>`                               | Logs out the currently logged in user.                                                                                                                                                                                             |
-| `refreshToken(): Promise<AccessToken>`                  | Refreshes the access token and returns it.                                                                                                                                                                                         |
-| `verifyAccessToken(): Promise<AccessTokenVerifyResult>` | Verifies the access token and returns it.                                                                                                                                                                                          |
-| `getBotFriendshipStatus(): Promise<any>`                | Gets bot friendship status if [configured](https://developers.line.biz/en/docs/ios-sdk/swift/link-a-bot/).                                                                                                                         |
+| Function                                                 | Description                                                                                                                                                                                                                        |
+| -------------------------------------------------------- | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
+| `login(args?: LoginArguments): Promise<LoginResult>`     | Starts the login flow of Line's SDK (Opens the apps if it's installed and defaults to the browser otherwise). It accepts the same argumements as the LineSDK, in an object `{ key: value }`, defaults the same way as LineSDK too. |
+| `getCurrentAccessToken(): Promise<AccessToken>`          | Returns the current access token for the currently logged in user.                                                                                                                                                                 |
+| `getProfile(): Promise<UserProfile>`                     | Returns the profile of the currently logged in user.                                                                                                                                                                               |
+| `logout(): Promise<void>`                                | Logs out the currently logged in user.                                                                                                                                                                                             |
+| `refreshToken(): Promise<AccessToken>`                   | Refreshes the access token and returns it.                                                                                                                                                                                         |
+| `verifyAccessToken(): Promise<AccessTokenVerifyResult>`  | Verifies the access token and returns it.                                                                                                                                                                                          |
+| `getBotFriendshipStatus(): Promise<BotFriendshipStatus>` | Gets bot friendship status if [configured](https://developers.line.biz/en/docs/ios-sdk/swift/link-a-bot/).                                                                                                                         |
 
 ### Return values
 
@@ -139,40 +140,34 @@ The following objects are returned on the methods described above:
 
 ```typescript
 {
-  /// The user ID of the current authorized user.
+   /// The user ID of the current authorized user.
   userID: String
 
   /// The display name of the current authorized user.
-  displayName: String
+  displayName: string
 
   /// The profile image URL of the current authorized user. `null` if the user has not set a profile
   /// image.
-  pictureURL?: URL
-
-  /// The large profile image URL of the current authorized user. `null` if the user has not set a profile
-  /// image.
-  pictureURLLarge?: URL
-
-  /// The small profile image URL of the current authorized user. `null` if the user has not set a profile
-  /// image.
-  pictureURLSmall?: URL
+  pictureURL?: string
 
   /// The status message of the current authorized user. `null` if the user has not set a status message.
-  statusMessage?: String
+  statusMessage?: string
 }
 ```
 
 2. AccessToken:
 
 ```typescript
 {
-  /// The value of the access token.
+   /// The value of the access token.
   access_token: String
-
   /// The expiration time of the access token. It is calculated using `createdAt` and the validity period
   /// of the access token. This value might not be the actual expiration time because this value depends
   /// on the system time of the device when `createdAt` is determined.
   expires_in: String
+  /// The raw string value of the ID token bound to the access token. The value exists only if the access token
+  /// is obtained with the `.openID` permission.
+  id_token?: String
 }
 ```
 
@@ -195,7 +190,7 @@ The following objects are returned on the methods described above:
 
 ```typescript
 {
-  /// The access token obtained by the login process.
+   /// The access token obtained by the login process.
   accessToken: AccessToken
   /// The permissions bound to the `accessToken` object by the authorization process. Scope has them separated by spaces
   scope: String
@@ -207,15 +202,20 @@ The following objects are returned on the methods described above:
   /// `LoginManagerOption` object when the user logs in. For more information, see Linking a bot with your LINE
   /// Login channel at https://developers.line.me/en/docs/line-login/web/link-a-bot/.
   friendshipStatusChanged?: boolean
-  /// The raw string value of the ID token bound to the access token. The value exists only if the access token
-  /// is obtained with the `.openID` permission.
-  lineIdToken?: String
   /// The `nonce` value when requesting ID Token during login process. Use this value as a parameter when you
   /// verify the ID Token against the LINE server. This value is `null` if `.openID` permission is not requested.
   IDTokenNonce?: String
 }
 ```
 
+5. BotFriendshipStatus
+
+```typescript
+{
+  friendFlag: boolean
+}
+```
+
 ### Arguments
 
 1. LoginArguments
@@ -232,21 +232,21 @@ The following objects are returned on the methods described above:
 
 ```typescript
 {
-  email = 'email',
+  EMAIL = 'email',
   /// The permission to get an ID token in the login response.
-  openID = 'openid',
+  OPEN_ID = 'openid',
 
   /// The permission to get the user's profile including the user ID, display name, and the profile image
   /// URL in the login response.
-  profile = 'profile',
+  PROFILE = 'profile',
 }
 ```
 
 3. BotPrompt
 
 ```typescript
 {
-  agressive = 'agressive',
+  aggressive = 'aggressive',
   normal = 'normal',
 }
 ```

.gitignore

@@ -175,7 +175,7 @@ class RNLine(reactContext: ReactApplicationContext) : ReactContextBaseJavaModule
     fun getCurrentAccessToken(promise: Promise) = invokeLineServiceMethod(
             promise = promise,
             serviceCallable = { lineApiClient.currentAccessToken },
-            parser = { parseAccessToken(it) }
+            parser = { parseAccessToken(it, lineIdToken = null) }
     )
 
     @ReactMethod
@@ -189,7 +189,7 @@ class RNLine(reactContext: ReactApplicationContext) : ReactContextBaseJavaModule
     fun refreshToken(promise: Promise) = invokeLineServiceMethod(
             promise = promise,
             serviceCallable = { lineApiClient.refreshAccessToken() },
-            parser = { parseAccessToken(it) }
+            parser = { parseAccessToken(it, lineIdToken = null) }
     )
 
     @ReactMethod
@@ -219,10 +219,11 @@ class RNLine(reactContext: ReactApplicationContext) : ReactContextBaseJavaModule
     }
 
     // Parsers
-    private fun parseAccessToken(accessToken: LineAccessToken): WritableMap = Arguments.makeNativeMap(
+    private fun parseAccessToken(accessToken: LineAccessToken, lineIdToken: LineIdToken?): WritableMap = Arguments.makeNativeMap(
             mapOf(
                     "access_token" to accessToken.tokenString,
-                    "expires_in" to accessToken.expiresInMillis
+                    "expires_in" to accessToken.expiresInMillis,
+                    "id_token" to lineIdToken?.rawString
             )
     )
 
@@ -232,7 +233,7 @@ class RNLine(reactContext: ReactApplicationContext) : ReactContextBaseJavaModule
             )
     )
 
-    private fun parseVerifyAccessToken(verifyAccessToken: LineCredential): WritableMap = Arguments.makeNativeMap(
+    private fun parseVerifyAccessToken( verifyAccessToken: LineCredential): WritableMap = Arguments.makeNativeMap(
             mapOf(
                     "client_id" to channelId,
                     "scope" to Scope.join(verifyAccessToken.scopes),
@@ -253,11 +254,10 @@ class RNLine(reactContext: ReactApplicationContext) : ReactContextBaseJavaModule
     private fun parseLoginResult(loginResult: LineLoginResult): WritableMap = Arguments.makeNativeMap(
             mapOf(
                     "userProfile" to parseProfile(loginResult.lineProfile!!),
-                    "accessToken" to parseAccessToken(loginResult.lineCredential!!.accessToken),
+                    "accessToken" to parseAccessToken(loginResult.lineCredential!!.accessToken, loginResult.lineIdToken),
                     "scope" to loginResult.lineCredential?.scopes?.let {
                         Scope.join(it)
                     },
-                    "lineIdToken" to loginResult.lineIdToken?.rawString,
                     "friendshipStatusChanged" to loginResult.friendshipStatusChanged,
                     "IDTokenNonce" to loginResult.lineIdToken?.nonce
             )

.prettierignore

@@ -40,31 +40,32 @@ import LineSDK
       LineLogin.nilArgument(reject)
       return
     }
-    print(args)
+
     let scopes = (args["scopes"] as? [String])?.map { LoginPermission(rawValue: $0) } ?? [.profile]
     let onlyWebLogin = (args["onlyWebLogin"] as? Bool) ?? false
-
-    var options: LoginManagerOptions = []
-    if onlyWebLogin { options = .onlyWebLogin }
+    var parameters: LoginManager.Parameters = LoginManager.Parameters.init()
+    
+    if onlyWebLogin { parameters.onlyWebLogin = onlyWebLogin }
 
     if let botPrompt = args["botPrompt"] as? String {
       switch botPrompt {
-      case "aggressive": options.insert(.botPromptAggressive)
-      case "normal": options.insert(.botPromptNormal)
+      case "aggressive": parameters.botPromptStyle = LoginManager.BotPrompt(rawValue: "aggresive")
+      case "normal": parameters.botPromptStyle = LoginManager.BotPrompt(rawValue: "normal")
       default: break
       }
     }
-
-    LoginManager.shared.login(
-      permissions: Set(scopes),
-      in: nil,
-      options: options) { result in
-        switch result {
-        case .success(let value): value.resolver(resolve, reject, name: "login")
-        case .failure(let error): error.rejecter(reject)
+    
+    DispatchQueue.main.async {
+        LoginManager.shared.login(
+          permissions: Set(scopes),
+          in: nil,
+          parameters: parameters) { result in
+            switch result {
+            case .success(let value): value.resolver(resolve, reject, name: "login")
+            case .failure(let error): error.rejecter(reject)
+            }
         }
     }
-
   }
 
   @objc func logout(_ resolve: @escaping RCTPromiseResolveBlock,
@@ -100,7 +101,7 @@ import LineSDK
 
   @objc func refreshToken(_ resolve: @escaping RCTPromiseResolveBlock,
                           rejecter reject: @escaping RCTPromiseRejectBlock) {
-    API.refreshAccessToken { result in
+    API.Auth.refreshAccessToken { result in
       switch result {
       case .success(let token): token.resolver(resolve, reject, name: "refresh token")
       case .failure(let error): error.rejecter(reject)
@@ -110,7 +111,7 @@ import LineSDK
 
   @objc func verifyAccessToken(_ resolve: @escaping RCTPromiseResolveBlock,
                                rejecter reject: @escaping RCTPromiseRejectBlock) {
-    API.verifyAccessToken { result in
+    API.Auth.verifyAccessToken { result in
       switch result {
       case .success(let token): token.resolver(resolve, reject, name: "verify token")
       case .failure(let error): error.rejecter(reject)