Skip to content

Commit a3bbc19

Browse files
authored
Merge pull request #202 from csfloat/feature/access-token-prover
Adds Access Token Prover
2 parents df66c75 + b80838d commit a3bbc19

File tree

6 files changed

+72
-12
lines changed

6 files changed

+72
-12
lines changed

src/lib/bridge/handlers/handlers.ts

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,8 @@ import {AnnotateOffer} from './annotate_offer';
1414
import {ExtensionVersion} from './extension_version';
1515
import {SendCookies} from './send_cookies';
1616
import {HasPermissions} from './has_permissions';
17+
import {MetaSettings} from './meta_settings';
18+
import {ProveTradesToken} from './prove_trades_token';
1719

1820
export const HANDLERS_MAP: {[key in RequestType]: RequestHandler<any, any>} = {
1921
[RequestType.EXECUTE_SCRIPT_ON_PAGE]: ExecuteScriptOnPage,
@@ -30,4 +32,6 @@ export const HANDLERS_MAP: {[key in RequestType]: RequestHandler<any, any>} = {
3032
[RequestType.EXTENSION_VERSION]: ExtensionVersion,
3133
[RequestType.SEND_COOKIES]: SendCookies,
3234
[RequestType.HAS_PERMISSIONS]: HasPermissions,
35+
[RequestType.META_SETTINGS]: MetaSettings,
36+
[RequestType.PROVE_TRADES_TOKEN]: ProveTradesToken,
3337
};
Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
import {EmptyRequestHandler} from './main';
2+
import {RequestType} from './types';
3+
4+
export interface MetaSettingsResponse {
5+
enable_auto_trade: boolean;
6+
}
7+
8+
export const MetaSettings = new EmptyRequestHandler<MetaSettingsResponse>(RequestType.META_SETTINGS, async (req) => {
9+
const resp = await fetch(`https://csfloat.com/api/v1/meta/extension`, {
10+
credentials: 'include',
11+
});
12+
13+
if (resp.status !== 200) {
14+
throw new Error('invalid status');
15+
}
16+
17+
return resp.json() as Promise<MetaSettingsResponse>;
18+
});
Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
import {EmptyRequestHandler, SimpleHandler} from './main';
2+
import {RequestType} from './types';
3+
4+
export interface ProveTradesTokenRequest {
5+
token: string;
6+
}
7+
8+
export interface ProveTradesTokenResponse {
9+
message: string;
10+
}
11+
12+
export const ProveTradesToken = new SimpleHandler<ProveTradesTokenRequest, ProveTradesTokenResponse>(
13+
RequestType.PROVE_TRADES_TOKEN,
14+
async (req) => {
15+
const resp = await fetch(`https://csfloat.com/api/v1/trades/prove-token?token=${req.token}`, {
16+
credentials: 'include',
17+
});
18+
19+
if (resp.status !== 200) {
20+
throw new Error('failed to prove, are you logged into CSFloat?');
21+
}
22+
23+
return resp.json() as Promise<ProveTradesTokenResponse>;
24+
}
25+
);

src/lib/bridge/handlers/types.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,4 +13,6 @@ export enum RequestType {
1313
EXTENSION_VERSION,
1414
SEND_COOKIES,
1515
HAS_PERMISSIONS,
16+
META_SETTINGS,
17+
PROVE_TRADES_TOKEN,
1618
}

src/lib/components/trade_history/trade_proof.ts

Lines changed: 16 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,14 @@ import {CustomElement, InjectAppend, InjectionMode} from '../injectors';
55
import {FloatElement} from '../custom';
66
import {fetchListingTime} from './helpers';
77
import '../common/ui/steam-button';
8+
import {ProveTradesToken} from '../../bridge/handlers/prove_trades_token';
9+
import {ClientSend} from '../../bridge/client';
810

911
@CustomElement()
1012
@InjectAppend('.tradehistoryrow .tradehistory_content', InjectionMode.CONTINUOUS)
1113
export class TradeProof extends FloatElement {
1214
@state()
13-
private proofNumber: number | undefined;
15+
private message: string | undefined;
1416

1517
@state()
1618
private isProcessing = false;
@@ -20,12 +22,12 @@ export class TradeProof extends FloatElement {
2022
}
2123

2224
render() {
23-
return this.proofNumber
24-
? html` <span>Proof: ${this.proofNumber}</span> `
25+
return this.message
26+
? html` <span>${this.message}</span> `
2527
: html`
2628
<csfloat-steam-button
2729
@click="${this.onClick}"
28-
.text="${this.isProcessing ? 'Computing Proof...' : 'CSFloat Proof'}"
30+
.text="${this.isProcessing ? 'Proving...' : 'Prove Trade on CSFloat'}"
2931
>
3032
</csfloat-steam-button>
3133
`;
@@ -34,14 +36,17 @@ export class TradeProof extends FloatElement {
3436
private async onClick() {
3537
this.isProcessing = true;
3638

37-
const index = $J('.tradehistoryrow').index($J(this).parent().parent());
39+
const token = document
40+
.getElementById('application_config')
41+
?.getAttribute('data-loyalty_webapi_token')
42+
?.replace('"', '')
43+
.replace('"', '');
44+
3845
try {
39-
this.proofNumber = await fetchListingTime(index);
40-
} catch (e) {
41-
alert(
42-
"Failed to parse time, make sure you're on an english version of the page by appending ?l=english to the url"
43-
);
46+
const resp = await ClientSend(ProveTradesToken, {token});
47+
this.message = resp.message;
48+
} catch (e: any) {
49+
alert(e.toString());
4450
}
45-
this.isProcessing = false;
4651
}
4752
}

src/lib/components/trade_offers/auto_track.ts

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ import {ClientSend} from '../../bridge/client';
77
import {state} from 'lit/decorators.js';
88
import {FetchPendingTrades} from '../../bridge/handlers/fetch_pending_trades';
99
import {HasPermissions} from '../../bridge/handlers/has_permissions';
10+
import {MetaSettings} from '../../bridge/handlers/meta_settings';
1011

1112
@CustomElement()
1213
@InjectAfter(
@@ -56,14 +57,19 @@ export class AutoTrackWidget extends FloatElement {
5657
super.connectedCallback();
5758

5859
try {
60+
const meta = await ClientSend(MetaSettings, {});
61+
if (!meta.enable_auto_trade) {
62+
return;
63+
}
64+
5965
await ClientSend(FetchPendingTrades, {});
6066

6167
const hasPermissions = await ClientSend(HasPermissions, {permissions: ['cookies', 'alarms']});
6268
if (!hasPermissions) {
6369
this.show = true;
6470
}
6571
} catch (e) {
66-
console.info('user is not logged into CSFloat');
72+
console.info('user is not logged into CSFloat or something went wrong');
6773
}
6874
}
6975

0 commit comments

Comments
 (0)