Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fixes #946

Merged
merged 3 commits into from
Feb 8, 2023
Merged

fixes #946

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7425b11
fixes
RustemYuzlibaev Feb 8, 2023
2c4c9a4
typo
RustemYuzlibaev Feb 8, 2023
6fe7468
Merge branch 'develop' into fix/sora-card-hot-fixes
RustemYuzlibaev Feb 8, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion src/components/X1/X1Dialog.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,6 @@ export default class X1Dialog extends Mixins(mixins.DialogMixin, mixins.LoadingM
background-color: var(--s-color-status-error-background);
padding: $basic-spacing;
margin-bottom: $basic-spacing / 2;
color: var(--s-color-status-error);

.disclaimer-warning-icon {
margin-right: $basic-spacing;
Expand Down
30 changes: 16 additions & 14 deletions src/utils/card.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,20 @@ import store from '../store';

import { KycStatus, Status, VerificationStatus } from '../types/card';

const getSoraProxyEndpoints = (soraNetwork: string) => {
const test = {
referenceNumberEndpoint: 'https://backend.dev.sora-card.tachi.soramitsu.co.jp/get-reference-number',
lastKycStatusEndpoint: 'https://backend.dev.sora-card.tachi.soramitsu.co.jp/kyc-last-status',
};

const prod = {
referenceNumberEndpoint: '',
lastKycStatusEndpoint: '',
};

return soraNetwork === WALLET_CONSTS.SoraNetwork.Prod ? prod : test;
};

// Defines user's KYC status.
// If accessToken expired, tries to get new JWT pair via refreshToken;
// if not, forces user to pass phone number again to create new JWT pair in sessionStorage.
Expand Down Expand Up @@ -36,7 +50,7 @@ async function getUpdatedJwtPair(refreshToken: string): Promise<Nullable<string>
const buffer = Buffer.from(apiKey);

try {
const response = await fetch('https://api-auth-test.soracard.com/RequestNewAccessToken', {
const response = await fetch(getSoraProxyEndpoints(soraNetwork).lastKycStatusEndpoint, {
method: 'POST',
headers: {
Authorization: `Basic ${buffer.toString('base64')}, Bearer ${refreshToken}`,
Expand All @@ -63,7 +77,7 @@ async function getUserStatus(accessToken: string): Promise<Status> {
if (!accessToken) return emptyStatusFields();

try {
const result = await fetch('https://sora-card.sc1.dev.sora2.soramitsu.co.jp/kyc-last-status', {
const result = await fetch('https://backend.dev.sora-card.tachi.soramitsu.co.jp/kyc-last-status', {
method: 'GET',
headers: {
Authorization: `Bearer ${accessToken}`,
Expand Down Expand Up @@ -163,18 +177,6 @@ export function soraCard(soraNetwork: string) {
return soraNetwork === WALLET_CONSTS.SoraNetwork.Prod ? prod : test;
};

const getSoraProxyEndpoints = (soraNetwork: string) => {
const test = {
referenceNumberEndpoint: 'https://sora-card.sc1.dev.sora2.soramitsu.co.jp/get-reference-number',
};

const prod = {
referenceNumberEndpoint: '',
};

return soraNetwork === WALLET_CONSTS.SoraNetwork.Prod ? prod : test;
};

const authService = getAuthServiceData(soraNetwork);
const kycService = getKycServiceData(soraNetwork);
const soraProxy = getSoraProxyEndpoints(soraNetwork);
Expand Down