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

Jump to bottom

Fix/forms auth fixes #108

Merged
merged 3 commits into from
Feb 8, 2019
Merged

Fix/forms auth fixes #108

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
cae9a2f
[KFI]feat(client-core): FormsAuthentication - fixed Logout error thro…
gallayl Feb 7, 2019
24ec4d6
[KFI]test(client-core): FormsAuth Tests - added missing type cast
gallayl Feb 7, 2019
e0950ff
[KFI]chore(client-core): FormsAuth - fixed error catching logic
gallayl Feb 7, 2019
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
20 changes: 14 additions & 6 deletions packages/sn-client-core/src/Authentication/FormsAuthenticationService.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ import { ObservableValue } from '@sensenet/client-utils'
import { User } from '@sensenet/default-content-types'
import Semaphor from 'semaphore-async-await'
import { AuthenticationService, ConstantContent, LoginState, ODataParams, ODataResponse, Repository } from '..'
import { isExtendedError } from '../Repository/Repository'

/**
* Authentication Service class for using Forms authentication through OData Actions
Expand Down Expand Up @@ -114,12 +115,19 @@ export class FormsAuthenticationService implements AuthenticationService {
* Logs out and destroys the current session
*/
public async logout(): Promise<boolean> {
await this.repository.executeAction({
method: 'POST',
idOrPath: ConstantContent.PORTAL_ROOT.Id,
name: 'Logout',
body: {},
})
try {
await this.repository.executeAction({
method: 'POST',
idOrPath: ConstantContent.PORTAL_ROOT.Id,
name: 'Logout',
body: {},
})
} catch (error) {
// ignore json parsing errors from empty response
if (!isExtendedError(error) || !error.response.ok) {
throw error
}
}
this.currentUser.setValue(ConstantContent.VISITOR_USER)
this.state.setValue(LoginState.Unauthenticated)
return true
Expand Down
2 changes: 1 addition & 1 deletion packages/sn-client-core/test/FormsAuthenticationTests.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ describe('Forms Authentication', () => {
const actionCall = jest.fn(async () => true)
const r = new Repository({})
r.authentication = new FormsAuthenticationService(r)
r.executeAction = actionCall
r.executeAction = actionCall as typeof r.executeAction
await r.authentication.login('username', 'password')
expect(actionCall).toBeCalledWith({
body: {
Expand Down