Skip to content

Commit 8abf420

Browse files
nsemetsnsemets
authored
chore(env): updated env files (CenterForOpenScience#328)
* chore(env): updated env files * fix(env): updated api url * fix(env): updated env for files widget
1 parent 8343301 commit 8abf420

60 files changed

Lines changed: 307 additions & 383 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎src/app/core/services/auth.service.ts‎

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -19,26 +19,28 @@ export class AuthService {
1919
private readonly jsonApiService = inject(JsonApiService);
2020
private readonly cookieService = inject(CookieService);
2121
private readonly loaderService = inject(LoaderService);
22+
private readonly apiUrl = `${environment.apiDomainUrl}/v2/users/`;
23+
private readonly webUrl = environment.webUrl;
2224
private readonly actions = createDispatchMap({ clearCurrentUser: ClearCurrentUser });
2325

2426
navigateToSignIn(): void {
2527
this.loaderService.show();
26-
const loginUrl = `${environment.casUrl}/login?${urlParam({ service: `${environment.webUrl}/login` })}`;
28+
const loginUrl = `${environment.casUrl}/login?${urlParam({ service: `${this.webUrl}/login` })}`;
2729
window.location.href = loginUrl;
2830
}
2931

3032
navigateToOrcidSingIn(): void {
3133
const loginUrl = `${environment.casUrl}/login?${urlParam({
3234
redirectOrcid: 'true',
33-
service: `${environment.webUrl}/login/?next=${encodeURIComponent(environment.webUrl)}`,
35+
service: `${this.webUrl}/login/?next=${encodeURIComponent(this.webUrl)}`,
3436
})}`;
3537
window.location.href = loginUrl;
3638
}
3739

3840
navigateToInstitutionSignIn(): void {
3941
const loginUrl = `${environment.casUrl}/login?${urlParam({
4042
campaign: 'institution',
41-
service: `${environment.webUrl}/login/?next=${encodeURIComponent(environment.webUrl)}`,
43+
service: `${this.webUrl}/login/?next=${encodeURIComponent(this.webUrl)}`,
4244
})}`;
4345
window.location.href = loginUrl;
4446
}
@@ -47,25 +49,25 @@ export class AuthService {
4749
this.loaderService.show();
4850
this.cookieService.deleteAll();
4951
this.actions.clearCurrentUser();
50-
window.location.href = `${environment.webUrl}/logout/?next=${encodeURIComponent('/')}`;
52+
window.location.href = `${this.webUrl}/logout/?next=${encodeURIComponent('/')}`;
5153
}
5254

5355
register(payload: SignUpModel) {
54-
const baseUrl = `${environment.apiUrlV1}/register/`;
56+
const baseUrl = `${this.webUrl}/api/v1/register/`;
5557
const body = { ...payload, 'g-recaptcha-response': payload.recaptcha, campaign: null };
5658

5759
return this.jsonApiService.post(baseUrl, body);
5860
}
5961

6062
forgotPassword(email: string) {
61-
const baseUrl = `${environment.apiUrl}/users/reset_password/`;
63+
const baseUrl = `${this.apiUrl}/reset_password/`;
6264
const params: Record<string, string> = { email };
6365

6466
return this.jsonApiService.get(baseUrl, params);
6567
}
6668

6769
resetPassword(userId: string, token: string, newPassword: string) {
68-
const baseUrl = `${environment.apiUrl}/users/reset_password/`;
70+
const baseUrl = `${this.apiUrl}/reset_password/`;
6971
const body = {
7072
data: {
7173
attributes: {

‎src/app/core/services/request-access.service.ts‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,16 @@ import { Observable } from 'rxjs';
22

33
import { inject, Injectable } from '@angular/core';
44

5-
import { JsonApiService } from '../../shared/services/json-api.service';
5+
import { JsonApiService } from '@osf/shared/services';
66

77
import { environment } from 'src/environments/environment';
88

99
@Injectable({
1010
providedIn: 'root',
1111
})
1212
export class RequestAccessService {
13-
jsonApiService = inject(JsonApiService);
13+
private readonly jsonApiService = inject(JsonApiService);
14+
private readonly apiUrl = `${environment.apiDomainUrl}/v2`;
1415

1516
requestAccessToProject(projectId: string, comment = ''): Observable<void> {
1617
const payload = {
@@ -23,6 +24,6 @@ export class RequestAccessService {
2324
},
2425
};
2526

26-
return this.jsonApiService.post<void>(`${environment.apiUrl}/nodes/${projectId}/requests/`, payload);
27+
return this.jsonApiService.post<void>(`${this.apiUrl}/nodes/${projectId}/requests/`, payload);
2728
}
2829
}

‎src/app/core/services/user-emails.service.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ import { environment } from 'src/environments/environment';
1313
})
1414
export class UserEmailsService {
1515
private readonly jsonApiService = inject(JsonApiService);
16-
private readonly baseUrl = `${environment.apiUrl}/users`;
16+
private readonly baseUrl = `${environment.apiDomainUrl}/v2/users`;
1717

1818
getEmails(): Observable<AccountEmailModel[]> {
1919
const params: Record<string, string> = {

‎src/app/core/services/user.service.ts‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,39 +23,40 @@ import { environment } from 'src/environments/environment';
2323
providedIn: 'root',
2424
})
2525
export class UserService {
26-
jsonApiService = inject(JsonApiService);
26+
private readonly jsonApiService = inject(JsonApiService);
27+
private readonly apiUrl = `${environment.apiDomainUrl}/v2`;
2728

2829
getUserById(userId: string): Observable<User> {
2930
return this.jsonApiService
30-
.get<UserResponseJsonApi>(`${environment.apiUrl}/users/${userId}/`)
31+
.get<UserResponseJsonApi>(`${this.apiUrl}/users/${userId}/`)
3132
.pipe(map((response) => UserMapper.fromUserGetResponse(response.data)));
3233
}
3334

3435
getCurrentUser(): Observable<UserData> {
3536
return this.jsonApiService
36-
.get<UserDataResponseJsonApi>(`${environment.apiUrl}/`)
37+
.get<UserDataResponseJsonApi>(`${this.apiUrl}/`)
3738
.pipe(map((response) => UserMapper.fromUserDataGetResponse(response)));
3839
}
3940

4041
getCurrentUserSettings(): Observable<UserSettings> {
4142
return this.jsonApiService
42-
.get<JsonApiResponse<UserSettingsGetResponse, null>>(`${environment.apiUrl}/users/me/settings/`)
43+
.get<JsonApiResponse<UserSettingsGetResponse, null>>(`${this.apiUrl}/users/me/settings/`)
4344
.pipe(map((response) => UserMapper.fromUserSettingsGetResponse(response.data)));
4445
}
4546

4647
updateUserSettings(userId: string, userSettings: UserSettings): Observable<UserSettings> {
4748
const request = UserMapper.toUpdateUserSettingsRequest(userId, userSettings);
4849

4950
return this.jsonApiService
50-
.patch<UserSettingsGetResponse>(`${environment.apiUrl}/users/${userId}/settings/`, request)
51+
.patch<UserSettingsGetResponse>(`${this.apiUrl}/users/${userId}/settings/`, request)
5152
.pipe(map((response) => UserMapper.fromUserSettingsGetResponse(response)));
5253
}
5354

5455
updateUserProfile(userId: string, key: string, data: ProfileSettingsUpdate): Observable<User> {
5556
const patchedData = key === ProfileSettingsKey.User ? data : { [key]: data };
5657

5758
return this.jsonApiService
58-
.patch<UserDataJsonApi>(`${environment.apiUrl}/users/${userId}/`, {
59+
.patch<UserDataJsonApi>(`${this.apiUrl}/users/${userId}/`, {
5960
data: { type: 'users', id: userId, attributes: patchedData },
6061
})
6162
.pipe(map((response) => UserMapper.fromUserGetResponse(response)));

‎src/app/features/admin-institutions/services/institutions-admin.service.ts‎

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -42,17 +42,18 @@ import { environment } from 'src/environments/environment';
4242
providedIn: 'root',
4343
})
4444
export class InstitutionsAdminService {
45-
private jsonApiService = inject(JsonApiService);
45+
private readonly jsonApiService = inject(JsonApiService);
46+
private readonly apiUrl = `${environment.apiDomainUrl}/v2`;
4647

4748
fetchDepartments(institutionId: string): Observable<InstitutionDepartment[]> {
4849
return this.jsonApiService
49-
.get<InstitutionDepartmentsJsonApi>(`${environment.apiUrl}/institutions/${institutionId}/metrics/departments/`)
50+
.get<InstitutionDepartmentsJsonApi>(`${this.apiUrl}/institutions/${institutionId}/metrics/departments/`)
5051
.pipe(map((res) => mapInstitutionDepartments(res)));
5152
}
5253

5354
fetchSummary(institutionId: string): Observable<InstitutionSummaryMetrics> {
5455
return this.jsonApiService
55-
.get<InstitutionSummaryMetricsJsonApi>(`${environment.apiUrl}/institutions/${institutionId}/metrics/summary/`)
56+
.get<InstitutionSummaryMetricsJsonApi>(`${this.apiUrl}/institutions/${institutionId}/metrics/summary/`)
5657
.pipe(map((result) => mapInstitutionSummaryMetrics(result.data.attributes)));
5758
}
5859

@@ -71,7 +72,7 @@ export class InstitutionsAdminService {
7172
};
7273

7374
return this.jsonApiService
74-
.get<InstitutionUsersJsonApi>(`${environment.apiUrl}/institutions/${institutionId}/metrics/users/`, params)
75+
.get<InstitutionUsersJsonApi>(`${this.apiUrl}/institutions/${institutionId}/metrics/users/`, params)
7576
.pipe(
7677
map((response) => ({
7778
users: mapInstitutionUsers(response as InstitutionUsersJsonApi),
@@ -105,23 +106,23 @@ export class InstitutionsAdminService {
105106
};
106107

107108
return this.jsonApiService
108-
.get<InstitutionIndexValueSearchJsonApi>(`${environment.shareDomainUrl}/index-value-search`, params)
109+
.get<InstitutionIndexValueSearchJsonApi>(`${environment.shareTroveUrl}/index-value-search`, params)
109110
.pipe(map((response) => mapIndexCardResults(response?.included)));
110111
}
111112

112113
sendMessage(request: SendMessageRequest): Observable<SendMessageResponseJsonApi> {
113114
const payload = sendMessageRequestMapper(request);
114115

115116
return this.jsonApiService.post<SendMessageResponseJsonApi>(
116-
`${environment.apiUrl}/users/${request.userId}/messages/`,
117+
`${this.apiUrl}/users/${request.userId}/messages/`,
117118
payload
118119
);
119120
}
120121

121122
requestProjectAccess(request: RequestProjectAccessData): Observable<void> {
122123
const payload = requestProjectAccessMapper(request);
123124

124-
return this.jsonApiService.post<void>(`${environment.apiUrl}/nodes/${request.projectId}/requests/`, payload);
125+
return this.jsonApiService.post<void>(`${this.apiUrl}/nodes/${request.projectId}/requests/`, payload);
125126
}
126127

127128
private fetchIndexCards(
@@ -131,7 +132,7 @@ export class InstitutionsAdminService {
131132
sort = '-dateModified',
132133
cursor = ''
133134
): Observable<AdminInstitutionSearchResult> {
134-
const url = `${environment.shareDomainUrl}/index-card-search`;
135+
const url = `${environment.shareTroveUrl}/index-card-search`;
135136
const affiliationParam = institutionIris.join(',');
136137

137138
const params: Record<string, string> = {

‎src/app/features/analytics/services/analytics.service.ts‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,15 @@ import { environment } from 'src/environments/environment';
1616
})
1717
export class AnalyticsService {
1818
private readonly jsonApiService = inject(JsonApiService);
19+
private readonly apiDomainUrl = environment.apiDomainUrl;
1920

2021
private readonly urlMap = new Map<ResourceType, string>([
2122
[ResourceType.Project, 'nodes'],
2223
[ResourceType.Registration, 'registrations'],
2324
]);
2425

2526
getMetrics(resourceId: string, dateRange: string): Observable<AnalyticsMetricsModel> {
26-
const baseUrl = `${environment.apiDomainUrl}/_/metrics/query/node_analytics`;
27+
const baseUrl = `${this.apiDomainUrl}/_/metrics/query/node_analytics`;
2728

2829
return this.jsonApiService
2930
.get<JsonApiResponse<AnalyticsMetricsGetResponse, null>>(`${baseUrl}/${resourceId}/${dateRange}/`)
@@ -32,7 +33,7 @@ export class AnalyticsService {
3233

3334
getRelatedCounts(resourceId: string, resourceType: ResourceType) {
3435
const resourcePath = this.urlMap.get(resourceType);
35-
const url = `${environment.apiUrl}/${resourcePath}/${resourceId}/?related_counts=true`;
36+
const url = `${this.apiDomainUrl}/v2/${resourcePath}/${resourceId}/?related_counts=true`;
3637

3738
return this.jsonApiService
3839
.get<RelatedCountsGetResponse>(url)

‎src/app/features/collections/services/add-to-collection.service.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ import { environment } from 'src/environments/environment';
1212
providedIn: 'root',
1313
})
1414
export class AddToCollectionService {
15-
private apiUrl = environment.apiUrl;
1615
private readonly jsonApiService = inject(JsonApiService);
16+
private readonly apiUrl = `${environment.apiDomainUrl}/v2`;
1717

1818
fetchCollectionLicenses(providerId: string): Observable<LicenseModel[]> {
1919
return this.jsonApiService

‎src/app/features/files/components/file-revisions/file-revisions.component.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ export class FileRevisionsComponent {
4747

4848
downloadRevision(version: string): void {
4949
if (this.fileGuid()) {
50-
window.open(`${environment.downloadUrl}/${this.fileGuid()}/?revision=${version}`)?.focus();
50+
window.open(`${environment.webUrl}/download/${this.fileGuid()}/?revision=${version}`)?.focus();
5151
}
5252
}
5353
}

‎src/app/features/files/pages/files/files.component.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -208,7 +208,7 @@ export class FilesComponent {
208208
const resourceId = this.resourceId();
209209

210210
const resourcePath = this.urlMap.get(this.resourceType()!);
211-
const folderLink = `${environment.apiUrl}/${resourcePath}/${resourceId}/files/`;
211+
const folderLink = `${environment.apiDomainUrl}/v2/${resourcePath}/${resourceId}/files/`;
212212
const iriLink = `${environment.webUrl}/${resourceId}`;
213213
this.actions.getRootFolders(folderLink);
214214
this.actions.getConfiguredStorageAddons(iriLink);

‎src/app/features/metadata/services/metadata.service.ts‎

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,8 @@ import { environment } from 'src/environments/environment';
2828
})
2929
export class MetadataService {
3030
private readonly jsonApiService = inject(JsonApiService);
31-
private readonly apiUrl = environment.apiUrl;
31+
private readonly apiDomainUrl = environment.apiDomainUrl;
32+
private readonly apiUrl = `${this.apiDomainUrl}/v2`;
3233
private readonly urlMap = new Map<ResourceType, string>([
3334
[ResourceType.Project, 'nodes'],
3435
[ResourceType.Registration, 'registrations'],
@@ -77,7 +78,7 @@ export class MetadataService {
7778

7879
getMetadataCedarTemplates(url?: string): Observable<CedarMetadataTemplateJsonApi> {
7980
return this.jsonApiService.get<CedarMetadataTemplateJsonApi>(
80-
url || `${environment.apiDomainUrl}/_/cedar_metadata_templates/`
81+
url || `${this.apiDomainUrl}/_/cedar_metadata_templates/`
8182
);
8283
}
8384

@@ -99,10 +100,7 @@ export class MetadataService {
99100
resourceType: ResourceType
100101
): Observable<CedarMetadataRecord> {
101102
const payload = CedarRecordsMapper.toCedarRecordsPayload(data, resourceId, this.urlMap.get(resourceType) as string);
102-
return this.jsonApiService.post<CedarMetadataRecord>(
103-
`${environment.apiDomainUrl}/_/cedar_metadata_records/`,
104-
payload
105-
);
103+
return this.jsonApiService.post<CedarMetadataRecord>(`${this.apiDomainUrl}/_/cedar_metadata_records/`, payload);
106104
}
107105

108106
updateMetadataCedarRecord(
@@ -114,7 +112,7 @@ export class MetadataService {
114112
const payload = CedarRecordsMapper.toCedarRecordsPayload(data, resourceId, this.urlMap.get(resourceType) as string);
115113

116114
return this.jsonApiService.patch<CedarMetadataRecord>(
117-
`${environment.apiDomainUrl}/_/cedar_metadata_records/${recordId}/`,
115+
`${this.apiDomainUrl}/_/cedar_metadata_records/${recordId}/`,
118116
payload
119117
);
120118
}

0 commit comments

Comments
 (0)