More error messaging 2024

.github/workflows/build.yml

@@ -3,18 +3,28 @@ on: push
 jobs:
   build:
     name: build
-    runs-on: macOS-latest
-    env:
-        DEVELOPER_DIR: /Applications/Xcode_11.1.app/Contents/Developer
+    runs-on: macos-latest
     steps:
       - name: Checkout
         uses: actions/checkout@master
         with:
           fetch-depth: 1
       - name: libxml
         run: brew install libxml2
-      - name: Swift build
+      - name: Swift build macOS
+        run: |
+          swift build  
+      - name: Xcode build macOS
+        run: |
+          xcodebuild -scheme "OAuthSwiftMacOS" | xcpretty -c; exit ${PIPESTATUS[0]}
+      - name: Swift build iOS
         run: |
           sdk=`xcrun -sdk iphonesimulator -show-sdk-path`
           sdkVersion=`echo $sdk | sed -E 's/.*iPhoneSimulator(.*)\.sdk/\1/'`
           swift build  -Xswiftc "-sdk" -Xswiftc "$sdk" -Xswiftc "-target" -Xswiftc "x86_64-apple-ios$sdkVersion-simulator"
+      - name: Xcode build iOS
+        run: |
+          xcodebuild -scheme "OAuthSwift" -sdk iphonesimulator | xcpretty -c; exit ${PIPESTATUS[0]}
+      - name: Xcode build mac Catalyst
+        run: |
+          xcodebuild -scheme "OAuthSwift" | xcpretty -c; exit ${PIPESTATUS[0]}

.github/workflows/lint.yml

@@ -3,15 +3,19 @@ on: push
 jobs:
   lint:
     name: Lint
-    runs-on: macOS-latest
+    runs-on: macos-latest
     steps:
       - name: Checkout
         uses: actions/checkout@master
         with:
           fetch-depth: 1
       - name: Install swiftlint
         run: |
-          brew install swiftlint
+          if [ -z "$(which swiftlint)" ]; then
+            brew install swiftlint
+          else
+            swiftlint version  
+          fi
         env:
           HOMEBREW_NO_INSTALL_CLEANUP: 1
       - name: Code Lint

.github/workflows/test.yml

@@ -3,9 +3,8 @@ on: push
 jobs:
   build:
     name: test
-    runs-on: macOS-latest
-    env:
-        DEVELOPER_DIR: /Applications/Xcode_11.1.app/Contents/Developer
+    runs-on: macos-latest
+    timeout-minutes: 60
     steps:
       - name: Checkout
         uses: actions/checkout@master
@@ -15,6 +14,14 @@ jobs:
         run: brew install libxml2
       - name: Swift test
         run: |
-          sdk=`xcrun -sdk iphonesimulator -show-sdk-path`
-          sdkVersion=`echo $sdk | sed -E 's/.*iPhoneSimulator(.*)\.sdk/\1/'`
-          swift test  -Xswiftc "-sdk" -Xswiftc "$sdk" -Xswiftc "-target" -Xswiftc "x86_64-apple-ios$sdkVersion-simulator"
+          # on mac os
+          swift --version
+          swift test 
+          # on iOS (deactivate until resolve issue with XCText)
+          #sdk=`xcrun -sdk iphonesimulator -show-sdk-path`
+          #sdkVersion=`echo $sdk | sed -E 's/.*iPhoneSimulator(.*)\.sdk/\1/'`
+          #swift test -Xswiftc "-sdk" -Xswiftc "$sdk" -Xswiftc "-target" -Xswiftc "x86_64-apple-ios$sdkVersion-simulator"
+      - name: Xcode test
+        run: |
+          pod update
+          xcodebuild -workspace OAuthSwift.xcworkspace  -scheme OAuthSwiftMacOS test

.gitignore

@@ -27,3 +27,7 @@ Podfile.lock
 
 # Carthage
 Carthage/
+
+# SwiftPM
+.build/
+.swiftpm/

.swiftlint.yml

@@ -5,7 +5,7 @@ included:
 disabled_rules:
     - file_length
     - cyclomatic_complexity
-    - variable_name
+    - identifier_name
     - todo
     - line_length
     - type_body_length

.travis.yml

@@ -1,16 +1,16 @@
 language: objective-c
-osx_image: xcode11.1
+osx_image: xcode12.2
 env:
   global:
     - LC_CTYPE=en_US.UTF-8
     - LANG=en_US.UTF-8
     - PROJECT=OAuthSwift.xcodeproj
     - IOS_FRAMEWORK_SCHEME="OAuthSwift"
     - MACOS_FRAMEWORK_SCHEME="OAuthSwiftMacOS"
-    - IOS_SDK=iphonesimulator13.1
-    - MACOS_SDK=macosx10.15
+    - IOS_SDK=iphonesimulator14.2
+    - MACOS_SDK=macosx11.0
   matrix:
-    - DESTINATION="OS=13.1,name=iPhone 8" SCHEME="$IOS_FRAMEWORK_SCHEME" SDK="$IOS_SDK"
+    - DESTINATION="OS=14.2,name=iPhone 8" SCHEME="$IOS_FRAMEWORK_SCHEME" SDK="$IOS_SDK"
     - DESTINATION="arch=x86_64" SCHEME="$MACOS_FRAMEWORK_SCHEME" SDK="$MACOS_SDK"
 before_install:
   - bundle install

Demo/Common/Services.plist

@@ -72,6 +72,13 @@
 		<key>consumerSecret</key>
 		<string></string>
 	</dict>
+	<key>Withings2</key>
+	<dict>
+		<key>consumerKey</key>
+		<string></string>
+		<key>consumerSecret</key>
+		<string></string>
+	</dict>
 	<key>Linkedin</key>
 	<dict>
 		<key>consumerKey</key>
@@ -247,5 +254,12 @@
 		<key>consumerKey</key>
 		<string></string>
 	</dict>
+	<key>Reddit</key>
+	<dict>
+		<key>consumerKey</key>
+		<string></string>
+		<key>consumerSecret</key>
+		<string></string>
+	</dict>
 </dict>
 </plist>

Demo/Common/ViewController.swift

@@ -122,6 +122,8 @@ extension ViewController {
             doOAuthFitbit2(parameters)
         case "Withings":
             doOAuthWithings(parameters)
+        case "Withings2":
+            doOAuthWithings2(parameters)
         case "Linkedin":
             doOAuthLinkedin(parameters)
         case "Linkedin2":
@@ -174,6 +176,8 @@ extension ViewController {
             doOAuthLyft(parameters)
         case "Twitch":
             doOAuthTwitch(parameters)
+        case "Reddit":
+            doOauthReddit(parameters)
         default:
             print("\(service) not implemented")
         }
@@ -541,6 +545,47 @@ extension ViewController {
                 }
         }
     }
+    func doOAuthWithings2(_ serviceParameters: [String:String]){
+        let oauthswift = OAuth2Swift(
+            consumerKey:    serviceParameters["consumerKey"]!,
+            consumerSecret: serviceParameters["consumerSecret"]!,
+            authorizeUrl:   "https://account.withings.com/oauth2_user/authorize2",
+            accessTokenUrl: "https://wbsapi.withings.net/v2/oauth2",
+            responseType:   "code",
+            customKeypath: "body",
+            customAccessTokenParams: ["action":"requesttoken"]
+        )
+
+        self.oauthswift = oauthswift
+        oauthswift.authorizeURLHandler = getURLHandler()
+        let _ = oauthswift.authorize(
+        withCallbackURL: URL(string: "oauth-swift://oauth-callback/withings")!,
+        scope: "user.metrics,user.activity,user.sleepevents",
+        state: "TEST") { result in
+            switch result {
+            case .success(let (credential, _, parameters)):
+                self.showTokenAlert(name: serviceParameters["name"], credential: credential)
+                self.testWithings2(oauthswift, userId: parameters["userid"] as! String)
+            case .failure(let error):
+                print(error.description)
+            }
+        }
+    }
+    func testWithings2(_ oauthswift: OAuth2Swift, userId : String) {
+        oauthswift.client.paramsLocation = .requestURIQuery
+        let _ = oauthswift.client.get(
+            "https://wbsapi.withings.net/v2/measure",
+            parameters: ["action": "getactivity", "userid": userId, "date":"2022-01-01"]) { result in
+                switch result {
+                case .success(let response):
+                    let jsonDict = try? response.jsonObject()
+                    print(jsonDict as Any)
+                case .failure(let error):
+                    print(error.description)
+                }
+        }
+    }
+
 
     // MARK: Linkedin
     func doOAuthLinkedin(_ serviceParameters: [String:String]){
@@ -1390,6 +1435,48 @@ extension ViewController {
             }
         }
     }
+
+    func doOauthReddit(_ serviceParameters: [String:String]) {
+        let oauthswift = OAuth2Swift(
+            consumerKey:    serviceParameters["consumerKey"]!,
+            consumerSecret: serviceParameters["consumerSecret"]!,
+            authorizeUrl:   "https://www.reddit.com/api/v1/authorize.compact",
+            accessTokenUrl: "https://www.reddit.com/api/v1/access_token",
+            responseType:   "code",
+            contentType:    "application/json"
+        )
+        self.oauthswift = oauthswift
+        oauthswift.accessTokenBasicAuthentification = true
+        oauthswift.authorizeURLHandler = getURLHandler()
+        let state = generateState(withLength: 20)
+        let _ = oauthswift.authorize(
+        withCallbackURL: URL(string: "oauth-swift://oauth-callback/reddit")!, scope: "read", state: state) { result in
+            switch result {
+            case .success(let (credential, _, _)):
+                self.showTokenAlert(name: serviceParameters["name"], credential: credential)
+                self.testReddit(oauthswift, credential.oauthToken)
+            case .failure(let error):
+                print(error.description)
+            }
+        }
+    }
+
+    func testReddit(_ oauthswift: OAuth2Swift, _ oauthToken: String) {
+        let applicationName = ""    // Provided by developer
+        let username = ""           // Provided by developer
+        let userAgent = "ios:\(applicationName):1.0 (by /u/\(username)"
+        let headers = ["Authorization": "Bearer \(oauthToken)", "User-Agent": userAgent]
+        let _ = oauthswift.client.get(
+        "https://oauth.reddit.com/r/all", headers: headers) { result in
+            switch result {
+            case .success(let response):
+                let dataString = response.string!
+                print(dataString)
+            case .failure(let error):
+                print(error)
+            }
+        }
+    }
 }
 
 let services = Services()

OAuthSwift.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name = 'OAuthSwift'
-  s.version = '2.1.0'
+  s.version = '2.2.0'
   s.license = 'MIT'
   s.summary = 'Swift based OAuth library for iOS and macOS.'
   s.homepage = 'https://github.com/OAuthSwift/OAuthSwift'
@@ -9,6 +9,9 @@ Pod::Spec.new do |s|
     'Dongri Jin' => 'dongrify@gmail.com',
     'Eric Marchand' => 'eric.marchand.n7@gmail.com'
   }
+  s.weak_frameworks = 'AuthenticationServices'
+  s.ios.frameworks = 'SafariServices'
+  s.osx.frameworks = 'SafariServices'
   s.source = { git: 'https://github.com/OAuthSwift/OAuthSwift.git', tag: s.version }
   s.source_files = 'Sources/**/*.swift'
   s.swift_versions = ['5.0', '5.1']