solid / solid-auth-client / 192

pending completion

Build # 192

Build Type

push

travis-ci

Committed by

RubenVerborgh

Commit Message

<a href="https://github.com/solid/solid-auth-client/commit/<a class=hub.com/solid/solid-auth-client/commit/c8b2c5d33cb63278a5b400da4a6ebfa5b7ad1f7f">c8b2c5d33<a href="https://github.com/solid/solid-auth-client/commit/c8b2c5d33cb63278a5b400da4a6ebfa5b7ad1f7f">&quot;&gt;Remove authType.

The authType field indicated whether TLS or OIDC was used.
Since </a><a class="double-link" href="https://github.com/solid/solid-auth-client/commit/<a class="double-link" href="https://github.com/solid/solid-auth-client/commit/d45b7b6cae9cccc7f0e55130539923c3b9119d00">d45b7b6ca</a>">d45b7b6ca</a><a href="https://github.com/solid/solid-auth-client/commit/c8b2c5d33cb63278a5b400da4a6ebfa5b7ad1f7f"> removed TLS,
auth is necessarily OIDC.

Run Details

116 of 143 branches covered (81.12%)

Branch coverage included in aggregate %.

12 of 12 new or added lines in 3 files covered. (100.0%)

277 of 312 relevant lines covered (88.78%)

9.1 hits per line

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

66.67

/src/api.js

// @flow
/* global RequestInfo, Response */
import { authnFetch } from './authn-fetch'
import { openIdpSelector, startPopupServer } from './popup'
import type { Session } from './session'
import { getSession, saveSession, clearSession } from './session'
import type { AsyncStorage } from './storage'
import { defaultStorage } from './storage'
import { currentUrlNoParams } from './url-util'
import * as WebIdOidc from './webid-oidc'

export type loginOptions = {
  callbackUri: ?string,
  popupUri: ?string,
  storage: AsyncStorage
}

const defaultLoginOptions = (): loginOptions => {
  const url = currentUrlNoParams()
  return {
    callbackUri: url ? url.split('#')[0] : null,
    popupUri: null,
    storage: defaultStorage()
  }
}

export const fetch = (url: RequestInfo, options?: Object): Promise<Response> =>
  authnFetch(defaultStorage())(url, options)

async function firstSession(
  storage: AsyncStorage,
  authFns: Array<() => Promise<?Session>>
): Promise<?Session> {
  if (authFns.length === 0) {
    return null
  }
  try {
    const session = await authFns[0]()
    if (session) {
      return saveSession(storage)(session)
    }
  } catch (err) {
    console.error(err)
  }
  return firstSession(storage, authFns.slice(1))
}

export async function login(
  idp: string,
  options: loginOptions
): Promise<?Session> {
  options = { ...defaultLoginOptions(), ...options }
  const webIdOidcLogin = await WebIdOidc.login(idp, options)
  return webIdOidcLogin
}

export async function popupLogin(options: loginOptions): Promise<?Session> {
  if (!options.popupUri) {
    throw new Error('Must provide options.popupUri')
  }
  if (!options.callbackUri) {
    options.callbackUri = options.popupUri
  }
  options = { ...defaultLoginOptions(), ...options }
  const childWindow = openIdpSelector(options)
  const session = await startPopupServer(options.storage, childWindow, options)
  return session
}

export async function currentSession(
  storage: AsyncStorage = defaultStorage()
): Promise<?Session> {
  const session = await getSession(storage)
  if (session) {
    return session
  }
  return firstSession(storage, [WebIdOidc.currentSession.bind(null, storage)])
}

export async function logout(
  storage: AsyncStorage = defaultStorage()
): Promise<void> {
  const session = await getSession(storage)
  if (session) {
    try {
      await WebIdOidc.logout(storage)
    } catch (err) {
      console.warn('Error logging out:')
      console.error(err)
    }
    await clearSession(storage)
  }
}

1	// @flow
2	/* global RequestInfo, Response */
3	import { authnFetch } from './authn-fetch'
4	import { openIdpSelector, startPopupServer } from './popup'
5	import type { Session } from './session'
6	import { getSession, saveSession, clearSession } from './session'
7	import type { AsyncStorage } from './storage'
8	import { defaultStorage } from './storage'
9	import { currentUrlNoParams } from './url-util'
10	import * as WebIdOidc from './webid-oidc'
11
12	export type loginOptions = {
13	callbackUri: ?string,
14	popupUri: ?string,
15	storage: AsyncStorage
16	}
17
18	const defaultLoginOptions = (): loginOptions => {	1✔
19	const url = currentUrlNoParams()	6✔
20	return {	6✔
21	callbackUri: url ? url.split('#')[0] : null,	6!
22	popupUri: null,
23	storage: defaultStorage()
24	}
25	}
26
27	export const fetch = (url: RequestInfo, options?: Object): Promise<Response> =>	1✔
28	authnFetch(defaultStorage())(url, options)	9✔
29
30	async function firstSession(
31	storage: AsyncStorage,
32	authFns: Array<() => Promise<?Session>>
33	): Promise<?Session> {
34	if (authFns.length === 0) {	4✔
35	return null	1✔
36	}
37	try {	3✔
38	const session = await authFns[0]()	3✔
39	if (session) {	3✔
40	return saveSession(storage)(session)	2✔
41	}
42	} catch (err) {
43	console.error(err)	×
44	}
45	return firstSession(storage, authFns.slice(1))	1✔
46	}
47
48	export async function login(
49	idp: string,
50	options: loginOptions
51	): Promise<?Session> {
52	options = { ...defaultLoginOptions(), ...options }	6✔
53	const webIdOidcLogin = await WebIdOidc.login(idp, options)	6✔
54	return webIdOidcLogin	6✔
55	}
56
57	export async function popupLogin(options: loginOptions): Promise<?Session> {
58	if (!options.popupUri) {	×
59	throw new Error('Must provide options.popupUri')	×
60	}
61	if (!options.callbackUri) {	×
62	options.callbackUri = options.popupUri	×
63	}
64	options = { ...defaultLoginOptions(), ...options }	×
65	const childWindow = openIdpSelector(options)	×
66	const session = await startPopupServer(options.storage, childWindow, options)	×
67	return session	×
68	}
69
70	export async function currentSession(
71	storage: AsyncStorage = defaultStorage()	4✔
72	): Promise<?Session> {
73	const session = await getSession(storage)	4✔
74	if (session) {	4✔
75	return session	1✔
76	}
77	return firstSession(storage, [WebIdOidc.currentSession.bind(null, storage)])	3✔
78	}
79
80	export async function logout(
81	storage: AsyncStorage = defaultStorage()	1✔
82	): Promise<void> {
83	const session = await getSession(storage)	1✔
84	if (session) {	1!
85	try {	1✔
86	await WebIdOidc.logout(storage)	1✔
87	} catch (err) {
88	console.warn('Error logging out:')	×
89	console.error(err)	×
90	}
91	await clearSession(storage)	1✔
92	}
93	}

solid / solid-auth-client / 192

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