Better tracking of auth state, added possibility to sign off and reauth

git-svn-id: http://svn.klever.net/kin/fireflix/trunk@164 fe716a7a-6dde-0310-88d9-d003556173a8

2 files changed, 61 insertions, 24 deletions

diff --git a/content/fireflix-panel.xul b/content/fireflix-panel.xul
index 75d6c2d..70a58fe 100644
--- a/content/fireflix-panel.xul
+++ b/content/fireflix-panel.xul
@@ -12,24 +12,45 @@
  >
 
  <script src="chrome://global/content/nsDragAndDrop.js"/>
  <script src="chrome://global/content/nsTransferable.js"/>
  <script type="application/x-javascript" src="md5.js" />
  <script type="application/x-javascript" src="flickr.js" />
  <script type="application/x-javascript" src="fireflix.js" />
 
  <stringbundleset>
   <stringbundle id="loc_strings" src="chrome://fireflix/locale/fireflix.properties" />
  </stringbundleset>
 
+ <commandset>
+  <command id="cmd_auth_auth" label="&panel.auth.auth.label;"
+  oncommand="fireflix.on_cmd_auth()"/>
+  <command id="cmd_auth_done" label="&panel.auth.done.label;"
+  oncommand="fireflix.on_cmd_auth_done()" disabled="true"/>
+  <command id="cmd_auth_open_flickr" label="&panel.auth.flickr.label;"
+  oncommand="fireflix.openTab('htp://www.flickr.com/')" />
+  <command id="cmd_auth_unauth" label="&panel.auth.unauth.label;"
+  oncommand="fireflix.on_cmd_auth_unauth()" />
+ </commandset>
+ 
+ <popupset>
+  <popup id="auth_menu">
+   <menuitem command="cmd_auth_auth"/>
+   <menuitem command="cmd_auth_done" hidden="true" id="menu_auth_done"/>
+   <menuitem command="cmd_auth_unauth" />
+   <menuseparator/>
+   <menuitem command="cmd_auth_open_flickr"/>
+  </popup>
+ </popupset>
+
  <commandset id="cmdset_search">
   <command id="cmd_search" label="&panel.search.cmd_search.label;"
   oncommand="fireflix.foundphotos.search_photos()"/>
   <command id="cmd_search_open" label="&panel.search.cmd_search_open.label;"
   oncommand="fireflix.foundphotos.on_cmd_open(event)" />
  </commandset>
 
  <commandset id="cmdset_sets">
   <command id="cmd_refresh_sets" label="&panel.sets.cmd_refresh_sets;"
   oncommand="fireflix.on_refresh_sets()" />
   <command id="cmd_set_props" label="&panel.sets.cmd_properties;"
   oncommand="fireflix.on_set_props()" disabled="true" />
@@ -60,34 +81,32 @@
    <menuitem command="cmd_uploads_add"/>
    <menuitem command="cmd_uploads_clear"/>
    <menuitem command="cmd_uploads_remove"/>
    <menuseparator/>
    <menuitem command="cmd_uploads_upload"/>
    <menuseparator/>
    <menu label="&panel.uploads.generate_html;" id="uploads_html_menu"/>
   </popup>
  </popupset>
 
  <vbox class="wholething" flex="1">
 
-  <groupbox>
+  <groupbox context="auth_menu">
    <caption label="&panel.auth_info;"/>
    <hbox>
     <label id="auth_info" value="&panel.no_auth_info;" flex="1" disabled="true"/>
-    <button id="b_auth" label="&panel.auth_button;" oncommand="fireflix.on_auth()"/>
-    <button id="b_auth_done" label="&panel.auth_complete_button;" hidden="true"
-    oncommand="fireflix.on_auth_done()"/>
-    <button label="&panel.flickr_button.label;"
-    tooltiptext="&panel.flickr_button.tip;"
-    oncommand="fireflix.openTab('http://www.flickr.com/')" />
+    <button id="b_auth" command="cmd_auth_auth"/>
+    <button id="b_auth_done" command="cmd_auth_done" hidden="true"/>
+    <button command="cmd_auth_open_flickr" 
+    tooltiptext="&panel.auth.flickr.tip;"/>
    </hbox>
   </groupbox>
 
   <tabbox flex="1" id="fireflix_tabs">
 
    <tabs>
     <tab label="&panel.tabs.search;"/>
     <tab label="&panel.tabs.sets;"/>
     <tab label="&panel.tabs.tags;" hidden="true"/> <!-- TODO: -->
     <tab id="tab_upload" label="&panel.tabs.upload;"/>
    </tabs>
 
diff --git a/content/fireflix.js b/content/fireflix.js
index 9518480..82c7b0c 100644
--- a/content/fireflix.js
+++ b/content/fireflix.js
@@ -3,75 +3,95 @@ function splitascii(s) {
  for(var i=0;i<s.length;++i) {
   var w = s.charCodeAt(i);
   rv += String.fromCharCode(
    w&0xff, (w>>8)&0xff );
  }
  return rv;
 }
 
 
 var fireflix = {
  flickr: new Flickr(),
  init: function() {
+  this.cmd_auth_auth = document.getElementById('cmd_auth_auth');
+  this.cmd_auth_done = document.getElementById('cmd_auth_done');
+  this.cmd_auth_unauth = document.getElementById('cmd_auth_unauth');
+  this.menu_auth_done = document.getElementById('menu_auth_done');
+  this.b_auth = document.getElementById('b_auth');
+  this.b_auth_done = document.getElementById('b_auth_done');
+  this.auth_info = document.getElementById('auth_info');
   this.loc_strings = document.getElementById('loc_strings');
   this.build_menus();
   this.cmd_set_props = document.getElementById('cmd_set_props');
   this.foundphotos.init(this);
   this.photosets.init(this);
   this.photoset.init(this);
   this.uploads.init(this);
   this.uploadObserver.init(this);
   this.flickr.api_key = '9c43cd66947a57e6f29db1a9da3f72e3';
   this.flickr.api_shs = '9c33c9e2f0f0cfd5';
   this.flickr.prefs_root = 'net.klever.kin.fireflix';
   this.flickr.load_token();
   document.getElementById('setslist').view = this.photosets;
   document.getElementById('setphotos').view = this.photoset;
   document.getElementById('uploadlist').view = this.uploads;
-  this.flickr.no_auth_info_label = document.getElementById('auth_info').value;
+  this.no_auth_info_label = this.auth_info.value;
+  this.set_auth_state(this.flickr.token,false);
   if(this.flickr.token) {
    this.refresh_stuff();
-   document.getElementById('auth_info').value =
-    this.flickr.user.fullname+' ['+this.flickr.user.username+']';
-   document.getElementById('auth_info').disabled = false;
-   document.getElementById('b_auth').hidden = true;
   }
  },
- on_auth: function() {
+ set_auth_state: function(au,inp) { /* authorized, in progress */
+  this.cmd_auth_unauth.disabled = !au;
+  this.b_auth.hidden = au || inp;
+  this.b_auth_done.hidden = !inp;
+  this.menu_auth_done.hidden = !inp;
+  this.cmd_auth_done.setAttribute('disabled',!inp);
+  this.auth_info.disabled = !au;
+  if(au) {
+   this.auth_info.value = this.flickr.user.fullname+' ['+this.flickr.user.username+']'; /* TODO: move to locale */
+  }else{
+   this.auth_info.value = this.no_auth_info_label;
+  }
+ },
+ on_cmd_auth: function() {
   var _this = this;
   this.flickr.authorize_0(
    function() {
-    document.getElementById('b_auth').hidden = true;
-    document.getElementById('b_auth_done').hidden = false;
+    _this.set_auth_state(_this.flickr.token,true);
    }, function(x,s,c,m) {
     _this.flickr_failure(x,s,c,m);
    }
   );
  },
- on_auth_done: function() {
-  document.getElementById('b_auth_done').hidden = true;
+ on_cmd_auth_done: function() {
+  this.set_auth_state(this.flickr.token,false);
   var _this = this;
   this.flickr.authorize_1(
    function() {
     _this.flickr.save_token();
     _this.refresh_stuff();
-    document.getElementById('auth_info').value =
+    _this.set_auth_state(_this.flickr.token,false);
+    _this.auth_info.value = 
      _this.flickr.user.fullname+' ['+_this.flickr.user.username+']';
-    document.getElementById('auth_info').disabled = false;
    }, function(x,s,c,m) {
-    document.getElementById('b_auth').hidden = false;
+    _this.set_auth_state(_this.flickr.token,false); /* XXX: no reset token? */
     _this.flickr_failure(x,s,c,m);
    }
   );
  },
+ on_cmd_auth_unauth: function() {
+  this.flickr.reset_token();
+  this.set_auth_state(false,false);
+ },
 
  refresh_sets: function() { this.photosets.refresh_sets(); },
  refresh_stuff: function() {
   this.refresh_sets();
   this.refresh_user_tags();
  },
 
  /* photoset treeview */
  photoset: {
   photos: new Array(),
   fireflix: null,
   init: function(f) {
@@ -857,22 +877,20 @@ var fireflix = {
     t.setAttribute('command',cpfx+'_'+csfx);
     t=cs.appendChild(document.createElement('command'));
     t.setAttribute('id',cpfx+'_'+csfx);
     t.setAttribute('oncommand','fireflix.on_'+cpfx+"('"+csfx+"',event)");
    }
   }
   return mp;
  },
 
  flickr_failure: function(x,s,c,m) {
   if(c==98) { // Invalid auth token
    this.flickr.reset_token();
-   document.getElementById('auth_info').value = this.no_auth_info_label;
-   document.getElementById('auth_info').disabled = true;
-   document.getElementById('b_auth').hidden = false;
+   this.set_auth_state(false,false);
    return;
   }
-  // TODO: is that beauty
+  // TODO: is that beauty?
   alert('flickr api call failed\n'+c+' '+m);
  }
 
 };