New method to retrieve access_token

CHANGELOG.txt

@@ -1,3 +1,5 @@
+v. 4.0.0
+ - New method to retrieve access_token
 v. 3.0.0
  - files/lock_file_batch
  - files/search updated to v2;

README.md

@@ -297,6 +297,8 @@ After making your changes, to create a new version of the module you have to fol
 - Uses [Titaniumifier](https://github.com/smclab/titaniumifier) to generate the zip module, with the command:
 
     `$ titaniumifier --in . --out ./dist`
+
+   ⚠️ **Titaniumifier** requires **node 8**. It does not work correctly with node version > 8.
 - Import your new **ti.dropbox-commonjs-x.x.x.zip** module in the project. This will create the [**`modules/commonjs`**](https://github.com/Astrovic/TiDropboxAPIv2/tree/master/modules/commonjs) folder you had removed earlier, with the new version of the module.
 
 All done :) Now you can send your pull request.

app/controllers/index.js

@@ -1,5 +1,5 @@
 var TiDropbox = require("ti.dropbox").TiDropbox;
-TiDropbox.init('e9tribefg77q4wg'/*<YOUR APP KEY HERE>*/, 'https://www.dropbox.com/'/*<YOUR redirect_uri HERE>*/);
+TiDropbox.init('e9tribefg77q4wg'/*<YOUR APP KEY HERE>*/, 'https://astrovicapps.com/'/*<YOUR redirect_uri HERE>*/);
 
 var dropboxAPIv2 = require("dropboxAPIv2").dropboxAPIv2;
 var selectedMethod = "";
@@ -57,16 +57,16 @@ for(var methodStr in dropboxAPIv2){
       apiList.push(apiRow);
     };
 };
-$.apiListTV.setData(apiList);
+$.apiListTV.data = apiList;
 
 function checkToken(){
   if(Ti.App.Properties.getString('DROPBOX_TOKENS',null)){
     $.loginBtn.logged = true;
-    $.loginBtn.setTitle("Dropbox Logout");
+    $.loginBtn.title = "Dropbox Logout";
     $.apiListTV.show();
   }else{
     $.loginBtn.logged = false;
-    $.loginBtn.setTitle("Dropbox Login");
+    $.loginBtntitle = "Dropbox Login";
     $.apiListTV.hide();
   };
   $.activityBgView.hide();

app/lib/tidropbox.js

@@ -360,9 +360,8 @@ var TiDropbox = {};
         Titanium.API.debug(e);
 
 
-        if (e.url.indexOf('#access_token') != -1) {
-            var token = e.url.split("=")[1];
-            token = token.substring(0, token.indexOf("&"));
+        if (e.url.indexOf('access_token') != -1) {
+            var token = e.url.match(/[?&]access_token=([^&]*)/)[1];
             TiDropbox.ACCESS_TOKEN = token;
             Ti.App.Properties.setString('DROPBOX_TOKENS',TiDropbox.ACCESS_TOKEN);
             Ti.API.debug('tidropbox_token: ' + token);
@@ -386,7 +385,7 @@ var TiDropbox = {};
                 });
             }
             destroyAuthorizeUI();
-        } else if (e.url.indexOf('#error=access_denied') != -1) {
+        } else if (e.url.indexOf('error=access_denied') != -1) {
             Ti.API.debug('tidropbox_access_denied, you need a new token');
             if (TiDropbox.auth_callback != undefined) {
                 TiDropbox.auth_callback({
@@ -397,7 +396,6 @@ var TiDropbox = {};
             }
             destroyAuthorizeUI();
         }
-
     };
 
 })();

modules/commonjs/ti.dropbox/3.0.0/manifest → modules/commonjs/ti.dropbox/4.0.0/manifest

@@ -1,8 +1,8 @@
-version: 2.0.0
+version: 4.0.0
 description: Titanium Appcelerator Javascript Dropbox API v2
 author: Vittorio Sorbera, astrovicApps
 license: ISC
-copyright: Copyright © 2018 Vittorio Sorbera, astrovicApps
+copyright: Copyright © 2021 Vittorio Sorbera, astrovicApps
 name: ti.dropbox
 moduleid: ti.dropbox
 guid: 3e89fe63-2de2-415e-9777-a63ed2c102a1

modules/commonjs/ti.dropbox/3.0.0/package.json → modules/commonjs/ti.dropbox/4.0.0/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ti.dropbox",
-  "version": "3.0.0",
+  "version": "4.0.0",
   "description": "Titanium Appcelerator Javascript Dropbox API v2",
   "titaniumManifest": {
     "guid": "3e89fe63-2de2-415e-9777-a63ed2c102a1"
@@ -26,5 +26,8 @@
     "url": "https://github.com/Astrovic/TiDropboxAPIv2/issues"
   },
   "homepage": "https://github.com/Astrovic/TiDropboxAPIv2#readme",
+  "dependencies": {
+    "titaniumifier": "^1.5.1"
+  },
   "_nativeDependencies": {}
 }

modules/commonjs/ti.dropbox/3.0.0/ti.dropbox.js → modules/commonjs/ti.dropbox/4.0.0/ti.dropbox.js

@@ -1,4 +1,63 @@
 (function(f){if(typeof exports==="object"&&typeof module!=="undefined"){module.exports=f()}else if(typeof define==="function"&&define.amd){define([],f)}else{var g;if(typeof window!=="undefined"){g=window}else if(typeof global!=="undefined"){g=global}else if(typeof self!=="undefined"){g=self}else{g=this}(g.ti || (g.ti = {})).dropbox = f()}})(function(){var define,module,exports;return (function e(t,n,r){function o(i,u){if(!n[i]){if(!t[i]){var a=typeof require=="function"&&require;if(!u&&a)return a.length===2?a(i,!0):a(i);if(s&&s.length===2)return s(i,!0);if(s)return s(i);var f=new Error("Cannot find module '"+i+"'");throw f.code="MODULE_NOT_FOUND",f}var l=n[i]={exports:{}};t[i][0].call(l.exports,function(e){var n=t[i][1][e];return o(n?n:e)},l,l.exports,e,t,n,r)}return n[i].exports}var i=Array.prototype.slice;Function.prototype.bind||Object.defineProperty(Function.prototype,"bind",{enumerable:!1,configurable:!0,writable:!0,value:function(e){function r(){return t.apply(this instanceof r&&e?this:e,n.concat(i.call(arguments)))}if(typeof this!="function")throw new TypeError("Function.prototype.bind - what is trying to be bound is not callable");var t=this,n=i.call(arguments,1);return r.prototype=Object.create(t.prototype),r.prototype.contructor=r,r}});var s=typeof require=="function"&&require;for(var u=0;u<r.length;u++)o(r[u]);return o})({1:[function(require,module,exports){
+
+module.exports = (function () { return this; })();
+
+module.exports.location = {};
+
+},{}],2:[function(require,module,exports){
+(function (global){
+
+module.exports.clearInterval = clearInterval;
+module.exports.clearTimeout = clearTimeout;
+module.exports.setInterval = setInterval;
+module.exports.setTimeout = setTimeout;
+
+// See https://html.spec.whatwg.org/multipage/webappapis.html#dom-windowtimers-cleartimeout
+
+function clearInterval(intervalId) {
+  try {
+    return global.clearInterval(intervalId);
+  }
+  catch (e) {
+    // Do nothing
+    return undefined;
+  }
+}
+
+function clearTimeout(timeoutId) {
+  try {
+    return global.clearTimeout(timeoutId);
+  }
+  catch (e) {
+    // Do nothing
+    return undefined;
+  }
+}
+
+function setInterval(func, delay) {
+  var args = [];
+  for (var i = 2, l = arguments.length; i < l; ++i) {
+    args[ i - 2 ] = arguments[ i ];
+  }
+
+  return global.setInterval(function () {
+    func.apply(this, args);
+  }, +delay);
+}
+
+function setTimeout(func, delay) {
+  var args = [];
+  for (var i = 2, l = arguments.length; i < l; ++i) {
+    args[ i - 2 ] = arguments[ i ];
+  }
+
+  return global.setTimeout(function () {
+    func.apply(this, args);
+  }, +delay);
+}
+
+}).call(this,require("--global--"))
+},{"--global--":1}],3:[function(require,module,exports){
 /**
  * this code was inspired by the work done by Adam Płócieniak
  * available at https://github.com/adasq/dropbox-v2-api/blob/master/dist/api.json
@@ -327,9 +386,11 @@ exports.dropboxAPIv2 = {
         "requiresReadableStream": false,
         "endpointType": "RPC",
         "testParams": {
-            "entries": [{
+            "entries": [
+              {
                 "path": "/Homework/math/Prime_Numbers.txt"
-            }]
+              }
+            ]
         },
         "parameters": [{
             "name": "entries",
@@ -339,7 +400,7 @@ exports.dropboxAPIv2 = {
                 "name": "path",
                 "type": "String(pattern=\"(/(.|[\\r\\n])*)|(ns:[0-9]+(/.*)?)\")",
                 "desc": "Path in the user's Dropbox to delete."
-            }],
+              }],
         }],
         "returnParameters": []
     },
@@ -3942,7 +4003,7 @@ exports.dropboxAPIv2 = {
     }
 }
 
-},{}],2:[function(require,module,exports){
+},{}],4:[function(require,module,exports){
 (function (setTimeout){
 /**
  *
@@ -4306,9 +4367,8 @@ var TiDropbox = {};
         Titanium.API.debug(e);
 
 
-        if (e.url.indexOf('#access_token') != -1) {
-            var token = e.url.split("=")[1];
-            token = token.substring(0, token.indexOf("&"));
+        if (e.url.indexOf('access_token') != -1) {
+            var token = e.url.match(/[?&]access_token=([^&]*)/)[1];
             TiDropbox.ACCESS_TOKEN = token;
             Ti.App.Properties.setString('DROPBOX_TOKENS',TiDropbox.ACCESS_TOKEN);
             Ti.API.debug('tidropbox_token: ' + token);
@@ -4332,7 +4392,7 @@ var TiDropbox = {};
                 });
             }
             destroyAuthorizeUI();
-        } else if (e.url.indexOf('#error=access_denied') != -1) {
+        } else if (e.url.indexOf('error=access_denied') != -1) {
             Ti.API.debug('tidropbox_access_denied, you need a new token');
             if (TiDropbox.auth_callback != undefined) {
                 TiDropbox.auth_callback({
@@ -4343,72 +4403,12 @@ var TiDropbox = {};
             }
             destroyAuthorizeUI();
         }
-
     };
 
 })();
 
 exports.TiDropbox = TiDropbox;
 
 }).call(this,require("--timers--").setTimeout)
-},{"--timers--":4,"../lib/dropboxAPIv2":1}],3:[function(require,module,exports){
-
-module.exports = (function () { return this; })();
-
-module.exports.location = {};
-
-},{}],4:[function(require,module,exports){
-(function (global){
-
-module.exports.clearInterval = clearInterval;
-module.exports.clearTimeout = clearTimeout;
-module.exports.setInterval = setInterval;
-module.exports.setTimeout = setTimeout;
-
-// See https://html.spec.whatwg.org/multipage/webappapis.html#dom-windowtimers-cleartimeout
-
-function clearInterval(intervalId) {
-  try {
-    return global.clearInterval(intervalId);
-  }
-  catch (e) {
-    // Do nothing
-    return undefined;
-  }
-}
-
-function clearTimeout(timeoutId) {
-  try {
-    return global.clearTimeout(timeoutId);
-  }
-  catch (e) {
-    // Do nothing
-    return undefined;
-  }
-}
-
-function setInterval(func, delay) {
-  var args = [];
-  for (var i = 2, l = arguments.length; i < l; ++i) {
-    args[ i - 2 ] = arguments[ i ];
-  }
-
-  return global.setInterval(function () {
-    func.apply(this, args);
-  }, +delay);
-}
-
-function setTimeout(func, delay) {
-  var args = [];
-  for (var i = 2, l = arguments.length; i < l; ++i) {
-    args[ i - 2 ] = arguments[ i ];
-  }
-
-  return global.setTimeout(function () {
-    func.apply(this, args);
-  }, +delay);
-}
-
-}).call(this,require("--global--"))
-},{"--global--":3}]},{},[2])(2)
-});
+},{"--timers--":2,"../lib/dropboxAPIv2":3}]},{},[4])(4)
+});