@smartsoft001/auth-domain 1.0.623 → 1.0.627
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/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@smartsoft001/auth-domain",
|
|
3
|
-
"version": "1.0.
|
|
3
|
+
"version": "1.0.627",
|
|
4
4
|
"description": "Utils to authorization",
|
|
5
5
|
"repository": {
|
|
6
6
|
"type": "git",
|
|
@@ -16,10 +16,10 @@
|
|
|
16
16
|
"typings": "./src/index.d.ts",
|
|
17
17
|
"dependencies": {
|
|
18
18
|
"typeorm": "0.2.29",
|
|
19
|
-
"@smartsoft001/domain-core": "1.0.
|
|
20
|
-
"@smartsoft001/models": "1.0.
|
|
19
|
+
"@smartsoft001/domain-core": "1.0.727",
|
|
20
|
+
"@smartsoft001/models": "1.0.754",
|
|
21
21
|
"reflect-metadata": "0.1.13",
|
|
22
|
-
"@smartsoft001/utils": "1.0.
|
|
22
|
+
"@smartsoft001/utils": "1.0.789",
|
|
23
23
|
"lodash": "^4.17.20",
|
|
24
24
|
"guid-typescript": "1.0.9",
|
|
25
25
|
"flatted": "^3.2.4",
|
|
@@ -27,12 +27,12 @@
|
|
|
27
27
|
"rxjs": "6.6.3",
|
|
28
28
|
"@angular/core": "12.2.7",
|
|
29
29
|
"@angular/platform-browser-dynamic": "12.2.7",
|
|
30
|
-
"@smartsoft001/users": "1.0.
|
|
30
|
+
"@smartsoft001/users": "1.0.746",
|
|
31
31
|
"@nestjs/common": "^7.6.3",
|
|
32
32
|
"@nestjs/jwt": "^7.1.0",
|
|
33
33
|
"@nestjs/typeorm": "^7.1.5",
|
|
34
|
-
"@smartsoft001/fb": "1.0.
|
|
35
|
-
"@smartsoft001/google": "1.0.
|
|
34
|
+
"@smartsoft001/fb": "1.0.496",
|
|
35
|
+
"@smartsoft001/google": "1.0.493"
|
|
36
36
|
},
|
|
37
37
|
"peerDependencies": {}
|
|
38
38
|
}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { IUserCredentials } from "@smartsoft001/users";
|
|
2
|
-
export declare type IAuthTokenRequest = IAuthTokenRequestPassword | IAuthTokenRequestRefreshToken | IAuthTokenRequestFb | IAuthTokenRequestGoogle;
|
|
2
|
+
export declare type IAuthTokenRequest = IAuthTokenRequestPassword | IAuthTokenRequestRefreshToken | IAuthTokenRequestCustom | IAuthTokenRequestFb | IAuthTokenRequestGoogle;
|
|
3
3
|
export interface IAuthTokenRequestFb extends IUserCredentials {
|
|
4
4
|
grant_type: "fb";
|
|
5
5
|
fb_token: string;
|
|
@@ -33,3 +33,7 @@ export interface IAuthToken {
|
|
|
33
33
|
token_type: 'bearer';
|
|
34
34
|
username?: string;
|
|
35
35
|
}
|
|
36
|
+
export interface IAuthTokenRequestCustom {
|
|
37
|
+
grant_type: string;
|
|
38
|
+
[key: string]: string;
|
|
39
|
+
}
|
|
@@ -22,7 +22,7 @@ export declare class TokenFactory implements IFactory<IAuthToken, {
|
|
|
22
22
|
private googleService;
|
|
23
23
|
private _invalidUsernameOrPasswordMessage;
|
|
24
24
|
constructor(config: TokenConfig, repository: Repository<User>, jwtService: JwtService, fbService: FbService, googleService: GoogleService);
|
|
25
|
-
static getQuery(config: IAuthTokenRequest): Partial<User>;
|
|
25
|
+
static getQuery(config: IAuthTokenRequest, customProvider?: boolean): Partial<User>;
|
|
26
26
|
static checkDisabled(user: User): void;
|
|
27
27
|
create(options: {
|
|
28
28
|
request: IAuthTokenRequest;
|
|
@@ -23,7 +23,7 @@ let TokenFactory = TokenFactory_1 = class TokenFactory {
|
|
|
23
23
|
this.googleService = googleService;
|
|
24
24
|
this._invalidUsernameOrPasswordMessage = "Invalid username or password";
|
|
25
25
|
}
|
|
26
|
-
static getQuery(config) {
|
|
26
|
+
static getQuery(config, customProvider = false) {
|
|
27
27
|
switch (config.grant_type) {
|
|
28
28
|
case "fb":
|
|
29
29
|
return { facebookUserId: config.fb_user_id };
|
|
@@ -34,7 +34,10 @@ let TokenFactory = TokenFactory_1 = class TokenFactory {
|
|
|
34
34
|
case "refresh_token":
|
|
35
35
|
return { authRefreshToken: config.refresh_token };
|
|
36
36
|
default:
|
|
37
|
-
|
|
37
|
+
if (!customProvider) {
|
|
38
|
+
throw new domain_core_1.DomainValidationError('Invalid grand type');
|
|
39
|
+
}
|
|
40
|
+
return null;
|
|
38
41
|
}
|
|
39
42
|
}
|
|
40
43
|
static checkDisabled(user) {
|
|
@@ -52,7 +55,7 @@ let TokenFactory = TokenFactory_1 = class TokenFactory {
|
|
|
52
55
|
yield this.googleService.getUserId(options.request.google_token);
|
|
53
56
|
}
|
|
54
57
|
this.valid(options.request);
|
|
55
|
-
const query = TokenFactory_1.getQuery(options.request);
|
|
58
|
+
const query = TokenFactory_1.getQuery(options.request, !!options.userProvider);
|
|
56
59
|
const user = options.userProvider
|
|
57
60
|
? yield options.userProvider.get(query, options.request)
|
|
58
61
|
: yield this.repository.findOne(query);
|
|
@@ -141,9 +144,6 @@ let TokenFactory = TokenFactory_1 = class TokenFactory {
|
|
|
141
144
|
if (!req.google_user_id)
|
|
142
145
|
throw new domain_core_1.DomainValidationError("google_user_id is empty");
|
|
143
146
|
}
|
|
144
|
-
else {
|
|
145
|
-
throw new domain_core_1.DomainValidationError("grant_type is incorrect");
|
|
146
|
-
}
|
|
147
147
|
}
|
|
148
148
|
};
|
|
149
149
|
TokenFactory = TokenFactory_1 = tslib_1.__decorate([
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"token.factory.js","sourceRoot":"","sources":["../../../../../../../libs/auth/domain/src/lib/feature-create-token/token.factory.ts"],"names":[],"mappings":";;;;;AAAA,2CAA4C;AAC5C,qCAAqC;AACrC,qCAAyC;AACzC,6CAAmD;AACnD,qDAAuC;AAEvC,2DAA4E;AAC5E,+CAAsD;AACtD,yCAA2C;AAC3C,iDAAmD;AAEnD,yDAA+C;AAC/C,iDAA6C;AAO7C,IAAa,YAAY,oBAAzB,MAAa,YAAY;IAavB,YACU,MAAmB,EACK,UAA4B,EACpD,UAAsB,EACtB,SAAoB,EACpB,aAA4B;QAJ5B,WAAM,GAAN,MAAM,CAAa;QACK,eAAU,GAAV,UAAU,CAAkB;QACpD,eAAU,GAAV,UAAU,CAAY;QACtB,cAAS,GAAT,SAAS,CAAW;QACpB,kBAAa,GAAb,aAAa,CAAe;QAP9B,sCAAiC,GAAG,8BAA8B,CAAC;IAQxE,CAAC;IAEJ,MAAM,CAAC,QAAQ,CAAC,MAAyB;
|
|
1
|
+
{"version":3,"file":"token.factory.js","sourceRoot":"","sources":["../../../../../../../libs/auth/domain/src/lib/feature-create-token/token.factory.ts"],"names":[],"mappings":"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"}
|