Skip to content
This repository has been archived by the owner on Jul 14, 2022. It is now read-only.

Commit

Permalink
updated to latest version of SDK
Browse files Browse the repository at this point in the history
  • Loading branch information
@rodsimpson
rodsimpson committed Aug 10, 2012
1 parent d0fad13 commit 39b16d5
Show file tree
Hide file tree
Showing 3 changed files with 127 additions and 128 deletions.
2 changes: 1 addition & 1 deletion index.html
View file
Expand Up @@ -93,7 +93,7 @@ <h1>Messagee</h1>
<button id="btn-update-account">Update</button>
</div>
<div style="width: 50%; float: right">
<a href="#page-messages-list" id="btn-close-update-account-page" data-role="button">Close</a>
<a href="#page-messages-list" id="btn-close" data-role="button">Close</a>
</div>
</div>
</div>
Expand Down
192 changes: 89 additions & 103 deletions js/apigee.appSDK.js
View file
Expand Up @@ -25,7 +25,7 @@ window.console.log = window.console.log || function() {};
//apigee namespace encapsulates this SDK
window.apigee = window.apigee || {};
apigee = apigee || {};
apigee.SDK_VERSION = '0.9.2';
apigee.SDK_VERSION = '0.9.3';

apigee.M = 'ManagementQuery';
apigee.A = 'ApplicationQuery';
Expand Down Expand Up @@ -54,7 +54,6 @@ apigee.A = 'ApplicationQuery';
*
* loginAppUser (username, password, successCallback, failureCallback)
* updateAppUser(uuid, name, email, username, oldpassword, newpassword, data, successCallback, failureCallback)
* createAppUser(name, email, username, password, data, successCallback, failureCallback)
*
* @class apigee.ApiClient
* @author Rod Simpson (rod@apigee.com)
Expand Down Expand Up @@ -389,7 +388,6 @@ apigee.ApiClient = (function () {
function (response) {
self.setAppUserUsername(response.user.username);
self.setAppUserFullName(response.user.name);
self.setAppUserFullName(response.user.givenName + response.user.familyName);
self.setAppUserEmail(response.user.email);
self.setAppUserUUID(response.user.uuid);
self.setToken(response.access_token);
Expand All @@ -405,102 +403,6 @@ apigee.ApiClient = (function () {
));
}

/*
* A public method to update an app user - currently does password update and user
* data update as two separate calls, but this will be changed to one call when the
* API is updated to support this
* @method updateAppUser
* @public
* @params {string} uuid
* @params {string} name
* @params {string} email
* @params {string} username
* @params {string} oldpassword
* @params {string} newpassword
* @params {function} successCallback
* @params {function} failureCallback
* @return {response} callback functions return API response object
*/
function updateAppUser(uuid, name, email, username, oldpassword, newpassword, data, successCallback, failureCallback) {
var self = this;
var data = data || {}
data.username = username;
data.email = email;
data.name = name;

var pwdata = {};
if (oldpassword) { pwdata.oldpassword = oldpassword; }
if (newpassword) { pwdata.newpassword = newpassword; }
//Note: we have ticket in to change PUT calls to /users to accept the password change
// once that is done, we will remove this call and merge it all into one
if (oldpassword && newpassword) {
this.runAppQuery(new apigee.Query('PUT', 'users/'+uuid+'/password', pwdata, null,
function (response) {

},
function (response) {

}
));
}
this.runAppQuery(new apigee.Query('PUT', 'users/'+uuid+'', data, null,
function (response) {
var user = response.entities[0];
self.setAppUserUsername(user.username);
self.setAppUserFullName(user.givenName + user.familyName);
self.setAppUserEmail(user.email);
self.setAppUserUUID(user.uuid);
if (successCallback && typeof(successCallback) == "function") {
successCallback(response);
}
},
function (response) {
if (failureCallback && typeof(failureCallback) == "function") {
failureCallback(response);
}
}
));
}

/**
* A public method to create an app user
* @method createAppUser
* @public
* @param {string} name
* @param {string} email
* @param {string} username
* @param {string} password
* @param {object} data
* @param {function} successCallback
* @param {function} failureCallback
* @return {response} callback functions return API response object
*/
function createAppUser(name, email, username, password, data, successCallback, failureCallback) {
var self = this;
var data = data || {}
data.username = username;
data.password = password;
data.email = email;
data.name = name;
this.runAppQuery(new apigee.Query('POST', 'users', data, null,
function (response) {
var user = response.entities[0];
self.setAppUserUsername(user.username);
self.setAppUserFullName(user.givenName + user.familyName);
self.setAppUserEmail(user.email);
self.setAppUserUUID(user.uuid);
if (successCallback && typeof(successCallback) == "function") {
successCallback(response);
}
},
function (response) {
if (failureCallback && typeof(failureCallback) == "function") {
failureCallback(response);
}
}
));
}

/*
* TODO: NOT IMPLEMENTED YET - A method to renew an app user's token
* @method renewAppUserToken
Expand Down Expand Up @@ -800,8 +702,6 @@ apigee.ApiClient = (function () {
getLogoutCallback:getLogoutCallback,
setLogoutCallback:setLogoutCallback,
callLogoutCallback:callLogoutCallback,
createAppUser:createAppUser,
updateAppUser:updateAppUser,
renewAppUserToken:renewAppUserToken,
logoutAppUser:logoutAppUser,
isLoggedInAppUser:isLoggedInAppUser
Expand Down Expand Up @@ -852,7 +752,7 @@ apigee.validation = (function () {
* @return {string} Returns a string with the allowed chars
*/
function getUsernameAllowedChars(){
return 'Length: min 6, max 80. Allowed: A-Z, a-z, 0-9, dot, and dash';
return 'Length: min 4, max 80. Allowed: A-Z, a-z, 0-9, dot, and dash';
}

/**
Expand All @@ -864,7 +764,7 @@ apigee.validation = (function () {
* @return {boolean} Returns true if string passes regex, false if not
*/
function validateName(name, failureCallback) {
if (nameRegex.test(name) && checkLength(name, 5, 16)) {
if (nameRegex.test(name) && checkLength(name, 4, 16)) {
return true;
} else {
if (failureCallback && typeof(failureCallback) == "function") {
Expand Down Expand Up @@ -1646,6 +1546,32 @@ apigee.validation = (function () {
path += "/" + this.getUUID();
}
}

//if this is a user, update the password if it has been specified
if (path == 'users') {
var data = this.getData();
var pwdata = {};
if (data.oldpassword) { pwdata.oldpassword = data.oldpassword; }
if (data.newpassword) { pwdata.newpassword = data.newpassword; }
//Note: we have a ticket in to change PUT calls to /users to accept the password change
// once that is done, we will remove this call and merge it all into one
if (oldpassword && newpassword) {
this.runAppQuery(new apigee.Query('PUT', 'users/'+uuid+'/password', pwdata, null,
function (response) {
//not calling any callbacks - this section will be merged as soon as API supports
// updating passwords in general PUT call
},
function (response) {

}
));
}
//remove old and new password fields so they don't end up as part of the entity object
delete data.oldpassword;
delete data.newpassword;
}

//update the entity
var self = this;
this.setAllQueryParams(method, path, this.getData(), null,
function(response) {
Expand Down Expand Up @@ -1874,6 +1800,66 @@ apigee.validation = (function () {
return this.getField('username');
}

/**
* Logs a user in
*
* @method getUsername
* @return none
*/
apigee.User.prototype.login = function (username, password, successCallback, failureCallback){
var self = this;
apigee.ApiClient.loginAppUser(username, password,
function (response) {
//store the user's info
if (processResponse(self, response)){
if (typeof(successCallback) == "function"){
successCallback(response);
}
} else {
if (typeof(errorCallback) == "function"){
errorCallback(response);
}
}
},
function (response) {
if (typeof(failureCallback) == "function"){
failureCallback(response);
}
}
);
}

/**
* Private method for handling the response from the server
*
* @method processResponse
* @private
* @param {string} self
* @param {object} response
* @return {boolean} true if the response was populated, false otherwise
*
*/
function processResponse(self, response){
if (response.user) { // && apigee.ApiClient.isUUID(response.entities[0].uuid )){
var entity = response.user;
//first save off the uuid
if (entity.uuid) {
self.setUUID(entity.uuid);
}
delete entity.uuid; //remove uuid from the object
delete entity.metadata; //remove uuid from the object
delete entity.created; //remove created from the object
delete entity.modified; //remove modified from the object
delete entity.type; //remove type from the object
delete entity.activated; //remove activated from the object

//store the rest of the fields
self.setData(entity);
return true;
}
return false;
}

})(apigee);


Expand Down

0 comments on commit 39b16d5

Please sign in to comment.