Skip to content
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

Jump to bottom

chore: cleanup deprecated joaat hash #15577

Merged
merged 1 commit into from
Aug 8, 2023
Merged

chore: cleanup deprecated joaat hash #15577

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
2 changes: 0 additions & 2 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,6 @@
"speakingurl": "14.0.1",
"switch-path": "1.2.0",
"tsyringe": "4.8.0",
"uint32": "0.2.1",
"underscore": "1.13.6",
"uuidjs": "4.2.13",
"webrtc-adapter": "8.2.3",
Expand Down Expand Up @@ -89,7 +88,6 @@
"@types/seedrandom": "^3",
"@types/sinon": "10.0.16",
"@types/speakingurl": "13.0.3",
"@types/uint32": "0.2.0",
"@types/underscore": "1.11.6",
"@types/webpack-env": "1.18.1",
"@wireapp/copy-config": "2.1.1",
Expand Down
2 changes: 0 additions & 2 deletions src/script/entity/User/User.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,6 @@ export class User {
public isService: boolean;
public isSingleSignOn: boolean;
public isNoPasswordSSO: boolean;
public joaatHash: number;
public providerId?: string;
public readonly accent_color: ko.PureComputed<string>;
public readonly accent_id: ko.Observable<number>;
Expand Down Expand Up @@ -137,7 +136,6 @@ export class User {
this.providerId = undefined;
this.serviceId = undefined;

this.joaatHash = -1;
this.isAvailable = ko.pureComputed(() => this.id !== '' && this.name() !== '');

this.accent_id = ko.observable(ACCENT_ID.BLUE);
Expand Down
1 change: 0 additions & 1 deletion src/script/user/UserMapper.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,6 @@ describe('User Mapper', () => {
const user_et = mapper.mapUserFromJson(self_user_payload, '');

expect(user_et.name()).toBe('John Doe');
expect(user_et.joaatHash).toBe(526273169);
expect(user_et.accent_id()).toBe(ACCENT_ID.BLUE);
});
});
Expand Down
2 changes: 0 additions & 2 deletions src/script/user/UserMapper.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@

import {container} from 'tsyringe';

import {joaatHash} from 'Util/Crypto';
import {getLogger, Logger} from 'Util/Logger';

import {isSelfAPIUser} from './UserGuards';
Expand Down Expand Up @@ -91,7 +90,6 @@ export class UserMapper {
const isNewUser = userEntity.id === '' && userData.id !== '';
if (isNewUser && userData.id) {
userEntity.id = userData.id;
userEntity.joaatHash = joaatHash(userData.id ?? '');
}

if (userData.qualified_id) {
Expand Down
65 changes: 0 additions & 65 deletions src/script/util/Crypto.test.ts
View file
Open in desktop

This file was deleted.

38 changes: 0 additions & 38 deletions src/script/util/Crypto.ts
View file
Open in desktop

This file was deleted.

9 changes: 0 additions & 9 deletions yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4411,13 +4411,6 @@ __metadata:
languageName: node
linkType: hard

"@types/uint32@npm:0.2.0":
version: 0.2.0
resolution: "@types/uint32@npm:0.2.0"
checksum: 10e31438f0be48629742ff148f2ae0030008b63d232472bc836dd19c34cdf219ccdfac1d7ff5d89e116c405e4b43e485268375f3343d00a84d1b3f32e3e24691
languageName: node
linkType: hard

"@types/underscore@npm:1.11.6":
version: 1.11.6
resolution: "@types/underscore@npm:1.11.6"
Expand Down Expand Up @@ -17703,7 +17696,6 @@ __metadata:
"@types/seedrandom": ^3
"@types/sinon": 10.0.16
"@types/speakingurl": 13.0.3
"@types/uint32": 0.2.0
"@types/underscore": 1.11.6
"@types/webpack-env": 1.18.1
"@wireapp/avs": 9.3.7
Expand Down Expand Up @@ -17809,7 +17801,6 @@ __metadata:
tsc-watch: 6.0.4
tsyringe: 4.8.0
typescript: 5.1.6
uint32: 0.2.1
underscore: 1.13.6
uuidjs: 4.2.13
webpack: 5.88.2
Expand Down
Loading