@arv-bedrock/auth-sso 0.2.0 → 0.2.2
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/cjs/auth.js +3 -2
- package/dist/cjs/index.js +3 -3
- package/dist/cjs/types/auth.d.ts +9 -3
- package/dist/cjs/types/auth.d.ts.map +1 -1
- package/dist/cjs/types/index.d.ts +1 -1
- package/dist/cjs/types/index.d.ts.map +1 -1
- package/dist/esm/auth.js +3 -2
- package/dist/esm/index.mjs +4 -4
- package/dist/esm/types/auth.d.ts +9 -3
- package/dist/esm/types/auth.d.ts.map +1 -1
- package/dist/esm/types/index.d.ts +1 -1
- package/dist/esm/types/index.d.ts.map +1 -1
- package/package.json +1 -1
package/dist/cjs/auth.js
CHANGED
|
@@ -98,10 +98,11 @@ class Auth {
|
|
|
98
98
|
user_type: this.userType,
|
|
99
99
|
});
|
|
100
100
|
const res = yield this.getClientInit();
|
|
101
|
-
if (res.
|
|
101
|
+
if (res.statusResponse.statusCode != '200') {
|
|
102
102
|
return this.doLogin();
|
|
103
103
|
}
|
|
104
104
|
this.clientInit = res.data;
|
|
105
|
+
return res;
|
|
105
106
|
});
|
|
106
107
|
}
|
|
107
108
|
setCookie(code) {
|
|
@@ -157,7 +158,7 @@ class Auth {
|
|
|
157
158
|
return __awaiter(this, void 0, void 0, function* () {
|
|
158
159
|
try {
|
|
159
160
|
const secretParam = `&${constant_1.CLIENT_SECRET}=${this.clientSecret}`;
|
|
160
|
-
const result = yield (0, _fetch_1.default)(`${this.authHost}/api/v1/
|
|
161
|
+
const result = yield (0, _fetch_1.default)(`${this.authHost}/api/v1/ums/profile?${this.queryString}${secretParam}`);
|
|
161
162
|
const profile = result.data;
|
|
162
163
|
this.setUser(profile);
|
|
163
164
|
return profile;
|
package/dist/cjs/index.js
CHANGED
|
@@ -10,10 +10,10 @@ const initBedrockAuth = ({ authUri, clientId, clientSecret, callback, userType,
|
|
|
10
10
|
authHost: authUri,
|
|
11
11
|
clientId,
|
|
12
12
|
clientSecret,
|
|
13
|
-
userType: userType !== null && userType !== void 0 ? userType :
|
|
13
|
+
userType: userType !== null && userType !== void 0 ? userType : 'officer',
|
|
14
14
|
})
|
|
15
|
-
.then(() => {
|
|
16
|
-
callback();
|
|
15
|
+
.then((data) => {
|
|
16
|
+
callback(data);
|
|
17
17
|
})
|
|
18
18
|
.catch((error) => {
|
|
19
19
|
callback(error);
|
package/dist/cjs/types/auth.d.ts
CHANGED
|
@@ -6,9 +6,15 @@ interface Options {
|
|
|
6
6
|
userType: UserType;
|
|
7
7
|
}
|
|
8
8
|
export interface ResponseData<T> {
|
|
9
|
-
|
|
9
|
+
statusResponse: StatusResponse;
|
|
10
10
|
data: T;
|
|
11
|
-
|
|
11
|
+
}
|
|
12
|
+
export interface StatusResponse {
|
|
13
|
+
statusCode: string;
|
|
14
|
+
statusDesc: string;
|
|
15
|
+
messageCode: string;
|
|
16
|
+
messageTH: string;
|
|
17
|
+
messageEN: string;
|
|
12
18
|
}
|
|
13
19
|
export interface AuthServiceResponse {
|
|
14
20
|
user_id: string;
|
|
@@ -50,7 +56,7 @@ declare class Auth {
|
|
|
50
56
|
doLogout: () => Promise<void>;
|
|
51
57
|
doRegister(redirectUrl?: string): void;
|
|
52
58
|
private createQueryParam;
|
|
53
|
-
init(options: Options): Promise<void
|
|
59
|
+
init(options: Options): Promise<void | ResponseData<ClientInit>>;
|
|
54
60
|
setCookie(code: string): Promise<void>;
|
|
55
61
|
private doLoginMethodReqeust;
|
|
56
62
|
private getParam;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"auth.d.ts","sourceRoot":"","sources":["../../../auth.ts"],"names":[],"mappings":"AAGA,MAAM,MAAM,QAAQ,GAAG,SAAS,GAAG,SAAS,CAAA;AAM5C,UAAU,OAAO;IACf,QAAQ,EAAE,MAAM,CAAA;IAChB,QAAQ,EAAE,MAAM,CAAA;IAChB,YAAY,EAAE,MAAM,CAAA;IACpB,QAAQ,EAAE,QAAQ,CAAA;CACnB;AAED,MAAM,WAAW,YAAY,CAAC,CAAC;IAC7B,
|
|
1
|
+
{"version":3,"file":"auth.d.ts","sourceRoot":"","sources":["../../../auth.ts"],"names":[],"mappings":"AAGA,MAAM,MAAM,QAAQ,GAAG,SAAS,GAAG,SAAS,CAAA;AAM5C,UAAU,OAAO;IACf,QAAQ,EAAE,MAAM,CAAA;IAChB,QAAQ,EAAE,MAAM,CAAA;IAChB,YAAY,EAAE,MAAM,CAAA;IACpB,QAAQ,EAAE,QAAQ,CAAA;CACnB;AAED,MAAM,WAAW,YAAY,CAAC,CAAC;IAC7B,cAAc,EAAE,cAAc,CAAA;IAC9B,IAAI,EAAE,CAAC,CAAA;CACR;AAED,MAAM,WAAW,cAAc;IAC7B,UAAU,EAAE,MAAM,CAAA;IAClB,UAAU,EAAE,MAAM,CAAA;IAClB,WAAW,EAAE,MAAM,CAAA;IACnB,SAAS,EAAE,MAAM,CAAA;IACjB,SAAS,EAAE,MAAM,CAAA;CAClB;AAED,MAAM,WAAW,mBAAmB;IAClC,OAAO,EAAE,MAAM,CAAA;IACf,KAAK,CAAC,EAAE,MAAM,CAAA;CACf;AAED,MAAM,WAAW,kBAAkB;IACjC,YAAY,EAAE,MAAM,CAAA;IACpB,aAAa,CAAC,EAAE,MAAM,CAAA;IACtB,QAAQ,CAAC,EAAE,MAAM,CAAA;CAClB;AAED,MAAM,WAAW,UAAU;IACzB,GAAG,EAAE,MAAM,CAAA;IACX,QAAQ,EAAE,OAAO,CAAA;CAClB;AAED,MAAM,WAAW,UAAU;IACzB,SAAS,EAAE,MAAM,CAAA;IACjB,aAAa,EAAE,MAAM,CAAA;IACrB,QAAQ,EAAE,OAAO,CAAA;CAClB;AAOD,MAAM,WAAW,kBAAkB;IACjC,WAAW,EAAE,MAAM,CAAA;CACpB;AAED,cAAM,IAAI;IACR,OAAO,CAAC,QAAQ,CAAU;IAE1B,OAAO,CAAC,QAAQ,CAAQ;IAExB,OAAO,CAAC,eAAe,CAAQ;IAE/B,OAAO,CAAC,QAAQ,CAAQ;IACxB,OAAO,CAAC,YAAY,CAAQ;IAE5B,OAAO,CAAC,IAAI,CAAO;IACnB,OAAO,CAAC,WAAW,CAAQ;IAC3B,OAAO,CAAC,UAAU,CAAY;;IAa9B,SAAS;IAIF,OAAO;IAKP,cAAc;IAKrB,OAAO,CAAC,OAAO;IAKf,OAAO,CAAC,cAAc;IAQf,OAAO,CAAC,WAAW,GAAE,MAA6B;IAalD,QAAQ,sBAOd;IAEM,UAAU,CAAC,WAAW,GAAE,MAA6B;IAc5D,OAAO,CAAC,gBAAgB;IAQX,IAAI,CAAC,OAAO,EAAE,OAAO;IAkBrB,SAAS,CAAC,IAAI,EAAE,MAAM;YAcrB,oBAAoB;IAalC,OAAO,CAAC,QAAQ;IAIH,aAAa;YAOZ,aAAa;IAQd,WAAW;IAMX,UAAU;IAchB,QAAQ;IASR,WAAW;CAQnB;AAED,QAAA,MAAM,WAAW,MAAa,CAAA;AAE9B,eAAe,WAAW,CAAA"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../index.ts"],"names":[],"mappings":"AAAA,OAAW,EAAE,QAAQ,EAAE,MAAM,QAAQ,
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../index.ts"],"names":[],"mappings":"AAAA,OAAW,EAAE,QAAQ,EAAE,MAAM,QAAQ,CAAA;AAErC,MAAM,MAAM,SAAS,GAAG;IACtB,QAAQ,CAAC,EAAE,QAAQ,CAAA;IACnB,OAAO,EAAE,MAAM,CAAA;IACf,QAAQ,EAAE,MAAM,CAAA;IAChB,YAAY,EAAE,MAAM,CAAA;IACpB,QAAQ,EAAE,CAAC,KAAK,CAAC,EAAE,GAAG,KAAK,IAAI,CAAA;CAChC,CAAA;AAED,eAAO,MAAM,eAAe,6DAMzB,SAAS,SAcX,CAAA;AAED,eAAO,MAAM,OAAO,iBAAkB,MAAM,SAA4B,CAAA;AAExE,eAAO,MAAM,QAAQ,qBAAsB,CAAA;AAE3C,eAAO,MAAM,UAAU,iBAAkB,MAAM,SAA+B,CAAA;AAE9E,eAAO,MAAM,SAAS,SAAU,MAAM,kBAAuB,CAAA;AAE7D,eAAO,MAAM,UAAU,iEAAwB,CAAA;AAE/C,eAAO,MAAM,WAAW,qBAAyB,CAAA;AAEjD,eAAO,MAAM,OAAO,cAAqB,CAAA;AAEzC,eAAO,MAAM,QAAQ,iCAAsB,CAAA;AAE3C,eAAO,MAAM,cAAc,cAA4B,CAAA;AAEvD,eAAO,MAAM,WAAW,kDAAyB,CAAA"}
|
package/dist/esm/auth.js
CHANGED
|
@@ -91,10 +91,11 @@ class Auth {
|
|
|
91
91
|
user_type: this.userType,
|
|
92
92
|
});
|
|
93
93
|
const res = await this.getClientInit();
|
|
94
|
-
if (res.
|
|
94
|
+
if (res.statusResponse.statusCode != '200') {
|
|
95
95
|
return this.doLogin();
|
|
96
96
|
}
|
|
97
97
|
this.clientInit = res.data;
|
|
98
|
+
return res;
|
|
98
99
|
}
|
|
99
100
|
async setCookie(code) {
|
|
100
101
|
const codeParam = `${CODE}=${code}`;
|
|
@@ -138,7 +139,7 @@ class Auth {
|
|
|
138
139
|
async getProfile() {
|
|
139
140
|
try {
|
|
140
141
|
const secretParam = `&${CLIENT_SECRET}=${this.clientSecret}`;
|
|
141
|
-
const result = await customFetch(`${this.authHost}/api/v1/
|
|
142
|
+
const result = await customFetch(`${this.authHost}/api/v1/ums/profile?${this.queryString}${secretParam}`);
|
|
142
143
|
const profile = result.data;
|
|
143
144
|
this.setUser(profile);
|
|
144
145
|
return profile;
|
package/dist/esm/index.mjs
CHANGED
|
@@ -1,13 +1,13 @@
|
|
|
1
|
-
import BR from
|
|
1
|
+
import BR from './auth';
|
|
2
2
|
export const initBedrockAuth = ({ authUri, clientId, clientSecret, callback, userType, }) => {
|
|
3
3
|
BR.init({
|
|
4
4
|
authHost: authUri,
|
|
5
5
|
clientId,
|
|
6
6
|
clientSecret,
|
|
7
|
-
userType: userType ??
|
|
7
|
+
userType: userType ?? 'officer',
|
|
8
8
|
})
|
|
9
|
-
.then(() => {
|
|
10
|
-
callback();
|
|
9
|
+
.then((data) => {
|
|
10
|
+
callback(data);
|
|
11
11
|
})
|
|
12
12
|
.catch((error) => {
|
|
13
13
|
callback(error);
|
package/dist/esm/types/auth.d.ts
CHANGED
|
@@ -6,9 +6,15 @@ interface Options {
|
|
|
6
6
|
userType: UserType;
|
|
7
7
|
}
|
|
8
8
|
export interface ResponseData<T> {
|
|
9
|
-
|
|
9
|
+
statusResponse: StatusResponse;
|
|
10
10
|
data: T;
|
|
11
|
-
|
|
11
|
+
}
|
|
12
|
+
export interface StatusResponse {
|
|
13
|
+
statusCode: string;
|
|
14
|
+
statusDesc: string;
|
|
15
|
+
messageCode: string;
|
|
16
|
+
messageTH: string;
|
|
17
|
+
messageEN: string;
|
|
12
18
|
}
|
|
13
19
|
export interface AuthServiceResponse {
|
|
14
20
|
user_id: string;
|
|
@@ -50,7 +56,7 @@ declare class Auth {
|
|
|
50
56
|
doLogout: () => Promise<void>;
|
|
51
57
|
doRegister(redirectUrl?: string): void;
|
|
52
58
|
private createQueryParam;
|
|
53
|
-
init(options: Options): Promise<void
|
|
59
|
+
init(options: Options): Promise<void | ResponseData<ClientInit>>;
|
|
54
60
|
setCookie(code: string): Promise<void>;
|
|
55
61
|
private doLoginMethodReqeust;
|
|
56
62
|
private getParam;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"auth.d.ts","sourceRoot":"","sources":["../../../auth.ts"],"names":[],"mappings":"AAGA,MAAM,MAAM,QAAQ,GAAG,SAAS,GAAG,SAAS,CAAA;AAM5C,UAAU,OAAO;IACf,QAAQ,EAAE,MAAM,CAAA;IAChB,QAAQ,EAAE,MAAM,CAAA;IAChB,YAAY,EAAE,MAAM,CAAA;IACpB,QAAQ,EAAE,QAAQ,CAAA;CACnB;AAED,MAAM,WAAW,YAAY,CAAC,CAAC;IAC7B,
|
|
1
|
+
{"version":3,"file":"auth.d.ts","sourceRoot":"","sources":["../../../auth.ts"],"names":[],"mappings":"AAGA,MAAM,MAAM,QAAQ,GAAG,SAAS,GAAG,SAAS,CAAA;AAM5C,UAAU,OAAO;IACf,QAAQ,EAAE,MAAM,CAAA;IAChB,QAAQ,EAAE,MAAM,CAAA;IAChB,YAAY,EAAE,MAAM,CAAA;IACpB,QAAQ,EAAE,QAAQ,CAAA;CACnB;AAED,MAAM,WAAW,YAAY,CAAC,CAAC;IAC7B,cAAc,EAAE,cAAc,CAAA;IAC9B,IAAI,EAAE,CAAC,CAAA;CACR;AAED,MAAM,WAAW,cAAc;IAC7B,UAAU,EAAE,MAAM,CAAA;IAClB,UAAU,EAAE,MAAM,CAAA;IAClB,WAAW,EAAE,MAAM,CAAA;IACnB,SAAS,EAAE,MAAM,CAAA;IACjB,SAAS,EAAE,MAAM,CAAA;CAClB;AAED,MAAM,WAAW,mBAAmB;IAClC,OAAO,EAAE,MAAM,CAAA;IACf,KAAK,CAAC,EAAE,MAAM,CAAA;CACf;AAED,MAAM,WAAW,kBAAkB;IACjC,YAAY,EAAE,MAAM,CAAA;IACpB,aAAa,CAAC,EAAE,MAAM,CAAA;IACtB,QAAQ,CAAC,EAAE,MAAM,CAAA;CAClB;AAED,MAAM,WAAW,UAAU;IACzB,GAAG,EAAE,MAAM,CAAA;IACX,QAAQ,EAAE,OAAO,CAAA;CAClB;AAED,MAAM,WAAW,UAAU;IACzB,SAAS,EAAE,MAAM,CAAA;IACjB,aAAa,EAAE,MAAM,CAAA;IACrB,QAAQ,EAAE,OAAO,CAAA;CAClB;AAOD,MAAM,WAAW,kBAAkB;IACjC,WAAW,EAAE,MAAM,CAAA;CACpB;AAED,cAAM,IAAI;IACR,OAAO,CAAC,QAAQ,CAAU;IAE1B,OAAO,CAAC,QAAQ,CAAQ;IAExB,OAAO,CAAC,eAAe,CAAQ;IAE/B,OAAO,CAAC,QAAQ,CAAQ;IACxB,OAAO,CAAC,YAAY,CAAQ;IAE5B,OAAO,CAAC,IAAI,CAAO;IACnB,OAAO,CAAC,WAAW,CAAQ;IAC3B,OAAO,CAAC,UAAU,CAAY;;IAa9B,SAAS;IAIF,OAAO;IAKP,cAAc;IAKrB,OAAO,CAAC,OAAO;IAKf,OAAO,CAAC,cAAc;IAQf,OAAO,CAAC,WAAW,GAAE,MAA6B;IAalD,QAAQ,sBAOd;IAEM,UAAU,CAAC,WAAW,GAAE,MAA6B;IAc5D,OAAO,CAAC,gBAAgB;IAQX,IAAI,CAAC,OAAO,EAAE,OAAO;IAkBrB,SAAS,CAAC,IAAI,EAAE,MAAM;YAcrB,oBAAoB;IAalC,OAAO,CAAC,QAAQ;IAIH,aAAa;YAOZ,aAAa;IAQd,WAAW;IAMX,UAAU;IAchB,QAAQ;IASR,WAAW;CAQnB;AAED,QAAA,MAAM,WAAW,MAAa,CAAA;AAE9B,eAAe,WAAW,CAAA"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../index.ts"],"names":[],"mappings":"AAAA,OAAW,EAAE,QAAQ,EAAE,MAAM,QAAQ,
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../index.ts"],"names":[],"mappings":"AAAA,OAAW,EAAE,QAAQ,EAAE,MAAM,QAAQ,CAAA;AAErC,MAAM,MAAM,SAAS,GAAG;IACtB,QAAQ,CAAC,EAAE,QAAQ,CAAA;IACnB,OAAO,EAAE,MAAM,CAAA;IACf,QAAQ,EAAE,MAAM,CAAA;IAChB,YAAY,EAAE,MAAM,CAAA;IACpB,QAAQ,EAAE,CAAC,KAAK,CAAC,EAAE,GAAG,KAAK,IAAI,CAAA;CAChC,CAAA;AAED,eAAO,MAAM,eAAe,6DAMzB,SAAS,SAcX,CAAA;AAED,eAAO,MAAM,OAAO,iBAAkB,MAAM,SAA4B,CAAA;AAExE,eAAO,MAAM,QAAQ,qBAAsB,CAAA;AAE3C,eAAO,MAAM,UAAU,iBAAkB,MAAM,SAA+B,CAAA;AAE9E,eAAO,MAAM,SAAS,SAAU,MAAM,kBAAuB,CAAA;AAE7D,eAAO,MAAM,UAAU,iEAAwB,CAAA;AAE/C,eAAO,MAAM,WAAW,qBAAyB,CAAA;AAEjD,eAAO,MAAM,OAAO,cAAqB,CAAA;AAEzC,eAAO,MAAM,QAAQ,iCAAsB,CAAA;AAE3C,eAAO,MAAM,cAAc,cAA4B,CAAA;AAEvD,eAAO,MAAM,WAAW,kDAAyB,CAAA"}
|