Revision 24:5b1d5cebab0a

View differences:

src/my/ws/upass/WS_UPass.java
11 11

  
12 12
package my.ws.upass;
13 13

  
14
import my.com.upass.UPassController;
14 15
import my.com.upass.UPassControllerV2;
15 16

  
16 17
/**
......
28 29
 */
29 30
public class WS_UPass {
30 31

  
31
	UPassControllerV2 upc = new UPassControllerV2();
32
	UPassController upc = new UPassController();
33
	UPassControllerV2 upcV2 = new UPassControllerV2();
32 34

  
33 35
	public int wsAD_AddUser(String rootAlias, String rootPassword,
34 36
			String adminUserAlias, String adminDesc, String adminUserPassword) {
35 37

  
36
		return upc.AD_AddUser(rootAlias, rootPassword, adminUserAlias, adminDesc, adminUserPassword);
38
		return upcV2.AD_AddUser(rootAlias, rootPassword, adminUserAlias, adminDesc, adminUserPassword);
39
//		return upc.AD_AddUser(rootAlias, rootPassword, adminUserAlias, adminDesc, adminUserPassword);
37 40
	}
38 41

  
39 42
	public int wsAD_ModifyUser(String rootAlias, String rootPassword,
40 43
			String adminUserAlias, String adminDesc, String adminUserPassword) {
41 44

  
42
		return upc.AD_ModifyUser(rootAlias, rootPassword, adminUserAlias, adminDesc, adminUserPassword);
45
		return upcV2.AD_ModifyUser(rootAlias, rootPassword, adminUserAlias, adminDesc, adminUserPassword);
43 46
	}
44 47

  
45 48
	public int wsAD_ActivateUser(String rootAlias, String rootPassword, String adminUserAlias) {
46 49

  
47
		return upc.AD_ActivateUser(rootAlias, rootPassword, adminUserAlias);
50
		return upcV2.AD_ActivateUser(rootAlias, rootPassword, adminUserAlias);
48 51
	}
49 52

  
50 53
	public int wsAD_LockUser(String rootAlias, String rootPassword, String adminUserAlias) {
51 54

  
52
		return upc.AD_LockUser(rootAlias, rootPassword, adminUserAlias);
55
		return upcV2.AD_LockUser(rootAlias, rootPassword, adminUserAlias);
53 56
	}
54 57

  
55 58
	public int wsAD_SuspendUser(String rootAlias, String rootPassword,
56 59
			String adminUserAlias, String fromDate, int nMinutes) {
57 60

  
58
		return upc.AD_SuspendUser(rootAlias, rootPassword, adminUserAlias, fromDate, nMinutes);
61
		return upcV2.AD_SuspendUser(rootAlias, rootPassword, adminUserAlias, fromDate, nMinutes);
59 62
	}
60 63

  
61 64
	// /////////////////////////////////////////////////////////////////////////////
......
65 68
	public int wsUA_AddUser(String adminUserAlias, String adminUserPassword,
66 69
			String userAlias, String userDesc, String userPassword, int appId) {
67 70

  
68
		return upc.UA_AddUser(adminUserAlias, adminUserPassword, userAlias, userDesc, userPassword, appId);
71
		return upcV2.UA_AddUser(adminUserAlias, adminUserPassword, userAlias, userDesc, userPassword, appId);
69 72
	}
70 73

  
71 74
	public int wsUA_ModifyUser(String adminUserAlias, String adminUserPassword,
72 75
			String userAlias, String userDesc, String userPassword) {
73 76

  
74
		return upc.UA_ModifyUser(adminUserAlias, adminUserPassword, userAlias, userDesc, userPassword);
77
		return upcV2.UA_ModifyUser(adminUserAlias, adminUserPassword, userAlias, userDesc, userPassword);
75 78
	}
76 79

  
77 80
	public int wsUA_ActivateUser(String adminUserAlias, String adminUserPassword, String userAlias) {
78 81

  
79
		return upc.UA_ActivateUser(adminUserAlias, adminUserPassword, userAlias);
82
		return upcV2.UA_ActivateUser(adminUserAlias, adminUserPassword, userAlias);
80 83
	}
81 84

  
82 85
	public int wsUA_LockUser(String adminUserAlias, String adminUserPassword, String userAlias) {
83 86

  
84
		return upc.UA_LockUser(adminUserAlias, adminUserPassword, userAlias);
87
		return upcV2.UA_LockUser(adminUserAlias, adminUserPassword, userAlias);
85 88
	}
86 89

  
87 90
	public int wsUA_SuspendUser(String adminUserAlias, String adminUserPassword,
88 91
			String userAlias, String fromDate, int nMinutes) {
89 92

  
90
		return upc.UA_SuspendUser(adminUserAlias, adminUserPassword, userAlias, fromDate, nMinutes);
93
		return upcV2.UA_SuspendUser(adminUserAlias, adminUserPassword, userAlias, fromDate, nMinutes);
91 94
	}
92 95

  
93 96
	public int wsUA_IsUserExist(String userAlias) {
94 97

  
95
		return upc.UA_IsUserExist(userAlias);
98
		return upcV2.UA_IsUserExist(userAlias);
96 99
	}
97 100

  
98 101
	public int wsUA_GetUserType(String userAlias) {
99 102

  
100
		return upc.UA_GetUserType(userAlias);
103
		return upcV2.UA_GetUserType(userAlias);
101 104
	}
102 105

  
103 106
	public int wsUA_DeleteUser(String adminUserAlias, String adminUserPassword, String userAlias) {
104 107

  
105
		return upc.UA_DeleteUser(adminUserAlias, adminUserPassword, userAlias);
108
		return upcV2.UA_DeleteUser(adminUserAlias, adminUserPassword, userAlias);
106 109
	}
107 110

  
108 111
	// /////////////////////////////////////////////////////////////////////////////////////////
......
111 114

  
112 115
	public int wsSP_Login(String userAlias, String password) {
113 116

  
114
		return upc.SP_Login(userAlias, password);
117
		return upcV2.SP_Login(userAlias, password);
115 118
	}
116 119

  
117 120
	public int wsSP_VerifyStaticPassword(String userAlias, String password) {
118 121

  
122
//		return upcV2.SP_VerifyStaticPassword(userAlias, password);
119 123
		return upc.SP_VerifyStaticPassword(userAlias, password);
120 124
	}
121 125

  
122 126
	public int wsSP_ChangeStaticPassword(String userAlias, String newPassword, String oldPassword) {
123 127

  
124
		return upc.SP_ChangeStaticPassword(userAlias, newPassword, oldPassword);
128
		return upcV2.SP_ChangeStaticPassword(userAlias, newPassword, oldPassword);
125 129
	}
126 130

  
127 131
	public int wsSP_ForceChangeStaticPassword(String userAlias, String newPassword, String oldPassword) {
128 132

  
129
		return upc.SP_ForceChangeStaticPassword(userAlias, newPassword, oldPassword);
133
		return upcV2.SP_ForceChangeStaticPassword(userAlias, newPassword, oldPassword);
130 134
	}
131 135

  
132 136
	public int wsSP_VerifyPasswordComplexity(String password, int appId) {
133 137

  
134
		return upc.VerifyPasswordComplexity(password, appId);
138
		return upcV2.VerifyPasswordComplexity(password, appId);
135 139
	}
136 140

  
137 141
	// /////////////////////////////////////////////////////////////////////////////////////////
......
140 144

  
141 145
	public String wsGenerateTAC(String userAlias, int appId) {
142 146

  
143
		return upc.GenerateTAC(userAlias, appId);
147
		return upcV2.GenerateTAC(userAlias, appId);
144 148
	}
145 149

  
146 150
	public String wsGenerateTACwithSessionID(String userAlias, String sessionID, int appId) {
147 151

  
148
		return upc.GenerateTAC(userAlias, sessionID, appId);
152
		return upcV2.GenerateTAC(userAlias, sessionID, appId);
149 153
	}
150 154

  
151 155
	public String wsGenerateTACwithSessionIDNonce(String userAlias, String sessionID, String nonce, int appId) {
152 156

  
153
		return upc.GenerateTAC(userAlias, sessionID, nonce, appId);
157
		return upcV2.GenerateTAC(userAlias, sessionID, nonce, appId);
154 158
	}
155 159

  
156 160
	public int wsVerifyTAC(String userAlias, String inTac, int appId) {
157 161

  
158
		return upc.VerifyTAC(userAlias, inTac, appId);
162
		return upcV2.VerifyTAC(userAlias, inTac, appId);
159 163
	}
160 164

  
161 165
	public int wsVerifyTACwithSessionID(String userAlias, String inTac, String sessionID, int appId) {
162 166

  
163
		return upc.VerifyTAC(userAlias, inTac, sessionID, appId);
167
		return upcV2.VerifyTAC(userAlias, inTac, sessionID, appId);
164 168
	}
165 169

  
166 170
	public int wsVerifyTACwithSessionIDNonce(String userAlias, String inTac, String sessionID, String nonce, int appId) {
167 171

  
168
		return upc.VerifyTAC(userAlias, inTac, sessionID, nonce, appId);
172
		return upcV2.VerifyTAC(userAlias, inTac, sessionID, nonce, appId);
169 173
	}
170 174

  
171 175
	public int wsResetTAC(String adminUserAlias, String adminUserPassword, String userAlias) {
172 176

  
173
		return upc.ResetTAC(adminUserAlias, adminUserPassword, userAlias);
177
		return upcV2.ResetTAC(adminUserAlias, adminUserPassword, userAlias);
174 178
	}
175 179

  
176 180
	public int wsDisableTAC(String adminUserAlias, String adminUserPassword, String userAlias) {
177 181

  
178
		return upc.DisableTAC(adminUserAlias, adminUserPassword, userAlias);
182
		return upcV2.DisableTAC(adminUserAlias, adminUserPassword, userAlias);
179 183
	}
180 184

  
181 185
	// /////////////////////////////////////////////////////////////////////////////////////////
......
184 188

  
185 189
	public int wsVerifyToken(String userAlias, String inPassword) {
186 190

  
187
		return upc.VerifyToken(userAlias, inPassword);
191
		return upcV2.VerifyToken(userAlias, inPassword);
188 192
	}
189 193

  
190 194
	public int wsResetToken(String adminUserAlias, String adminUserPassword, String userAlias) {
191 195

  
192
		return upc.ResetToken(adminUserAlias, adminUserPassword, userAlias);
196
		return upcV2.ResetToken(adminUserAlias, adminUserPassword, userAlias);
193 197
	}
194 198

  
195 199
	public int wsDeleteTokenFromStore(String adminUserAlias, String adminUserPassword, String serialNumber) {
196 200

  
197
		return upc.DeleteTokenFromStore(adminUserAlias, adminUserPassword, serialNumber);
201
		return upcV2.DeleteTokenFromStore(adminUserAlias, adminUserPassword, serialNumber);
198 202
	}
199 203

  
200 204
	public int wsAssignTokenToUser(String adminUserAlias, String adminUserPassword,
201 205
			String serialNumber, String userAlias) {
202 206

  
203
		return upc.AssignTokenToUser(adminUserAlias, adminUserPassword, serialNumber, userAlias);
207
		return upcV2.AssignTokenToUser(adminUserAlias, adminUserPassword, serialNumber, userAlias);
204 208
	}
205 209

  
206 210
	public int wsUnassignTokenFromUser(String adminUserAlias, String adminUserPassword, String userAlias) {
207 211

  
208
		return upc.UnassignTokenFromUser(adminUserAlias, adminUserPassword, userAlias);
212
		return upcV2.UnassignTokenFromUser(adminUserAlias, adminUserPassword, userAlias);
209 213
	}
210 214

  
211 215
	public int wsDisableToken(String adminUserAlias, String adminUserPassword, String userAlias) {
212 216

  
213
		return upc.DisableToken(adminUserAlias, adminUserPassword, userAlias);
217
		return upcV2.DisableToken(adminUserAlias, adminUserPassword, userAlias);
214 218
	}
215 219

  
216 220
	public int wsEnableToken(String adminUserAlias, String adminUserPassword, String userAlias) {
217 221

  
218
		return upc.EnableToken(adminUserAlias, adminUserPassword, userAlias);
222
		return upcV2.EnableToken(adminUserAlias, adminUserPassword, userAlias);
219 223
	}
220 224

  
221 225
	public String wsGetTokenVendor() {
222 226

  
223
		return upc.getTokenVendor();
227
		return upcV2.getTokenVendor();
224 228
	}
225 229

  
226 230
	public int wsCheckPasswordReused(String userAlias, String password) {
227 231

  
228
		return upc.UA_CheckPasswordReused(userAlias, password);
232
		return upcV2.UA_CheckPasswordReused(userAlias, password);
229 233
	}
230 234

  
231 235
	public int wsSynchronizeToken(String adminUserAlias, String adminUserPassword,
232 236
			String userAlias, String otp1, String otp2) {
233 237

  
234
		return upc.SynchronizeToken(adminUserAlias, adminUserPassword, userAlias, otp1, otp2);
238
		return upcV2.SynchronizeToken(adminUserAlias, adminUserPassword, userAlias, otp1, otp2);
235 239
	}
236 240

  
237 241
	// /////////////////////////////////////////////////////////////////////////////////////////
......
240 244

  
241 245
	public String wsGenerateSecurityCode(String referenceId) {
242 246

  
243
		return upc.GenerateSecurityCode(referenceId);
247
		return upcV2.GenerateSecurityCode(referenceId);
244 248
	}
245 249

  
246 250
	public int wsVerifySecurityCode(String referenceId, String securityCode) {
247 251

  
248
		return upc.VerifySecurityCode(referenceId, securityCode);
252
		return upcV2.VerifySecurityCode(referenceId, securityCode);
249 253
	}
250 254
	
251 255
	//TODO: 

Also available in: Unified diff