Skip to content

Commit 9b88dc8

Browse files
committed
Merge branch 'develop' which has Notifications
2 parents 77dfb26 + 29b1351 commit 9b88dc8

File tree

219 files changed

+14182
-3182
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

219 files changed

+14182
-3182
lines changed

sdk/build.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<property name="doc.root" value="../packaged.docs" />
88

99
<property name="sdk.version.major" value="04"/>
10-
<property name="sdk.version.minor" value="02"/>
10+
<property name="sdk.version.minor" value="03"/>
1111
<property name="sdk.root.folder" value="ATT_APIPLATFORM_HTML5SDK-R${sdk.version.major}.${sdk.version.minor}"/>
1212
<property name="output" value="${zip.root}/${sdk.root.folder}" />
1313
<property name="doc.output" value="${doc.root}/docs" />

sdk/client/att-api-client.js

Lines changed: 324 additions & 159 deletions
Large diffs are not rendered by default.

sdk/doc_src/class-categories.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
"AttApiClient.DeviceCapabilities",
1111
"AttApiClient.InAppMessaging",
1212
"AttApiClient.MMS",
13+
"AttApiClient.Notification",
1314
"AttApiClient.OAuth",
1415
"AttApiClient.SMS",
1516
"AttApiClient.Speech",

sdk/doc_src/guides/getting_started/README.md

Lines changed: 23 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,14 @@ For details on using the Device Capabilities, MMS, In-App Messaging, OAuth, SMS,
44

55
- [AT&T API Platform](https://developer.att.com/).
66

7-
**Note:** To use the AT&T API Platform SDK to build an application, you must obtain an API key set for each application intended to utilize the [AT&T API Platform](https://developer.att.com/docs). If you choose to utilize the SMS or MMS APIs, the AT&T Developer Program will provide short codes (virtual phone numbers) to associate with your application.
7+
**Note:** To use the AT&T API Platform SDK to build an app, you must obtain an API key set for each app in which you intend to utilize the [AT&T API Platform](https://developer.att.com/docs). If you wish to use the SMS or MMS APIs, the AT&T Developer Program will provide short codes (virtual phone numbers) to associate with your app.
88

99
Overview
1010
---
1111

1212
The AT&T API Platform SDK for HTML5 has three main layers: Client/Browser, HTML5 SDK Server, and AT&T API Platform:
1313

14-
**Client/Browser** Contains your app code; this layer is for end-user interaction. The AT&T SDK for HTML5 uses a JavaScript library (att-api-client.js) to enable development of cross-platform mobile web apps.
14+
**Client/Browser** Contains your app code; this layer is for user interaction. The AT&T SDK for HTML5 uses a JavaScript library (att-api-client.js) to enable development of cross-platform mobile Web apps.
1515

1616
**HTML5 SDK Server** Provides reusable and extendable server code written in Java, PHP, and Ruby. The HTML5 SDK Server takes requests from the AttApiClient object and sends them to the AT&T API Platform.
1717

@@ -24,58 +24,61 @@ The AT&T API Platform SDK for HTML5 has three main layers: Client/Browser, HTML5
2424
About the Guides
2525
---
2626

27-
These guides are for intermediate to advanced web application developers who have a good understanding of HTML, JavaScript, and related browser and server technologies. Server implementations of the SDK are provided in Java, Ruby, and PHP. You should be familiar with installing, configuring and developing applications in the language of your choice.
27+
These guides are for intermediate to advanced Web app developers who have a good understanding of HTML, JavaScript, and related browser and server technologies. Server implementations of the SDK are provided in Java, Ruby, and PHP. You should be familiar with installing, configuring and developing apps in the language of your choice.
2828

29-
JavaScript is the language used for all of the client-side code in the AT&T API Platform SDK for HTML5. All samples use the Sencha Touch SDK. These guides are designed to get an application up and running, and to make calls to the AT&T APIs. To customize the behavior of a Sencha Touch based application, you should become familiar with the Sencha Touch SDK. To gain a better understanding of Sencha Touch, visit the [Sencha Learn](http://www.sencha.com/) for in-depth tutorials and API documentation.
29+
JavaScript is the language used for all of the client-side code in the AT&T API Platform SDK for HTML5. All samples use the Sencha Touch SDK. These guides are designed to get an app up and running, and to make calls to the AT&T APIs. To customize the behavior of a Sencha Touch-based app, you should become familiar with the Sencha Touch SDK. To gain a better understanding of Sencha Touch, visit [Sencha Learn](http://www.sencha.com/) for in-depth tutorials and API documentation.
3030

31-
If you want to write HTML5 applications without using Sencha Touch, you can use the provided JavaScript library (att-api-client.js) to utilize AT&T APIs in a library-neutral way.
31+
If you want to write HTML5 apps without using Sencha Touch, you can use the provided JavaScript library (att-api-client.js) to utilize AT&T APIs in a library-neutral way.
3232

3333
**You will need a WebKit-based browser to run the sample code. Desktop WebKit browsers include Google Chrome and Apple Safari. Supported mobile devices include Android and iOS. **
3434

3535

3636
Creating an AT&T Developer Account
3737
---
3838

39-
In order to access the AT&T API Platform, you must first join the [AT&T Developer Program](https://developer.att.com) by creating an account. Once your account is created and validated, and you have followed the instructions on the AT&T Developer Program site to get access to the AT&T API Platform, you will be ready to set up an application within your AT&T Developer account.
39+
In order to access the AT&T API Platform, you must first join the [AT&T Developer Program](https://developer.att.com) by creating an account. Once your account is created and validated and you have followed the instructions on the AT&T Developer Program site to get access to the AT&T API Platform, you will be ready to set up an app within your AT&T Developer account.
4040

4141

42-
Setting Up Your Application
42+
Setting Up Your App
4343
----
4444

45-
1. Log in to the AT&T Developer Program [website](https://developer.att.com) and click the My Apps button.
46-
2. Click Set Up New App, complete the required fields and select the APIs you wish to enable.
47-
3. Click Submit App. Take note of the keys generated for your application setup.
48-
These values are used to configure the server software for authentication when it communicates with the AT&T APIs. The short code is used as the address from which your application sends messages, and as the destination address for your application to process incoming messages.
49-
5. Check all of the AT&T service APIs, including but not limited to: Multimedia Messaging Service (MMS), Short Messaging Service (SMS), and Speech to Text (SPEECH). As you create your application, you should enable all of these services.
45+
1. Log in to the [AT&T Developer Program website](https://developer.att.com) and click the My Apps button.
46+
2. Click Set Up New App, complete the required fields, and select the APIs you wish to enable.
47+
3. Click Submit App. Take note of the App Key and App Secret generated for your app setup.
48+
These values are used to configure the server software for authentication when communicating with the AT&T APIs. The short code is used as the address from which your application sends messages, and as the destination address for your application to process incoming messages.
49+
5. Select all of the AT&T APIs to enable them for your app. As you create your app you will be able to integrate only the APIs you want to use.
5050

5151

5252
OAuth Redirect URL
5353
---
5454

55-
An OAuth Redirect URL is required for all applications using Device Capabilities, and In-App Messaging APIs. The OAuth Redirect URL is the URL to your application, where the user is redirected once the user consent process is completed. When the application attempts an OAuth authentication, AT&T servers verify that the passed callback matches the one provisioned for your application.
55+
An OAuth Redirect URL is required for all apps using the Device Capabilities and In-App Messaging APIs. The OAuth Redirect URL is the URL to your application, where the user is redirected once the user consent process is completed. When the app attempts an OAuth authentication, AT&T servers verify that the passed callback matches the one provisioned for your app.
5656

57-
After authentication, the AT&T API redirects the user back to http://yourhost:yourport/att/callback, yourhost:yourport will need to match exactly with the yourhost:yourport from which the application was loaded.
57+
After authentication, the AT&T API redirects the user back to http://yourhost:yourport/att/callback, yourhost:yourport will need to match exactly with the yourhost:yourport from which the app was loaded.
5858

59-
For example, if your application is hosted on mynewapp.com, and the user loads mynewapp.com, then your redirect URL should be http://mynewapp.com/att/callback .
59+
For example, if your app is hosted on mynewapp.com, and the user loads mynewapp.com, then your redirect URL should be http://mynewapp.com/att/callback .
6060

61-
In these examples and guides, we assume that you are using a 127.0.0.1 host (often used for a local development server). However, any valid DNS name will work. If you plan to test the client from a different computer or on a mobile device, using 127.0.0.1 will not work. In that case you should use a real DNS name that maps to your server.
61+
In these examples and guides, we assume that you are using a host address of 127.0.0.1 (often used for a local development server). However, any valid DNS name will work. If you plan to test the client from a different computer or on a mobile device, using 127.0.0.1 will not work. In that case you should use a real DNS name that maps to your server.
6262

6363
Once your application is provisioned with the AT&T Developer Program, you can proceed with configuring the HTML SDK server.
6464

65+
Notifications Callback URL
66+
---
67+
You can use a Webhooks callback URL to receive notifications of changes to your In-App Messaging message box. After initial app setup on the [AT&T Developer Program website](https://developer.att.com), edit the app and click Push Notifications. Enter the Notification Callback URL for your server at https://yourdomain:yoursslport/att/notification/v1/callback.
6568

6669
HTML5 SDK Server
6770
----
6871

69-
The AT&T API Platform SDK for HTML5 provides examples to address cross domain access and other security concerns. The SDK Server provides a proxy between the web application and the AT&T APIs. It also provides appropriate methods to request the OAuth login sequence, fetch an access token, and make requests to the AT&T APIs.
72+
The AT&T API Platform SDK for HTML5 provides examples to address cross-domain access and other security concerns. The SDK Server provides a proxy between the Web app and the AT&T APIs. It also provides appropriate methods for requesting the OAuth login sequence, fetching an access token, and making requests to the AT&T APIs.
7073

7174
The HTML5 SDK Server layer has been implemented in three popular languages: Java, Ruby, and PHP.
7275

73-
The implementation in each language provides a consistent HTTP API for Client access. The HTTP API allows clients to connect to any of the server implementations without modification.
76+
The implementation in each language provides a consistent HTTP API for client access. The HTTP API allows clients to connect to any of the server implementations without modification.
7477

75-
The HTML5 SDK Server proxy is designed to run with a minimum number of external dependencies, to make integration into your specific environment more convenient. However, depending on the language and development tools used in your environment, modifications may be required to the provided proxy code.
78+
The HTML5 SDK server proxy is designed to run with a minimum number of external dependencies, making integration into your specific environment more convenient. However, depending on the language and development tools used in your environment, modifications may be required to the provided proxy code.
7679

7780

7881
Quick Start
7982
---
8083

81-
To get started, choose the server guide for the language of your choice from the menu on the left. The guide will walk you through the process of configuring, building, and running a web application that uses the AT&T API Platform.
84+
To get started, choose the server guide for the language of your choice from the menu on the left. The guide will walk you through the process of configuring, building, and running a Web app that uses the AT&T API Platform.

sdk/doc_src/guides/sample_app_test/README.md

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,19 +6,19 @@ The following section describes how to test your connection to the AT&T APIs usi
66

77

88
##OAuth
9-
Device Capabilities and In-App Messaging require users to authorize your app via an OAuth consent. The SDK facilitates this process by presenting the user with the AT&T API Platform access page, capturing their authorization code, requesting and storing the user’s access token. The user needs to authorize consent only once per session.
9+
Device Capabilities and In-App Messaging require users to authorize your app using OAuth consent. The SDK facilitates this process by presenting the user with the AT&T API Platform access page, capturing their authorization code, requesting and storing the user’s access token. The user needs to authorize consent only once per session.
1010

11-
A user accessing In-App Messaging features will be presented with a Consent Request screen requesting app authorization to an AT&T wireless number or account. Device Capabilities uses OAuth authentication but it will not show a consent screen. The authorization is performed automatically if you are on the AT&T network.
11+
A user accessing In-App Messaging features will be presented with a Consent Request screen requesting app authorization to an AT&T wireless number or account. Device Capabilities uses OAuth authentication but it will not show a consent screen. The authorization is performed automatically if you are on the AT&T network.
1212

13-
(**) The authentication pages shown below are from AT&T servers, not the SDK. The UI may be updated and slightly different from the screenshots below.
13+
(**) The following authentication pages are from AT&T servers, not the SDK. The UI may be updated and appear differently than these examples.
1414

15-
There are several authentication methods you may use, but the easiest and fastest method is using an AT&T device with an active wireless number, and send an authorization password to AT&T’s short code:
15+
There are several authentication methods you can use, but the easiest and fastest method is using an AT&T device with an active wireless number to send an authorization password to the AT&T short code:
1616

17-
![Oauth](/sdk/doc_src/resources/images/sample_apps_screens/oauth-one.png)
17+
![Oauth](resources/images/sample_apps_screens/oauth-one.png)
1818

1919
When the correct password is received, you will see a screen like the following indicating that you have authorized the request:
2020

21-
![Oauth](/sdk/doc_src/resources/images/sample_apps_screens/oauth-close.png)
21+
![Oauth](resources/images/sample_apps_screens/oauth-close.png)
2222

2323
Make sure to select "Close window" to redirect the user back to your app and deliver the OAuth token to the server.
2424

@@ -157,7 +157,9 @@ You can specify up to 10 addresses by separating them with commas. Valid address
157157
* Email Addresses
158158
* Short Codes
159159

160-
You can send a message up to 10 different addresses.
160+
You can send a message to up to 10 different addresses.
161+
162+
In-App Messaging notifications will be received by the app server at https://your_app_server_domain_name:4568/att/notification/v1/callback.
161163

162164
##Advertising
163165
Point your browser to this address:

sdk/package.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
sdk.version.major=04
2-
sdk.version.minor=02
2+
sdk.version.minor=03
33

sdk/server/java/codekit/pom.xml

Lines changed: 5 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -28,17 +28,11 @@
2828
</configuration>
2929
</plugin>
3030

31-
32-
<plugin>
33-
<groupId>org.apache.maven.plugins</groupId>
34-
<artifactId>maven-javadoc-plugin</artifactId>
35-
<version>2.9</version>
36-
<configuration></configuration>
37-
</plugin>
38-
3931
<plugin>
4032
<groupId>org.apache.maven.plugins</groupId>
4133
<artifactId>maven-javadoc-plugin</artifactId>
34+
<version>2.9</version>
35+
<configuration></configuration>
4236
<executions>
4337
<execution>
4438
<id>attach-javadocs</id>
@@ -125,9 +119,9 @@
125119
<version>2.5</version>
126120
</dependency>
127121
<dependency>
128-
<groupId>com.metaparadigm</groupId>
129-
<artifactId>json-rpc</artifactId>
130-
<version>1.0</version>
122+
<groupId>org.json</groupId>
123+
<artifactId>json</artifactId>
124+
<version>20140107</version>
131125
</dependency>
132126
<dependency>
133127
<groupId>org.apache.commons</groupId>

0 commit comments

Comments
 (0)