Merge pull request #5 from IBM-Cloud/updates/1426

Updates/1426

Author: l2fprod

actions/feedback/AddFeedback.swift

@@ -8,7 +8,8 @@ import Foundation
 import SwiftyJSON
 
 func main(args: [String:Any]) -> [String:Any] {
- 
+ print("Received:",args)
+
  var str = ""
  var subject = ""
  var cloudantBody = [String:String]()

actions/feedback/AnalyzeFeedback.swift

@@ -7,7 +7,8 @@ import Dispatch
 import KituraNet
 
 func main(args: [String:Any]) -> [String:Any] {
- 
+ print("Received:",args)
+
  let str = ""
  var responseValue = ""
  var messageTemplate = ""

actions/users/AddUser.swift

@@ -8,11 +8,12 @@ import Foundation
 import SwiftyJSON
 
 func main(args: [String:Any]) -> [String:Any] {
+ print("Received:",args)
 
  var str = ""
  var subject = ""
  var name = "Guest"
- var deviceId = ""
+ var deviceId = args["deviceId"] as? String
  var picture = ""
  var email = ""
  var cloudantBody = [String:String]()
@@ -44,7 +45,6 @@ func main(args: [String:Any]) -> [String:Any] {
  if let idTokenFromString = idToken.data(using: .utf8, allowLossyConversion: false) {
  let idTokenJSON = JSON(data: idTokenFromString)
  name = idTokenJSON["name"].stringValue.isEmpty ? "Guest" : idTokenJSON["name"].stringValue
- deviceId = idTokenJSON["oauth_client"]["device_id"].stringValue
  cloudantBody["name"] = name
  cloudantBody["deviceid"] = deviceId
  if(idTokenJSON["amr"][0].stringValue != "appid_anon")

actions/users/PrepareUserNotification.swift

@@ -7,7 +7,8 @@ import Dispatch
 import Foundation
 
 func main(args: [String:Any]) -> [String:Any] {
- 
+ print("Received:",args)
+
  var str = ""
  var responseValue = ""
  var name = ""
@@ -70,8 +71,8 @@ func main(args: [String:Any]) -> [String:Any] {
  }
  }
  responseData = [
- "deviceIds": [deviceIds],
- "text": notificationText
+ "targetDeviceIds": [deviceIds],
+ "messageText": notificationText
  ]
 
  return responseData

actions/validate/ValidateToken.swift

@@ -8,7 +8,8 @@ import SwiftyJSON
 
 
 func main(args: [String:Any]) -> [String:Any] {
- 
+ print("Received:",args)
+
  var args: [String:Any] = args
  let str = ""
  var result: [String:Any] = [

deploy.sh

@@ -33,26 +33,30 @@ function install() {
  # # ignore "document already exists error"
  curl -s -X POST -H 'Content-Type: application/json' -d @actions/feedback/moods.json $CLOUDANT_URL/moods/_bulk_docs | grep -v conflict
 
+ echo "Creating IAM-compatible push notifications package..."
+ git clone https://github.com/ibm-functions/package-push-notifications.git
+ (cd package-push-notifications/runtimes/nodejs && ibmcloud fn deploy -m manifest.yaml)
+
  echo "Creating packages..."
  ibmcloud fn package create $PACKAGE_NAME\
  -p services.cloudant.url $CLOUDANT_URL\
  -p services.appid.url $APPID_URL\
  -p services.appid.clientId $APPID_CLIENTID\
  -p services.appid.secret $APPID_SECRET\
  -p services.ta.url $TONE_ANALYZER_URL\
- -p services.ta.username $TONE_ANALYZER_USERNAME\
- -p services.ta.password $TONE_ANALYZER_PASSWORD\
+ -p services.ta.username apikey\
+ -p services.ta.password $TONE_ANALYZER_APIKEY
 
  ibmcloud fn package bind /whisk.system/cloudant \
  $PACKAGE_NAME-cloudant \
  -p username $CLOUDANT_USERNAME \
  -p password $CLOUDANT_PASSWORD \
  -p host $CLOUDANT_HOST
 
- ibmcloud fn package bind /whisk.system/pushnotifications \
+ ibmcloud fn package bind push-notifications \
  $PACKAGE_NAME-push \
- -p appId $PUSH_APP_GUID \
- -p appSecret $PUSH_APP_SECRET \
+ -p appGuid $PUSH_APP_GUID \
+ -p apikey $PUSH_APP_APIKEY \
  -p apiHost $PUSH_APP_API_HOST
 
  echo "Creating actions..."
@@ -93,7 +97,7 @@ function install() {
 
  # sequence reading the document from cloudant changes then calling analyze feedback on it
  ibmcloud fn action create $PACKAGE_NAME/feedback-analyze-sequence \
- $PACKAGE_NAME-cloudant/read-document,$PACKAGE_NAME/feedback-analyze,$PACKAGE_NAME/users-prepare-notify,$PACKAGE_NAME-push/sendMessage \
+ $PACKAGE_NAME-cloudant/read-document,$PACKAGE_NAME/feedback-analyze,$PACKAGE_NAME/users-prepare-notify,$PACKAGE_NAME-push/send-message \
  --sequence
 
  echo "Creating triggers..."
@@ -123,6 +127,7 @@ function uninstall() {
  ibmcloud fn package delete $PACKAGE_NAME-cloudant
  ibmcloud fn package delete $PACKAGE_NAME-push
  ibmcloud fn package delete $PACKAGE_NAME
+ (cd package-push-notifications/runtimes/nodejs && ibmcloud fn deploy -m manifest.yaml)
 
  echo "Done"
  ibmcloud fn list
@@ -131,20 +136,19 @@ function uninstall() {
 function update() {
  echo "Updating actions..."
  ibmcloud fn action update $PACKAGE_NAME/auth-validate \
- actions/validate/ValidateToken.swift \
+ actions/validate/ValidateToken.swift
 
-  ibmcloud fn action update $PACKAGE_NAME/users-add \
- actions/users/AddUser.swift \
+ ibmcloud fn action update $PACKAGE_NAME/users-add \
+ actions/users/AddUser.swift
 
-  ibmcloud fn action update $PACKAGE_NAME/users-prepare-notify \
- actions/users/PrepareUserNotification.swift \
+ ibmcloud fn action update $PACKAGE_NAME/users-prepare-notify \
+ actions/users/PrepareUserNotification.swift
 
- ibmcloud fn action update $PACKAGE_NAME/feedback-put \
- actions/feedback/AddFeedback.swift \
-
- ibmcloud fn action update $PACKAGE_NAME/feedback-analyze \
- actions/feedback/AnalyzeFeedback.swift \
+ ibmcloud fn action update $PACKAGE_NAME/feedback-put \
+ actions/feedback/AddFeedback.swift
 
+ ibmcloud fn action update $PACKAGE_NAME/feedback-analyze \
+ actions/feedback/AnalyzeFeedback.swift
 }
 
 function showenv() {

followupapp/.gitignore

@@ -0,0 +1,18 @@
+build/
+DerivedData
+
+## Various settings
+*.pbxuser
+!default.pbxuser
+*.mode1v3
+!default.mode1v3
+*.mode2v3
+!default.mode2v3
+*.perspectivev3
+!default.perspectivev3
+xcuserdata
+
+## Other
+*.xccheckout
+*.moved-aside
+*.xcuserstate

followupapp/FollowUpappid.xcodeproj/project.pbxproj

@@ -14,7 +14,7 @@
 BD4CE2401E8BDB780018989D /* anonymous.png in Resources */ = {isa = PBXBuildFile; fileRef = BD4CE23F1E8BDB780018989D /* anonymous.png */; };
 BD4F2CB71E8908E200BF4057 /* TokenStorage.swift in Sources */ = {isa = PBXBuildFile; fileRef = BD4F2CB61E8908E200BF4057 /* TokenStorage.swift */; };
 CFB0DACE856F7BC02E4390CD /* Pods_FollowUpappid.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6E4A9588D2E02D651A0A0001 /* Pods_FollowUpappid.framework */; };
-EF440D341E34DF0A008B57C4 /* BuildFile in Resources */ = {isa = PBXBuildFile; };
+EF440D341E34DF0A008B57C4 /* (null) in Resources */ = {isa = PBXBuildFile; };
 EFFC7C5F1E34C71500C3CCB5 /* AfterLoginViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = EFFC7C4B1E34C71500C3CCB5 /* AfterLoginViewController.swift */; };
 EFFC7C601E34C71500C3CCB5 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = EFFC7C4C1E34C71500C3CCB5 /* AppDelegate.swift */; };
 EFFC7C611E34C71500C3CCB5 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = EFFC7C4D1E34C71500C3CCB5 /* Assets.xcassets */; };
@@ -152,7 +152,6 @@
 EF3DA4601CE0B04D007A2B0A /* Frameworks */,
 EF3DA4611CE0B04D007A2B0A /* Resources */,
 EE02DEC27C8EC1506F880E86 /* [CP] Embed Pods Frameworks */,
-7DCD21DB5B72DE8C551D8D49 /* [CP] Copy Pods Resources */,
 );
 buildRules = (
 );
@@ -191,6 +190,7 @@
 developmentRegion = English;
 hasScannedForEncodings = 0;
 knownRegions = (
+English,
 en,
 Base,
 );
@@ -215,7 +215,7 @@
 BD4CE2401E8BDB780018989D /* anonymous.png in Resources */,
 4690A2801E8CE27F00C8D792 /* anonymous user.png in Resources */,
 EFFC7C6A1E34C71500C3CCB5 /* warning.png in Resources */,
-EF440D341E34DF0A008B57C4 /* BuildFile in Resources */,
+EF440D341E34DF0A008B57C4 /* (null) in Resources */,
 EFFC7C631E34C71500C3CCB5 /* Main.storyboard in Resources */,
 EFFC7C611E34C71500C3CCB5 /* Assets.xcassets in Resources */,
 EFFC7C621E34C71500C3CCB5 /* LaunchScreen.storyboard in Resources */,
@@ -244,45 +244,32 @@
 shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
 showEnvVarsInLog = 0;
 };
-7DCD21DB5B72DE8C551D8D49 /* [CP] Copy Pods Resources */ = {
-isa = PBXShellScriptBuildPhase;
-buildActionMask = 2147483647;
-files = (
-);
-inputPaths = (
-);
-name = "[CP] Copy Pods Resources";
-outputPaths = (
-);
-runOnlyForDeploymentPostprocessing = 0;
-shellPath = /bin/sh;
-shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-FollowUpappid/Pods-FollowUpappid-resources.sh\"\n";
-showEnvVarsInLog = 0;
-};
 EE02DEC27C8EC1506F880E86 /* [CP] Embed Pods Frameworks */ = {
 isa = PBXShellScriptBuildPhase;
 buildActionMask = 2147483647;
 files = (
 );
 inputPaths = (
-"${SRCROOT}/Pods/Target Support Files/Pods-FollowUpappid/Pods-FollowUpappid-frameworks.sh",
+"${PODS_ROOT}/Target Support Files/Pods-FollowUpappid/Pods-FollowUpappid-frameworks.sh",
 "${BUILT_PRODUCTS_DIR}/Alamofire/Alamofire.framework",
 "${BUILT_PRODUCTS_DIR}/BMSAnalyticsAPI/BMSAnalyticsAPI.framework",
 "${BUILT_PRODUCTS_DIR}/BMSCore/BMSCore.framework",
 "${BUILT_PRODUCTS_DIR}/BMSPush/BMSPush.framework",
-"${BUILT_PRODUCTS_DIR}/BluemixAppID/BluemixAppID.framework",
+"${BUILT_PRODUCTS_DIR}/IBMCloudAppID/IBMCloudAppID.framework",
+"${BUILT_PRODUCTS_DIR}/JOSESwift/JOSESwift.framework",
 );
 name = "[CP] Embed Pods Frameworks";
 outputPaths = (
 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Alamofire.framework",
 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/BMSAnalyticsAPI.framework",
 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/BMSCore.framework",
 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/BMSPush.framework",
-"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/BluemixAppID.framework",
+"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/IBMCloudAppID.framework",
+"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/JOSESwift.framework",
 );
 runOnlyForDeploymentPostprocessing = 0;
 shellPath = /bin/sh;
-shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-FollowUpappid/Pods-FollowUpappid-frameworks.sh\"\n";
+shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-FollowUpappid/Pods-FollowUpappid-frameworks.sh\"\n";
 showEnvVarsInLog = 0;
 };
 /* End PBXShellScriptBuildPhase section */
@@ -361,7 +348,7 @@
 GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 GCC_WARN_UNUSED_FUNCTION = YES;
 GCC_WARN_UNUSED_VARIABLE = YES;
-IPHONEOS_DEPLOYMENT_TARGET = 9.0;
+IPHONEOS_DEPLOYMENT_TARGET = 10.0;
 MTL_ENABLE_DEBUG_INFO = YES;
 ONLY_ACTIVE_ARCH = YES;
 SDKROOT = iphoneos;
@@ -401,7 +388,7 @@
 GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 GCC_WARN_UNUSED_FUNCTION = YES;
 GCC_WARN_UNUSED_VARIABLE = YES;
-IPHONEOS_DEPLOYMENT_TARGET = 9.0;
+IPHONEOS_DEPLOYMENT_TARGET = 10.0;
 MTL_ENABLE_DEBUG_INFO = NO;
 SDKROOT = iphoneos;
 SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
@@ -420,13 +407,13 @@
 "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 DEVELOPMENT_TEAM = M7XN3GW8UC;
 INFOPLIST_FILE = "$(SRCROOT)/FollowUpappid/Info.plist";
-IPHONEOS_DEPLOYMENT_TARGET = 9.0;
+IPHONEOS_DEPLOYMENT_TARGET = 10.0;
 LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 PRODUCT_BUNDLE_IDENTIFIER = FollowUpappidID;
 PRODUCT_NAME = "$(TARGET_NAME)";
 PROVISIONING_PROFILE = "";
 SWIFT_OBJC_BRIDGING_HEADER = "";
-SWIFT_VERSION = 3.0;
+SWIFT_VERSION = 4.0;
 };
 name = Debug;
 };
@@ -441,13 +428,13 @@
 "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 DEVELOPMENT_TEAM = M7XN3GW8UC;
 INFOPLIST_FILE = "$(SRCROOT)/FollowUpappid/Info.plist";
-IPHONEOS_DEPLOYMENT_TARGET = 9.0;
+IPHONEOS_DEPLOYMENT_TARGET = 10.0;
 LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 PRODUCT_BUNDLE_IDENTIFIER = FollowUpappidID;
 PRODUCT_NAME = "$(TARGET_NAME)";
 PROVISIONING_PROFILE = "";
 SWIFT_OBJC_BRIDGING_HEADER = "";
-SWIFT_VERSION = 3.0;
+SWIFT_VERSION = 4.0;
 };
 name = Release;
 };

followupapp/FollowUpappid.xcworkspace/contents.xcworkspacedata

@@ -0,0 +1,8 @@
+<?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>IDEDidComputeMac32BitWarning</key>
+<true/>
+</dict>
+</plist>