@sitecore/sc-contenthub-webclient-sdk 1.2.61 → 1.2.65
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/authentication/oauth-client-credentials-grant.d.ts +6 -0
- package/dist/authentication/oauth-client-credentials-grant.js +30 -0
- package/dist/authentication/oauth-client-credentials-grant.js.map +1 -0
- package/dist/authentication/oauth-grant-type.d.ts +2 -1
- package/dist/authentication/oauth-grant-type.js +1 -0
- package/dist/authentication/oauth-grant-type.js.map +1 -1
- package/dist/clients/content-hub-client.d.ts +2 -1
- package/dist/clients/content-hub-client.js.map +1 -1
- package/dist/clients/internal-client.d.ts +3 -1
- package/dist/clients/internal-client.js +11 -5
- package/dist/clients/internal-client.js.map +1 -1
- package/dist/models/search/visual-search-request-resource.d.ts +4 -0
- package/dist/models/search/visual-search-request-resource.js +4 -0
- package/dist/models/search/visual-search-request-resource.js.map +1 -1
- package/dist/models/search/visual-search-response-resource.d.ts +4 -0
- package/dist/models/search/visual-search-response-resource.js +4 -0
- package/dist/models/search/visual-search-response-resource.js.map +1 -1
- package/esm/authentication/oauth-client-credentials-grant.d.ts +6 -0
- package/esm/authentication/oauth-client-credentials-grant.js +28 -0
- package/esm/authentication/oauth-client-credentials-grant.js.map +1 -0
- package/esm/authentication/oauth-grant-type.d.ts +2 -1
- package/esm/authentication/oauth-grant-type.js +1 -0
- package/esm/authentication/oauth-grant-type.js.map +1 -1
- package/esm/clients/content-hub-client.d.ts +2 -1
- package/esm/clients/content-hub-client.js.map +1 -1
- package/esm/clients/internal-client.d.ts +3 -1
- package/esm/clients/internal-client.js +11 -5
- package/esm/clients/internal-client.js.map +1 -1
- package/esm/models/search/visual-search-request-resource.d.ts +4 -0
- package/esm/models/search/visual-search-request-resource.js +4 -0
- package/esm/models/search/visual-search-request-resource.js.map +1 -1
- package/esm/models/search/visual-search-response-resource.d.ts +4 -0
- package/esm/models/search/visual-search-response-resource.js +4 -0
- package/esm/models/search/visual-search-response-resource.js.map +1 -1
- package/package.json +1 -1
|
@@ -0,0 +1,30 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
|
|
3
|
+
var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
|
|
4
|
+
if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
|
|
5
|
+
else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
|
|
6
|
+
return c > 3 && r && Object.defineProperty(target, key, r), r;
|
|
7
|
+
};
|
|
8
|
+
var __metadata = (this && this.__metadata) || function (k, v) {
|
|
9
|
+
if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
|
|
10
|
+
};
|
|
11
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
|
+
const ta_json_1 = require("ta-json");
|
|
13
|
+
const oauth_grant_base_1 = require("./oauth-grant-base");
|
|
14
|
+
const oauth_grant_type_1 = require("./oauth-grant-type");
|
|
15
|
+
let OAuthClientCredentialsGrant = class OAuthClientCredentialsGrant extends oauth_grant_base_1.OAuthGrantBase {
|
|
16
|
+
constructor(clientId, clientSecret) {
|
|
17
|
+
super(clientId, clientSecret);
|
|
18
|
+
this.type = oauth_grant_type_1.OAuthGrantType.ClientCredentials;
|
|
19
|
+
}
|
|
20
|
+
};
|
|
21
|
+
__decorate([
|
|
22
|
+
(0, ta_json_1.JsonProperty)("grant_type"),
|
|
23
|
+
__metadata("design:type", String)
|
|
24
|
+
], OAuthClientCredentialsGrant.prototype, "type", void 0);
|
|
25
|
+
OAuthClientCredentialsGrant = __decorate([
|
|
26
|
+
(0, ta_json_1.JsonObject)(),
|
|
27
|
+
__metadata("design:paramtypes", [String, String])
|
|
28
|
+
], OAuthClientCredentialsGrant);
|
|
29
|
+
exports.default = OAuthClientCredentialsGrant;
|
|
30
|
+
//# sourceMappingURL=oauth-client-credentials-grant.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"oauth-client-credentials-grant.js","sourceRoot":"","sources":["../../src/authentication/oauth-client-credentials-grant.ts"],"names":[],"mappings":";;;;;;;;;;;AAAA,qCAAmD;AAEnD,yDAAoD;AACpD,yDAAoD;AAGrC,IAAM,2BAA2B,GAAjC,MAAM,2BAA4B,SAAQ,iCAAc;IAInE,YAAY,QAAgB,EAAE,YAAoB;QAC9C,KAAK,CAAC,QAAQ,EAAE,YAAY,CAAC,CAAC;QAHlC,SAAI,GAAmB,iCAAc,CAAC,iBAAiB,CAAC;IAIxD,CAAC;CACJ,CAAA;AALG;IADC,IAAA,sBAAY,EAAC,YAAY,CAAC;;yDAC6B;AAFvC,2BAA2B;IAD/C,IAAA,oBAAU,GAAE;;GACQ,2BAA2B,CAO/C;kBAPoB,2BAA2B"}
|
|
@@ -5,5 +5,6 @@ var OAuthGrantType;
|
|
|
5
5
|
(function (OAuthGrantType) {
|
|
6
6
|
OAuthGrantType["Password"] = "password";
|
|
7
7
|
OAuthGrantType["RefreshToken"] = "refresh_token";
|
|
8
|
+
OAuthGrantType["ClientCredentials"] = "client_credentials";
|
|
8
9
|
})(OAuthGrantType || (exports.OAuthGrantType = OAuthGrantType = {}));
|
|
9
10
|
//# sourceMappingURL=oauth-grant-type.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"oauth-grant-type.js","sourceRoot":"","sources":["../../src/authentication/oauth-grant-type.ts"],"names":[],"mappings":";;;AAAA,IAAY,
|
|
1
|
+
{"version":3,"file":"oauth-grant-type.js","sourceRoot":"","sources":["../../src/authentication/oauth-grant-type.ts"],"names":[],"mappings":";;;AAAA,IAAY,cAIX;AAJD,WAAY,cAAc;IACtB,uCAAqB,CAAA;IACrB,gDAA8B,CAAA;IAC9B,0DAAwC,CAAA;AAC5C,CAAC,EAJW,cAAc,8BAAd,cAAc,QAIzB"}
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
/// <reference types="urijs" />
|
|
2
|
+
import OAuthClientCredentialsGrant from "../authentication/oauth-client-credentials-grant";
|
|
2
3
|
import OAuthPasswordGrant from "../authentication/oauth-password-grant";
|
|
3
4
|
import OAuthRefreshTokenGrant from "../authentication/oauth-refreshtoken-grant";
|
|
4
5
|
import { Nullable } from "../base-types";
|
|
@@ -86,5 +87,5 @@ export declare class ContentHubClient implements IExtendedContentHubClient {
|
|
|
86
87
|
readonly entityDefinitionMapper: EntityDefinitionMapper;
|
|
87
88
|
readonly linkHelper: ILinkHelper;
|
|
88
89
|
impersonatedUsername: Nullable<string>;
|
|
89
|
-
constructor(baseUri: URI | string, oauthGrant?: OAuthPasswordGrant | OAuthRefreshTokenGrant, logger?: ILogger);
|
|
90
|
+
constructor(baseUri: URI | string, oauthGrant?: OAuthPasswordGrant | OAuthRefreshTokenGrant | OAuthClientCredentialsGrant, logger?: ILogger);
|
|
90
91
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"content-hub-client.js","sourceRoot":"","sources":["../../src/clients/content-hub-client.ts"],"names":[],"mappings":";;;;;;
|
|
1
|
+
{"version":3,"file":"content-hub-client.js","sourceRoot":"","sources":["../../src/clients/content-hub-client.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
/// <reference types="urijs" />
|
|
2
|
+
import OAuthClientCredentialsGrant from "../authentication/oauth-client-credentials-grant";
|
|
2
3
|
import OAuthPasswordGrant from "../authentication/oauth-password-grant";
|
|
3
4
|
import OAuthRefreshTokenGrant from "../authentication/oauth-refreshtoken-grant";
|
|
4
5
|
import { MapStringTo } from "../base-types";
|
|
@@ -40,6 +41,7 @@ export declare class InternalClient implements IInternalClient {
|
|
|
40
41
|
private _accessToken;
|
|
41
42
|
private _passwordGrant;
|
|
42
43
|
private _refreshTokenGrant;
|
|
44
|
+
private _clientCredentialsGrant;
|
|
43
45
|
private _isAuthenticated;
|
|
44
46
|
private _requestHeaders;
|
|
45
47
|
private readonly _client;
|
|
@@ -47,7 +49,7 @@ export declare class InternalClient implements IInternalClient {
|
|
|
47
49
|
* Indicates if we should authenticate with OAuth.
|
|
48
50
|
*/
|
|
49
51
|
private get shouldAuthenticateWithOAuth();
|
|
50
|
-
constructor(baseUri: URI | string, oauthGrant?: OAuthPasswordGrant | OAuthRefreshTokenGrant);
|
|
52
|
+
constructor(baseUri: URI | string, oauthGrant?: OAuthPasswordGrant | OAuthRefreshTokenGrant | OAuthClientCredentialsGrant);
|
|
51
53
|
authenticateAsync(): Promise<boolean>;
|
|
52
54
|
setRequestHeaders(headers: MapStringTo<string>): void;
|
|
53
55
|
/**
|
|
@@ -15,6 +15,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
15
15
|
exports.InternalClient = void 0;
|
|
16
16
|
const axios_1 = __importDefault(require("axios"));
|
|
17
17
|
const ta_json_1 = require("ta-json");
|
|
18
|
+
const oauth_client_credentials_grant_1 = __importDefault(require("../authentication/oauth-client-credentials-grant"));
|
|
18
19
|
const oauth_password_grant_1 = __importDefault(require("../authentication/oauth-password-grant"));
|
|
19
20
|
const oauth_refreshtoken_grant_1 = __importDefault(require("../authentication/oauth-refreshtoken-grant"));
|
|
20
21
|
const token_info_1 = require("../authentication/token-info");
|
|
@@ -28,11 +29,12 @@ class InternalClient {
|
|
|
28
29
|
* Indicates if we should authenticate with OAuth.
|
|
29
30
|
*/
|
|
30
31
|
get shouldAuthenticateWithOAuth() {
|
|
31
|
-
return !!(this._passwordGrant || this._refreshTokenGrant);
|
|
32
|
+
return !!(this._passwordGrant || this._refreshTokenGrant || this._clientCredentialsGrant);
|
|
32
33
|
}
|
|
33
34
|
constructor(baseUri, oauthGrant) {
|
|
34
35
|
this._passwordGrant = null;
|
|
35
36
|
this._refreshTokenGrant = null;
|
|
37
|
+
this._clientCredentialsGrant = null;
|
|
36
38
|
this._requestHeaders = {};
|
|
37
39
|
guard_1.default.notNullOrUndefined(baseUri);
|
|
38
40
|
guard_1.default.notNull(oauthGrant);
|
|
@@ -61,6 +63,9 @@ class InternalClient {
|
|
|
61
63
|
else if (oauthGrant instanceof oauth_refreshtoken_grant_1.default) {
|
|
62
64
|
this._refreshTokenGrant = oauthGrant;
|
|
63
65
|
}
|
|
66
|
+
else if (oauthGrant instanceof oauth_client_credentials_grant_1.default) {
|
|
67
|
+
this._clientCredentialsGrant = oauthGrant;
|
|
68
|
+
}
|
|
64
69
|
if (this.shouldAuthenticateWithOAuth) {
|
|
65
70
|
const createRefreshTokenResponseInterceptor = () => {
|
|
66
71
|
const responseInterceptor = this._client.interceptors.response.use((response) => response, (error) => {
|
|
@@ -119,8 +124,9 @@ class InternalClient {
|
|
|
119
124
|
if (this._accessToken) {
|
|
120
125
|
return true;
|
|
121
126
|
}
|
|
122
|
-
|
|
123
|
-
|
|
127
|
+
const grant = this._passwordGrant || this._clientCredentialsGrant;
|
|
128
|
+
if (!grant) {
|
|
129
|
+
throw new invalid_operation_error_1.InvalidOperationError("Can not authenticate - Missing OAuth grant.");
|
|
124
130
|
}
|
|
125
131
|
return yield this._client
|
|
126
132
|
.request({
|
|
@@ -137,12 +143,12 @@ class InternalClient {
|
|
|
137
143
|
.join("&");
|
|
138
144
|
},
|
|
139
145
|
],
|
|
140
|
-
data: ta_json_1.TaJson.serialize(
|
|
146
|
+
data: ta_json_1.TaJson.serialize(grant),
|
|
141
147
|
})
|
|
142
148
|
.then(response => {
|
|
143
149
|
const tokenInfo = ta_json_1.TaJson.deserialize(response.data, token_info_1.TokenInfo);
|
|
144
150
|
this._accessToken = tokenInfo.accessToken;
|
|
145
|
-
this._refreshTokenGrant = new oauth_refreshtoken_grant_1.default(
|
|
151
|
+
this._refreshTokenGrant = new oauth_refreshtoken_grant_1.default(grant.clientId, grant.clientSecret, tokenInfo.refreshToken);
|
|
146
152
|
this._client.interceptors.request.use(config => {
|
|
147
153
|
config.headers["Authorization"] = `Bearer ${this._accessToken}`;
|
|
148
154
|
return config;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"internal-client.js","sourceRoot":"","sources":["../../src/clients/internal-client.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,kDAAiH;AACjH,qCAAiC;AAEjC,kGAAwE;AACxE,0GAAgF;AAChF,6DAAyD;AAEzD,yEAAqE;AACrE,+EAA0E;AAC1E,qDAA6B;AAC7B,gDAA4C;AAE5C,yDAAqD;AA0CrD,MAAa,cAAc;
|
|
1
|
+
{"version":3,"file":"internal-client.js","sourceRoot":"","sources":["../../src/clients/internal-client.ts"],"names":[],"mappings":"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"}
|
|
@@ -12,6 +12,10 @@ export declare class VisualSearchResource {
|
|
|
12
12
|
* The id of the asset that the user wants to find similar assets for.
|
|
13
13
|
*/
|
|
14
14
|
imageEntityId?: number;
|
|
15
|
+
/**
|
|
16
|
+
* The value for the AI search box.
|
|
17
|
+
*/
|
|
18
|
+
text?: string;
|
|
15
19
|
constructor(init?: Partial<VisualSearchResource>);
|
|
16
20
|
}
|
|
17
21
|
export declare class VisualSearchRequestResource extends VisualSearchResource {
|
|
@@ -29,6 +29,10 @@ __decorate([
|
|
|
29
29
|
(0, ta_json_1.JsonProperty)("imageEntityId"),
|
|
30
30
|
__metadata("design:type", Number)
|
|
31
31
|
], VisualSearchResource.prototype, "imageEntityId", void 0);
|
|
32
|
+
__decorate([
|
|
33
|
+
(0, ta_json_1.JsonProperty)("text"),
|
|
34
|
+
__metadata("design:type", String)
|
|
35
|
+
], VisualSearchResource.prototype, "text", void 0);
|
|
32
36
|
exports.VisualSearchResource = VisualSearchResource = __decorate([
|
|
33
37
|
(0, ta_json_1.JsonObject)(),
|
|
34
38
|
__metadata("design:paramtypes", [Object])
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"visual-search-request-resource.js","sourceRoot":"","sources":["../../../src/models/search/visual-search-request-resource.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,qCAA4E;AAKrE,IAAM,oBAAoB,GAA1B,MAAM,oBAAoB;
|
|
1
|
+
{"version":3,"file":"visual-search-request-resource.js","sourceRoot":"","sources":["../../../src/models/search/visual-search-request-resource.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,qCAA4E;AAKrE,IAAM,oBAAoB,GAA1B,MAAM,oBAAoB;IAyB7B,YAAY,IAAoC;QAC5C,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;IAC9B,CAAC;CACJ,CAAA;AA5BY,oDAAoB;AAK7B;IADC,IAAA,sBAAY,EAAC,OAAO,CAAC;;mDACP;AAMf;IADC,IAAA,sBAAY,EAAC,MAAM,CAAC;;kDACG;AAMxB;IADC,IAAA,sBAAY,EAAC,eAAe,CAAC;;2DACP;AAMvB;IADC,IAAA,sBAAY,EAAC,MAAM,CAAC;;kDACP;+BAvBL,oBAAoB;IADhC,IAAA,oBAAU,GAAE;;GACA,oBAAoB,CA4BhC;AAKM,IAAM,2BAA2B,GAAjC,MAAM,2BAA4B,SAAQ,oBAAoB;IAOjE,YAAY,IAA2C;QACnD,KAAK,CAAC,IAAI,CAAC,CAAC;QAEZ,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;IAC9B,CAAC;CACJ,CAAA;AAZY,kEAA2B;AAKpC;IADC,IAAA,sBAAY,EAAC,OAAO,CAAC;;0DACP;sCALN,2BAA2B;IAFvC,IAAA,oBAAU,GAAE;IACZ,IAAA,mCAAyB,EAAC,OAAO,CAAC;;GACtB,2BAA2B,CAYvC"}
|
|
@@ -5,5 +5,9 @@ export declare class VisualSearchResponseResource extends VisualSearchResource {
|
|
|
5
5
|
* Will be used to show in the filters.
|
|
6
6
|
*/
|
|
7
7
|
imageLink?: string;
|
|
8
|
+
/**
|
|
9
|
+
* This string is to remove some visual search data from the query.
|
|
10
|
+
*/
|
|
11
|
+
removeQuery: string;
|
|
8
12
|
constructor(init?: Partial<VisualSearchResponseResource>);
|
|
9
13
|
}
|
|
@@ -23,6 +23,10 @@ __decorate([
|
|
|
23
23
|
(0, ta_json_1.JsonProperty)("imageLink"),
|
|
24
24
|
__metadata("design:type", String)
|
|
25
25
|
], VisualSearchResponseResource.prototype, "imageLink", void 0);
|
|
26
|
+
__decorate([
|
|
27
|
+
(0, ta_json_1.JsonProperty)("removeQuery"),
|
|
28
|
+
__metadata("design:type", String)
|
|
29
|
+
], VisualSearchResponseResource.prototype, "removeQuery", void 0);
|
|
26
30
|
exports.VisualSearchResponseResource = VisualSearchResponseResource = __decorate([
|
|
27
31
|
(0, ta_json_1.JsonObject)(),
|
|
28
32
|
(0, ta_json_1.JsonDiscriminatorProperty)("image"),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"visual-search-response-resource.js","sourceRoot":"","sources":["../../../src/models/search/visual-search-response-resource.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,qCAA4E;AAC5E,qFAAwE;AAKjE,IAAM,4BAA4B,GAAlC,MAAM,4BAA6B,SAAQ,qDAAoB;
|
|
1
|
+
{"version":3,"file":"visual-search-response-resource.js","sourceRoot":"","sources":["../../../src/models/search/visual-search-response-resource.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,qCAA4E;AAC5E,qFAAwE;AAKjE,IAAM,4BAA4B,GAAlC,MAAM,4BAA6B,SAAQ,qDAAoB;IAclE,YAAY,IAA4C;QACpD,KAAK,CAAC,IAAI,CAAC,CAAC;QAEZ,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;IAC9B,CAAC;CACJ,CAAA;AAnBY,oEAA4B;AAMrC;IADC,IAAA,sBAAY,EAAC,WAAW,CAAC;;+DACP;AAMnB;IADC,IAAA,sBAAY,EAAC,aAAa,CAAC;;iEACR;uCAZX,4BAA4B;IAFxC,IAAA,oBAAU,GAAE;IACZ,IAAA,mCAAyB,EAAC,OAAO,CAAC;;GACtB,4BAA4B,CAmBxC"}
|
|
@@ -0,0 +1,28 @@
|
|
|
1
|
+
var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
|
|
2
|
+
var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
|
|
3
|
+
if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
|
|
4
|
+
else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
|
|
5
|
+
return c > 3 && r && Object.defineProperty(target, key, r), r;
|
|
6
|
+
};
|
|
7
|
+
var __metadata = (this && this.__metadata) || function (k, v) {
|
|
8
|
+
if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
|
|
9
|
+
};
|
|
10
|
+
import { JsonObject, JsonProperty } from "ta-json";
|
|
11
|
+
import { OAuthGrantBase } from "./oauth-grant-base";
|
|
12
|
+
import { OAuthGrantType } from "./oauth-grant-type";
|
|
13
|
+
let OAuthClientCredentialsGrant = class OAuthClientCredentialsGrant extends OAuthGrantBase {
|
|
14
|
+
constructor(clientId, clientSecret) {
|
|
15
|
+
super(clientId, clientSecret);
|
|
16
|
+
this.type = OAuthGrantType.ClientCredentials;
|
|
17
|
+
}
|
|
18
|
+
};
|
|
19
|
+
__decorate([
|
|
20
|
+
JsonProperty("grant_type"),
|
|
21
|
+
__metadata("design:type", String)
|
|
22
|
+
], OAuthClientCredentialsGrant.prototype, "type", void 0);
|
|
23
|
+
OAuthClientCredentialsGrant = __decorate([
|
|
24
|
+
JsonObject(),
|
|
25
|
+
__metadata("design:paramtypes", [String, String])
|
|
26
|
+
], OAuthClientCredentialsGrant);
|
|
27
|
+
export default OAuthClientCredentialsGrant;
|
|
28
|
+
//# sourceMappingURL=oauth-client-credentials-grant.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"oauth-client-credentials-grant.js","sourceRoot":"","sources":["../../src/authentication/oauth-client-credentials-grant.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,EAAE,UAAU,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AAEnD,OAAO,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AACpD,OAAO,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AAGrC,IAAM,2BAA2B,GAAjC,MAAM,2BAA4B,SAAQ,cAAc;IAInE,YAAY,QAAgB,EAAE,YAAoB;QAC9C,KAAK,CAAC,QAAQ,EAAE,YAAY,CAAC,CAAC;QAHlC,SAAI,GAAmB,cAAc,CAAC,iBAAiB,CAAC;IAIxD,CAAC;CACJ,CAAA;AALG;IADC,YAAY,CAAC,YAAY,CAAC;;yDAC6B;AAFvC,2BAA2B;IAD/C,UAAU,EAAE;;GACQ,2BAA2B,CAO/C;eAPoB,2BAA2B"}
|
|
@@ -2,5 +2,6 @@ export var OAuthGrantType;
|
|
|
2
2
|
(function (OAuthGrantType) {
|
|
3
3
|
OAuthGrantType["Password"] = "password";
|
|
4
4
|
OAuthGrantType["RefreshToken"] = "refresh_token";
|
|
5
|
+
OAuthGrantType["ClientCredentials"] = "client_credentials";
|
|
5
6
|
})(OAuthGrantType || (OAuthGrantType = {}));
|
|
6
7
|
//# sourceMappingURL=oauth-grant-type.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"oauth-grant-type.js","sourceRoot":"","sources":["../../src/authentication/oauth-grant-type.ts"],"names":[],"mappings":"AAAA,MAAM,CAAN,IAAY,
|
|
1
|
+
{"version":3,"file":"oauth-grant-type.js","sourceRoot":"","sources":["../../src/authentication/oauth-grant-type.ts"],"names":[],"mappings":"AAAA,MAAM,CAAN,IAAY,cAIX;AAJD,WAAY,cAAc;IACtB,uCAAqB,CAAA;IACrB,gDAA8B,CAAA;IAC9B,0DAAwC,CAAA;AAC5C,CAAC,EAJW,cAAc,KAAd,cAAc,QAIzB"}
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
/// <reference types="urijs" />
|
|
2
|
+
import OAuthClientCredentialsGrant from "../authentication/oauth-client-credentials-grant";
|
|
2
3
|
import OAuthPasswordGrant from "../authentication/oauth-password-grant";
|
|
3
4
|
import OAuthRefreshTokenGrant from "../authentication/oauth-refreshtoken-grant";
|
|
4
5
|
import { Nullable } from "../base-types";
|
|
@@ -86,5 +87,5 @@ export declare class ContentHubClient implements IExtendedContentHubClient {
|
|
|
86
87
|
readonly entityDefinitionMapper: EntityDefinitionMapper;
|
|
87
88
|
readonly linkHelper: ILinkHelper;
|
|
88
89
|
impersonatedUsername: Nullable<string>;
|
|
89
|
-
constructor(baseUri: URI | string, oauthGrant?: OAuthPasswordGrant | OAuthRefreshTokenGrant, logger?: ILogger);
|
|
90
|
+
constructor(baseUri: URI | string, oauthGrant?: OAuthPasswordGrant | OAuthRefreshTokenGrant | OAuthClientCredentialsGrant, logger?: ILogger);
|
|
90
91
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"content-hub-client.js","sourceRoot":"","sources":["../../src/clients/content-hub-client.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"content-hub-client.js","sourceRoot":"","sources":["../../src/clients/content-hub-client.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
/// <reference types="urijs" />
|
|
2
|
+
import OAuthClientCredentialsGrant from "../authentication/oauth-client-credentials-grant";
|
|
2
3
|
import OAuthPasswordGrant from "../authentication/oauth-password-grant";
|
|
3
4
|
import OAuthRefreshTokenGrant from "../authentication/oauth-refreshtoken-grant";
|
|
4
5
|
import { MapStringTo } from "../base-types";
|
|
@@ -40,6 +41,7 @@ export declare class InternalClient implements IInternalClient {
|
|
|
40
41
|
private _accessToken;
|
|
41
42
|
private _passwordGrant;
|
|
42
43
|
private _refreshTokenGrant;
|
|
44
|
+
private _clientCredentialsGrant;
|
|
43
45
|
private _isAuthenticated;
|
|
44
46
|
private _requestHeaders;
|
|
45
47
|
private readonly _client;
|
|
@@ -47,7 +49,7 @@ export declare class InternalClient implements IInternalClient {
|
|
|
47
49
|
* Indicates if we should authenticate with OAuth.
|
|
48
50
|
*/
|
|
49
51
|
private get shouldAuthenticateWithOAuth();
|
|
50
|
-
constructor(baseUri: URI | string, oauthGrant?: OAuthPasswordGrant | OAuthRefreshTokenGrant);
|
|
52
|
+
constructor(baseUri: URI | string, oauthGrant?: OAuthPasswordGrant | OAuthRefreshTokenGrant | OAuthClientCredentialsGrant);
|
|
51
53
|
authenticateAsync(): Promise<boolean>;
|
|
52
54
|
setRequestHeaders(headers: MapStringTo<string>): void;
|
|
53
55
|
/**
|
|
@@ -9,6 +9,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
|
|
|
9
9
|
};
|
|
10
10
|
import axios from "axios";
|
|
11
11
|
import { TaJson } from "ta-json";
|
|
12
|
+
import OAuthClientCredentialsGrant from "../authentication/oauth-client-credentials-grant";
|
|
12
13
|
import OAuthPasswordGrant from "../authentication/oauth-password-grant";
|
|
13
14
|
import OAuthRefreshTokenGrant from "../authentication/oauth-refreshtoken-grant";
|
|
14
15
|
import { TokenInfo } from "../authentication/token-info";
|
|
@@ -22,11 +23,12 @@ export class InternalClient {
|
|
|
22
23
|
* Indicates if we should authenticate with OAuth.
|
|
23
24
|
*/
|
|
24
25
|
get shouldAuthenticateWithOAuth() {
|
|
25
|
-
return !!(this._passwordGrant || this._refreshTokenGrant);
|
|
26
|
+
return !!(this._passwordGrant || this._refreshTokenGrant || this._clientCredentialsGrant);
|
|
26
27
|
}
|
|
27
28
|
constructor(baseUri, oauthGrant) {
|
|
28
29
|
this._passwordGrant = null;
|
|
29
30
|
this._refreshTokenGrant = null;
|
|
31
|
+
this._clientCredentialsGrant = null;
|
|
30
32
|
this._requestHeaders = {};
|
|
31
33
|
Guard.notNullOrUndefined(baseUri);
|
|
32
34
|
Guard.notNull(oauthGrant);
|
|
@@ -55,6 +57,9 @@ export class InternalClient {
|
|
|
55
57
|
else if (oauthGrant instanceof OAuthRefreshTokenGrant) {
|
|
56
58
|
this._refreshTokenGrant = oauthGrant;
|
|
57
59
|
}
|
|
60
|
+
else if (oauthGrant instanceof OAuthClientCredentialsGrant) {
|
|
61
|
+
this._clientCredentialsGrant = oauthGrant;
|
|
62
|
+
}
|
|
58
63
|
if (this.shouldAuthenticateWithOAuth) {
|
|
59
64
|
const createRefreshTokenResponseInterceptor = () => {
|
|
60
65
|
const responseInterceptor = this._client.interceptors.response.use((response) => response, (error) => {
|
|
@@ -113,8 +118,9 @@ export class InternalClient {
|
|
|
113
118
|
if (this._accessToken) {
|
|
114
119
|
return true;
|
|
115
120
|
}
|
|
116
|
-
|
|
117
|
-
|
|
121
|
+
const grant = this._passwordGrant || this._clientCredentialsGrant;
|
|
122
|
+
if (!grant) {
|
|
123
|
+
throw new InvalidOperationError("Can not authenticate - Missing OAuth grant.");
|
|
118
124
|
}
|
|
119
125
|
return yield this._client
|
|
120
126
|
.request({
|
|
@@ -131,12 +137,12 @@ export class InternalClient {
|
|
|
131
137
|
.join("&");
|
|
132
138
|
},
|
|
133
139
|
],
|
|
134
|
-
data: TaJson.serialize(
|
|
140
|
+
data: TaJson.serialize(grant),
|
|
135
141
|
})
|
|
136
142
|
.then(response => {
|
|
137
143
|
const tokenInfo = TaJson.deserialize(response.data, TokenInfo);
|
|
138
144
|
this._accessToken = tokenInfo.accessToken;
|
|
139
|
-
this._refreshTokenGrant = new OAuthRefreshTokenGrant(
|
|
145
|
+
this._refreshTokenGrant = new OAuthRefreshTokenGrant(grant.clientId, grant.clientSecret, tokenInfo.refreshToken);
|
|
140
146
|
this._client.interceptors.request.use(config => {
|
|
141
147
|
config.headers["Authorization"] = `Bearer ${this._accessToken}`;
|
|
142
148
|
return config;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"internal-client.js","sourceRoot":"","sources":["../../src/clients/internal-client.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,KAA4F,MAAM,OAAO,CAAC;AACjH,OAAO,EAAE,MAAM,EAAE,MAAM,SAAS,CAAC;AAEjC,OAAO,kBAAkB,MAAM,wCAAwC,CAAC;AACxE,OAAO,sBAAsB,MAAM,4CAA4C,CAAC;AAChF,OAAO,EAAE,SAAS,EAAE,MAAM,8BAA8B,CAAC;AAEzD,OAAO,EAAE,mBAAmB,EAAE,MAAM,gCAAgC,CAAC;AACrE,OAAO,EAAE,qBAAqB,EAAE,MAAM,mCAAmC,CAAC;AAC1E,OAAO,KAAK,MAAM,UAAU,CAAC;AAC7B,OAAO,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAC;AAE5C,OAAO,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAC;AA0CrD,MAAM,OAAO,cAAc;
|
|
1
|
+
{"version":3,"file":"internal-client.js","sourceRoot":"","sources":["../../src/clients/internal-client.ts"],"names":[],"mappings":"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"}
|
|
@@ -12,6 +12,10 @@ export declare class VisualSearchResource {
|
|
|
12
12
|
* The id of the asset that the user wants to find similar assets for.
|
|
13
13
|
*/
|
|
14
14
|
imageEntityId?: number;
|
|
15
|
+
/**
|
|
16
|
+
* The value for the AI search box.
|
|
17
|
+
*/
|
|
18
|
+
text?: string;
|
|
15
19
|
constructor(init?: Partial<VisualSearchResource>);
|
|
16
20
|
}
|
|
17
21
|
export declare class VisualSearchRequestResource extends VisualSearchResource {
|
|
@@ -25,6 +25,10 @@ __decorate([
|
|
|
25
25
|
JsonProperty("imageEntityId"),
|
|
26
26
|
__metadata("design:type", Number)
|
|
27
27
|
], VisualSearchResource.prototype, "imageEntityId", void 0);
|
|
28
|
+
__decorate([
|
|
29
|
+
JsonProperty("text"),
|
|
30
|
+
__metadata("design:type", String)
|
|
31
|
+
], VisualSearchResource.prototype, "text", void 0);
|
|
28
32
|
VisualSearchResource = __decorate([
|
|
29
33
|
JsonObject(),
|
|
30
34
|
__metadata("design:paramtypes", [Object])
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"visual-search-request-resource.js","sourceRoot":"","sources":["../../../src/models/search/visual-search-request-resource.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,EAAC,yBAAyB,EAAE,UAAU,EAAE,YAAY,EAAC,MAAM,SAAS,CAAC;AAKrE,IAAM,oBAAoB,GAA1B,MAAM,oBAAoB;
|
|
1
|
+
{"version":3,"file":"visual-search-request-resource.js","sourceRoot":"","sources":["../../../src/models/search/visual-search-request-resource.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,EAAC,yBAAyB,EAAE,UAAU,EAAE,YAAY,EAAC,MAAM,SAAS,CAAC;AAKrE,IAAM,oBAAoB,GAA1B,MAAM,oBAAoB;IAyB7B,YAAY,IAAoC;QAC5C,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;IAC9B,CAAC;CACJ,CAAA;AAvBG;IADC,YAAY,CAAC,OAAO,CAAC;;mDACP;AAMf;IADC,YAAY,CAAC,MAAM,CAAC;;kDACG;AAMxB;IADC,YAAY,CAAC,eAAe,CAAC;;2DACP;AAMvB;IADC,YAAY,CAAC,MAAM,CAAC;;kDACP;AAvBL,oBAAoB;IADhC,UAAU,EAAE;;GACA,oBAAoB,CA4BhC;;AAKM,IAAM,2BAA2B,GAAjC,MAAM,2BAA4B,SAAQ,oBAAoB;IAOjE,YAAY,IAA2C;QACnD,KAAK,CAAC,IAAI,CAAC,CAAC;QAEZ,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;IAC9B,CAAC;CACJ,CAAA;AAPG;IADC,YAAY,CAAC,OAAO,CAAC;;0DACP;AALN,2BAA2B;IAFvC,UAAU,EAAE;IACZ,yBAAyB,CAAC,OAAO,CAAC;;GACtB,2BAA2B,CAYvC"}
|
|
@@ -5,5 +5,9 @@ export declare class VisualSearchResponseResource extends VisualSearchResource {
|
|
|
5
5
|
* Will be used to show in the filters.
|
|
6
6
|
*/
|
|
7
7
|
imageLink?: string;
|
|
8
|
+
/**
|
|
9
|
+
* This string is to remove some visual search data from the query.
|
|
10
|
+
*/
|
|
11
|
+
removeQuery: string;
|
|
8
12
|
constructor(init?: Partial<VisualSearchResponseResource>);
|
|
9
13
|
}
|
|
@@ -19,6 +19,10 @@ __decorate([
|
|
|
19
19
|
JsonProperty("imageLink"),
|
|
20
20
|
__metadata("design:type", String)
|
|
21
21
|
], VisualSearchResponseResource.prototype, "imageLink", void 0);
|
|
22
|
+
__decorate([
|
|
23
|
+
JsonProperty("removeQuery"),
|
|
24
|
+
__metadata("design:type", String)
|
|
25
|
+
], VisualSearchResponseResource.prototype, "removeQuery", void 0);
|
|
22
26
|
VisualSearchResponseResource = __decorate([
|
|
23
27
|
JsonObject(),
|
|
24
28
|
JsonDiscriminatorProperty("image"),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"visual-search-response-resource.js","sourceRoot":"","sources":["../../../src/models/search/visual-search-response-resource.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,EAAC,yBAAyB,EAAE,UAAU,EAAE,YAAY,EAAC,MAAM,SAAS,CAAC;AAC5E,OAAO,EAAE,oBAAoB,EAAE,MAAM,kCAAkC,CAAC;AAKjE,IAAM,4BAA4B,GAAlC,MAAM,4BAA6B,SAAQ,oBAAoB;
|
|
1
|
+
{"version":3,"file":"visual-search-response-resource.js","sourceRoot":"","sources":["../../../src/models/search/visual-search-response-resource.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,EAAC,yBAAyB,EAAE,UAAU,EAAE,YAAY,EAAC,MAAM,SAAS,CAAC;AAC5E,OAAO,EAAE,oBAAoB,EAAE,MAAM,kCAAkC,CAAC;AAKjE,IAAM,4BAA4B,GAAlC,MAAM,4BAA6B,SAAQ,oBAAoB;IAclE,YAAY,IAA4C;QACpD,KAAK,CAAC,IAAI,CAAC,CAAC;QAEZ,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;IAC9B,CAAC;CACJ,CAAA;AAbG;IADC,YAAY,CAAC,WAAW,CAAC;;+DACP;AAMnB;IADC,YAAY,CAAC,aAAa,CAAC;;iEACR;AAZX,4BAA4B;IAFxC,UAAU,EAAE;IACZ,yBAAyB,CAAC,OAAO,CAAC;;GACtB,4BAA4B,CAmBxC"}
|