plist updated with push credentials

Author: VidyasagarMSC

License.txt

@@ -0,0 +1,13 @@
+Copyright 2017 IBM Corp.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with 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.

Notice.txt

@@ -0,0 +1,2 @@
+This product includes software originally developed by IBM Corporation
+Copyright 2017 IBM Corp.

README.md

@@ -1,2 +1,10 @@
-# serverless-followupapp-ios
-A mobile follow-up app using a serverless backend in Swift
+# A native iOS-Swift mobile app using a serverless backend in Swift
+
+The application is a feedback app that smartly analyses the Tone of the feedback provided and appropriately acknowledges the customer through a Push Notification.
+
+In this application, the user authenticates against [App ID](https://console.bluemix.net/catalog/services/AppID). App ID provides access and identification tokens. Further calls to the backend API include the access token. The backend is implemented with [Cloud Functions](https://console.bluemix.net/openwhisk). The serverless actions, exposed as Web Actions, expect the token to be sent in the request headers and verify its validity (signature and expiration date) before allowing access to the actual API. When the user submits a feedback, the feedback is stored in [Cloudant](https://console.bluemix.net/catalog/services/cloudantNoSQLDB) and later processed with Tone Analyzer. Based on the analysis result, a notification is sent back to the user with [Push Notifications](https://console.bluemix.net/catalog/services/imfpush).
+
+## License
+
+See [License.txt](License.txt) for license information.
+

deploy.sh

@@ -126,24 +126,20 @@ function uninstall() {
 function update() {
  echo "Updating actions..."
  bx wsk action update $PACKAGE_NAME/auth-validate \
- actions/validate/build/libs/validate.jar \
- --main serverlessfollowup.auth.ValidateToken
+ actions/validate/ValidateToken.swift \
+
+ bx wsk action update $PACKAGE_NAME/users-add \
+ actions/users/AddUser.swift \
 
- bx wsk action update $PACKAGE_NAME/users-add \
- actions/users/build/libs/users.jar \
- --main serverlessfollowup.users.AddUser
+ bx wsk action update $PACKAGE_NAME/users-prepare-notify \
+ actions/users/PrepareUserNotification.swift \
 
- bx wsk action update $PACKAGE_NAME/users-prepare-notify \
- actions/users/build/libs/users.jar \
- --main serverlessfollowup.users.PrepareUserNotification
+ bx wsk action update $PACKAGE_NAME/feedback-put \
+ actions/feedback/AddFeedback.swift \
 
- bx wsk action update $PACKAGE_NAME/feedback-put \
- actions/feedback/build/libs/feedback.jar \
- --main serverlessfollowup.feedback.AddFeedback
+ bx wsk action update $PACKAGE_NAME/feedback-analyze \
+ actions/feedback/AnalyzeFeedback.swift \
 
- bx wsk action update $PACKAGE_NAME/feedback-analyze \
- actions/feedback/build/libs/feedback.jar \
- --main serverlessfollowup.feedback.AnalyzeFeedback
 }
 
 function showenv() {

followupapp/FollowUpappid/AfterLoginViewController.swift

@@ -10,7 +10,6 @@
  * limitations under the License.
  */
 
-
 import UIKit
 import BluemixAppID
 import BMSCore
@@ -21,13 +20,8 @@ class AfterLoginViewController: UIViewController,UITextViewDelegate {
 
  @IBOutlet weak var toptext: UILabel!
  @IBOutlet weak var profilePic: UIImageView!
- 
- @IBOutlet weak var hintMessageView: UILabel!
  @IBOutlet weak var topBar: UIView!
- @IBOutlet weak var nextLabel: UILabel!
  @IBOutlet weak var successMsg: UILabel!
- // function for displaying login
- // @IBOutlet weak var warningText: UILabel!
  @IBOutlet weak var submitButton: UIButton!
  @IBOutlet weak var feedbackText: UITextView!
  var accessToken:AccessToken?
@@ -126,6 +120,9 @@ class AfterLoginViewController: UIViewController,UITextViewDelegate {
 
  }
 
+ /// Called by Submit button.
+ ///
+ /// - Parameter sender: <#sender description#>
  @IBAction func submitFeedback(_ sender: Any) {
 
  ServerlessAPI.sharedInstance.sendFeedback(accessToken: accessToken!,idToken: idToken!, message: feedbackText.text)

followupapp/FollowUpappid/AppDelegate.swift

@@ -19,11 +19,13 @@ import BluemixAppID
 class AppDelegate: UIResponder, UIApplicationDelegate {
 
  var window: UIWindow?
- 
+ var pushAppGUID: String?
+ var pushClientSecret: String?
  func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplicationLaunchOptionsKey: Any]?) -> Bool {
 
+ //Initialize BMSCore SDK.
  let myBMSClient = BMSClient.sharedInstance
- myBMSClient.initialize(bluemixRegion:BMSClient.Region.sydney )
+ myBMSClient.initialize(bluemixRegion:BMSClient.Region.sydney ) // TODO: Change to the region of push notifications service.
  myBMSClient.requestTimeout = 10.0 // seconds
 
  // Initialize the AppID instance with your tenant ID and region
@@ -34,6 +36,8 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
  let bmsclient = BMSClient.sharedInstance
  let backendGUID = dictionary["authTenantId"] as? String
  let serverlessBackendURL = dictionary["serverlessBackendUrl"] as? String
+ pushAppGUID = dictionary["pushAppGuid"] as? String
+ pushClientSecret = dictionary["pushClientSecret"] as? String
  bmsclient.initialize(bluemixRegion: region)
  let appid = AppID.sharedInstance
  appid.initialize(tenantId: backendGUID!, bluemixRegion: region)
@@ -42,6 +46,9 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
  TokenStorageManager.sharedInstance.initialize(tenantId: backendGUID!)
  ServerlessAPI.sharedInstance.initialize(tenantId: backendGUID!,serverlessBackendURL: serverlessBackendURL!)
  }
+ 
+ 
+ //Request for user permission to send push notifications
  let notificationSettings = UIUserNotificationSettings(types: [.badge, .sound, .alert], categories: nil)
  UIApplication.shared.registerUserNotificationSettings(notificationSettings)
  UIApplication.shared.registerForRemoteNotifications()
@@ -52,6 +59,20 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
  return AppID.sharedInstance.application(application, open: url, options: options)
  }
 
+ func application(_ application: UIApplication, didRegisterForRemoteNotificationsWithDeviceToken deviceToken: Data) {
+ let push = BMSPushClient.sharedInstance
+ push.initializeWithAppGUID(appGUID: pushAppGUID!, clientSecret: pushClientSecret!)
+ push.registerWithDeviceToken(deviceToken: deviceToken) { (response, statusCode, error) -> Void in
+ if error.isEmpty {
+ print( "Response during device registration : \(String(describing: response))")
+ print( "status code during device registration : \(String(describing: statusCode))")
+ } else{
+ print( "Error during device registration \(error) ")
+ print( "Error during device registration \n - status code: \(String(describing: statusCode)) \n Error :\(error) \n")
+ }
+ }
+ }
+ 
  func applicationWillResignActive(_ application: UIApplication) {
  // Sent when the application is about to move from active to inactive state. This can occur for certain types of temporary interruptions (such as an incoming phone call or SMS message) or when the user quits the application and it begins the transition to the background state.
  // Use this method to pause ongoing tasks, disable timers, and throttle down OpenGL ES frame rates. Games should use this method to pause the game.

followupapp/FollowUpappid/BMSCredentials.plist

@@ -7,6 +7,10 @@
 <key>appName</key>
 <string>serverlessfollowupapp</string>
 <key>serverlessBackendUrl</key>
+<string>https://openwhisk.ng.bluemix.net/api/v1/web/REPLACE-WITH-ORG-NAME_REPLACE-WITH-SPACE-NAME/serverlessfollowup</string>
+<key>pushAppGuid</key>
+<string></string>
+<key>pushClientSecret</key>
 <string></string>
 </dict>
 </plist>

followupapp/FollowUpappid/ServerlessAPI.swift

@@ -12,6 +12,7 @@ import BluemixAppID
 
 public class ServerlessAPI{
 
+
  var idToken:IdentityToken?
  var accessToken:AccessToken?
  var tenantId : String?
@@ -24,6 +25,12 @@ public class ServerlessAPI{
  self.serverlessBackendURL = serverlessBackendURL
  }
 
+ 
+ /// Send a request to serverless action to a user after validating the accesstoken
+ ///
+ /// - Parameters:
+ /// - accessToken: Provided by App ID
+ /// - idToken: Provided by App ID
  func addUser(accessToken:AccessToken?, idToken:IdentityToken?)
  {
  self.accessToken = accessToken
@@ -62,6 +69,12 @@ public class ServerlessAPI{
  }
  }
 
+ /// Calls serverless action to add feedback to database.
+ ///
+ /// - Parameters:
+ /// - accessToken: Provided by AppID service.
+ /// - idToken: Provided by AppID service
+ /// - message: As entered in Feedback Text View
  func sendFeedback(accessToken:AccessToken?, idToken:IdentityToken?, message: String?)
  {