Revision 7f8af0e9

b/docs/astakos-api-guide.rst
426 426
             "endpoints": [{
427 427
                 "SNF:uiURL": "https://accounts.example.synnefo.org/ui",
428 428
                 "versionId": "",
429
                 "SNF:webloginURL": "http://localhost:8080/astakos/weblogin"
429 430
                 "publicURL": "https://accounts.example.synnefo.org/astakos/weblogin"}],
430 431
             "type": "astakos_weblogin",
431 432
             "name": "astakos_weblogin"}],
......
473 474
            <service type="object-store" name="pithos_object-store">
474 475
                <endpoint  SNF:uiURL="https://object-store.example.synnefo.org/ui"  versionId="v1"  publicURL="https://object-store.example.synnefo.org/pithos/object-store/v1"  /> </service>
475 476
            <service type="astakos_weblogin" name="astakos_weblogin">
476
                <endpoint  SNF:uiURL="htftps://accounts.example.synnefo.org/ui"  versionId=""  publicURL="https://accounts.example.synnefo.org/astakos/weblogin"  />
477
                <endpoint  SNF:uiURL="htftps://accounts.example.synnefo.org/ui"  versionId=""  "SNF:webloginURL": "http://localhost:8080/astakos/weblogin"  publicURL="https://accounts.example.synnefo.org/astakos/weblogin"  />
477 478
        </serviceCatalog>
478 479
    </access>
479 480

  
b/snf-astakos-app/astakos/api/tokens.py
100 100
        for l in [e.data.values('key', 'value') for e in s.endpoints.all()]:
101 101
            endpoint = dict((d['key'], d['value']) for d in l)
102 102
            endpoint["SNF:uiURL"] = s.component.url
103
            if s.name == 'astakos_weblogin':
104
                endpoint["SNF:webloginURL"] = endpoint["publicURL"]
103 105
            endpoints.append(endpoint)
104 106
        append({"name": s.name,
105 107
                "type": s.type,

Also available in: Unified diff