summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRamón M. Gómez <ramongomez@us.es>2019-05-15 09:17:55 +0200
committerRamón M. Gómez <ramongomez@us.es>2019-05-15 09:17:55 +0200
commite157720ae79fb76cdbfc6eff738ff1797c7cb722 (patch)
tree8b8f150db135d5b736437be2ab1e584018db41a6
parent4c47182a3e6c7d9e09042e6d60f7578f52339a8a (diff)
#761 Fix access bug from web frontend to a repository.
-rw-r--r--admin/WebConsole3/frontend/src/app/api/repository.service.ts54
-rw-r--r--admin/WebConsole3/frontend/src/environments/environment.ts6
2 files changed, 30 insertions, 30 deletions
diff --git a/admin/WebConsole3/frontend/src/app/api/repository.service.ts b/admin/WebConsole3/frontend/src/app/api/repository.service.ts
index 1561f41a..55fd88a0 100644
--- a/admin/WebConsole3/frontend/src/app/api/repository.service.ts
+++ b/admin/WebConsole3/frontend/src/app/api/repository.service.ts
@@ -1,27 +1,27 @@
-import { Injectable } from '@angular/core';
-import { HttpClient} from '@angular/common/http';
-
-import { environment } from '../../environments/environment';
-import { Repository } from '../model/repository';
-import { RepositorySerializer } from '../serializer/repository.serializer';
-
-import {ResourceService} from 'globunet-angular/core/providers/api/resource.service';
-import {Observable} from 'rxjs';
-
-
-@Injectable({
- providedIn: 'root'
-})
-export class RepositoryService extends ResourceService<Repository> {
-
- constructor(http: HttpClient) {
- super(http, environment.API_URL, 'repositories', new RepositorySerializer());
- }
-
- getInfo(repository: Repository) {
- const url = 'https://' + repository.ip + '/' + environment.BASE_DIR + environment.API_BASE_URL;
- return this.httpClient.get(url, {headers: {
- Authorization: repository.password
- }});
- }
-}
+import { Injectable } from '@angular/core';
+import { HttpClient} from '@angular/common/http';
+
+import { environment } from '../../environments/environment';
+import { Repository } from '../model/repository';
+import { RepositorySerializer } from '../serializer/repository.serializer';
+
+import {ResourceService} from 'globunet-angular/core/providers/api/resource.service';
+import {Observable} from 'rxjs';
+
+
+@Injectable({
+ providedIn: 'root'
+})
+export class RepositoryService extends ResourceService<Repository> {
+
+ constructor(http: HttpClient) {
+ super(http, environment.API_URL, 'repositories', new RepositorySerializer());
+ }
+
+ getInfo(repository: Repository) {
+ const url = 'https://' + repository.ip + '/' + environment.BASE_DIR + environment.API_BASE_URL;
+ return this.httpClient.get(url, {headers: {
+ Authorization: repository.randomId
+ }});
+ }
+}
diff --git a/admin/WebConsole3/frontend/src/environments/environment.ts b/admin/WebConsole3/frontend/src/environments/environment.ts
index 16b61e25..ef17e26d 100644
--- a/admin/WebConsole3/frontend/src/environments/environment.ts
+++ b/admin/WebConsole3/frontend/src/environments/environment.ts
@@ -1,7 +1,7 @@
// This file can be replaced during build by using the `fileReplacements` array.
// `ng build --prod` replaces `environment.ts` with `environment.prod.ts`.
// The list of file replacements can be found in `angular.json`.
-const url = 'https://172.16.140.210/opengnsys3';
+const url = 'https://SERVERIP/opengnsys3';
export const environment = {
production: false,
BASE_URL: url,
@@ -9,8 +9,8 @@ export const environment = {
API_PUBLIC_URL: url + '/api',
API_BASE_URL: '/backend/web/app_dev.php/api',
OAUTH_DOMAIN: '/backend/web/app_dev.php/oauth/v2/token',
- OAUTH_CLIENT_ID: '1_23amzbdp4kskg80444oscko4w0w8wokocs88k0g8w88o4oggs4',
- OAUTH_CLIENT_SECRET: '46rttt2trwo4gocgoc4w80k4s8ok48sg8s84kk0cw48csks8o8',
+ OAUTH_CLIENT_ID: 'CLIENTID',
+ OAUTH_CLIENT_SECRET: 'CLIENTSECRET',
BASE_DIR: 'opengnsys3',
clientstatus: ['off', 'initializing', 'oglive', 'busy', 'linux', 'linux_session', 'macos', 'windows', 'windows_session'],
windowsboots: ['reboot', 'directo (kexec)'],