Skip to content

T
taobao-mini-template
Commit 22c51efa authored by qinhaitao's avatar qinhaitao
Browse files
Options

feat: 🎸 回调地址优化

parent 0d074ef4
Hide whitespace changes
Inline Side-by-side
Showing with 44 additions and 36 deletions
v2.0/dist/config/test.js
View file @ 22c51efa
...@@ -2,6 +2,6 @@ ...@@ -2,6 +2,6 @@
Object.defineProperty(exports, "__esModule", { value: true }); Object.defineProperty(exports, "__esModule", { value: true });
exports.cfg = void 0; exports.cfg = void 0;
exports.cfg = { exports.cfg = {
vipCallBackUrl: "\u5730\u5740" vipCallBackUrl: "\u5BA2\u6237\u7AEF\u751F\u6210\u7684\u9884\u89C8\u5730\u5740(C\u7AEF\u5BA2\u6237\u7AEF\u5F00\u53D1\u63D0\u4F9B)"
}; };
//# sourceMappingURL=test.js.map //# sourceMappingURL=test.js.map
\ No newline at end of file
v2.0/dist/config/test.js.map
View file @ 22c51efa
{"version":3,"file":"test.js","sourceRoot":"","sources":["../../src/config/test.ts"],"names":[],"mappings":";;;AAGa,QAAA,GAAG,GAAY;IAC1B,cAAc,EAAE,cAAI;CACrB,CAAA"} {"version":3,"file":"test.js","sourceRoot":"","sources":["../../src/config/test.ts"],"names":[],"mappings":";;;AAGa,QAAA,GAAG,GAAY;IAC1B,cAAc,EAAE,iHAAuB;CACxC,CAAA"}
\ No newline at end of file \ No newline at end of file
v2.0/dist/controller/user.controller.d.ts
View file @ 22c51efa
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
import { UserService, AccessService } from '../service'; import { UserService, AccessService } from '../service';
export interface IVipParams { export interface IVipParams {
activityId: string; activityId: string;
callbackUrl?: string; inviteId?: string;
} }
export interface ILoginParams { export interface ILoginParams {
activityId: string; activityId: string;
......
v2.0/dist/controller/user.controller.js
View file @ 22c51efa
...@@ -95,15 +95,17 @@ var User = /** @class */ (function () { ...@@ -95,15 +95,17 @@ var User = /** @class */ (function () {
var session = _a.session, activityUserNick = _a.activityUserNick; var session = _a.session, activityUserNick = _a.activityUserNick;
var userService = _b[0]; var userService = _b[0];
return __awaiter(this, void 0, void 0, function () { return __awaiter(this, void 0, void 0, function () {
var _c, callbackUrl, activityId, vipCallBackUrl, result; var _c, activityId, _d, inviteId, vipCallBackUrl, query, callbackUrl, result;
return __generator(this, function (_d) { return __generator(this, function (_e) {
switch (_d.label) { switch (_e.label) {
case 0: case 0:
_c = context.data, callbackUrl = _c.callbackUrl, activityId = _c.activityId; _c = context.data, activityId = _c.activityId, _d = _c.inviteId, inviteId = _d === void 0 ? '' : _d;
vipCallBackUrl = config_1.getConfig(context).vipCallBackUrl; vipCallBackUrl = config_1.getConfig(context).vipCallBackUrl;
return [4 /*yield*/, userService.getShopVip(session, activityUserNick, callbackUrl || vipCallBackUrl)]; query = "activityId=" + activityId + "&inviteId=" + inviteId;
callbackUrl = vipCallBackUrl + "&query=" + encodeURIComponent(query);
return [4 /*yield*/, userService.getShopVip(session, activityUserNick, callbackUrl)];
case 1: case 1:
result = _d.sent(); result = _e.sent();
return [2 /*return*/, sdk_1.resultsModel.success(result)]; return [2 /*return*/, sdk_1.resultsModel.success(result)];
} }
}); });
......
v2.0/dist/controller/user.controller.js.map
View file @ 22c51efa
{"version":3,"file":"user.controller.js","sourceRoot":"","sources":["../../src/controller/user.controller.ts"],"names":[],"mappings":";AAAA,cAAc;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAEd,0CAAuE;AAEvE,8BAAqC;AACrC,sCAAuD;AACvD,oCAAqC;AAYrC;IAAA;IA6CA,CAAC;IA5CC;;OAEG;IAIG,oBAAK,GAAX,UACE,OAA+B,EAC/B,EAAqD,EACrD,EAA0D;YADxD,QAAQ,cAAA,EAAE,OAAO,aAAA,EAAE,YAAY,kBAAA;YAChC,WAAW,QAAA,EAAE,aAAa,QAAA;;;;;;wBAEnB,MAAM,GAAK,OAAO,OAAZ,CAAY;wBAElB,QAAQ,GAAK,OAAO,CAAC,IAAI,SAAjB,CAAiB;6BAE7B,CAAC,QAAQ,EAAT,wBAAS;wBACX,qBAAM,WAAW,CAAC,YAAY,CAAC,OAAO,EAAE,YAAY,CAAC,EAAA;;wBAArD,SAAqD,CAAA;;4BAErD,qBAAM,WAAW,CAAC,cAAc,CAAC,OAAO,EAAE,QAAQ,EAAE,YAAY,CAAC,EAAA;;wBAAjE,SAAiE,CAAA;;;oBAGnE,UAAU;oBACV,qBAAM,aAAa,CAAC,SAAS,CAAC,QAAQ,EAAE,OAAO,CAAC,KAAK,CAAC,EAAA;;wBADtD,UAAU;wBACV,SAAsD,CAAA;wBAEtD,sBAAO,kBAAY,CAAC,OAAO,CAAC;gCAC1B,MAAM,QAAA;6BACP,CAAC,EAAA;;;;KACH;IACD;;OAEG;IAGG,yBAAU,GAAhB,UACE,OAA6B,EAC7B,EAA+C,EAC/C,EAA4B;YAD1B,OAAO,aAAA,EAAE,gBAAgB,sBAAA;YAC1B,WAAW,QAAA;;;;;;wBAEN,KAA8B,OAAO,CAAC,IAAI,EAAxC,WAAW,iBAAA,EAAE,UAAU,gBAAA,CAAiB;wBACxC,cAAc,GAAK,kBAAS,CAAC,OAAO,CAAC,eAAvB,CAAuB;wBAC9B,qBAAM,WAAW,CAAC,UAAU,CAAC,OAAO,EAAE,gBAAgB,EAAE,WAAW,IAAI,cAAc,CAAC,EAAA;;wBAA/F,MAAM,GAAG,SAAsF;wBAErG,sBAAO,kBAAY,CAAC,OAAO,CAAC,MAAM,CAAC,EAAA;;;;KACpC;IArCD;QAHC,uBAAW,CAAC,CAAC,YAAY,EAAE,UAAU,EAAE,QAAQ,EAAE,UAAU,CAAC,CAAC;QAC7D,6BAAiB;QACjB,oBAAQ,CAAC,CAAC,qBAAW,EAAE,uBAAa,CAAC,CAAC;;;;qCAsBtC;IAMD;QAFC,uBAAW,CAAC,CAAC,YAAY,CAAC,CAAC;QAC3B,oBAAQ,CAAC,CAAC,qBAAW,CAAC,CAAC;;;;0CAWvB;IACH,WAAC;CAAA,AA7CD,IA6CC;kBA7CoB,IAAI"} {"version":3,"file":"user.controller.js","sourceRoot":"","sources":["../../src/controller/user.controller.ts"],"names":[],"mappings":";AAAA,cAAc;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAEd,0CAAuE;AAEvE,8BAAqC;AACrC,sCAAuD;AACvD,oCAAqC;AAYrC;IAAA;IAkDA,CAAC;IAjDC;;OAEG;IAIG,oBAAK,GAAX,UACE,OAA+B,EAC/B,EAAqD,EACrD,EAA0D;YADxD,QAAQ,cAAA,EAAE,OAAO,aAAA,EAAE,YAAY,kBAAA;YAChC,WAAW,QAAA,EAAE,aAAa,QAAA;;;;;;wBAEnB,MAAM,GAAK,OAAO,OAAZ,CAAY;wBAElB,QAAQ,GAAK,OAAO,CAAC,IAAI,SAAjB,CAAiB;6BAE7B,CAAC,QAAQ,EAAT,wBAAS;wBACX,qBAAM,WAAW,CAAC,YAAY,CAAC,OAAO,EAAE,YAAY,CAAC,EAAA;;wBAArD,SAAqD,CAAA;;4BAErD,qBAAM,WAAW,CAAC,cAAc,CAAC,OAAO,EAAE,QAAQ,EAAE,YAAY,CAAC,EAAA;;wBAAjE,SAAiE,CAAA;;;oBAGnE,UAAU;oBACV,qBAAM,aAAa,CAAC,SAAS,CAAC,QAAQ,EAAE,OAAO,CAAC,KAAK,CAAC,EAAA;;wBADtD,UAAU;wBACV,SAAsD,CAAA;wBAEtD,sBAAO,kBAAY,CAAC,OAAO,CAAC;gCAC1B,MAAM,QAAA;6BACP,CAAC,EAAA;;;;KACH;IACD;;OAEG;IAGG,yBAAU,GAAhB,UACE,OAA6B,EAC7B,EAA+C,EAC/C,EAA4B;YAD1B,OAAO,aAAA,EAAE,gBAAgB,sBAAA;YAC1B,WAAW,QAAA;;;;;;wBAEN,KAAgC,OAAO,CAAC,IAAI,EAA1C,UAAU,gBAAA,EAAE,gBAAa,EAAb,QAAQ,mBAAG,EAAE,KAAA,CAAiB;wBAC5C,cAAc,GAAK,kBAAS,CAAC,OAAO,CAAC,eAAvB,CAAuB;wBAGvC,KAAK,GAAG,gBAAc,UAAU,kBAAa,QAAU,CAAA;wBACvD,WAAW,GAAc,cAAc,eAAU,kBAAkB,CAAC,KAAK,CAAG,CAAA;wBAEjE,qBAAM,WAAW,CAAC,UAAU,CAAC,OAAO,EAAE,gBAAgB,EAAE,WAAW,CAAC,EAAA;;wBAA7E,MAAM,GAAG,SAAoE;wBAEnF,sBAAO,kBAAY,CAAC,OAAO,CAAC,MAAM,CAAC,EAAA;;;;KACpC;IA1CD;QAHC,uBAAW,CAAC,CAAC,YAAY,EAAE,UAAU,EAAE,QAAQ,EAAE,UAAU,CAAC,CAAC;QAC7D,6BAAiB;QACjB,oBAAQ,CAAC,CAAC,qBAAW,EAAE,uBAAa,CAAC,CAAC;;;;qCAsBtC;IAMD;QAFC,uBAAW,CAAC,CAAC,YAAY,CAAC,CAAC;QAC3B,oBAAQ,CAAC,CAAC,qBAAW,CAAC,CAAC;;;;0CAgBvB;IACH,WAAC;CAAA,AAlDD,IAkDC;kBAlDoB,IAAI"}
\ No newline at end of file \ No newline at end of file
v2.0/dist/decorator/check.d.ts
View file @ 22c51efa
...@@ -2,8 +2,7 @@ export declare const paramsCheck: (params: string[]) => (target: Object, name: s ...@@ -2,8 +2,7 @@ export declare const paramsCheck: (params: string[]) => (target: Object, name: s
export declare const userCheck: ({ intercept }: { export declare const userCheck: ({ intercept }: {
intercept?: boolean; intercept?: boolean;
}) => (target: any, name: string, descriptor: PropertyDescriptor) => void; }) => (target: any, name: string, descriptor: PropertyDescriptor) => void;
export declare const vipCheck: ({ intercept, callbackUrl }: { export declare const vipCheck: ({ intercept }: {
intercept?: boolean; intercept?: boolean;
callbackUrl?: string;
}) => (target: any, name: string, descriptor: PropertyDescriptor) => void; }) => (target: any, name: string, descriptor: PropertyDescriptor) => void;
export declare const activityTimeCheck: (target: any, name: string, descriptor: PropertyDescriptor) => void; export declare const activityTimeCheck: (target: any, name: string, descriptor: PropertyDescriptor) => void;
v2.0/dist/decorator/check.js
View file @ 22c51efa
...@@ -105,7 +105,7 @@ exports.userCheck = function (_a) { ...@@ -105,7 +105,7 @@ exports.userCheck = function (_a) {
}; };
// 是否是会员 // 是否是会员
exports.vipCheck = function (_a) { exports.vipCheck = function (_a) {
var _b = _a.intercept, intercept = _b === void 0 ? true : _b, _c = _a.callbackUrl, callbackUrl = _c === void 0 ? '' : _c; var _b = _a.intercept, intercept = _b === void 0 ? true : _b;
return function (target, name, descriptor) { return function (target, name, descriptor) {
var method = descriptor.value; var method = descriptor.value;
descriptor.value = function () { descriptor.value = function () {
...@@ -114,19 +114,22 @@ exports.vipCheck = function (_a) { ...@@ -114,19 +114,22 @@ exports.vipCheck = function (_a) {
args[_i] = arguments[_i]; args[_i] = arguments[_i];
} }
return __awaiter(this, void 0, void 0, function () { return __awaiter(this, void 0, void 0, function () {
var context, _a, otherArgs, vipCallBackUrl, userService, session, vipInfo; var context, _a, otherArgs, _b, activityId, _c, inviteId, vipCallBackUrl, query, callbackUrl, userService, session, vipInfo;
return __generator(this, function (_b) { return __generator(this, function (_d) {
switch (_b.label) { switch (_d.label) {
case 0: case 0:
context = args[0], _a = args[1], otherArgs = _a === void 0 ? {} : _a; context = args[0], _a = args[1], otherArgs = _a === void 0 ? {} : _a;
_b = context.data, activityId = _b.activityId, _c = _b.inviteId, inviteId = _c === void 0 ? '' : _c;
vipCallBackUrl = config_1.getConfig(context).vipCallBackUrl; vipCallBackUrl = config_1.getConfig(context).vipCallBackUrl;
query = "activityId=" + activityId + "&inviteId=" + inviteId;
callbackUrl = vipCallBackUrl + "&query=" + encodeURIComponent(query);
userService = new service_1.UserService(context); userService = new service_1.UserService(context);
return [4 /*yield*/, utils_1.getSellerSession(context)]; return [4 /*yield*/, utils_1.getSellerSession(context)];
case 1: case 1:
session = (_b.sent()).session; session = (_d.sent()).session;
return [4 /*yield*/, userService.getShopVip(session, callbackUrl || vipCallBackUrl)]; return [4 /*yield*/, userService.getShopVip(session, callbackUrl)];
case 2: case 2:
vipInfo = _b.sent(); vipInfo = _d.sent();
if (!vipInfo.isVip && intercept) if (!vipInfo.isVip && intercept)
return [2 /*return*/, sdk_1.resultsModel.error(constants_1.CODE_TYPES.ERROR_NO_VIP, '非店铺会员', vipInfo)]; return [2 /*return*/, sdk_1.resultsModel.error(constants_1.CODE_TYPES.ERROR_NO_VIP, '非店铺会员', vipInfo)];
return [2 /*return*/, method.apply(target, [context, __assign(__assign({}, otherArgs), { vipInfo: vipInfo, session: session })])]; return [2 /*return*/, method.apply(target, [context, __assign(__assign({}, otherArgs), { vipInfo: vipInfo, session: session })])];
......
v2.0/dist/decorator/check.js.map
View file @ 22c51efa
{"version":3,"file":"check.js","sourceRoot":"","sources":["../../src/decorator/check.ts"],"names":[],"mappings":"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"} {"version":3,"file":"check.js","sourceRoot":"","sources":["../../src/decorator/check.ts"],"names":[],"mappings":"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"}
\ No newline at end of file \ No newline at end of file
v2.0/dist/service/user.service.js
View file @ 22c51efa
...@@ -127,11 +127,10 @@ var UserService = /** @class */ (function (_super) { ...@@ -127,11 +127,10 @@ var UserService = /** @class */ (function (_super) {
if (activityUserNick === void 0) { activityUserNick = ''; } if (activityUserNick === void 0) { activityUserNick = ''; }
if (callbackUrl === void 0) { callbackUrl = ''; } if (callbackUrl === void 0) { callbackUrl = ''; }
return __awaiter(this, void 0, void 0, function () { return __awaiter(this, void 0, void 0, function () {
var activityId, result, shopUrl, cbUrl, e_1; var activityId, result, shopUrl, e_1;
return __generator(this, function (_a) { return __generator(this, function (_a) {
switch (_a.label) { switch (_a.label) {
case 0: case 0:
console.log(activityUserNick, 'activityUserNick');
if (utils_1.isUseVipMock(this.context, activityUserNick)) { if (utils_1.isUseVipMock(this.context, activityUserNick)) {
return [2 /*return*/, vipMock_1.VIP_MOCK]; return [2 /*return*/, vipMock_1.VIP_MOCK];
} }
...@@ -146,7 +145,6 @@ var UserService = /** @class */ (function (_super) { ...@@ -146,7 +145,6 @@ var UserService = /** @class */ (function (_super) {
result: '' result: ''
} }
}; };
cbUrl = callbackUrl + "&query=activityId%3D" + activityId;
_a.label = 1; _a.label = 1;
case 1: case 1:
_a.trys.push([1, 4, , 5]); _a.trys.push([1, 4, , 5]);
...@@ -156,7 +154,7 @@ var UserService = /** @class */ (function (_super) { ...@@ -156,7 +154,7 @@ var UserService = /** @class */ (function (_super) {
return [4 /*yield*/, sdk_1.TBAPIS.getShopVipUrl(this.context, session, { return [4 /*yield*/, sdk_1.TBAPIS.getShopVipUrl(this.context, session, {
source: 'isvapp', source: 'isvapp',
entrance: 'duiba' entrance: 'duiba'
}, cbUrl)]; }, callbackUrl)];
case 3: case 3:
shopUrl = _a.sent(); shopUrl = _a.sent();
return [3 /*break*/, 5]; return [3 /*break*/, 5];
......
v2.0/dist/service/user.service.js.map
View file @ 22c51efa
{"version":3,"file":"user.service.js","sourceRoot":"","sources":["../../src/service/user.service.ts"],"names":[],"mappings":"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"} {"version":3,"file":"user.service.js","sourceRoot":"","sources":["../../src/service/user.service.ts"],"names":[],"mappings":"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"}
\ No newline at end of file \ No newline at end of file
v2.0/src/config/test.ts
View file @ 22c51efa
...@@ -2,5 +2,5 @@ ...@@ -2,5 +2,5 @@
import { IConfig } from './index' import { IConfig } from './index'
export const cfg: IConfig = { export const cfg: IConfig = {
vipCallBackUrl: `地址` vipCallBackUrl: `客户端生成的预览地址(C端客户端开发提供)`
} }
v2.0/src/controller/user.controller.ts
View file @ 22c51efa
...@@ -7,7 +7,7 @@ import { UserService, AccessService } from '../service' ...@@ -7,7 +7,7 @@ import { UserService, AccessService } from '../service'
import { getConfig } from '../config' import { getConfig } from '../config'
export interface IVipParams { export interface IVipParams {
activityId: string activityId: string
callbackUrl?: string inviteId?: string // 需要助力回调时请求该接口
} }
export interface ILoginParams { export interface ILoginParams {
activityId: string activityId: string
...@@ -55,9 +55,14 @@ export default class User { ...@@ -55,9 +55,14 @@ export default class User {
{ session, activityUserNick }: IControllerInfos, { session, activityUserNick }: IControllerInfos,
[userService]: [UserService] [userService]: [UserService]
): Promise<IResult<IVipInfo>> { ): Promise<IResult<IVipInfo>> {
const { callbackUrl, activityId } = context.data const { activityId, inviteId = '' } = context.data
const { vipCallBackUrl } = getConfig(context) let { vipCallBackUrl } = getConfig(context)
const result = await userService.getShopVip(session, activityUserNick, callbackUrl || vipCallBackUrl)
// 拼接回调参数
let query = `activityId=${activityId}&inviteId=${inviteId}`
let callbackUrl: string = `${vipCallBackUrl}&query=${encodeURIComponent(query)}`
const result = await userService.getShopVip(session, activityUserNick, callbackUrl)
return resultsModel.success(result) return resultsModel.success(result)
} }
......
v2.0/src/decorator/check.ts
View file @ 22c51efa
...@@ -40,17 +40,20 @@ export const userCheck = ({ intercept = true }) => { ...@@ -40,17 +40,20 @@ export const userCheck = ({ intercept = true }) => {
} }
// 是否是会员 // 是否是会员
export const vipCheck = ({ intercept = true, callbackUrl = '' }) => { export const vipCheck = ({ intercept = true }) => {
return function (target: any, name: string, descriptor: PropertyDescriptor) { return function (target: any, name: string, descriptor: PropertyDescriptor) {
const method = descriptor.value const method = descriptor.value
descriptor.value = async function (...args: any[]) { descriptor.value = async function (...args: any[]) {
const [context, otherArgs = {}] = args const [context, otherArgs = {}] = args
const { activityId, inviteId = '' } = context.data
const { vipCallBackUrl } = getConfig(context) const { vipCallBackUrl } = getConfig(context)
// 拼接回调参数
let query = `activityId=${activityId}&inviteId=${inviteId}`
let callbackUrl: string = `${vipCallBackUrl}&query=${encodeURIComponent(query)}`
const userService = new UserService(context) const userService = new UserService(context)
const { session } = await getSellerSession(context) const { session } = await getSellerSession(context)
const vipInfo = await userService.getShopVip(session, callbackUrl || vipCallBackUrl) const vipInfo = await userService.getShopVip(session, callbackUrl)
if (!vipInfo.isVip && intercept) return resultsModel.error(CODE_TYPES.ERROR_NO_VIP, '非店铺会员', vipInfo) if (!vipInfo.isVip && intercept) return resultsModel.error(CODE_TYPES.ERROR_NO_VIP, '非店铺会员', vipInfo)
return method.apply(target, [context, { ...otherArgs, vipInfo, session }]) return method.apply(target, [context, { ...otherArgs, vipInfo, session }])
......
v2.0/src/service/user.service.ts
View file @ 22c51efa
...@@ -45,7 +45,6 @@ class UserService extends BaseService { ...@@ -45,7 +45,6 @@ class UserService extends BaseService {
* @returns {isVip: boolean(是否是会员), url: string(入会链接) } * @returns {isVip: boolean(是否是会员), url: string(入会链接) }
*/ */
async getShopVip(session: string, activityUserNick: string = '', callbackUrl: string = ''): Promise<IVipInfo> { async getShopVip(session: string, activityUserNick: string = '', callbackUrl: string = ''): Promise<IVipInfo> {
console.log(activityUserNick, 'activityUserNick')
if (isUseVipMock(this.context, activityUserNick)) { if (isUseVipMock(this.context, activityUserNick)) {
return VIP_MOCK return VIP_MOCK
} }
...@@ -61,7 +60,6 @@ class UserService extends BaseService { ...@@ -61,7 +60,6 @@ class UserService extends BaseService {
} }
} }
const cbUrl: string = `${callbackUrl}&query=activityId%3D${activityId}`
try { try {
result = await TBAPIS.queryVipinfo(this.context, session) result = await TBAPIS.queryVipinfo(this.context, session)
...@@ -72,7 +70,7 @@ class UserService extends BaseService { ...@@ -72,7 +70,7 @@ class UserService extends BaseService {
source: 'isvapp', source: 'isvapp',
entrance: 'duiba' entrance: 'duiba'
}, },
cbUrl callbackUrl
) )
} catch (e) { } catch (e) {
console.log(e) console.log(e)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment