Merge pull request #25 from apivideo/origin-identification-headers

feat(java) Add origin identification headers

Author: bot-api-video

ApiVideoUploader.podspec

@@ -4,8 +4,8 @@ Pod::Spec.new do |s|
   s.osx.deployment_target = '10.12'
   s.tvos.deployment_target = '10.0'
   s.watchos.deployment_target = '3.0'
-  s.version = '0.1.3'
-  s.source = { :git => 'https://github.com/apivideo/api.video-ios-uploader', :tag => 'v0.1.3' }
+  s.version = '0.1.4'
+  s.source = { :git => 'https://github.com/apivideo/api.video-ios-uploader', :tag => 'v0.1.4' }
   s.authors = { 'Ecosystem Team' => 'ecosystem@api.video' }
   s.license = { :type => 'MIT' }
   s.homepage = 'https://docs.api.video'

CHANGELOG.md

@@ -1,6 +1,9 @@
 # Changelog
 All changes to this project will be documented in this file.
 
+## [0.1.4] - 2022-03-11
+- Add Origin identification headers
+
 ## [0.1.3] - 2022-01-24
 - Add applicationName parameter (to allow user agent extension)
 

README.md

@@ -24,7 +24,7 @@
 
 # Project description
 
-api.video's iOS uploader uploads videos to api.video using delegated upload token or API Key.
+api.video's iOS  uploads videos to api.video using delegated upload token or API Key.
 
 It allows you to upload videos in two ways:
 - standard upload: to send a whole video file in one go
@@ -39,14 +39,14 @@ It allows you to upload videos in two ways:
 Specify it in your `Cartfile`:
 
 ```
-github "apivideo/api.video-ios-uploader" ~> 0.1.3
+github "apivideo/api.video-ios-uploader" ~> 0.1.4
 ```
 
 Run `carthage update`
 
 ### CocoaPods
 
-Add `pod 'ApiVideoUploader', '0.1.3'` in your `Podfile`
+Add `pod 'ApiVideoUploader', '0.1.4'` in your `Podfile`
 
 Run `pod install`
 

Sources/APIs.swift

@@ -7,14 +7,15 @@
 import Foundation
 enum ApiVideoUploaderError: Error {
     case invalidApplicationName
+    case invalidApplicationVersion
+    case missingApplicationName
 }
 
 public class ApiVideoUploader {
-    private static let DEFAULT_USER_AGENT = "api.video uploader (iOS; v:0.1.3; )";
 
     public static var apiKey: String? = nil
     public static var basePath = "https://ws.api.video"
-    internal  static var customHeaders:[String: String] = ["User-Agent": ApiVideoUploader.DEFAULT_USER_AGENT]
+    internal  static var customHeaders:[String: String] = ["AV-Origin-Client": "ios-uploader:0.1.4"]
     private static var chunkSize: Int = 50 * 1024 * 1024
     internal static var requestBuilderFactory: RequestBuilderFactory = AlamofireRequestBuilderFactory()
     internal static var credential = ApiVideoCredential()
@@ -34,16 +35,38 @@ public class ApiVideoUploader {
         return ApiVideoUploader.chunkSize
     }
 
-    public static func setApplicationName(applicationName: String) throws {
-        let pattern = #"^[\w\-.\/]{1,50}$"#
+
+    public static func setApplicationName(applicationName: String, applicationVersion: String?) throws {
+        if(applicationName.isEmpty) {
+            if(applicationVersion != nil && !applicationVersion!.isEmpty) {
+                throw ApiVideoUploaderError.missingApplicationName
+            }
+            ApiVideoUploader.customHeaders["AV-Origin-App"] = nil
+            return
+        }
+
+        let pattern = #"^[\w\-]{1,50}$"#
         let regex = try! NSRegularExpression(pattern: pattern, options: .anchorsMatchLines)
         let stringRange = NSRange(location: 0, length: applicationName.utf16.count)
         let matches = regex.matches(in: applicationName, range: stringRange)
         if(matches.isEmpty) {
             throw ApiVideoUploaderError.invalidApplicationName
         }
-        ApiVideoUploader.customHeaders["User-Agent"] = ApiVideoUploader.DEFAULT_USER_AGENT + " " + applicationName
+
+        if(applicationVersion != nil && !applicationVersion!.isEmpty) {
+            let pattern2 = #"^[\w\-]{1,50}$"#
+            let regex2 = try! NSRegularExpression(pattern: pattern2, options: .anchorsMatchLines)
+            let stringRange2 = NSRange(location: 0, length: applicationVersion!.utf16.count)
+            let matches2 = regex2.matches(in: applicationVersion!, range: stringRange2)
+            if(matches2.isEmpty) {
+                throw ApiVideoUploaderError.invalidApplicationVersion
+            }
+            ApiVideoUploader.customHeaders["AV-Origin-App"] = applicationName + ":" + applicationVersion!
+            return
+        }
+        ApiVideoUploader.customHeaders["AV-Origin-App"] = applicationName
     }
+
 }
 
 open class RequestBuilder<T> {

project.yml

@@ -7,7 +7,7 @@ targets:
     sources: [Sources]
     info:
       path: ./Info.plist
-      version: 0.1.3
+      version: 0.1.4
     settings:
       APPLICATION_EXTENSION_API_ONLY: true
     scheme: {}