Skip to content
This repository has been archived by the owner on Aug 27, 2020. It is now read-only.

Commit

Permalink
renames some functions; tries to give them appropriate names
Browse files Browse the repository at this point in the history
  • Loading branch information
@mmichaa
mmichaa committed Nov 4, 2014
1 parent c106582 commit 184b74d
Show file tree
Hide file tree
Showing 3 changed files with 37 additions and 41 deletions.
2 changes: 1 addition & 1 deletion Info.plist
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<array>
<dict>
<key>Command</key>
<string>passafari_open</string>
<string>passafari_command_activate</string>
<key>Identifier</key>
<string>passafari</string>
<key>Image</key>
Expand Down
20 changes: 10 additions & 10 deletions end.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@ function passafari_injected_message_handler(event) {

console.log("passafari_injected_message_handler: " + name);

if(name === "passafari_credentials") {
passafari_injected_credentials_handler(name, data);
} else if(name === "passafari_retrieve") {
passafari_injected_retrieve_handler(name, data);
if(name === "passafari_message_fillin") {
passafari_injected_message_fillin(name, data);
} else if(name === "passafari_message_readout") {
passafari_injected_message_readout(name, data);
} else {
console.log(data);
}
Expand All @@ -23,7 +23,7 @@ if(window.parent === window) {
}

// CALLED by passafari_injected_message_handler
function passafari_injected_credentials_handler(event_name, event_data) {
function passafari_injected_message_fillin(event_name, event_data) {
if(event_data.length === 1) {
var credentials = event_data[0];
var input_candidates = passafari_input_candidates();
Expand All @@ -34,19 +34,19 @@ function passafari_injected_credentials_handler(event_name, event_data) {
inputs.username.value = credentials.Login;
inputs.password.value = credentials.Password;
} else {
console.log("passafari_injected_credentials_handler: more than one inputs found.")
console.log("passafari_injected_message_fillin: more than one inputs found.")
console.log(inputs);
}
} else {
console.log("passafari_injected_credentials_handler: more than one credentials found.")
console.log("passafari_injected_message_fillin: more than one credentials found.")
console.log(event_data);
}

return undefined;
}

// CALLED by passafari_injected_message_handler
function passafari_injected_retrieve_handler(event_name, event_data) {
function passafari_injected_message_readout(event_name, event_data) {
var input_candidates = passafari_input_candidates();

if(input_candidates.length === 1) {
Expand All @@ -55,9 +55,9 @@ function passafari_injected_retrieve_handler(event_name, event_data) {
var username = inputs.username.value;
var password = inputs.password.value;

passafari_notify_global_page("passafari_save", {"Login": username, "Password": password});
passafari_notify_global_page("passafari_message_save", {"Login": username, "Password": password});
} else {
console.log("passafari_injected_retrieve_handler: more than one inputs found.")
console.log("passafari_injected_message_readout: more than one inputs found.")
console.log(inputs);
}

Expand Down
56 changes: 26 additions & 30 deletions global.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,12 @@ function passafari_settings_handler(event) {

function passafari_command_handler(event) {
console.log("passafari_command_handler: " + event.command);
if (event.command === "passafari_open") {
passafari_open(event);
} else if (event.command === "passafari_select_credentials") {
passafari_select_credentials(event);
} else if (event.command === "passafari_select_save") {
passafari_select_save(event);
if (event.command === "passafari_command_activate") {
passafari_command_activate(event);
} else if (event.command === "passafari_command_select") {
passafari_command_select(event);
} else if (event.command === "passafari_command_save") {
passafari_command_save(event);
} else {
console.log(event);
}
Expand All @@ -24,8 +24,8 @@ function passafari_command_handler(event) {

function passafari_message_handler(event) {
console.log("passafari_message_handler: " + event.name);
if (event.name == "passafari_save") {
passafari_save(event);
if (event.name == "passafari_message_save") {
passafari_message_save(event);
} else {
console.log(event);
}
Expand All @@ -38,15 +38,15 @@ safari.application.addEventListener("message", passafari_message_handler, false)


// CALLED by passafari_command_handler
function passafari_open(event) {
function passafari_command_activate(event) {
passafari_associate();
passafari_credentials_cache(null);

passafari_retrieve_credentials(function(credentials) {
if (credentials.length === 0) {
passafari_notify_injected("passafari_retrieve");
passafari_notify_injected("passafari_message_readout");
} else if (credentials.length === 1) {
passafari_notify_injected("passafari_credentials", credentials);
passafari_notify_injected("passafari_message_fillin", credentials);
} else {
passafari_display_credentials(credentials);
}
Expand All @@ -56,29 +56,29 @@ function passafari_open(event) {
}

// CALLED by passafari_command_handler
function passafari_select_credentials(event) {
function passafari_command_select(event) {
var idx = parseInt( event.target.identifier.split("_").pop() );
var credentials = passafari_credentials_cache(null);

if (credentials.length === 0) {
// NOOP
} else if (credentials.length === 1) {
passafari_notify_injected("passafari_credentials", credentials);
passafari_notify_injected("passafari_message_fillin", credentials);
} else {
passafari_notify_injected("passafari_credentials", [ credentials[idx] ]);
passafari_notify_injected("passafari_message_fillin", [ credentials[idx] ]);
}

return undefined;
}

// CALLED by passafari_command_handler
function passafari_select_save(event) {
function passafari_command_save(event) {
var idx = parseInt( event.target.identifier.split("_").pop() );
var credentials = passafari_credentials_cache(null);
var credential = credentials[idx];

if(credential) {
var updateCallback = function(code) { console.log("passafari_save: response code '" + code + "'.") };
var updateCallback = function(code) { console.log("passafari_command_save: response code '" + code + "'.") };
var tab = undefined;
var entryId = credential.Uuid;
var username = credential.Login;
Expand All @@ -89,47 +89,43 @@ function passafari_select_save(event) {
passafari_generate_password(function(passwords) {
if(passwords[0]) {
password = credential.Password = passwords[0].Password;
console.log("passafari_select_save: generated password '" + password + "'.");
passafari_notify_injected("passafari_credentials", [ credential ]);
console.log("passafari_command_save: generated password '" + password + "'.");
passafari_notify_injected("passafari_message_fillin", [ credential ]);
}
keepass.updateCredentials(updateCallback, tab, entryId, username, password, url);
});
} else {
keepass.updateCredentials(updateCallback, tab, entryId, username, password, url);
}
} else {
console.log("passafari_select_save: no credential found in cache for index '" + idx + "'.");
console.log("passafari_command_save: no credential found in cache for index '" + idx + "'.");
}

return undefined;
}

// CALLED by passafari_message_handler
function passafari_save(event) {
console.log("passafari_save:");
console.log(event);

function passafari_message_save(event) {
var credentials = passafari_credentials_cache(null) || [];
var credential = event.message;

if (credentials.length === 0) {
if (credential && credential.Login.length > 0) {
var toolbarItem = passafari_toolbar_item();

safari.extension.removeMenu("passafari_save");
var menu = safari.extension.createMenu("passafari_save");
safari.extension.removeMenu("passafari_add");
var menu = safari.extension.createMenu("passafari_add");

menu.appendMenuItem("passafari_credentials_0", credential.Login + " | " + "credentials.add".toLocaleString(), "passafari_select_save");
menu.appendMenuItem("passafari_credentials_0", credential.Login + " | " + "credentials.add".toLocaleString(), "passafari_command_save");

passafari_credentials_cache([credential]);

toolbarItem.menu = menu;
toolbarItem.showMenu();
}
} else if (credentials.length === 1) {
// NOOP
} else {
// NOOP
console.log("passafari_message_save: more than one credentials found.");
console.log(event);
}
}

Expand Down Expand Up @@ -201,7 +197,7 @@ function passafari_display_credentials(credentials) {
for(var idx = 0; idx < credentials.length; idx++) {
var credential = credentials[idx];

menu.appendMenuItem("passafari_credentials_" + idx, credential.Login + " | " + credential.Name, "passafari_select_credentials");
menu.appendMenuItem("passafari_credentials_" + idx, credential.Login + " | " + credential.Name, "passafari_command_select");
}

passafari_credentials_cache(credentials);
Expand Down

0 comments on commit 184b74d

Please sign in to comment.