From 35d9cc6a9b335394a52dc6caef84ec8a7a955541 Mon Sep 17 00:00:00 2001 From: richard-loafle <44828666+richard-loafle@users.noreply.github.com> Date: Fri, 3 Apr 2020 10:59:44 +0900 Subject: [PATCH] bug fixed --- package-lock.json | 20 ++++++++----------- package.json | 4 ++-- projects/store-authentication/ng-package.json | 2 ++ projects/store-authentication/package.json | 4 +++- .../src/lib/store/login/actions.ts | 12 ++++++++--- .../src/lib/store/login/reducers.ts | 2 +- 6 files changed, 25 insertions(+), 19 deletions(-) diff --git a/package-lock.json b/package-lock.json index c0f1add..f80dea4 100644 --- a/package-lock.json +++ b/package-lock.json @@ -2167,14 +2167,10 @@ } }, "@ucap/core": { - "version": "0.0.2", - "resolved": "http://10.81.13.221:8081/nexus/repository/npm-all/@ucap/core/-/core-0.0.2.tgz", - "integrity": "sha512-GqYS7R4hxPqwMzyBRYwpTyoLbqUg5Do3yj2Y7NhI9jkwlt1aLGWfN6WMOwUJzBHP+IGx4slhO1Pda7F+9OqBew==", - "dev": true, - "requires": { - "detect-browser": "^5.0.0", - "file-type": "^14.1.4" - } + "version": "0.0.6", + "resolved": "http://10.81.13.221:8081/nexus/repository/npm-all/@ucap/core/-/core-0.0.6.tgz", + "integrity": "sha512-nLu1l7LzxgB/prkpxiWnF8yBpWRLZps8xRzRVpsC9bzxNsfoKC9ZYsUc48BYY0VlDNNb91oe8B+Dt4ec8q88fQ==", + "dev": true }, "@ucap/logger": { "version": "0.0.2", @@ -2377,9 +2373,8 @@ "dev": true }, "@ucap/ng-store-authentication": { - "version": "file:pack/ucap-ng-store-authentication-0.0.3.tgz", - "integrity": "sha512-qgtPOxPDBWLytKNl4KxPJiAt+EhWk+7JZMiKGlrs/VqXgys4UHVv/OJhOC46d0ZBunswUsiEw4W97NXi+APW/w==", - "dev": true + "version": "file:pack/ucap-ng-store-authentication-0.0.4.tgz", + "integrity": "sha512-auUqI5uS1VblhrcPSaHragi6mZ2E6KCJE+SjW05QSe+pNg2afmuCheQNC8bTGkaU0iDbLjgEwmPuhBfLczihRg==" }, "@ucap/ng-store-chat": { "version": "file:pack/ucap-ng-store-chat-0.0.3.tgz", @@ -2388,7 +2383,8 @@ }, "@ucap/ng-store-group": { "version": "file:pack/ucap-ng-store-group-0.0.4.tgz", - "integrity": "sha512-UTvyFws2Gl+yFAIAj76oHhsJHowH0sgZFtdNeLRYouB970z1yqUsPLczyZTH6INEukBclANwEzeZxM2+SaeiUg==" + "integrity": "sha512-UTvyFws2Gl+yFAIAj76oHhsJHowH0sgZFtdNeLRYouB970z1yqUsPLczyZTH6INEukBclANwEzeZxM2+SaeiUg==", + "dev": true }, "@ucap/ng-store-organization": { "version": "file:pack/ucap-ng-store-organization-0.0.3.tgz", diff --git a/package.json b/package.json index 68a55bb..5e2541d 100644 --- a/package.json +++ b/package.json @@ -134,7 +134,7 @@ "@ucap/api-message": "~0.0.1", "@ucap/api-prompt": "~0.0.1", "@ucap/api-public": "~0.0.1", - "@ucap/core": "~0.0.1", + "@ucap/core": "~0.0.6", "@ucap/logger": "~0.0.2", "@ucap/native": "~0.0.1", "@ucap/native-browser": "~0.0.1", @@ -165,7 +165,7 @@ "@ucap/ng-protocol-status": "file:pack/ucap-ng-protocol-status-0.0.1.tgz", "@ucap/ng-protocol-sync": "file:pack/ucap-ng-protocol-sync-0.0.1.tgz", "@ucap/ng-protocol-umg": "file:pack/ucap-ng-protocol-umg-0.0.1.tgz", - "@ucap/ng-store-authentication": "file:pack/ucap-ng-store-authentication-0.0.3.tgz", + "@ucap/ng-store-authentication": "file:pack/ucap-ng-store-authentication-0.0.4.tgz", "@ucap/ng-store-chat": "file:pack/ucap-ng-store-chat-0.0.3.tgz", "@ucap/ng-store-group": "file:pack/ucap-ng-store-group-0.0.4.tgz", "@ucap/ng-store-organization": "file:pack/ucap-ng-store-organization-0.0.3.tgz", diff --git a/projects/store-authentication/ng-package.json b/projects/store-authentication/ng-package.json index 05193a5..bc65827 100644 --- a/projects/store-authentication/ng-package.json +++ b/projects/store-authentication/ng-package.json @@ -6,12 +6,14 @@ "umdModuleIds": { "@ngrx/store": "@ngrx/store", "@ngrx/effects": "@ngrx/effects", + "@ucap/core": "@ucap/core", "@ucap/pi": "@ucap/pi", "@ucap/protocol-authentication": "@ucap/protocol-authentication", "@ucap/protocol-option": "@ucap/protocol-option", "@ucap/protocol-query": "@ucap/protocol-query", "@ucap/ng-pi": "@ucap/ng-pi", "@ucap/ng-protocol-authentication": "@ucap/ng-protocol-authentication", + "@ucap/ng-protocol-option": "@ucap/ng-protocol-option", "@ucap/ng-protocol-query": "@ucap/ng-protocol-query" } } diff --git a/projects/store-authentication/package.json b/projects/store-authentication/package.json index 48663e5..3af003c 100644 --- a/projects/store-authentication/package.json +++ b/projects/store-authentication/package.json @@ -1,6 +1,6 @@ { "name": "@ucap/ng-store-authentication", - "version": "0.0.3", + "version": "0.0.4", "publishConfig": { "registry": "http://10.81.13.221:8081/nexus/repository/npm-ucap/" }, @@ -13,9 +13,11 @@ "@ucap/core": "~0.0.1", "@ucap/pi": "~0.0.1", "@ucap/protocol-authentication": "~0.0.1", + "@ucap/protocol-option": "~0.0.1", "@ucap/protocol-query": "~0.0.1", "@ucap/ng-pi": "~0.0.1", "@ucap/ng-protocol-authentication": "~0.0.1", + "@ucap/ng-protocol-option": "~0.0.1", "@ucap/ng-protocol-query": "~0.0.1", "rxjs": "~6.5.4", "tslib": "^1.10.0" diff --git a/projects/store-authentication/src/lib/store/login/actions.ts b/projects/store-authentication/src/lib/store/login/actions.ts index 2ceebab..1e41f74 100644 --- a/projects/store-authentication/src/lib/store/login/actions.ts +++ b/projects/store-authentication/src/lib/store/login/actions.ts @@ -1,7 +1,12 @@ import { createAction, props } from '@ngrx/store'; +import { LoginSession } from '@ucap/core'; import { Login2Response } from '@ucap/pi'; -import { LoginResponse, LogoutResponse } from '@ucap/protocol-authentication'; +import { + LoginRequest, + LoginResponse, + LogoutResponse +} from '@ucap/protocol-authentication'; /** * request of web login @@ -44,7 +49,7 @@ export const webLoginFailure = createAction( export const login = createAction( '[ucap::authentication::login] login', props<{ - loginRes: LoginResponse; + req: LoginRequest; }>() ); /** @@ -53,7 +58,8 @@ export const login = createAction( export const loginSuccess = createAction( '[ucap::authentication::login] login Success', props<{ - loginRes: LoginResponse; + res: LoginResponse; + loginSession: LoginSession; }>() ); /** diff --git a/projects/store-authentication/src/lib/store/login/reducers.ts b/projects/store-authentication/src/lib/store/login/reducers.ts index 7aaa2cd..aee7688 100644 --- a/projects/store-authentication/src/lib/store/login/reducers.ts +++ b/projects/store-authentication/src/lib/store/login/reducers.ts @@ -8,7 +8,7 @@ export const reducer = createReducer( on(loginSuccess, (state, action) => { return { ...state, - loginRes: action.loginRes + loginRes: action.res }; }),