Skip to content

Commit 14a411f

Browse files
nikosdouvlisnikosdouvlis
committed
Revert "fix(backend,types,clerk-js): Introduce image_url to User-related types"
This reverts commit 6e86468
1 parent 337af43 commit 14a411f

14 files changed

Lines changed: 5 additions & 42 deletions

File tree

‎packages/backend/src/api/resources/JSON.ts‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -162,11 +162,7 @@ export interface OrganizationMembershipPublicUserDataJSON {
162162
identifier: string;
163163
first_name: string | null;
164164
last_name: string | null;
165-
/**
166-
* @deprecated Use image_url instead
167-
*/
168165
profile_image_url: string;
169-
image_url: string;
170166
user_id: string;
171167
}
172168

@@ -256,11 +252,7 @@ export interface UserJSON extends ClerkResourceJSON {
256252
last_name: string;
257253
gender: string;
258254
birthday: string;
259-
/**
260-
* @deprecated Use image_url instead
261-
*/
262255
profile_image_url: string;
263-
image_url: string;
264256
primary_email_address_id: string;
265257
primary_phone_number_id: string;
266258
primary_web3_wallet_id: string;

‎packages/backend/src/api/resources/OrganizationMembership.ts‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@ export class OrganizationMembershipPublicUserData {
3434
readonly firstName: string | null,
3535
readonly lastName: string | null,
3636
readonly profileImageUrl: string,
37-
readonly imageUrl: string,
3837
readonly userId: string,
3938
) {}
4039

@@ -44,7 +43,6 @@ export class OrganizationMembershipPublicUserData {
4443
data.first_name,
4544
data.last_name,
4645
data.profile_image_url,
47-
data.image_url,
4846
data.user_id,
4947
);
5048
}

‎packages/backend/src/api/resources/User.ts‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ export class User {
1515
readonly createdAt: number,
1616
readonly updatedAt: number,
1717
readonly profileImageUrl: string,
18-
readonly imageUrl: string,
1918
readonly gender: string,
2019
readonly birthday: string,
2120
readonly primaryEmailAddressId: string | null,
@@ -46,7 +45,6 @@ export class User {
4645
data.created_at,
4746
data.updated_at,
4847
data.profile_image_url,
49-
data.image_url,
5048
data.gender,
5149
data.birthday,
5250
data.primary_email_address_id,

‎packages/backend/src/fixtures/responses/user.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"username": null,
55
"first_name": "John",
66
"last_name": "Doe",
7-
"image_url": null,
7+
"profile_image_url": null,
88
"primary_email_address_id": "idn_email_address",
99
"primary_phone_number_id": "idn_phone_number",
1010
"password_enabled": false,

‎packages/clerk-js/src/core/resources/OrganizationMembership.test.ts‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@ describe('OrganizationMembership', () => {
2828
first_name: 'test_first_name',
2929
last_name: 'test_last_name',
3030
profile_image_url: 'test_url',
31-
image_url: 'test_url',
3231
identifier: 'test@identifier.gr',
3332
id: 'test_user_id',
3433
},

‎packages/clerk-js/src/core/resources/OrganizationMembership.ts‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,6 @@ export class OrganizationMembership extends BaseResource implements Organization
6767
firstName: data.public_user_data.first_name,
6868
lastName: data.public_user_data.last_name,
6969
profileImageUrl: data.public_user_data.profile_image_url,
70-
imageUrl: data.public_user_data.image_url,
7170
identifier: data.public_user_data.identifier,
7271
userId: data.public_user_data.user_id,
7372
};

‎packages/clerk-js/src/core/resources/User.ts‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,6 @@ export class User extends BaseResource implements UserResource {
6464
primaryPhoneNumber: PhoneNumberResource | null = null;
6565
primaryWeb3WalletId: string | null = null;
6666
primaryWeb3Wallet: Web3WalletResource | null = null;
67-
imageUrl = '';
6867
profileImageUrl = '';
6968
twoFactorEnabled = false;
7069
totpEnabled = false;
@@ -272,7 +271,6 @@ export class User extends BaseResource implements UserResource {
272271
}
273272

274273
this.profileImageUrl = data.profile_image_url;
275-
this.imageUrl = data.image_url;
276274
this.username = data.username;
277275
this.passwordEnabled = data.password_enabled;
278276
this.emailAddresses = (data.email_addresses || []).map(

‎packages/clerk-js/src/core/test/fixtures.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ export const createUser = (params: WithUserParams): UserJSON => {
116116
primary_email_address_id: '',
117117
primary_phone_number_id: '',
118118
primary_web3_wallet_id: '',
119-
image_url: '',
119+
profile_image_url: '',
120120
username: 'testUsername',
121121
web3_wallets: [],
122122
password: '',

‎packages/clerk-js/src/ui/components/UserProfile/__tests__/ProfilePage.test.tsx‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,6 @@ describe('ProfilePage', () => {
4747
const { wrapper } = await createFixtures(f => {
4848
f.withUser({
4949
email_addresses: ['test@clerk.dev'],
50-
image_url: 'https://clerk.com',
5150
profile_image_url: 'https://clerk.com',
5251
first_name: 'F',
5352
last_name: 'L',
@@ -75,7 +74,7 @@ describe('ProfilePage', () => {
7574
const { wrapper, fixtures } = await createFixtures(f => {
7675
f.withUser({
7776
email_addresses: ['test@clerk.dev'],
78-
image_url: 'https://clerk.com',
77+
profile_image_url: 'https://clerk.com',
7978
});
8079
});
8180
fixtures.clerk.user?.setProfileImage.mockReturnValueOnce(Promise.resolve({} as ImageResource));

‎packages/clerk-js/src/ui/utils/test/fixtureHelpers.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ const createUserFixtureHelpers = (baseClient: ClientJSON) => {
5252
return {
5353
first_name: 'FirstName',
5454
last_name: 'LastName',
55-
image_url: '',
55+
profile_image_url: '',
5656
identifier: 'email@test.com',
5757
user_id: '',
5858
...params,

0 commit comments

Comments
 (0)