Fixed OneDrive refreshing token, fixed handling of Google Drive inval…

…id_grant error
zenden2k · May 13, 2024 · 9571123 · 9571123
1 parent fea11f9
commit 9571123
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 0 deletions.
diff --git a/Data/Scripts/googledrive.nut b/Data/Scripts/googledrive.nut
@@ -32,6 +32,12 @@ function _CheckResponse(except = false) {
  throw "unauthorized_exception";
  } 
  return -2;
+ } else if (nm.responseCode() == 400) {
+ local t = ParseJSON(nm.responseBody());
+ if ("error" in t && t.error == "invalid_grant") {
+ _ClearAuthData();
+ return -2;
+ }
  } else if (/*nm.responseCode() == 0 ||*/ (nm.responseCode() >= 400 && nm.responseCode() <= 499)) {
  WriteLog("error", "Response code " + nm.responseCode() + "\r\n" + nm.errorString() );
  return 0;

diff --git a/Data/Scripts/onedrive.nut b/Data/Scripts/onedrive.nut
@@ -82,6 +82,7 @@ function RefreshToken() {
  } catch ( ex ) {
 
  }
+
  refreshToken = ServerParams.getParam("refreshToken");
  if ( time() > tokenTime + expiresIn && refreshToken != "") {
  // Refresh access token
@@ -104,6 +105,7 @@ function RefreshToken() {
  ServerParams.setParam("tokenType", tokenType);
  ServerParams.setParam("token", token);
  ServerParams.setParam("tokenTime", time().tostring());
+ ServerParams.setParam("refreshToken", t.refresh_token);
  if ( token != "" ) {
  return 1;
  } else {