diff --git a/src/app/modules/auth/sign-in/sign-in.component.ts b/src/app/modules/auth/sign-in/sign-in.component.ts index ecc4ed9..3349670 100644 --- a/src/app/modules/auth/sign-in/sign-in.component.ts +++ b/src/app/modules/auth/sign-in/sign-in.component.ts @@ -55,7 +55,12 @@ export class AuthSignInComponent implements OnInit { // recaptcha: ['', Validators.required], }); this._identityService.captcha().then((result) => { - console.log('success', result, result.getToken(), result.getImage()); + console.log( + 'success', + result, + result.getSecurityCodeHash(), + result.getImage() + ); this.imagePath = this._sanitizer.bypassSecurityTrustResourceUrl( 'data:image/jpg;base64,' + result.getImage() diff --git a/src/app/modules/protobuf/c2se/backend/identity_pb.d.ts b/src/app/modules/protobuf/c2se/backend/identity_pb.d.ts index aba7a31..233362b 100644 --- a/src/app/modules/protobuf/c2se/backend/identity_pb.d.ts +++ b/src/app/modules/protobuf/c2se/backend/identity_pb.d.ts @@ -13,8 +13,8 @@ export const SUBJECT_CAPTCHA: string; export const SUBJECT_SIGNIN: string; export class SigninRequest extends jspb.Message { - getToken(): string; - setToken(value: string): void; + getSecurityCodeHash(): string; + setSecurityCodeHash(value: string): void; getSecurityCode(): string; setSecurityCode(value: string): void; @@ -48,7 +48,7 @@ export class SigninRequest extends jspb.Message { export namespace SigninRequest { export type AsObject = { - token: string; + securityCodeHash: string; securityCode: string; username: string; password: string; diff --git a/src/app/modules/protobuf/c2se/backend/identity_pb.js b/src/app/modules/protobuf/c2se/backend/identity_pb.js index c4a02d1..6a0f5fe 100644 --- a/src/app/modules/protobuf/c2se/backend/identity_pb.js +++ b/src/app/modules/protobuf/c2se/backend/identity_pb.js @@ -161,7 +161,7 @@ if (jspb.Message.GENERATE_TO_OBJECT) { ) { var f, obj = { - token: jspb.Message.getFieldWithDefault(msg, 1, ""), + securityCodeHash: jspb.Message.getFieldWithDefault(msg, 1, ""), securityCode: jspb.Message.getFieldWithDefault(msg, 2, ""), username: jspb.Message.getFieldWithDefault(msg, 3, ""), password: jspb.Message.getFieldWithDefault(msg, 4, ""), @@ -206,7 +206,7 @@ proto.bet.beteran.c2se.backend.identity.SigninRequest.deserializeBinaryFromReade switch (field) { case 1: var value = /** @type {string} */ (reader.readString()); - msg.setToken(value); + msg.setSecurityCodeHash(value); break; case 2: var value = /** @type {string} */ (reader.readString()); @@ -252,7 +252,7 @@ proto.bet.beteran.c2se.backend.identity.SigninRequest.prototype.serializeBinary proto.bet.beteran.c2se.backend.identity.SigninRequest.serializeBinaryToWriter = function (message, writer) { var f = undefined; - f = message.getToken(); + f = message.getSecurityCodeHash(); if (f.length > 0) { writer.writeString(1, f); } @@ -271,10 +271,10 @@ proto.bet.beteran.c2se.backend.identity.SigninRequest.serializeBinaryToWriter = }; /** - * optional string token = 1; + * optional string securityCodeHash = 1; * @return {string} */ -proto.bet.beteran.c2se.backend.identity.SigninRequest.prototype.getToken = +proto.bet.beteran.c2se.backend.identity.SigninRequest.prototype.getSecurityCodeHash = function () { return /** @type {string} */ ( jspb.Message.getFieldWithDefault(this, 1, "") @@ -285,7 +285,7 @@ proto.bet.beteran.c2se.backend.identity.SigninRequest.prototype.getToken = * @param {string} value * @return {!proto.bet.beteran.c2se.backend.identity.SigninRequest} returns this */ -proto.bet.beteran.c2se.backend.identity.SigninRequest.prototype.setToken = +proto.bet.beteran.c2se.backend.identity.SigninRequest.prototype.setSecurityCodeHash = function (value) { return jspb.Message.setProto3StringField(this, 1, value); }; diff --git a/src/app/modules/protobuf/c2se/common/identity_pb.d.ts b/src/app/modules/protobuf/c2se/common/identity_pb.d.ts index 0e1decc..f60d16c 100644 --- a/src/app/modules/protobuf/c2se/common/identity_pb.d.ts +++ b/src/app/modules/protobuf/c2se/common/identity_pb.d.ts @@ -281,8 +281,8 @@ export namespace CaptchaResponse { }; export class Result extends jspb.Message { - getToken(): string; - setToken(value: string): void; + getSecurityCodeHash(): string; + setSecurityCodeHash(value: string): void; getImage(): string; setImage(value: string): void; @@ -307,7 +307,7 @@ export namespace CaptchaResponse { export namespace Result { export type AsObject = { - token: string; + securityCodeHash: string; image: string; }; } diff --git a/src/app/modules/protobuf/c2se/common/identity_pb.js b/src/app/modules/protobuf/c2se/common/identity_pb.js index 8100c5a..499e1d9 100644 --- a/src/app/modules/protobuf/c2se/common/identity_pb.js +++ b/src/app/modules/protobuf/c2se/common/identity_pb.js @@ -1611,7 +1611,7 @@ if (jspb.Message.GENERATE_TO_OBJECT) { function (includeInstance, msg) { var f, obj = { - token: jspb.Message.getFieldWithDefault(msg, 1, ""), + securityCodeHash: jspb.Message.getFieldWithDefault(msg, 1, ""), image: jspb.Message.getFieldWithDefault(msg, 2, ""), }; @@ -1655,7 +1655,7 @@ proto.bet.beteran.c2se.common.identity.CaptchaResponse.Result.deserializeBinaryF switch (field) { case 1: var value = /** @type {string} */ (reader.readString()); - msg.setToken(value); + msg.setSecurityCodeHash(value); break; case 2: var value = /** @type {string} */ (reader.readString()); @@ -1693,7 +1693,7 @@ proto.bet.beteran.c2se.common.identity.CaptchaResponse.Result.prototype.serializ proto.bet.beteran.c2se.common.identity.CaptchaResponse.Result.serializeBinaryToWriter = function (message, writer) { var f = undefined; - f = message.getToken(); + f = message.getSecurityCodeHash(); if (f.length > 0) { writer.writeString(1, f); } @@ -1704,10 +1704,10 @@ proto.bet.beteran.c2se.common.identity.CaptchaResponse.Result.serializeBinaryToW }; /** - * optional string token = 1; + * optional string securityCodeHash = 1; * @return {string} */ -proto.bet.beteran.c2se.common.identity.CaptchaResponse.Result.prototype.getToken = +proto.bet.beteran.c2se.common.identity.CaptchaResponse.Result.prototype.getSecurityCodeHash = function () { return /** @type {string} */ ( jspb.Message.getFieldWithDefault(this, 1, "") @@ -1718,7 +1718,7 @@ proto.bet.beteran.c2se.common.identity.CaptchaResponse.Result.prototype.getToken * @param {string} value * @return {!proto.bet.beteran.c2se.common.identity.CaptchaResponse.Result} returns this */ -proto.bet.beteran.c2se.common.identity.CaptchaResponse.Result.prototype.setToken = +proto.bet.beteran.c2se.common.identity.CaptchaResponse.Result.prototype.setSecurityCodeHash = function (value) { return jspb.Message.setProto3StringField(this, 1, value); }; diff --git a/src/app/modules/protobuf/c2se/frontend/identity_pb.d.ts b/src/app/modules/protobuf/c2se/frontend/identity_pb.d.ts index 8774539..0737d52 100644 --- a/src/app/modules/protobuf/c2se/frontend/identity_pb.d.ts +++ b/src/app/modules/protobuf/c2se/frontend/identity_pb.d.ts @@ -13,8 +13,8 @@ export const SUBJECT_CAPTCHA: string; export const SUBJECT_SIGNIN: string; export class SigninRequest extends jspb.Message { - getToken(): string; - setToken(value: string): void; + getSecurityCodeHash(): string; + setSecurityCodeHash(value: string): void; getSecurityCode(): string; setSecurityCode(value: string): void; @@ -48,7 +48,7 @@ export class SigninRequest extends jspb.Message { export namespace SigninRequest { export type AsObject = { - token: string; + securityCodeHash: string; securityCode: string; username: string; password: string; diff --git a/src/app/modules/protobuf/c2se/frontend/identity_pb.js b/src/app/modules/protobuf/c2se/frontend/identity_pb.js index 54a5b7c..43406c9 100644 --- a/src/app/modules/protobuf/c2se/frontend/identity_pb.js +++ b/src/app/modules/protobuf/c2se/frontend/identity_pb.js @@ -161,7 +161,7 @@ if (jspb.Message.GENERATE_TO_OBJECT) { ) { var f, obj = { - token: jspb.Message.getFieldWithDefault(msg, 1, ""), + securityCodeHash: jspb.Message.getFieldWithDefault(msg, 1, ""), securityCode: jspb.Message.getFieldWithDefault(msg, 2, ""), username: jspb.Message.getFieldWithDefault(msg, 3, ""), password: jspb.Message.getFieldWithDefault(msg, 4, ""), @@ -206,7 +206,7 @@ proto.bet.beteran.c2se.frontend.identity.SigninRequest.deserializeBinaryFromRead switch (field) { case 1: var value = /** @type {string} */ (reader.readString()); - msg.setToken(value); + msg.setSecurityCodeHash(value); break; case 2: var value = /** @type {string} */ (reader.readString()); @@ -252,7 +252,7 @@ proto.bet.beteran.c2se.frontend.identity.SigninRequest.prototype.serializeBinary proto.bet.beteran.c2se.frontend.identity.SigninRequest.serializeBinaryToWriter = function (message, writer) { var f = undefined; - f = message.getToken(); + f = message.getSecurityCodeHash(); if (f.length > 0) { writer.writeString(1, f); } @@ -271,10 +271,10 @@ proto.bet.beteran.c2se.frontend.identity.SigninRequest.serializeBinaryToWriter = }; /** - * optional string token = 1; + * optional string securityCodeHash = 1; * @return {string} */ -proto.bet.beteran.c2se.frontend.identity.SigninRequest.prototype.getToken = +proto.bet.beteran.c2se.frontend.identity.SigninRequest.prototype.getSecurityCodeHash = function () { return /** @type {string} */ ( jspb.Message.getFieldWithDefault(this, 1, "") @@ -285,7 +285,7 @@ proto.bet.beteran.c2se.frontend.identity.SigninRequest.prototype.getToken = * @param {string} value * @return {!proto.bet.beteran.c2se.frontend.identity.SigninRequest} returns this */ -proto.bet.beteran.c2se.frontend.identity.SigninRequest.prototype.setToken = +proto.bet.beteran.c2se.frontend.identity.SigninRequest.prototype.setSecurityCodeHash = function (value) { return jspb.Message.setProto3StringField(this, 1, value); };