Revision 48d996dc
b/trunk/Pithos.Client.WPF/PithosAccount.cs | ||
---|---|---|
96 | 96 |
var listenerUrl = "pithos://127.0.0.1"; |
97 | 97 |
|
98 | 98 |
|
99 |
|
|
100 | 99 |
//var receiveCredentials = ListenForRedirectAsync(port); |
101 | 100 |
|
102 | 101 |
//var logoutUrl = loginUrl.Replace("login", "im/logout"); |
... | ... | |
140 | 139 |
{ |
141 | 140 |
//<=0.13 |
142 | 141 |
var loginUri = serverUri.Combine("login"); |
143 |
//var loginUri = new Uri("https://astakos.synnefo.dev.grnet.gr/astakos/weblogin/login"); |
|
144 |
// WebClient webClient = new WebClient(); |
|
145 |
// string catalogResult = webClient.UploadString(tokenUri, ""); |
|
146 |
// MessageBox.Show(tokenUri.ToString()); |
|
147 | 142 |
|
143 |
// >0.14 |
|
148 | 144 |
WebRequest webRequest = WebRequest.Create(serverUri); |
149 | 145 |
webRequest.Method = "POST"; |
150 | 146 |
|
... | ... | |
164 | 160 |
Uri webLogin = new Uri(okeanosServices["access"]["serviceCatalog"][0]["endpoints"][0]["publicURL"].ToString()); |
165 | 161 |
|
166 | 162 |
webLogin = webLogin.Combine("login"); |
167 |
|
|
168 |
//foreach (var service in okeanosServices["access"]["serviceCatalog"]) |
|
169 |
//{ |
|
170 |
// foreach (var epoint in service["endpoints"]) |
|
171 |
// { |
|
172 |
// } |
|
173 |
//} |
|
174 |
// Dictionary<string, string> OkeanosServices = JsonConvert.DeserializeObject<Dictionary<string, string>>(responseStr); |
|
175 | 163 |
return webLogin; |
176 | 164 |
} |
177 | 165 |
} |
178 | 166 |
|
179 | 167 |
catch (Exception ex) |
180 | 168 |
{ |
181 |
MessageBox.Show("Stream Failed"); |
|
169 |
//MessageBox.Show("Stream Failed");
|
|
182 | 170 |
return loginUri; |
183 | 171 |
} |
184 |
|
|
185 |
|
|
186 | 172 |
} |
187 | 173 |
} |
188 | 174 |
|
189 | 175 |
catch (Exception ex) |
190 | 176 |
{ |
191 |
MessageBox.Show("Service URL Failed"); |
|
177 |
//MessageBox.Show("Service URL Failed");
|
|
192 | 178 |
return loginUri; |
193 | 179 |
} |
194 | 180 |
} |
195 | 181 |
|
196 |
|
|
197 | 182 |
} |
198 | 183 |
} |
b/trunk/Pithos.Client.WPF/app.config | ||
---|---|---|
122 | 122 |
<value>https://pithos.dev.grnet.gr/im/feedback</value> |
123 | 123 |
</setting> |
124 | 124 |
<setting name="ProductionServer" serializeAs="String"> |
125 |
<value>https://pithos.okeanos.grnet.gr</value>
|
|
125 |
<value>https://accounts.okeanos.grnet.gr/identity/v2.0/tokens</value>
|
|
126 | 126 |
</setting> |
127 | 127 |
<setting name="DevelopmentServer" serializeAs="String"> |
128 | 128 |
<value>https://pithos.dev.grnet.gr</value> |
Also available in: Unified diff