digilib-old: webapp/src/main/webapp/jquery/jquery.digilib.annotator.js comparison

comparison webapp/src/main/webapp/jquery/jquery.digilib.annotator.js @ 1120:8bd10cd04169

authentication for annotations with password works now. (permissions are still flaky.)

author	robcast
date	Wed, 07 Nov 2012 18:09:57 +0100
parents	036efe7361c8
children	efe4b0f18cf8

comparison

equal deleted inserted replaced

-:036efe7361c8
+:8bd10cd04169
 /**
 * set user account for annotations
 */
 setAnnotationUser : function (data, user, password) {
-var settings = data.settings;
+	var annotator = data.annotator;
-if (user == null) {
+	var auth = annotator.plugins.Auth;
-// user name entered in JS-prompt
+	if (auth == null) {
-user = window.prompt("User name:", settings.annotationUser);
+		console.error("setAnnotationUser: No Auth plugin!!");
-if (user != null) {
+		return;
-// password entered in JS-prompt
+	}
-password = window.prompt("Password:", '');
+	setAnnotationUser(data, auth, user, password);
-settings.annotationUser = user;
+	// get new token
-data.dlOpts.annotationUser = user;
+	auth.token = null;
-digilib.fn.storeOptions(data);
+	auth._unsafeToken = null;
-loadAnnotationToken(data, password);
+	auth.requestToken();
-}
+	// save new token in cookie
-} else {
+	auth.withToken(function (tkn) {
-settings.annotationUser = user;
+		data.dlOpts.annotationToken = auth.token;
-data.dlOpts.annotationUser = user;
+		        digilib.fn.storeOptions(data);
-digilib.fn.storeOptions(data);
+	        	// reload annotations
-loadAnnotationToken(data, password);
+		data.annotations = [];
-}
+		renderAnnotations(data);
+		annotator.plugins.Store.pluginInit();
+	});
 },
 /**
 * set a mark-annotation by clicking (or giving a position and a text)
 *
 var url = data.settings.digilibBaseUrl + '/jquery/digilib.html?';
 url += digilib.fn.getParamString(data.settings, ['fn', 'pn'], digilib.defaults);
 return url;
 };
+/**
+* sets annotation user and password in digilib and Annotator.Auth plugin.
+* auth is Auth plugin instance.
+*/
+	var setAnnotationUser = function (data, auth, user, password) {
+		if (user == null) {
+	        // user name entered in JS-prompt
+	        user = window.prompt("Please authenticate: User name", data.settings.annotationUser);
+	        if (user != null && user != 'anonymous') {
+	            // password entered in JS-prompt
+	            password = window.prompt("Please authenticate: Password", '');
+	            // set params for Auth plugin
+	         	auth.options.requestData.password = password;
+	        } else {
+	        	// use anonymous user
+	        	user = 'anonymous';
+	         	delete auth.options.requestData.password;
+	        }
+}
+// set user in digilib
+data.settings.annotationUser = user;
+data.dlOpts.annotationUser = user;
+digilib.fn.storeOptions(data);
+// set params for Auth plugin
+auth.options.requestData.user = user;
+// set params for Permissions plugin
+var perms = data.annotator.plugins.Permissions;
+if (perms != null) {
+	perms.options.user = user;
+}
+	};
 /**
 * add a mark-annotation where clicked.
 */
 var setAnnotationMark = function(data) {
 var $scaler = data.$scaler;
 					break;
 				}
 			}
 		};
 	};
-/**
+	/**
-* Get an authentication token from the token server.
+	 * returns handleUnauthorized function for Annotator.Auth plugin.
-*
+	 */
-* Stores the token and loads annotations on success.
+var getHandleUnauthorized = function (data) {
-*/
+	return function (auth) {
-var loadAnnotationToken = function(data, password) {
+		// prompt for user name and set user
-	return;
+		setAnnotationUser(data, auth);
-var settings = data.settings;
+// then try again
-var url = settings.annotationTokenUrl;
+return true;
-var params = {'user': settings.annotationUser};
+	};
-if (password != null) {
+};
-params.password = password;
-}
-// TODO: better error handling
-$.post(url, params)
-.done(function (authToken, authStatus) {
-console.debug("got auth token data=", authToken);
-data.annotationToken = authToken;
-data.dlOpts.annotationToken = authToken;
-digilib.fn.storeOptions(data);
-//loadAnnotations(data);
-})
-.fail(function (xhr, status) {
-console.error("got auth token error:", xhr);
-data.annotationToken = null;
-data.settings.annotationUser = "anonymous";
-//loadAnnotations(data);
-});
-};
 /**
 * install additional buttons
 */
 var installButtons = function(data) {
 var settings = data.settings;
 }
 if (data.dlOpts.annotationUser != null) {
 // get annotation user from cookie
 data.settings.annotationUser = data.dlOpts.annotationUser;
 }
-if (data.dlOpts.annotationToken != null) {
-// get annotation token from cookie
-data.annotationToken = data.dlOpts.annotationToken;
-}
 // install event handler
 $data.bind('setup', handleSetup);
 $data.bind('update', handleUpdate);
 };
 * setup creates Annotator object.
 */
 var handleSetup = function(evt) {
 console.debug("annotations: handleSetup");
 var data = this;
-/* if (data.annotationToken ==  null) {
-loadAnnotationToken(data);
-} */
 // set up annotator (after html has been set up)
 var uri = getAnnotationPageUrl(data);
 var annotator = new Annotator(data.$elem.get(0));
 // set plugin parameters
 var pluginParams = {
 	'Auth' : {
-		'token' : data.annotationToken,
+		'token' : data.dlOpts.annotationToken,
 		'tokenUrl' : data.settings.annotationTokenUrl,
 		'autoFetch' : true,
 	            'requestMethod' : 'POST',
 	            'requestData' : {
 	            	'user': data.settings.annotationUser,
-	            	'password': data.annotationPassword
 	            },
-	            'unauthorizedCallback' : function (that) {
+	            'unauthorizedCallback' : getHandleUnauthorized(data)
-	            	window.alert("401");
-	            	return false;
-	            }
 	},
 	'Permissions' : {
 		'user' : data.settings.annotationUser
 	},
 	'Store' : {
 	console.debug("plugin:", name, params);
 	annotator.addPlugin(name, params);
 });
 		// save annotator reference
 data.annotator = annotator;
+	// save annotation token in cookie
+	var auth = annotator.plugins.Auth;
+	// save new token in cookie
+	auth.withToken(function (tkn) {
+		data.dlOpts.annotationToken = auth.token;
+	        digilib.fn.storeOptions(data);
+	});
 };
 /**
 * update renders all annotations.
 */