Skip to content

Commit 1f1312a

Browse files
derrabaukeGaurav0
authored andcommitted
refactor: prevent ember/string import and camelize ourself
1 parent d7d5c2b commit 1f1312a

3 files changed

Lines changed: 294 additions & 346 deletions

File tree

addon/authenticators/oidc.js

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
import { later } from "@ember/runloop";
22
import { inject as service } from "@ember/service";
3-
import { camelize } from "@ember/string";
43
import { lastValue, task } from "ember-concurrency";
54
import BaseAuthenticator from "ember-simple-auth/authenticators/base";
65
import { resolve } from "rsvp";
@@ -14,13 +13,12 @@ import {
1413
isBadRequestResponse,
1514
} from "ember-simple-auth-oidc/utils/errors";
1615

17-
const camelizeObjectKeys = (obj) => {
18-
Object.keys(obj).forEach((key) => {
19-
obj[camelize(key)] = obj[key];
20-
delete obj[key];
21-
});
22-
return obj;
23-
};
16+
const camelize = (s) => s.replace(/_./g, (x) => x[1].toUpperCase());
17+
18+
const camelizeObjectKeys = (obj) =>
19+
Object.entries(obj).reduce((newObj, [key, value]) => {
20+
return (newObj[camelize(key)] = value);
21+
}, {});
2422

2523
export default class OidcAuthenticator extends BaseAuthenticator {
2624
@service router;

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@
3030
"dependencies": {
3131
"@apollo/client": "^3.8.8",
3232
"@babel/core": "^7.23.5",
33-
"@ember/string": "^3.1.1",
3433
"@embroider/macros": "^1.13.3",
3534
"base64-js": "^1.5.1",
3635
"ember-auto-import": "^2.7.0",
@@ -47,6 +46,7 @@
4746
"@babel/eslint-parser": "7.23.3",
4847
"@babel/plugin-proposal-decorators": "7.23.5",
4948
"@ember/optional-features": "2.0.0",
49+
"@ember/string": "^3.1.1",
5050
"@ember/test-helpers": "^3.3.0",
5151
"@ember/test-waiters": "^3.1.0",
5252
"@embroider/test-setup": "3.0.3",
@@ -62,7 +62,7 @@
6262
"ember-cli-mirage": "3.0.2",
6363
"ember-cli-sri": "2.1.1",
6464
"ember-cli-terser": "4.0.2",
65-
"ember-data": "~5.3.9",
65+
"ember-data": "~4.11.3",
6666
"ember-fetch": "^8.1.2",
6767
"ember-load-initializers": "2.1.2",
6868
"ember-qunit": "8.0.2",

0 commit comments

Comments
 (0)