Skip to content

migrate deprecated oc_requesttoken access to OC.requestToken #871

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
binsky08 merged 1 commit into from
Aug 24, 2026
Merged

migrate deprecated oc_requesttoken access to OC.requestToken #871

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion Gruntfile.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ module.exports = function (grunt) {
"jQuery": true,
"$": true,
"_": true,
"oc_requesttoken": true
"_nc_auth_requestToken": true
}
},
all: ['js/app/**/*.js']
Expand Down Expand Up @@ -229,6 +229,7 @@ module.exports = function (grunt) {
'js/vendor/ui-sortable/sortable.js',
'js/vendor/jquery-3.7.1.min.js',
'js/vendor/jquery-ui.min.js',
'js/lib/auth.js',
'js/lib/promise.js',
'js/lib/crypto_wrap.js',
'js/lib/otpauth.umd.js',
Expand Down Expand Up @@ -274,6 +275,7 @@ module.exports = function (grunt) {
'js/vendor/papa-parse/papaparse.min.js',
'js/vendor/jquery-3.7.1.min.js',
'js/vendor/jquery-ui.min.js',
'js/lib/auth.js',
'js/lib/promise.js',
'js/lib/crypto_wrap.js',
'js/lib/otpauth.umd.js',
Expand Down
3 changes: 1 addition & 2 deletions js/app/app.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,8 +80,7 @@
});
}).config([
'$httpProvider', function($httpProvider) {
/** global: oc_requesttoken */
$httpProvider.defaults.headers.common.requesttoken = oc_requesttoken;
$httpProvider.defaults.headers.common.requesttoken = GetRequestToken();
}]).config(function(localStorageServiceProvider) {
localStorageServiceProvider.setNotify(true, true);
}).config(function($translateProvider) {
Expand Down
3 changes: 1 addition & 2 deletions js/app/app_public.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,7 @@
'pascalprecht.translate'

]).config(['$httpProvider', function ($httpProvider) {
/** global: oc_requesttoken */
$httpProvider.defaults.headers.common.requesttoken = oc_requesttoken;
$httpProvider.defaults.headers.common.requesttoken = GetRequestToken();
}]).config(function ($translateProvider) {
$translateProvider.useUrlLoader(OC.generateUrl('/apps/' + APP_ID + '/api/v2/language'));
$translateProvider.preferredLanguage('en');
Expand Down
14 changes: 14 additions & 0 deletions js/lib/auth.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
/**
* Token injection logic required for ajax requests with Nextcloud 34+ since they removed their upstream jquery
* as well as the former oc_requesttoken (with Nextcloud 35+). See https://github.com/nextcloud/passman/issues/869
*/
function GetRequestToken() {
if (typeof OC !== 'undefined' && OC.requestToken) {
return OC.requestToken;
}
if (typeof _nc_auth_requestToken === 'string' && _nc_auth_requestToken) {
return _nc_auth_requestToken;
}
const head = document.head || document.getElementsByTagName('head')[0];
return (head && head.dataset.requesttoken) ? head.dataset.requesttoken : '';
}
14 changes: 1 addition & 13 deletions js/settings-admin.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,24 +23,12 @@
$(document).ready(function () {
const urlPrefix = 'apps/passman';

// Token injection logic required for ajax requests with Nextcloud 34+ since they removed their upstream jquery
function getRequestToken() {
if (typeof OC !== 'undefined' && OC.requestToken) {
return OC.requestToken;
}
if (typeof oc_requesttoken !== 'undefined' && oc_requesttoken) {
return oc_requesttoken;
}
var head = document.head || document.getElementsByTagName('head')[0];
return (head && head.dataset.requesttoken) ? head.dataset.requesttoken : '';
}

function getAjaxMethod(options) {
return (options.type || options.method || 'GET').toUpperCase();
}

$.ajaxPrefilter(function (options) {
var token = getRequestToken();
var token = GetRequestToken();
if (!token) {
return;
}
Expand Down
1 change: 1 addition & 0 deletions templates/admin.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@

/*build-js-start*/
Util::addScript(MyAppTemplateConfig::APP_ID, 'vendor/jquery-3.7.1.min', 'core');
Util::addScript(MyAppTemplateConfig::APP_ID, 'lib/auth', 'core');
/*build-js-end*/

Util::addScript(MyAppTemplateConfig::APP_ID, 'settings-admin', 'core');
Expand Down
1 change: 1 addition & 0 deletions templates/bookmarklet.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@
Util::addScript(MyAppTemplateConfig::APP_ID, 'vendor/download', 'core');
Util::addScript(MyAppTemplateConfig::APP_ID, 'vendor/ui-sortable/sortable', 'core');
Util::addScript(MyAppTemplateConfig::APP_ID, 'vendor/papa-parse/papaparse.min', 'core');
Util::addScript(MyAppTemplateConfig::APP_ID, 'lib/auth', 'core');
Util::addScript(MyAppTemplateConfig::APP_ID, 'lib/promise', 'core');
Util::addScript(MyAppTemplateConfig::APP_ID, 'lib/crypto_wrap', 'core');

Expand Down
1 change: 1 addition & 0 deletions templates/main.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@
Util::addScript(MyAppTemplateConfig::APP_ID, 'vendor/download', 'core');
Util::addScript(MyAppTemplateConfig::APP_ID, 'vendor/ui-sortable/sortable', 'core');
Util::addScript(MyAppTemplateConfig::APP_ID, 'vendor/papa-parse/papaparse.min', 'core');
Util::addScript(MyAppTemplateConfig::APP_ID, 'lib/auth', 'core');
Util::addScript(MyAppTemplateConfig::APP_ID, 'lib/promise', 'core');
Util::addScript(MyAppTemplateConfig::APP_ID, 'lib/crypto_wrap', 'core');
Util::addScript(MyAppTemplateConfig::APP_ID, 'lib/otpauth.umd', 'core');
Expand Down
1 change: 1 addition & 0 deletions templates/public_share.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@
Util::addScript(MyAppTemplateConfig::APP_ID, 'vendor/llqrcode/llqrcode', 'core');
Util::addScript(MyAppTemplateConfig::APP_ID, 'vendor/forge.0.6.9.min', 'core');
Util::addScript(MyAppTemplateConfig::APP_ID, 'vendor/download', 'core');
Util::addScript(MyAppTemplateConfig::APP_ID, 'lib/auth', 'core');
Util::addScript(MyAppTemplateConfig::APP_ID, 'lib/promise', 'core');
Util::addScript(MyAppTemplateConfig::APP_ID, 'lib/crypto_wrap', 'core');

Expand Down
Loading