@roadmanjs/auth 0.0.19 → 0.0.20
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/index.d.ts +1 -0
- package/dist/index.js +1 -0
- package/dist/index.js.map +1 -1
- package/dist/middlewares/isAuth.d.ts +8 -1
- package/dist/middlewares/isAuth.js +10 -11
- package/dist/middlewares/isAuth.js.map +1 -1
- package/dist/shared.d.ts +8 -0
- package/dist/shared.js +3 -0
- package/dist/shared.js.map +1 -0
- package/dist/user/User.resolver.auth.d.ts +1 -1
- package/dist/user/User.resolver.auth.js +1 -2
- package/dist/user/User.resolver.auth.js.map +1 -1
- package/dist/user/User.resolver.d.ts +1 -1
- package/dist/user/User.resolver.js.map +1 -1
- package/dist/user/auth.d.ts +2 -2
- package/package.json +3 -1
package/dist/index.d.ts
CHANGED
package/dist/index.js
CHANGED
|
@@ -14,6 +14,7 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
|
|
|
14
14
|
for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
|
|
15
15
|
};
|
|
16
16
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
17
|
+
__exportStar(require("./shared"), exports);
|
|
17
18
|
__exportStar(require("./middlewares"), exports);
|
|
18
19
|
__exportStar(require("./roadman"), exports);
|
|
19
20
|
__exportStar(require("./user"), exports);
|
package/dist/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,gDAA8B;AAC9B,4CAA0B;AAC1B,yCAAuB"}
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,2CAAyB;AACzB,gDAA8B;AAC9B,4CAA0B;AAC1B,yCAAuB"}
|
|
@@ -1,2 +1,9 @@
|
|
|
1
|
-
import { ContextType
|
|
1
|
+
import { ContextType } from '../shared';
|
|
2
|
+
import { MiddlewareFn } from 'couchset';
|
|
3
|
+
/**
|
|
4
|
+
*
|
|
5
|
+
* @sets context.payload = { userId, iat, exp }
|
|
6
|
+
* @param next
|
|
7
|
+
* @returns
|
|
8
|
+
*/
|
|
2
9
|
export declare const isAuth: MiddlewareFn<ContextType>;
|
|
@@ -2,28 +2,27 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.isAuth = void 0;
|
|
4
4
|
const lodash_1 = require("lodash");
|
|
5
|
+
const logs_1 = require("@roadmanjs/logs");
|
|
5
6
|
const jsonwebtoken_1 = require("jsonwebtoken");
|
|
7
|
+
/**
|
|
8
|
+
*
|
|
9
|
+
* @sets context.payload = { userId, iat, exp }
|
|
10
|
+
* @param next
|
|
11
|
+
* @returns
|
|
12
|
+
*/
|
|
6
13
|
const isAuth = ({ context }, next) => {
|
|
7
14
|
const authorization = (0, lodash_1.get)(context, 'req.headers.authorization', '');
|
|
15
|
+
const accessTokenSecret = (0, lodash_1.get)(process.env, 'ACCESS_TOKEN_SECRET', '');
|
|
8
16
|
if ((0, lodash_1.isEmpty)(authorization)) {
|
|
9
17
|
throw new Error('Not Authenticated');
|
|
10
18
|
}
|
|
11
19
|
try {
|
|
12
20
|
const token = authorization.split(' ')[1];
|
|
13
|
-
const verified = (0, jsonwebtoken_1.verify)(token,
|
|
14
|
-
// verbose('user is auth', verified);
|
|
15
|
-
/**
|
|
16
|
-
{
|
|
17
|
-
userId: 'xxxxxxx04453',
|
|
18
|
-
iat: 1616303858,
|
|
19
|
-
exp: 1616307458
|
|
20
|
-
}
|
|
21
|
-
*/
|
|
21
|
+
const verified = (0, jsonwebtoken_1.verify)(token, accessTokenSecret);
|
|
22
22
|
context.payload = verified;
|
|
23
|
-
// TODO set user object to request
|
|
24
23
|
}
|
|
25
24
|
catch (err) {
|
|
26
|
-
|
|
25
|
+
(0, logs_1.log)('not authenticated');
|
|
27
26
|
throw new Error('not authenticated');
|
|
28
27
|
}
|
|
29
28
|
return next();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"isAuth.js","sourceRoot":"","sources":["../../src/middlewares/isAuth.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"isAuth.js","sourceRoot":"","sources":["../../src/middlewares/isAuth.ts"],"names":[],"mappings":";;;AAAA,mCAA4C;AAI5C,0CAAoC;AACpC,+CAAoC;AAEpC;;;;;GAKG;AACI,MAAM,MAAM,GAA8B,CAAC,EAAC,OAAO,EAAC,EAAE,IAAI,EAAE,EAAE;IACjE,MAAM,aAAa,GAAG,IAAA,YAAI,EAAC,OAAO,EAAE,2BAA2B,EAAE,EAAE,CAAC,CAAC;IACrE,MAAM,iBAAiB,GAAG,IAAA,YAAI,EAAC,OAAO,CAAC,GAAG,EAAE,qBAAqB,EAAE,EAAE,CAAC,CAAC;IAEvE,IAAI,IAAA,gBAAO,EAAC,aAAa,CAAC,EAAE;QACxB,MAAM,IAAI,KAAK,CAAC,mBAAmB,CAAC,CAAC;KACxC;IAED,IAAI;QACA,MAAM,KAAK,GAAG,aAAa,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;QAC1C,MAAM,QAAQ,GAAG,IAAA,qBAAM,EAAC,KAAK,EAAE,iBAAiB,CAAC,CAAC;QAClD,OAAO,CAAC,OAAO,GAAG,QAAQ,CAAC;KAC9B;IAAC,OAAO,GAAG,EAAE;QACV,IAAA,UAAG,EAAC,mBAAmB,CAAC,CAAC;QACzB,MAAM,IAAI,KAAK,CAAC,mBAAmB,CAAC,CAAC;KACxC;IAED,OAAO,IAAI,EAAE,CAAC;AAClB,CAAC,CAAC;AAlBW,QAAA,MAAM,UAkBjB"}
|
package/dist/shared.d.ts
ADDED
package/dist/shared.js
ADDED
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"shared.js","sourceRoot":"","sources":["../src/shared.ts"],"names":[],"mappings":""}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import { ContextType } from 'couchset';
|
|
2
1
|
import { LoginResponseType } from './User.model';
|
|
2
|
+
import { ContextType } from '../shared';
|
|
3
3
|
export declare class UserAuthResolver {
|
|
4
4
|
phoneLogin(phone: string, _firebaseToken: string, createNew: boolean, { res }: ContextType): Promise<LoginResponseType>;
|
|
5
5
|
}
|
|
@@ -20,14 +20,13 @@ const logs_1 = require("@roadmanjs/logs");
|
|
|
20
20
|
const User_methods_1 = require("./User.methods");
|
|
21
21
|
const firebaseToken_1 = require("../middlewares/firebaseToken");
|
|
22
22
|
const auth_1 = require("./auth");
|
|
23
|
-
const _1 = require(".");
|
|
24
23
|
let UserAuthResolver = class UserAuthResolver {
|
|
25
24
|
async phoneLogin(phone, _firebaseToken, createNew, { res }) {
|
|
26
25
|
try {
|
|
27
26
|
const username = phone;
|
|
28
27
|
(0, logs_1.log)(`LOGIN: phone=${phone} _firebaseToken=${_firebaseToken}`);
|
|
29
28
|
const users = await User_model_1.UserModel.pagination({
|
|
30
|
-
select:
|
|
29
|
+
select: User_model_1.allUserModelKeys,
|
|
31
30
|
where: {
|
|
32
31
|
$or: [{ email: { $eq: username } }, { phone: username }, { phone: `+1${username}` }],
|
|
33
32
|
},
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"User.resolver.auth.js","sourceRoot":"","sources":["../../src/user/User.resolver.auth.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,
|
|
1
|
+
{"version":3,"file":"User.resolver.auth.js","sourceRoot":"","sources":["../../src/user/User.resolver.auth.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import { ContextType } from 'couchset';
|
|
2
1
|
import { UserType, AuthResType, UserTypeInput } from './User.model';
|
|
2
|
+
import { ContextType } from '../shared';
|
|
3
3
|
export declare class UserResolver {
|
|
4
4
|
me(context: ContextType): Promise<UserType | null>;
|
|
5
5
|
revokeRefreshTokenForUser(userId: string): Promise<AuthResType>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"User.resolver.js","sourceRoot":"","sources":["../../src/user/User.resolver.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,
|
|
1
|
+
{"version":3,"file":"User.resolver.js","sourceRoot":"","sources":["../../src/user/User.resolver.ts"],"names":[],"mappings":"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"}
|
package/dist/user/auth.d.ts
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { Response } from 'express';
|
|
2
2
|
import { UserType } from '../user';
|
|
3
3
|
export declare const sendRefreshToken: (res: Response, token: string) => void;
|
|
4
|
-
export declare const createAccessToken: (user: UserType) =>
|
|
5
|
-
export declare const createRefreshToken: (user: UserType) =>
|
|
4
|
+
export declare const createAccessToken: (user: UserType) => string;
|
|
5
|
+
export declare const createRefreshToken: (user: UserType) => string;
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@roadmanjs/auth",
|
|
3
|
-
"version": "0.0.
|
|
3
|
+
"version": "0.0.20",
|
|
4
4
|
"description": " An auth roadman using a UserType model in Couchbase and firebase-auth",
|
|
5
5
|
"main": "dist/index.js",
|
|
6
6
|
"types": "dist/index.d.ts",
|
|
@@ -39,6 +39,7 @@
|
|
|
39
39
|
"@types/chalk": "^2.2.0",
|
|
40
40
|
"@types/debug": "^4.1.5",
|
|
41
41
|
"@types/dotenv": "^8.2.0",
|
|
42
|
+
"@types/jsonwebtoken": "^8.5.8",
|
|
42
43
|
"@types/lodash": "^4.14.168",
|
|
43
44
|
"@types/mocha": "^8.2.0",
|
|
44
45
|
"@types/node": "^10.0.3",
|
|
@@ -75,6 +76,7 @@
|
|
|
75
76
|
"@roadmanjs/firebase-admin": "^0.0.4",
|
|
76
77
|
"@roadmanjs/logs": "^0.0.1",
|
|
77
78
|
"@roadmanjs/utils": "^0.0.4",
|
|
79
|
+
"graphql-redis-subscriptions": "^2.4.2",
|
|
78
80
|
"jsonwebtoken": "^8.5.1"
|
|
79
81
|
}
|
|
80
82
|
}
|