refactor: substr(ing) > slice

emramir · Dec 13, 2021 · 1ac434a · 1ac434a
1 parent 2ac6a34
commit 1ac434a
Show file tree

Hide file tree

Showing 8 changed files with 12 additions and 12 deletions.
diff --git a/docs/update-configuration.js b/docs/update-configuration.js
@@ -123,15 +123,15 @@ const props = [
 
       if (nextIsOption) {
         nextIsOption = false;
-        option = blocks[strLine.substring(2)] = new Block(); // eslint-disable-line no-multi-assign
+        option = blocks[strLine.slice(2)] = new Block(); // eslint-disable-line no-multi-assign
         return;
       }
 
       const next = props.find((prop) => {
         if (
           prop.startsWith('@')
-            ? strLine.substring(2, 2 + prop.length) === prop
-            : strLine.substring(2, 2 + prop.length + 1) === `${prop}:`
+            ? strLine.slice(2, 2 + prop.length) === prop
+            : strLine.slice(2, 2 + prop.length + 1) === `${prop}:`
         ) {
           let override;
           if (prop === 'example' && option.example) {

diff --git a/example/views/repost.ejs b/example/views/repost.ejs
@@ -6,15 +6,15 @@
     <script nonce="<%= nonce %>">
     function parseQuery(queryString) {
       var query = {};
-      var pairs = (queryString[0] === '?' ? queryString.substr(1) : queryString).split('&');
+      var pairs = (queryString[0] === '?' ? queryString.slice(1) : queryString).split('&');
       for (var i = 0; i < pairs.length; i++) {
           var pair = pairs[i].split('=');
           query[decodeURIComponent(pair[0])] = decodeURIComponent(pair[1] || '');
       }
       return query;
     }
 
-    var fields = parseQuery(window.location.hash.substring(1));
+    var fields = parseQuery(window.location.hash.slice(1));
     fields.upstream = '<%= upstream %>'
     var uid = fields.state.split('|')[0]
 

diff --git a/lib/helpers/keystore.js b/lib/helpers/keystore.js
@@ -16,7 +16,7 @@ const keyscore = (key, { alg, use }) => {
 };
 
 const getKtyFromJWSAlg = (alg) => {
-  switch (alg.substr(0, 2)) {
+  switch (alg.slice(0, 2)) {
     case 'RS':
     case 'PS': return 'RSA';
     case 'HS': return 'oct';
@@ -39,7 +39,7 @@ const getCrvFromJWSAlg = (alg) => {
 };
 
 const getKtyFromJWEAlg = (alg, epk) => {
-  switch (alg.substr(0, 1)) {
+  switch (alg[0]) {
     case 'A':
     case 'P': return 'oct';
     case 'R': return 'RSA';

diff --git a/lib/helpers/oidc_context.js b/lib/helpers/oidc_context.js
@@ -81,7 +81,7 @@ module.exports = function getContext(provider) {
     }
 
     urlFor(name, opt) {
-      const mountPath = (this.ctx.req.originalUrl && this.ctx.req.originalUrl.substring(
+      const mountPath = (this.ctx.req.originalUrl && this.ctx.req.originalUrl.slice(
         0,
         this.ctx.req.originalUrl.indexOf(this.ctx.request.url),
       ))

diff --git a/lib/models/formats/paseto.js b/lib/models/formats/paseto.js
@@ -2,7 +2,7 @@ const { strict: assert } = require('assert');
 const crypto = require('crypto');
 
 let paseto;
-let paseto3 = process.version.substr(1).split('.').map((x) => parseInt(x, 10))[0] >= 16;
+let paseto3 = parseInt(process.versions.node, 10) >= 16;
 
 if (paseto3) {
   try {

diff --git a/lib/provider.js b/lib/provider.js
@@ -2,7 +2,7 @@
 const attention = require('./helpers/attention');
 
 const [major, minor] = process.version
-  .substr(1)
+  .slice(1)
   .split('.')
   .map((str) => parseInt(str, 10));
 

diff --git a/test/ci.js b/test/ci.js
@@ -54,7 +54,7 @@ function report() {
     const mountTo = '/oidc';
     const frameworks = ['connect', 'express', 'fastify', 'koa'];
 
-    if (process.version.substr(1).split('.').map((x) => parseInt(x, 10))[0] >= 12) {
+    if (process.version.slice(1).split('.').map((x) => parseInt(x, 10))[0] >= 12) {
       frameworks.push('hapi');
     }
 

diff --git a/test/formats/paseto.test.js b/test/formats/paseto.test.js
@@ -8,7 +8,7 @@ const sinon = require('sinon').createSandbox();
 const { expect } = require('chai');
 
 let paseto;
-const above16 = process.version.substr(1).split('.').map((x) => parseInt(x, 10))[0] >= 16;
+const above16 = parseInt(process.versions.node, 10) >= 16;
 if (above16) {
   // eslint-disable-next-line
   paseto = require('paseto3');