9243131568

Committed 26 May 2024 12:13PM UTC coverage: 96.213% (-0.4%) from 96.642%

Build # 9243131568

Build Type

Pull #1139

github

Committed by

web-flow

Commit Message

Merge 1049b1024 into 739b5cd1a

Pull Request Pull Request #1139: feat(accounts): enhance auth account data structure

Run Details

402 of 415 branches covered (96.87%)

Branch coverage included in aggregate %.

113 of 128 new or added lines in 15 files covered. (88.28%)

3 existing lines in 1 file now uncovered.

1046 of 1090 relevant lines covered (95.96%)

20.05 hits per line

Source File
Press 'n' to go to next uncovered line, 'b' for previous

81.08

/src/utils/auth/migration.ts

import type { Account, AuthState } from '../../types';
import Constants from '../constants';
import { loadState, saveState } from '../storage';

/**
 * Migrate authenticated accounts from old data structure to new data structure (v5.7.0+).
 *
 * @deprecated We plan to remove this migration logic in a future major release.
 */
export function migrateAuthenticatedAccounts() {
  const existing = loadState();

  if (hasAccountsToMigrate(existing.auth)) {
    console.log('Commencing authenticated accounts migration');

    const migratedAccounts = convertAccounts(existing.auth);

    saveState(
      { ...existing.auth, accounts: migratedAccounts },
      existing.settings,
    );
    console.log('Authenticated accounts migration complete');
  }
}

export function hasAccountsToMigrate(existingAuthState: AuthState): boolean {
  if (!existingAuthState) {
    return false;
  }

  if (existingAuthState?.accounts?.length > 0) {
    return false;
  }

  if (
    existingAuthState?.token ||
    existingAuthState?.enterpriseAccounts?.length > 0
  ) {
    return true;
  }

  return false;
}

export function convertAccounts(existingAuthState: AuthState): Account[] {
  const migratedAccounts: Account[] = [];

  if (existingAuthState?.token) {
    migratedAccounts.push({
      hostname: Constants.DEFAULT_AUTH_OPTIONS.hostname,
      platform: 'GitHub Cloud',
      method: 'Personal Access Token',
      token: existingAuthState.token,
      user: existingAuthState.user,
    });
  }

  if (existingAuthState?.enterpriseAccounts) {
    for (const legacyEnterpriseAccount of existingAuthState.enterpriseAccounts) {
      migratedAccounts.push({
        hostname: legacyEnterpriseAccount.hostname,
        platform: 'GitHub Enterprise Server',
        method: 'OAuth App',
        token: legacyEnterpriseAccount.token,
        user: null,
      });
    }
  }

  return migratedAccounts;
}

1	import type { Account, AuthState } from '../../types';
2	import Constants from '../constants';	24✔
3	import { loadState, saveState } from '../storage';	24✔
4
5	/**
6	* Migrate authenticated accounts from old data structure to new data structure (v5.7.0+).
7	*
8	* @deprecated We plan to remove this migration logic in a future major release.
9	*/
10	export function migrateAuthenticatedAccounts() {	24✔
11	const existing = loadState();	20✔
12
13	if (hasAccountsToMigrate(existing.auth)) {	20!
NEW 14	console.log('Commencing authenticated accounts migration');	×
15
NEW 16	const migratedAccounts = convertAccounts(existing.auth);	×
17
NEW 18	saveState(	×
19	{ ...existing.auth, accounts: migratedAccounts },
20	existing.settings,
21	);
NEW 22	console.log('Authenticated accounts migration complete');	×
23	}
24	}
25
26	export function hasAccountsToMigrate(existingAuthState: AuthState): boolean {	24✔
27	if (!existingAuthState) {	28✔
28	return false;	22✔
29	}
30
31	if (existingAuthState?.accounts?.length > 0) {	6✔
32	return false;	2✔
33	}
34
35	if (	4✔
36	existingAuthState?.token \|\|	3✔
37	existingAuthState?.enterpriseAccounts?.length > 0
38	) {
39	return true;	4✔
40	}
41
NEW 42	return false;	×
43	}
44
45	export function convertAccounts(existingAuthState: AuthState): Account[] {	24✔
46	const migratedAccounts: Account[] = [];	6✔
47
48	if (existingAuthState?.token) {	6✔
49	migratedAccounts.push({	4✔
50	hostname: Constants.DEFAULT_AUTH_OPTIONS.hostname,
51	platform: 'GitHub Cloud',
52	method: 'Personal Access Token',
53	token: existingAuthState.token,
54	user: existingAuthState.user,
55	});
56	}
57
58	if (existingAuthState?.enterpriseAccounts) {	6✔
59	for (const legacyEnterpriseAccount of existingAuthState.enterpriseAccounts) {	4✔
60	migratedAccounts.push({	4✔
61	hostname: legacyEnterpriseAccount.hostname,
62	platform: 'GitHub Enterprise Server',
63	method: 'OAuth App',
64	token: legacyEnterpriseAccount.token,
65	user: null,
66	});
67	}
68	}
69
70	return migratedAccounts;	6✔
71	}

gitify-app / gitify / 9243131568

Source File Press 'n' to go to next uncovered line, 'b' for previous

Source File
Press 'n' to go to next uncovered line, 'b' for previous