Add support for watchOS (#43)

* Add support for watchOS

* Update exclude paths, since iOS and watchOS share common code

* Updated version number to 2.3.2

Author: alexnachbaur-okta

Framework/iOS/Info.plist

@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>2.3.1</string>
+	<string>2.3.2</string>
 	<key>CFBundleVersion</key>
 	<string>$(CURRENT_PROJECT_VERSION)</string>
 </dict>

Framework/macOS/Info.plist

@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>$(PRODUCT_BUNDLE_PACKAGE_TYPE)</string>
 	<key>CFBundleShortVersionString</key>
-	<string>2.3.1</string>
+	<string>2.3.2</string>
 	<key>CFBundleVersion</key>
 	<string>$(CURRENT_PROJECT_VERSION)</string>
 	<key>NSHumanReadableCopyright</key>

Framework/watchOS/Info.plist

@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>CFBundleDevelopmentRegion</key>
+	<string>$(DEVELOPMENT_LANGUAGE)</string>
+	<key>CFBundleExecutable</key>
+	<string>$(EXECUTABLE_NAME)</string>
+	<key>CFBundleIdentifier</key>
+	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
+	<key>CFBundleInfoDictionaryVersion</key>
+	<string>6.0</string>
+	<key>CFBundleName</key>
+	<string>$(PRODUCT_NAME)</string>
+	<key>CFBundlePackageType</key>
+	<string>$(PRODUCT_BUNDLE_PACKAGE_TYPE)</string>
+	<key>CFBundleShortVersionString</key>
+	<string>2.3.2</string>
+	<key>CFBundleVersion</key>
+	<string>$(CURRENT_PROJECT_VERSION)</string>
+</dict>
+</plist>

Framework/watchOS/OktaJWTLib_watchOS_BridgingHeader.h

@@ -0,0 +1,15 @@
+/*
+* Copyright (c) 2019, Okta, Inc. and/or its affiliates. All rights reserved.
+* The Okta software accompanied by this notice is provided pursuant to the Apache License, Version 2.0 (the "License.")
+*
+* You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0.
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+*
+* See the License for the specific language governing permissions and limitations under the License.
+*/
+#import <Foundation/Foundation.h>
+
+#import <OktaJWTLib/NSData+SHA.h>
+#import <OktaJWTLib/NSData+HMAC.h>

OktaJWT.podspec

@@ -1,23 +1,25 @@
 Pod::Spec.new do |s|
   s.name             = 'OktaJWT'
-  s.version          = '2.3.1'
+  s.version          = '2.3.2'
   s.summary          = 'A JWT verification library'
 
   s.description      = <<-DESC
 Library to validate JSON Web Tokens.
                        DESC
-  s.platforms        = { :ios => "12.0", :osx => "10.14"}
+  s.platforms        = { :ios => "12.0", :watchos => "6.0", :osx => "10.14"}
   s.homepage         = 'https://github.com/okta/okta-ios-jwt'
   s.license          = { :type => 'Apache-2.0', :file => 'LICENSE' }
   s.author           = { 'Okta Developers' => 'developers@okta.com' }
   s.source           = { :git => 'https://github.com/okta/okta-ios-jwt.git', :tag => s.version.to_s }
   s.social_media_url = 'https://twitter.com/oktaDev'
 
   s.ios.deployment_target = '12.0'
+  s.watchos.deployment_target = '6.0'
   s.osx.deployment_target = '10.14'
 
   s.source_files = 'Sources/**/*.{h,m,swift}'
   s.ios.exclude_files = 'Sources/**/macOS/**'
+  s.watchos.exclude_files = 'Sources/**/macOS/**'
   s.osx.exclude_files = 'Sources/**/iOS/**'
   s.swift_version = '4.2'
 end

OktaJWT.xcodeproj/project.pbxproj

@@ -31,7 +31,7 @@ public extension RSAPKCS1SignerProtocol {
 
 public class RSAPKCS1SignerFactory {
     public static func createSigner(hashFunction: SignatureAlgorithm.HashFunction, key: RSAKey) -> RSAPKCS1SignerProtocol {
-#if os(iOS)
+#if os(iOS) || os(watchOS)
         return RSAPKCS1SignerIOS(hashFunction: hashFunction, key: key)
 #elseif os(OSX)
         return RSAPKCS1SignerMacOS(hashFunction: hashFunction, key: key)

Sources/ThirdParty/JSONWebToken+Okta/RSAPKCS1SignerProtocol.swift

@@ -34,7 +34,7 @@ public extension RSAPKCS1VerifierProtocol {
 
 public class RSAPKCS1VerifierFactory {
     public static func createVerifier(key: RSAKey, hashFunction: SignatureAlgorithm.HashFunction) -> RSAPKCS1VerifierProtocol {
-#if os(iOS)
+#if os(iOS) || os(watchOS)
         return RSAPKCS1VerifierIOS(key: key, hashFunction: hashFunction)
 #elseif os(OSX)
         return RSAPKCS1VerifierMacOS(key: key, hashFunction: hashFunction)

Sources/ThirdParty/JSONWebToken+Okta/RSAPKCS1VerifierProtocol.swift

@@ -13,6 +13,8 @@
 import Foundation
 #if os(iOS)
 import UIKit
+#elseif os(watchOS)
+import WatchKit
 #endif
 
 open class Utils: NSObject {
@@ -128,6 +130,8 @@ open class Utils: NSObject {
     internal class func buildUserAgentString() -> String {
 #if os(iOS)
         return "okta-ios-jwt/\(VERSION) iOS/\(UIDevice.current.systemVersion) Device/\(Utils.deviceModel())"
+#elseif os(watchOS)
+        return "okta-ios-jwt/\(VERSION) watchOS/\(WKInterfaceDevice.current().systemVersion) Device/\(Utils.deviceModel())"
 #elseif os(OSX)
         return "okta-ios-jwt/\(VERSION) macOS/\(ProcessInfo.processInfo.operatingSystemVersion) Device/\(Utils.deviceModel())"
 #endif