Skip to content

Commit

Permalink
Support alias
Browse files Browse the repository at this point in the history
  • Loading branch information
@farhan687
farhan687 committed Jan 6, 2017
1 parent f3ea668 commit cd500ee
Show file tree
Hide file tree
Showing 2 changed files with 141 additions and 111 deletions.
4 changes: 2 additions & 2 deletions app/app.component.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -331,9 +331,8 @@ export class AppComponent implements OnInit, OnChanges {
// get mappings
getMappings(clearFlag) {
var self = this;
this.appbaseService.get('/_mapping').then(function(res) {
this.appbaseService.getMappings().then(function(data) {
self.connected = true;
let data = res.json();
self.setInitialValue();
self.finalUrl = self.config.host + '/' + self.config.appname;
self.mapping = data;
Expand Down Expand Up @@ -378,6 +377,7 @@ export class AppComponent implements OnInit, OnChanges {
}, 300);

}).catch(function(e) {
console.log(e);
self.initial_connect = true;
self.errorShow({
title: 'Authentication Error',
Expand Down
248 changes: 139 additions & 109 deletions app/shared/appbase.service.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,113 +5,143 @@ import 'rxjs/add/operator/toPromise';
@Injectable()

export class AppbaseService {
constructor(private http: Http) {}
public requestParam: any = {
url: null,
auth: null
};
public config: any = {
username: null,
password: null
};
public appbaseRef: any;

setAppbase(config: any) {
this.config.username = config.username;
this.config.password = config.password;
this.requestParam.pureurl = config.url;
if(config.appname) {
this.requestParam.url = config.url + '/' + config.appname;
} else {
this.requestParam.url = config.url;
}
this.requestParam.auth = "Basic " + btoa(config.username + ':' + config.password);
}
get(path: string) {
let headers = new Headers({
'Content-Type': 'application/json;charset=UTF-8',
'Authorization': this.requestParam.auth
});
var request_url = this.requestParam.url.replace(this.config.username+':'+this.config.password+'@', '');
var request_path = request_url + path + '/';
console.log(request_path);
return this.http.get(request_path, { headers: headers }).toPromise();
}
getVersion() {
let headers = new Headers({
'Content-Type': 'application/json;charset=UTF-8',
'Authorization': this.requestParam.auth
});
var request_url = this.requestParam.pureurl.replace(this.config.username+':'+this.config.password+'@', '');
var request_path = request_url + '/';
console.log(request_path);
return this.http.get(request_path, { headers: headers }).toPromise()
}
post(path: string, data: any) {
let requestData = JSON.stringify(data);
let headers = new Headers({
'Content-Type': 'application/json;charset=UTF-8',
'Authorization': this.requestParam.auth
});
return this.http.post(this.requestParam.url + path, requestData, { headers: headers }).toPromise()
}
posturl(url: string, data: any) {
let requestData = JSON.stringify(data);
let headers = new Headers({
'Content-Type': 'application/json;charset=UTF-8',
'Authorization': this.requestParam.auth
});
return this.http.post(url, requestData, { headers: headers }).toPromise()
}
put(path: string, data: any) {
let headers = new Headers({
'Content-Type': 'application/json;charset=UTF-8',
'Authorization': this.requestParam.auth
});
return this.http.put(this.requestParam.url + path, data, { headers: headers }).toPromise()
}
delete(path: string) {
let headers = new Headers({
'Content-Type': 'application/json;charset=UTF-8',
'Authorization': this.requestParam.auth
});
return this.http.delete(this.requestParam.url + path, { headers: headers }).toPromise()
}
public handleError(error: any) {
console.error('An error occurred', error);
}
getIndices(url: string) {
var temp_config = this.filterurl(url);
this.setAppbase(temp_config);
return this.get('/_stats/indices');
}
filterurl(url: string) {
if (url) {
var obj = {
username: 'test',
password: 'test',
url: url
};
var urlsplit = url.split(':');
try {
obj.username = urlsplit[1].replace('//', '');
var httpPrefix = url.split('://');
if(urlsplit[2]) {
var pwsplit = urlsplit[2].split('@');
obj.password = pwsplit[0];
if(url.indexOf('@') !== -1) {
obj.url = httpPrefix[0] + '://' + pwsplit[1];
if(urlsplit[3]) {
obj.url += ':'+urlsplit[3];
}
}
}
} catch(e) {
console.log(e);
}
return obj;
} else {
return null;
}
}
constructor(private http: Http) {}
public requestParam: any = {
url: null,
auth: null
};
public config: any = {
username: null,
password: null
};
public appbaseRef: any;
setAppbase(config: any) {
this.config.username = config.username;
this.config.password = config.password;
this.requestParam.pureurl = config.url;
if (config.appname) {
this.requestParam.url = config.url + '/' + config.appname;
} else {
this.requestParam.url = config.url;
}
this.requestParam.auth = "Basic " + btoa(config.username + ':' + config.password);
}
get(path: string) {
let headers = new Headers({
'Content-Type': 'application/json;charset=UTF-8',
'Authorization': this.requestParam.auth
});
var request_url = this.requestParam.url.replace(this.config.username + ':' + this.config.password + '@', '');
var request_path = request_url + path + '/';
console.log(request_path);
return this.http.get(request_path, { headers: headers }).toPromise();
}
getMappings() {
var self = this;
return new Promise((resolve, reject) => {
getRequest('/_mapping').then(function(res) {
let mappingData = res.json();
getRequest('/_alias').then(function(res) {
let aliasData = res.json();
for(let index in aliasData) {
for(let alias in aliasData[index].aliases) {
mappingData[alias] = mappingData[index];
}
}
resolve(mappingData);
}).catch(function(e) {
resolve(mappingData);
});
}).catch(function(e) {
reject(e);
})
});
function getRequest(path) {
let headers = new Headers({
'Content-Type': 'application/json;charset=UTF-8',
'Authorization': self.requestParam.auth
});
var request_url = self.requestParam.url.replace(self.config.username + ':' + self.config.password + '@', '');
var request_path = request_url + path + '/';
console.log(request_path);
return self.http.get(request_path, { headers: headers }).toPromise();
}
}
getVersion() {
let headers = new Headers({
'Content-Type': 'application/json;charset=UTF-8',
'Authorization': this.requestParam.auth
});
var request_url = this.requestParam.pureurl.replace(this.config.username + ':' + this.config.password + '@', '');
var request_path = request_url + '/';
console.log(request_path);
return this.http.get(request_path, { headers: headers }).toPromise()
}
post(path: string, data: any) {
let requestData = JSON.stringify(data);
let headers = new Headers({
'Content-Type': 'application/json;charset=UTF-8',
'Authorization': this.requestParam.auth
});
return this.http.post(this.requestParam.url + path, requestData, { headers: headers }).toPromise()
}
posturl(url: string, data: any) {
let requestData = JSON.stringify(data);
let headers = new Headers({
'Content-Type': 'application/json;charset=UTF-8',
'Authorization': this.requestParam.auth
});
return this.http.post(url, requestData, { headers: headers }).toPromise()
}
put(path: string, data: any) {
let headers = new Headers({
'Content-Type': 'application/json;charset=UTF-8',
'Authorization': this.requestParam.auth
});
return this.http.put(this.requestParam.url + path, data, { headers: headers }).toPromise()
}
delete(path: string) {
let headers = new Headers({
'Content-Type': 'application/json;charset=UTF-8',
'Authorization': this.requestParam.auth
});
return this.http.delete(this.requestParam.url + path, { headers: headers }).toPromise()
}
public handleError(error: any) {
console.error('An error occurred', error);
}
getIndices(url: string) {
var temp_config = this.filterurl(url);
this.setAppbase(temp_config);
return this.get('/_stats/indices');
}
filterurl(url: string) {
if (url) {
var obj = {
username: 'test',
password: 'test',
url: url
};
var urlsplit = url.split(':');
try {
obj.username = urlsplit[1].replace('//', '');
var httpPrefix = url.split('://');
if (urlsplit[2]) {
var pwsplit = urlsplit[2].split('@');
obj.password = pwsplit[0];
if (url.indexOf('@') !== -1) {
obj.url = httpPrefix[0] + '://' + pwsplit[1];
if (urlsplit[3]) {
obj.url += ':' + urlsplit[3];
}
}
}
} catch (e) {
console.log(e);
}
return obj;
} else {
return null;
}
}
}

0 comments on commit cd500ee

Please sign in to comment.